diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0daeff2b..0c17ade8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,251 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/Json/SplitterJson.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/Json/SplittersJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/DefaultTheme.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.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/Database/VisualiserDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/DBForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/DBForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/DBMainFormParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/FormsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/FormsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FormsParams/MainFormParamsDBTable.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/StatusEnum.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Current.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/List/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/List/HyperlinksStyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/List/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/List/StyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/PassesSubMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/PropertiesSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/StyledPopupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/VisualiserMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MenuBarButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/ProgressBar/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/ProgressBar/StyledProgressBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/HiddenListRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledCellLabel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/WrapTextRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/GraphTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DBObjectDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DBObjectDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogSlider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogSlider.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogSpinner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogSpinner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/NumberDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/NumberDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/PercentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/PercentsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SessionMaxtimeDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/SessionMaxtimeDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SliderNumberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/SliderNumberForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SpinnerNumberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/SpinnerNumberForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/ComboTextDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/FileNameForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/MultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/TextDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/TextDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/TextFieldDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/TextFieldDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/FormType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/FormType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Sapfor.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/icons/Sapfor.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/UI/DVMParameterFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/UI/DVMParameterFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/UI/MachineFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/UI/MachineFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/UI/MakefilePreviewForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/UI/MakefilePreviewForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfile/UI/SapforProfileFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/UI/SapforProfileFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObjectWithMessages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObjectWithMessages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/EGoto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/EGoto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IGoto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IGoto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Loop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Loop.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/LoopState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/LoopState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/NonRectIter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/NonRectIter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Stop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Stop.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/OSDComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/OSDComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PickUpComponentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PickUpComponentFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PublishForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ChangeFilePass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ChangeFilePass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FunctionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.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/Syntax/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/ThemeElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/ThemeElement.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserColor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/VisualiserColor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserFonts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Fonts/VisualiserFonts.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/VisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserThemeName.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -116,16 +350,16 @@
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="Common.Visual.CommonUI" />
+      <recent name="CommomUI" />
+      <recent name="_VisualDVM.Global" />
       <recent name="Common.CurrentAnchestor" />
       <recent name="Common.Utils.CommonUtils" />
-      <recent name="Common.CommonConstants" />
-      <recent name="Common.Visual.CommonUI" />
-      <recent name="Common_old.Constants" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
       <recent name="E:\Visual_DVM_2020\src\Visual_DVM_2021\UI\Main" />
     </key>
diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java
index 175ba0d8..e8678475 100644
--- a/src/Common/Database/SQLITE/SQLiteDatabase.java
+++ b/src/Common/Database/SQLITE/SQLiteDatabase.java
@@ -4,7 +4,7 @@ import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DBTableColumn;
 import Common.Database.Database;
 import Common.Utils.CommonUtils;
-import Common_old.UI.UI;
+import Common.Visual.CommonUI;
 import Visual_DVM_2021.Passes.PassException;
 import javafx.util.Pair;
 
@@ -210,7 +210,7 @@ public abstract class SQLiteDatabase extends Database {
     protected void insert(DBTable table, DBObject o) throws Exception {
         PreparedStatement ps = insertStatements.get(table.d);
         if (ps == null)
-            UI.Info("INSERT NULL");
+            CommonUI.Info("INSERT NULL");
         int i = 1;
         for (DBTableColumn column : table.columns.values()) {
             if (!column.AutoIncrement) {
@@ -234,7 +234,7 @@ public abstract class SQLiteDatabase extends Database {
     protected void update(DBTable table, DBObject o) throws Exception {
         PreparedStatement ps = updateStatements.get(table.d);
         if (ps == null)
-            UI.Info("UPDATE NULL");
+            CommonUI.Info("UPDATE NULL");
         int i = 1;
         for (DBTableColumn column : table.columns.values()) {
             if (!column.AutoIncrement) {
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index ee34d180..cac2f353 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -1,13 +1,11 @@
 package Common.Database.Tables;
 import Common.CurrentAnchestor;
-import Common_old.Current;
 import Common.Visual.DataSetFilter;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.DataMenuBar;
 import Common_old.UI.Tables.ColumnFilter;
-import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Utils.TextLog;
 import Common.Database.Objects.DBObject;
 import Common.Visual.CommonUI;
@@ -135,7 +133,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return false;
     }
     public boolean ShowDeleteObjectDialog(DBObject object) {
-        return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
+        return CommonUI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
     }
     public String QName() {
         return "\"" + Name + "\"";
diff --git a/src/Common/Utils/CommonUtils.java b/src/Common/Utils/CommonUtils.java
index 9db3b445..a7ca6928 100644
--- a/src/Common/Utils/CommonUtils.java
+++ b/src/Common/Utils/CommonUtils.java
@@ -1,8 +1,6 @@
 package Common.Utils;
 import Common.CommonConstants;
 import Common.Database.VisualiserDatabase;
-import Common.Mode;
-import Common_old.Current;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.apache.commons.io.FileUtils;
@@ -24,15 +22,20 @@ import java.util.concurrent.Semaphore;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 public class CommonUtils {
-    //Режим
-    public static Mode mode= Mode.Undefined;
-    public static boolean hasUI() {
-        return mode.equals(Mode.Normal);
+    static String HomePath = System.getProperty("user.dir");
+    public static void setHomePath(String path_in){
+        HomePath = path_in;
     }
     //Текущая оперционная система
-    public static boolean isWindows=true;
-    //Домашняя папка.
-    public static String Home;
+    public static boolean isWindows() {
+        return System.getProperty("os.name").startsWith("Windows");
+    }
+    public static String getHomePath(){
+        return HomePath;
+    }
+    public static File getHomeDirectory(){
+        return new File(getHomePath());
+    };
     //ГЛОБАЛЬНЫЙ ЖУРНАЛ
     public static Loggable MainLog;
     public static Semaphore date_semaphore = new Semaphore(1);
@@ -148,9 +151,9 @@ public class CommonUtils {
         return res.toString();
     }
     //Синтаксис и регулярные выражения
-    public static String printAllForbiddenCharacters(){
+    public static String printAllForbiddenCharacters() {
         Vector<String> res = new Vector<>();
-        for (char c: CommonConstants.forbidden_file_name_characters)
+        for (char c : CommonConstants.forbidden_file_name_characters)
             res.add(String.valueOf(c));
         return String.join(" ", res);
     }
@@ -385,7 +388,7 @@ public class CommonUtils {
         return path.replace('/', '\\');
     }
     public static double getFileSizeMegaBytes(File file) {
-        return ((double)file.length()) / (1024 * 1024);
+        return ((double) file.length()) / (1024 * 1024);
     }
     public static byte[] fileToBytes(File src) throws Exception {
         byte[] dst = Files.readAllBytes(src.toPath());
diff --git a/src/Common/Utils/Loggable.java b/src/Common/Utils/Loggable.java
index b7143d0a..6c01ced4 100644
--- a/src/Common/Utils/Loggable.java
+++ b/src/Common/Utils/Loggable.java
@@ -1,6 +1,6 @@
 package Common.Utils;
+import Common.Visual.CommonUI;
 import Common_old.UI.DebugPrintLevel;
-import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 
 import java.io.File;
@@ -40,8 +40,8 @@ public interface Loggable {
         ex.printStackTrace(writer);
         writer.flush();
         Print(out.toString());
-        if (CommonUtils.hasUI())
-            UI.Error("Возникло исключение. Подробности в файле журнала\n" +
+        if (CommonUI.isActive())
+            CommonUI.Error("Возникло исключение. Подробности в файле журнала\n" +
                     CommonUtils.Brackets(getLogFile().getAbsolutePath()));
     }
 }
diff --git a/src/Common/Visual/CommonUI.java b/src/Common/Visual/CommonUI.java
index d75d658e..14bf69ff 100644
--- a/src/Common/Visual/CommonUI.java
+++ b/src/Common/Visual/CommonUI.java
@@ -1,13 +1,41 @@
 package Common.Visual;
 import Common.Database.Tables.DataSet;
+import Common.Mode;
+import Common.Utils.CommonUtils;
+import Common.Visual.Themes.DefaultTheme;
+import Common.Visual.Themes.VisualiserTheme;
+import _VisualDVM.Global;
 
 import javax.swing.*;
+import javax.swing.event.ChangeListener;
+import javax.swing.text.DefaultFormatter;
 import java.awt.*;
 import java.util.LinkedHashMap;
 import java.util.Stack;
 public class CommonUI {
+    public static boolean active=true; //есть ли интерфейс. в консольных версиях не нужен.
+    public static boolean isActive() {
+        return active;
+    }
+    //---
     public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
     public static Stack<Component> windowsStack = new Stack<>();
+    static VisualiserTheme theme = new DefaultTheme();
+    public static VisualiserTheme getTheme() {
+        return theme;
+    }
+    public static void setTheme(VisualiserTheme theme_in){
+        theme= theme_in;
+    }
+    public static Component getFrontWindow() {
+        Component res = null;
+        try {
+            res = windowsStack.peek();
+        } catch (Exception ignored){
+
+        }
+        return res;
+    }
     //-----
     public static void Clear(Container container) {
         container.removeAll();
@@ -37,4 +65,42 @@ public class CommonUI {
             }
         }
     }
+    public static void MakeSpinnerRapid(JSpinner spinner, ChangeListener listener) {
+        JComponent comp = spinner.getEditor();
+        JFormattedTextField field = (JFormattedTextField) comp.getComponent(0);
+        DefaultFormatter formatter = (DefaultFormatter) field.getFormatter();
+        formatter.setCommitsOnValidEdit(true);
+        formatter.setAllowsInvalid(true);
+        spinner.addChangeListener(listener);
+    }
+    //Примитивные диалоговые элементы
+    public static boolean Question(Component parent, String text) {
+        return !CommonUI.isActive() || (JOptionPane.showConfirmDialog(parent,
+                text + "?",
+                "Подтверждение",
+                JOptionPane.YES_NO_OPTION,
+                JOptionPane.QUESTION_MESSAGE) == 0);
+    }
+    public static boolean Question(String text) {
+        return Question(getFrontWindow(), text);
+    }
+    public static void Info(String message) {
+        CommonUtils.CopyToClipboard(message);
+        if (CommonUI.isActive())
+            JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
+    }
+    public static void Error(String message) {
+        CommonUtils.CopyToClipboard(message);
+        if (CommonUI.isActive())
+            JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
+    }
+    public static boolean Warning(String text) {
+        return !CommonUI.isActive() ||
+                JOptionPane.showConfirmDialog(getFrontWindow(),
+                        text + "\nВы уверены?",
+                        "Подтверждение",
+                        JOptionPane.YES_NO_OPTION,
+                        JOptionPane.WARNING_MESSAGE) == 0;
+    }
+    //--
 }
diff --git a/src/_VisualDVM/Syntax/VisualiserFonts.java b/src/Common/Visual/Fonts/VisualiserFonts.java
similarity index 91%
rename from src/_VisualDVM/Syntax/VisualiserFonts.java
rename to src/Common/Visual/Fonts/VisualiserFonts.java
index 7e76c61d..80492c87 100644
--- a/src/_VisualDVM/Syntax/VisualiserFonts.java
+++ b/src/Common/Visual/Fonts/VisualiserFonts.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Syntax;
+package Common.Visual.Fonts;
 public enum VisualiserFonts {
     GoodState,
     ReadyState,
diff --git a/src/Common/Visual/StatusEnum.java b/src/Common/Visual/StatusEnum.java
index 630ac868..124d2f2a 100644
--- a/src/Common/Visual/StatusEnum.java
+++ b/src/Common/Visual/StatusEnum.java
@@ -1,5 +1,5 @@
 package Common.Visual;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 public interface StatusEnum {
     default String getDescription() {
         return toString();
diff --git a/src/Common/Visual/Themes/DefaultTheme.java b/src/Common/Visual/Themes/DefaultTheme.java
new file mode 100644
index 00000000..7638b17d
--- /dev/null
+++ b/src/Common/Visual/Themes/DefaultTheme.java
@@ -0,0 +1,60 @@
+package Common.Visual.Themes;
+import java.awt.*;
+public class DefaultTheme extends VisualiserTheme{
+    @Override
+    protected String getForegroundHex() {
+        return "#000000";
+    }
+    @Override
+    protected String getBackgroundHex() {
+        return "#f7f7f7";
+    }
+    @Override
+    protected String getSelectionBackgroundHex() {
+        return "#dae3f1";
+    }
+    @Override
+    protected String getTreeBackgroundHex() {
+        return "#ffffff";
+    }
+    @Override
+    protected String getBarForegroundHex() {
+        return "#637780";
+    }
+    @Override
+    protected String getBarBackgroundHex() {
+        return "#ffffff";
+    }
+    @Override
+    protected String getTableBackgroundHex() {
+        return "#ffffff";
+    }
+    @Override
+    protected Color getGoodFontColor() {
+        return Color.decode("#009738");
+    }
+    @Override
+    protected Color getReadyFontColor2() {
+        return Color.decode("#FFD700");
+    }
+    @Override
+    protected Color getProgressFontColor() {
+        return Color.decode("#f39a28");
+    }
+    @Override
+    protected Color getBadFontColor() {
+        return Color.decode("#ab0000");
+    }
+    @Override
+    protected Color getFatalFontColor() {
+        return Color.decode("#FF4500");
+    }
+    @Override
+    protected Color getUnknownFontColor() {
+        return Color.GRAY;
+    }
+    @Override
+    protected Color getHyperlinkFontColor() {
+        return Color.blue;
+    }
+}
diff --git a/src/_VisualDVM/Syntax/ThemeElement.java b/src/Common/Visual/Themes/ThemeElement.java
similarity index 80%
rename from src/_VisualDVM/Syntax/ThemeElement.java
rename to src/Common/Visual/Themes/ThemeElement.java
index 35ff699f..ef4f32a7 100644
--- a/src/_VisualDVM/Syntax/ThemeElement.java
+++ b/src/Common/Visual/Themes/ThemeElement.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Syntax;
+package Common.Visual.Themes;
 public interface ThemeElement {
     default void FontUp() {
     }
diff --git a/src/Common/Visual/Themes/VisualiserTheme.java b/src/Common/Visual/Themes/VisualiserTheme.java
new file mode 100644
index 00000000..8f2e81f9
--- /dev/null
+++ b/src/Common/Visual/Themes/VisualiserTheme.java
@@ -0,0 +1,175 @@
+package Common.Visual.Themes;
+import Common.Utils.CommonUtils;
+import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.VisualiserColor;
+import org.fife.ui.rsyntaxtextarea.Theme;
+
+import java.awt.*;
+import java.awt.font.TextAttribute;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+
+import static java.awt.Font.MONOSPACED;
+public abstract class VisualiserTheme {
+    public Color foreground;
+    public Color background;
+    public Color selection_background;
+    public Color trees_background;
+    public Color bar_foreground;
+    public Color bar_background;
+    public Color table_background;
+    //--
+    protected abstract String getForegroundHex();
+    protected abstract String getBackgroundHex();
+    protected abstract String getSelectionBackgroundHex();
+    protected abstract String getTreeBackgroundHex();
+    protected abstract String getBarForegroundHex();
+    protected abstract String getBarBackgroundHex();
+    protected abstract String getTableBackgroundHex();
+    protected abstract Color getGoodFontColor();
+    protected abstract Color getReadyFontColor2();
+    protected abstract Color getProgressFontColor();
+    protected abstract Color getBadFontColor();
+    protected abstract Color getFatalFontColor();
+    protected abstract Color getUnknownFontColor();
+    protected abstract Color getHyperlinkFontColor();
+    //--
+    public LinkedHashMap<VisualiserFonts, Font> Fonts = new LinkedHashMap<>();
+    public LinkedHashMap<VisualiserColor, Color> Colors = new LinkedHashMap<>();
+    protected void createFonts(){
+        Fonts.put(VisualiserFonts.GoodState,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, "Times New Roman");
+                                put(TextAttribute.FOREGROUND, getGoodFontColor());
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.ReadyState,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, "Times New Roman");
+                                put(TextAttribute.FOREGROUND, getReadyFontColor2());
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.BadState,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, "Times New Roman");
+                                put(TextAttribute.FOREGROUND, getBadFontColor());
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.BlueState,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, "Times New Roman");
+                                put(TextAttribute.FOREGROUND, getHyperlinkFontColor());
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.Fatal,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, "Times New Roman");
+                                put(TextAttribute.FOREGROUND, getFatalFontColor());
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.UnknownState,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, "Times New Roman");
+                                put(TextAttribute.FOREGROUND, getUnknownFontColor());
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.Hyperlink,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, MONOSPACED);
+                                put(TextAttribute.FOREGROUND, getHyperlinkFontColor());
+                                put(TextAttribute.SIZE, 18);
+                                put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
+                                put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.ProgressState,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, "Times New Roman");
+                                put(TextAttribute.FOREGROUND, getProgressFontColor());
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                ));
+        Fonts.put(VisualiserFonts.Disabled, new Font(
+                new HashMap<TextAttribute, Object>() {
+                    {
+                        put(TextAttribute.FAMILY, MONOSPACED);
+                        put(TextAttribute.BACKGROUND, Color.lightGray);
+                        put(TextAttribute.FOREGROUND, Color.lightGray);
+                        put(TextAttribute.SIZE, 18);
+                        put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
+                    }
+                }
+        ));
+        Fonts.put(VisualiserFonts.Distribution,
+                new Font(
+                        new HashMap<TextAttribute, Object>() {
+                            {
+                                put(TextAttribute.FAMILY, MONOSPACED);
+                                put(TextAttribute.SIZE, 16);
+                            }
+                        }
+                )
+        );
+        Fonts.put(VisualiserFonts.TreePlain, new Font("Times New Roman", Font.PLAIN, 16));
+        Fonts.put(VisualiserFonts.TreeItalic, new Font("Times New Roman", Font.ITALIC, 16));
+        Fonts.put(VisualiserFonts.TreeBold, new Font("Times New Roman", Font.BOLD, 16));
+        Fonts.put(VisualiserFonts.TreeBoldItalic, new Font("Times New Roman", Font.BOLD|Font.ITALIC, 16));
+        Fonts.put(VisualiserFonts.Menu, new Font("Times New Roman", Font.ITALIC, 16));
+        Fonts.put(VisualiserFonts.NewVersion, new Font(
+                new HashMap<TextAttribute, Object>() {
+                    {
+                        put(TextAttribute.FAMILY, "Times New Roman");
+                        put(TextAttribute.FOREGROUND, Color.BLACK);
+                        put(TextAttribute.BACKGROUND, Color.YELLOW);
+                        put(TextAttribute.SIZE, 16);
+                    }
+                }
+
+        ));
+    }
+    public VisualiserTheme() {
+        try {
+            //-----------------------------------------------
+            foreground = Color.decode(getForegroundHex());
+            background = Color.decode(getBackgroundHex());
+            selection_background = Color.decode(getSelectionBackgroundHex());
+            trees_background = Color.decode(getTreeBackgroundHex());
+            bar_foreground = Color.decode(getBarForegroundHex());
+            bar_background = Color.decode(getBarBackgroundHex());
+            table_background = Color.decode(getTableBackgroundHex());
+            createFonts();
+        } catch (Exception ex) {
+            CommonUtils.MainLog.PrintException(ex);
+        }
+    }
+}
diff --git a/src/_VisualDVM/Syntax/VisualiserColor.java b/src/Common/Visual/VisualiserColor.java
similarity index 74%
rename from src/_VisualDVM/Syntax/VisualiserColor.java
rename to src/Common/Visual/VisualiserColor.java
index 2f202773..286edaf3 100644
--- a/src/_VisualDVM/Syntax/VisualiserColor.java
+++ b/src/Common/Visual/VisualiserColor.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Syntax;
+package Common.Visual;
 public enum VisualiserColor {
     ToolTip_background,
     ToolTip_foreground
diff --git a/src/Common_old/UI/Windows/Dialog/DBObjectDialog.java b/src/Common/Visual/Windows/Dialog/DBObjectDialog.java
similarity index 96%
rename from src/Common_old/UI/Windows/Dialog/DBObjectDialog.java
rename to src/Common/Visual/Windows/Dialog/DBObjectDialog.java
index eaf8544a..ffcd7638 100644
--- a/src/Common_old/UI/Windows/Dialog/DBObjectDialog.java
+++ b/src/Common/Visual/Windows/Dialog/DBObjectDialog.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import Common.Database.Objects.DBObject;
 public abstract class DBObjectDialog<T extends DBObject, F extends DialogFields> extends Dialog<T, F> {
     public boolean edit = false;
diff --git a/src/Common_old/UI/Windows/Dialog/Dialog.java b/src/Common/Visual/Windows/Dialog/Dialog.java
similarity index 93%
rename from src/Common_old/UI/Windows/Dialog/Dialog.java
rename to src/Common/Visual/Windows/Dialog/Dialog.java
index c3c787d2..a9d7eef5 100644
--- a/src/Common_old/UI/Windows/Dialog/Dialog.java
+++ b/src/Common/Visual/Windows/Dialog/Dialog.java
@@ -1,10 +1,8 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
-import Common_old.Current;
-import _VisualDVM.Syntax.ThemeElement;
-import _VisualDVM.Syntax.VisualiserFonts;
-import Common_old.UI.UI;
+import Common.Visual.Themes.ThemeElement;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common.Utils.TextLog;
 
 import javax.swing.*;
@@ -37,7 +35,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         setModal(true);
         toFront();
         getContentPane().setLayout(new BorderLayout());
-        lTitle.setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        lTitle.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
         if (!getIconPath().isEmpty()) {
             setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
         }
@@ -139,7 +137,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
             OK = true;
             CloseAction();
         } else
-            UI.Error("Валидация не пройдена:\n" + Log.toString());
+            CommonUI.Error("Валидация не пройдена:\n" + Log.toString());
     }
     protected void onCancel() {
         CloseAction();
diff --git a/src/Common_old/UI/Windows/Dialog/DialogFields.java b/src/Common/Visual/Windows/Dialog/DialogFields.java
similarity index 68%
rename from src/Common_old/UI/Windows/Dialog/DialogFields.java
rename to src/Common/Visual/Windows/Dialog/DialogFields.java
index 6e5dc535..3b071aea 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogFields.java
+++ b/src/Common/Visual/Windows/Dialog/DialogFields.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import java.awt.*;
 public interface DialogFields {
     Component getContent();
diff --git a/src/Common_old/UI/Windows/Dialog/DialogSlider.java b/src/Common/Visual/Windows/Dialog/DialogSlider.java
similarity index 83%
rename from src/Common_old/UI/Windows/Dialog/DialogSlider.java
rename to src/Common/Visual/Windows/Dialog/DialogSlider.java
index d5c61268..6e220f9c 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogSlider.java
+++ b/src/Common/Visual/Windows/Dialog/DialogSlider.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import javax.swing.*;
 import java.awt.*;
 public class DialogSlider extends JSlider implements DialogFields {
diff --git a/src/Common_old/UI/Windows/Dialog/DialogSpinner.java b/src/Common/Visual/Windows/Dialog/DialogSpinner.java
similarity index 83%
rename from src/Common_old/UI/Windows/Dialog/DialogSpinner.java
rename to src/Common/Visual/Windows/Dialog/DialogSpinner.java
index 2fff5b42..48471f4b 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogSpinner.java
+++ b/src/Common/Visual/Windows/Dialog/DialogSpinner.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import javax.swing.*;
 import java.awt.*;
 public class DialogSpinner extends JSpinner implements DialogFields {
diff --git a/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
similarity index 59%
rename from src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java
rename to src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
index 3fdfaf55..b9d7fb65 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java
+++ b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
@@ -1,12 +1,12 @@
-package Common_old.UI.Windows.Dialog;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+package Common.Visual.Windows.Dialog;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import java.awt.*;
 public class DialogTextComboBox extends JComboBox<String> implements DialogFields {
     public DialogTextComboBox() {
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
         setEditable(false);
     }
     @Override
diff --git a/src/Common_old/UI/Windows/Dialog/DialogTextField.java b/src/Common/Visual/Windows/Dialog/DialogTextField.java
similarity index 85%
rename from src/Common_old/UI/Windows/Dialog/DialogTextField.java
rename to src/Common/Visual/Windows/Dialog/DialogTextField.java
index eba26c67..2905aee0 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogTextField.java
+++ b/src/Common/Visual/Windows/Dialog/DialogTextField.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import Common_old.UI.TextField.StyledTextField;
 
 import java.awt.*;
diff --git a/src/Common_old/UI/Windows/Dialog/DialogWrapText.java b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
similarity index 84%
rename from src/Common_old/UI/Windows/Dialog/DialogWrapText.java
rename to src/Common/Visual/Windows/Dialog/DialogWrapText.java
index ed18c465..31542ab8 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogWrapText.java
+++ b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
@@ -1,6 +1,6 @@
-package Common_old.UI.Windows.Dialog;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+package Common.Visual.Windows.Dialog;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import java.awt.*;
@@ -8,7 +8,7 @@ public class DialogWrapText extends JTextPane implements DialogFields {
     public DialogWrapText(){
         setOpaque(true);
         setBackground(Color.WHITE);
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeBold));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold));
         setEditable(false);
     }
     @Override
diff --git a/src/Common_old/UI/Windows/Dialog/NumberDialog.java b/src/Common/Visual/Windows/Dialog/NumberDialog.java
similarity index 89%
rename from src/Common_old/UI/Windows/Dialog/NumberDialog.java
rename to src/Common/Visual/Windows/Dialog/NumberDialog.java
index c39d8c13..81cceca3 100644
--- a/src/Common_old/UI/Windows/Dialog/NumberDialog.java
+++ b/src/Common/Visual/Windows/Dialog/NumberDialog.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 public abstract class NumberDialog<F extends DialogFields> extends Dialog<Integer, F> {
     public NumberDialog(Class<F> f) {
         super(f);
diff --git a/src/Common_old/UI/Windows/Dialog/PercentsForm.java b/src/Common/Visual/Windows/Dialog/PercentsForm.java
similarity index 93%
rename from src/Common_old/UI/Windows/Dialog/PercentsForm.java
rename to src/Common/Visual/Windows/Dialog/PercentsForm.java
index 182ffea7..b23ef0e6 100644
--- a/src/Common_old/UI/Windows/Dialog/PercentsForm.java
+++ b/src/Common/Visual/Windows/Dialog/PercentsForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 public class PercentsForm extends SliderNumberForm {
     public PercentsForm() {
     }
diff --git a/src/Common_old/UI/Windows/Dialog/SessionMaxtimeDialog.java b/src/Common/Visual/Windows/Dialog/SessionMaxtimeDialog.java
similarity index 86%
rename from src/Common_old/UI/Windows/Dialog/SessionMaxtimeDialog.java
rename to src/Common/Visual/Windows/Dialog/SessionMaxtimeDialog.java
index 8ec058c1..11f86a66 100644
--- a/src/Common_old/UI/Windows/Dialog/SessionMaxtimeDialog.java
+++ b/src/Common/Visual/Windows/Dialog/SessionMaxtimeDialog.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import javax.swing.*;
 public class SessionMaxtimeDialog extends SpinnerNumberForm {
     public SessionMaxtimeDialog() {
diff --git a/src/Common_old/UI/Windows/Dialog/SliderNumberForm.java b/src/Common/Visual/Windows/Dialog/SliderNumberForm.java
similarity index 97%
rename from src/Common_old/UI/Windows/Dialog/SliderNumberForm.java
rename to src/Common/Visual/Windows/Dialog/SliderNumberForm.java
index 0e628835..b107cea6 100644
--- a/src/Common_old/UI/Windows/Dialog/SliderNumberForm.java
+++ b/src/Common/Visual/Windows/Dialog/SliderNumberForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 public class SliderNumberForm extends NumberDialog<DialogSlider> {
diff --git a/src/Common_old/UI/Windows/Dialog/SpinnerNumberForm.java b/src/Common/Visual/Windows/Dialog/SpinnerNumberForm.java
similarity index 92%
rename from src/Common_old/UI/Windows/Dialog/SpinnerNumberForm.java
rename to src/Common/Visual/Windows/Dialog/SpinnerNumberForm.java
index 19247350..04e47200 100644
--- a/src/Common_old/UI/Windows/Dialog/SpinnerNumberForm.java
+++ b/src/Common/Visual/Windows/Dialog/SpinnerNumberForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog;
+package Common.Visual.Windows.Dialog;
 public abstract class SpinnerNumberForm extends NumberDialog<DialogSpinner> {
     public SpinnerNumberForm() {
         super(DialogSpinner.class);
diff --git a/src/Common_old/UI/Windows/Dialog/Text/ComboTextDialog.java b/src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java
similarity index 85%
rename from src/Common_old/UI/Windows/Dialog/Text/ComboTextDialog.java
rename to src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java
index 3aa8c007..4561fb0f 100644
--- a/src/Common_old/UI/Windows/Dialog/Text/ComboTextDialog.java
+++ b/src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java
@@ -1,6 +1,6 @@
-package Common_old.UI.Windows.Dialog.Text;
-import Common_old.UI.Windows.Dialog.Dialog;
-import Common_old.UI.Windows.Dialog.DialogTextComboBox;
+package Common.Visual.Windows.Dialog.Text;
+import Common.Visual.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.DialogTextComboBox;
 
 import java.util.Vector;
 public class ComboTextDialog extends Dialog<String, DialogTextComboBox> {
diff --git a/src/Common_old/UI/Windows/Dialog/Text/FileNameForm.java b/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
similarity index 84%
rename from src/Common_old/UI/Windows/Dialog/Text/FileNameForm.java
rename to src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
index 9ff0a540..5112b767 100644
--- a/src/Common_old/UI/Windows/Dialog/Text/FileNameForm.java
+++ b/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog.Text;
+package Common.Visual.Windows.Dialog.Text;
 import Common_old.Utils.Utils;
 public class FileNameForm extends TextFieldDialog {
     public FileNameForm() {
diff --git a/src/Common_old/UI/Windows/Dialog/Text/MultilineTextForm.java b/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
similarity index 95%
rename from src/Common_old/UI/Windows/Dialog/Text/MultilineTextForm.java
rename to src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
index afe30d4d..6f6c4b71 100644
--- a/src/Common_old/UI/Windows/Dialog/Text/MultilineTextForm.java
+++ b/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog.Text;
+package Common.Visual.Windows.Dialog.Text;
 import Common_old.UI.Editor.BaseEditor;
 public class MultilineTextForm extends TextDialog<BaseEditor> {
     public MultilineTextForm() {
diff --git a/src/Common_old/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java b/src/Common/Visual/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java
similarity index 85%
rename from src/Common_old/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java
rename to src/Common/Visual/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java
index e4b8feb9..01fe9189 100644
--- a/src/Common_old/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java
+++ b/src/Common/Visual/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows.Dialog.Text;
+package Common.Visual.Windows.Dialog.Text;
 public class ReadOnlyMultilineTextForm extends MultilineTextForm {
     public ReadOnlyMultilineTextForm() {
     }
diff --git a/src/Common_old/UI/Windows/Dialog/Text/TextDialog.java b/src/Common/Visual/Windows/Dialog/Text/TextDialog.java
similarity index 77%
rename from src/Common_old/UI/Windows/Dialog/Text/TextDialog.java
rename to src/Common/Visual/Windows/Dialog/Text/TextDialog.java
index 9396e33d..7ab32ffd 100644
--- a/src/Common_old/UI/Windows/Dialog/Text/TextDialog.java
+++ b/src/Common/Visual/Windows/Dialog/Text/TextDialog.java
@@ -1,6 +1,6 @@
-package Common_old.UI.Windows.Dialog.Text;
-import Common_old.UI.Windows.Dialog.Dialog;
-import Common_old.UI.Windows.Dialog.DialogFields;
+package Common.Visual.Windows.Dialog.Text;
+import Common.Visual.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.DialogFields;
 //текстовый диалог. возвращает текст. может иметь параметром исходный текст.
 public abstract class TextDialog<F extends DialogFields> extends Dialog<String, F> {
     public TextDialog(Class<F> f) {
diff --git a/src/Common_old/UI/Windows/Dialog/Text/TextFieldDialog.java b/src/Common/Visual/Windows/Dialog/Text/TextFieldDialog.java
similarity index 89%
rename from src/Common_old/UI/Windows/Dialog/Text/TextFieldDialog.java
rename to src/Common/Visual/Windows/Dialog/Text/TextFieldDialog.java
index 6fca3393..04310825 100644
--- a/src/Common_old/UI/Windows/Dialog/Text/TextFieldDialog.java
+++ b/src/Common/Visual/Windows/Dialog/Text/TextFieldDialog.java
@@ -1,5 +1,5 @@
-package Common_old.UI.Windows.Dialog.Text;
-import Common_old.UI.Windows.Dialog.DialogTextField;
+package Common.Visual.Windows.Dialog.Text;
+import Common.Visual.Windows.Dialog.DialogTextField;
 
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
diff --git a/src/Common_old/UI/Windows/Form.java b/src/Common/Visual/Windows/Form.java
similarity index 68%
rename from src/Common_old/UI/Windows/Form.java
rename to src/Common/Visual/Windows/Form.java
index c361b080..bb591781 100644
--- a/src/Common_old/UI/Windows/Form.java
+++ b/src/Common/Visual/Windows/Form.java
@@ -1,7 +1,6 @@
-package Common_old.UI.Windows;
+package Common.Visual.Windows;
 import Common.Utils.CommonUtils;
-import GlobalData.GlobalDatabase;
-import _VisualDVM.Syntax.ThemeElement;
+import Common.Visual.Themes.ThemeElement;
 import Common.Database.Objects.DBForm.DBForm;
 
 import javax.swing.*;
@@ -9,17 +8,17 @@ import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 public abstract class Form extends JFrame implements ThemeElement {
-    private DBForm info = null;
+    private DBForm dbInfo = null;
     public Form() {
-        if (getIconName().length() > 0) setIconImage(new ImageIcon(Form.class.getResource(getIconName())).getImage());
+        if (getIconPath()!=null) setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
         SetListener();
-        this.setTitle(CommonUtils.isWindows ? getWTitleText() : getUTitleText());
+        this.setTitle(CommonUtils.isWindows() ? getWTitleText() : getUTitleText());
         pack();
         setMinimumSize(new Dimension(getDefaultWidth(), getDefaultHeight()));
     }
     abstract protected JPanel getMainPanel();
-    public String getIconName() {
-        return "";
+    public String getIconPath() {
+        return null;
     }
     public String getWTitleText() {
         return "";
@@ -27,7 +26,7 @@ public abstract class Form extends JFrame implements ThemeElement {
     public String getUTitleText() {
         return "";
     }
-    protected String getFormType() {
+    protected String getFormKey() {
         return null;
     }
     protected void SetListener() {
@@ -72,24 +71,23 @@ public abstract class Form extends JFrame implements ThemeElement {
     }
     public void AfterClose() {
     }
-    //todo поменять на json? вместе с окном компонент
     public void LoadWindowParameters() throws Exception {
-        if (getFormType()!=null)
-            if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(getFormType())) {
-                info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(getFormType());
-                info.Apply(this);
+        if (getFormKey()!=null)
+            if (CommonUtils.db.forms.Data.containsKey(getFormKey())) {
+                dbInfo = CommonUtils.db.forms.Data.get(getFormKey());
+                dbInfo.Apply(this);
                 return;
             }
         setSize(getDefaultWidth(), getDefaultHeight());
         setLocationRelativeTo(getRelative());
     }
     public void SaveWindowParameters() throws Exception {
-        if (getFormType()!=null) {
-            if (info != null) {
-                info.Init(this);
-                CommonUtils.db.Update(info);
+        if (getFormKey()!=null) {
+            if (dbInfo != null) {
+                dbInfo.Init(this);
+                CommonUtils.db.Update(dbInfo);
             } else
-                CommonUtils.db.Insert(new DBForm(getFormType(), this));
+                CommonUtils.db.Insert(new DBForm(getFormKey(), this));
         }
     }
     @Override
diff --git a/src/Common_old/Current.java b/src/Common_old/Current.java
index 9c309483..f9c458b9 100644
--- a/src/Common_old/Current.java
+++ b/src/Common_old/Current.java
@@ -21,7 +21,6 @@ import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import Visual_DVM_2021.Passes.UI.PassForm;
-import _VisualDVM.Syntax.VisualiserTheme;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
@@ -34,10 +33,8 @@ public enum Current implements CurrentAnchestor {
     SapforEtalonVersion,
     SapforVersion,
     //--
-    //--
     ComponentServerBackup,
     Subscriber,
-    Theme,
     FileGraphElement,
     InlineGraphElement,
     InlineGraphElement2,
@@ -166,8 +163,6 @@ public enum Current implements CurrentAnchestor {
                 return "Тест";
             case Sapfor:
                 return "SAPFOR";
-            case Theme:
-                return "Тема";
             case EnvironmentValue:
                 return "Значение переменной окружения";
             case SelectedDirectory:
@@ -373,9 +368,6 @@ public enum Current implements CurrentAnchestor {
     public static PassForm getPassForm() {
         return (Visual_DVM_2021.Passes.UI.PassForm) CurrentAnchestor.get(Current.PassForm);
     }
-    public static VisualiserTheme getTheme() {
-        return (VisualiserTheme) CurrentAnchestor.get(Current.Theme);
-    }
     public static ParallelRegion getParallelRegion() {
         return (ParallelRegion) CurrentAnchestor.get(Current.ParallelRegion);
     }
diff --git a/src/Common_old/UI/Editor/BaseEditor.java b/src/Common_old/UI/Editor/BaseEditor.java
index 470f6ee5..2e85f572 100644
--- a/src/Common_old/UI/Editor/BaseEditor.java
+++ b/src/Common_old/UI/Editor/BaseEditor.java
@@ -1,11 +1,11 @@
 package Common_old.UI.Editor;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Menus.StyledPopupMenu;
 import Common_old.UI.Menus.TextEditorMenu;
-import _VisualDVM.Syntax.ThemeElement;
-import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Themes.ThemeElement;
+import Common.Visual.Windows.Dialog.DialogFields;
+import _VisualDVM.Syntax.SPFEditorTheme;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 
 import javax.swing.event.HyperlinkEvent;
@@ -45,7 +45,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
                         //todo переход в нужную строку по ctrl+g?
                         case KeyEvent.VK_Z:
                             if (getText().equals(startText)) {
-                                UI.Info("Начальная версия текста достигнута.");
+                                CommonUI.Info("Начальная версия текста достигнута.");
                                 e.consume();
                             }
                             break;
@@ -129,7 +129,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
     @Override
     public void applyTheme() {
         float font_size = (float) getFont().getSize();
-        Current.getTheme().getEditorTheme().apply(this);
+        ((SPFEditorTheme)CommonUI.getTheme()).getEditorTheme().apply(this);
         setFont(getFont().deriveFont(font_size));
         menu.applyTheme();
         //меню связано с редактором. поэтому тема меняется только вместе с ним.
diff --git a/src/Common_old/UI/List/HyperlinksStyledList.java b/src/Common_old/UI/List/HyperlinksStyledList.java
index a557b85f..46cecb9a 100644
--- a/src/Common_old/UI/List/HyperlinksStyledList.java
+++ b/src/Common_old/UI/List/HyperlinksStyledList.java
@@ -1,10 +1,10 @@
 package Common_old.UI.List;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 public class HyperlinksStyledList extends StyledList {
     @Override
     public void applyTheme() {
         super.applyTheme();
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
     }
 }
diff --git a/src/Common_old/UI/List/StyledList.java b/src/Common_old/UI/List/StyledList.java
index a1da1d5f..a6addf43 100644
--- a/src/Common_old/UI/List/StyledList.java
+++ b/src/Common_old/UI/List/StyledList.java
@@ -1,17 +1,17 @@
 package Common_old.UI.List;
-import Common_old.Current;
-import _VisualDVM.Syntax.ThemeElement;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Themes.ThemeElement;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 public class StyledList extends JList implements ThemeElement {
     public StyledList() {
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         applyTheme();
     }
     @Override
     public void applyTheme() {
-        setBackground(Current.getTheme().table_background);
-        setForeground(Current.getTheme().foreground);
+        setBackground(CommonUI.getTheme().table_background);
+        setForeground(CommonUI.getTheme().foreground);
     }
 }
diff --git a/src/Common_old/UI/Menus/PassesSubMenu.java b/src/Common_old/UI/Menus/PassesSubMenu.java
index 45710d16..7e4401d1 100644
--- a/src/Common_old/UI/Menus/PassesSubMenu.java
+++ b/src/Common_old/UI/Menus/PassesSubMenu.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -10,7 +10,7 @@ public class PassesSubMenu extends JMenu {
     public PassesSubMenu(String title, String icon, PassCode_2021... passes) {
         super(title);
         setIcon(CommonUtils.getIcon(icon));
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
         for (PassCode_2021 code : passes) {
             add(Pass_2021.passes.get(code).createMenuItem());
         }
diff --git a/src/Common_old/UI/Menus/PropertiesSubmenu.java b/src/Common_old/UI/Menus/PropertiesSubmenu.java
index 29d92dd9..bde1646f 100644
--- a/src/Common_old/UI/Menus/PropertiesSubmenu.java
+++ b/src/Common_old/UI/Menus/PropertiesSubmenu.java
@@ -1,8 +1,8 @@
 package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 public class PropertiesSubmenu extends JMenu {
@@ -10,7 +10,7 @@ public class PropertiesSubmenu extends JMenu {
         super(title);
         if (icon != null)
             setIcon(CommonUtils.getIcon(icon));
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
         for (String name : settings) {
             Global.properties.addFlagMenuItem(this, name);
         }
diff --git a/src/Common_old/UI/Menus/StyledPopupMenu.java b/src/Common_old/UI/Menus/StyledPopupMenu.java
index fac95e93..4078734d 100644
--- a/src/Common_old/UI/Menus/StyledPopupMenu.java
+++ b/src/Common_old/UI/Menus/StyledPopupMenu.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus;
-import Common_old.Current;
-import _VisualDVM.Syntax.ThemeElement;
+import Common.Visual.CommonUI;
+import Common.Visual.Themes.ThemeElement;
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuEvent;
@@ -21,15 +21,15 @@ public class StyledPopupMenu extends JPopupMenu implements ThemeElement {
         });
     }
     private void refreshTheme_r(MenuElement element) {
-        element.getComponent().setBackground(Current.getTheme().background);
-        element.getComponent().setForeground(Current.getTheme().foreground);
+        element.getComponent().setBackground(CommonUI.getTheme().background);
+        element.getComponent().setForeground(CommonUI.getTheme().foreground);
         for (MenuElement se : element.getSubElements())
             refreshTheme_r(se);
     }
     @Override
     public void applyTheme() {
-        setBackground(Current.getTheme().background);
-        setForeground(Current.getTheme().foreground);
+        setBackground(CommonUI.getTheme().background);
+        setForeground(CommonUI.getTheme().foreground);
         refreshTheme_r(this);
     }
     public void CheckElementsVisibility() {
diff --git a/src/Common_old/UI/Menus/VisualiserMenuItem.java b/src/Common_old/UI/Menus/VisualiserMenuItem.java
index c720dd36..e4d0f18c 100644
--- a/src/Common_old/UI/Menus/VisualiserMenuItem.java
+++ b/src/Common_old/UI/Menus/VisualiserMenuItem.java
@@ -1,21 +1,21 @@
 package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 public class VisualiserMenuItem extends JMenuItem {
     public VisualiserMenuItem(String text) {
         super(text, null);
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
     }
     public VisualiserMenuItem(String text, String icon_path) {
         super(text);
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
         if (icon_path != null)
             setIcon(CommonUtils.getIcon(icon_path));
     }
     public VisualiserMenuItem(){
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
     }
 }
diff --git a/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java b/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java
index 2ef22519..0f645248 100644
--- a/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java
+++ b/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java
@@ -2,7 +2,7 @@ package Common_old.UI.Menus_2023.CredentialsBar;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java b/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java
index 96f137ec..4bdd0fe4 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java
+++ b/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java
@@ -1,4 +1,5 @@
 package Common_old.UI.Menus_2023.MainMenuBar;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
@@ -29,7 +30,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 setIcon("/icons/ComponentsActual.png");
                 addActionListener(e -> {
                     if (PerformanceAnalyzer.isActive) {
-                        UI.Info("Перед работой с компонентами закройте анализатор производительности!");
+                        CommonUI.Info("Перед работой с компонентами закройте анализатор производительности!");
                     } else {
                         Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do();
                         Global.RefreshUpdatesStatus();
diff --git a/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index f7aaf505..a041315f 100644
--- a/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -15,7 +15,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
                 "FocusPassesResult"
         ));
         add(new CompactnessSettingsMenu());
-        if (CommonUtils.isWindows) {
+        if (CommonUtils.isWindows()) {
             add(new SettingsSubmenu("Компиляция на локальной машине", null,
                     SettingName.LocalMakePathWindows,
                     SettingName.Kernels
diff --git a/src/Common_old/UI/Menus_2023/MenuBarButton.java b/src/Common_old/UI/Menus_2023/MenuBarButton.java
index 33c613d9..26fffbec 100644
--- a/src/Common_old/UI/Menus_2023/MenuBarButton.java
+++ b/src/Common_old/UI/Menus_2023/MenuBarButton.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus_2023;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import java.awt.*;
@@ -9,7 +9,7 @@ import java.awt.*;
 public class MenuBarButton extends JButton {
     public MenuBarButton() {
         super();
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
         //
         setBorderPainted(false);
         setContentAreaFilled(false);
@@ -30,6 +30,6 @@ public class MenuBarButton extends JButton {
         setIcon(CommonUtils.getIcon(icon_path));
     }
     public void setFont(VisualiserFonts font_in){
-        setFont(Current.getTheme().Fonts.get(font_in));
+        setFont(CommonUI.getTheme().Fonts.get(font_in));
     }
 }
diff --git a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java b/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
index a6ebe65a..5b0f707c 100644
--- a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
+++ b/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
@@ -1,9 +1,10 @@
 package Common_old.UI.Menus_2023.ProjectMenuBar;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.VisualiserMenu;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.UI;
 import ProjectData.ProjectView;
 
@@ -18,7 +19,7 @@ public class ProjectViewMenu extends VisualiserMenu {
             JMenuItem m = new JMenuItem(view.getDescription()) {
                 {
                     setIcon(CommonUtils.getIcon(view.getIcon()));
-                    setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                    setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
                     addActionListener(e -> {
                         CurrentAnchestor.set(Current.ProjectView, view);
                         UI.getMainWindow().getProjectWindow().ShowProjectView();
diff --git a/src/Common_old/UI/Menus_2023/SettingsSubmenu.java b/src/Common_old/UI/Menus_2023/SettingsSubmenu.java
index ec72c79f..03461cb9 100644
--- a/src/Common_old/UI/Menus_2023/SettingsSubmenu.java
+++ b/src/Common_old/UI/Menus_2023/SettingsSubmenu.java
@@ -1,8 +1,8 @@
 package Common_old.UI.Menus_2023;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import GlobalData.GlobalDatabase;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import GlobalData.Settings.SettingName;
 
 import javax.swing.*;
@@ -11,7 +11,7 @@ public class SettingsSubmenu extends JMenu {
         super(title);
         if (icon != null)
             setIcon(CommonUtils.getIcon(icon));
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
         for (SettingName c : settings) {
             add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem());
         }
diff --git a/src/Common_old/UI/Menus_2023/VisualiserMenu.java b/src/Common_old/UI/Menus_2023/VisualiserMenu.java
index a06002ab..659220ec 100644
--- a/src/Common_old/UI/Menus_2023/VisualiserMenu.java
+++ b/src/Common_old/UI/Menus_2023/VisualiserMenu.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus_2023;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -13,7 +13,7 @@ public class VisualiserMenu extends JMenu {
         setToolTipText(text);
         if (textVisible)
             setText(text);
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         if (!iconPath.isEmpty())
             setIcon(CommonUtils.getIcon(iconPath));
     }
diff --git a/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java b/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
index f389f6a4..9caf20f1 100644
--- a/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
+++ b/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus_2023;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -34,7 +34,7 @@ public class VisualiserMenuBar extends JToolBar {
     public JLabel addLabel(String text_in, String icon_path_in) {
         JLabel res = new JLabel(text_in) {
             {
-                setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
                 if (icon_path_in != null) {
                     setIcon(CommonUtils.getIcon(icon_path_in));
                 }
diff --git a/src/Common_old/UI/ProgressBar/StyledProgressBar.java b/src/Common_old/UI/ProgressBar/StyledProgressBar.java
index 96a50b14..448bd047 100644
--- a/src/Common_old/UI/ProgressBar/StyledProgressBar.java
+++ b/src/Common_old/UI/ProgressBar/StyledProgressBar.java
@@ -1,6 +1,6 @@
 package Common_old.UI.ProgressBar;
-import Common_old.Current;
-import _VisualDVM.Syntax.ThemeElement;
+import Common.Visual.CommonUI;
+import Common.Visual.Themes.ThemeElement;
 
 import javax.swing.*;
 public class StyledProgressBar extends JProgressBar implements ThemeElement {
@@ -10,7 +10,7 @@ public class StyledProgressBar extends JProgressBar implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(Current.getTheme().bar_background);
-        setForeground(Current.getTheme().bar_foreground);
+        setBackground(CommonUI.getTheme().bar_background);
+        setForeground(CommonUI.getTheme().bar_foreground);
     }
 }
diff --git a/src/Common_old/UI/Tables/HiddenListRenderer.java b/src/Common_old/UI/Tables/HiddenListRenderer.java
index 47010791..f84e317c 100644
--- a/src/Common_old/UI/Tables/HiddenListRenderer.java
+++ b/src/Common_old/UI/Tables/HiddenListRenderer.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Tables;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import java.util.Vector;
@@ -12,6 +12,6 @@ public class HiddenListRenderer extends RendererCell<Vector<String>> {
     @Override
     public void Display() {
         setText(String.join(";", value));
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
     }
 }
diff --git a/src/Common_old/UI/Tables/StatusEnumRenderer.java b/src/Common_old/UI/Tables/StatusEnumRenderer.java
index adfc6fd2..ff1ae225 100644
--- a/src/Common_old/UI/Tables/StatusEnumRenderer.java
+++ b/src/Common_old/UI/Tables/StatusEnumRenderer.java
@@ -1,5 +1,5 @@
 package Common_old.UI.Tables;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common.Visual.StatusEnum;
 
 import javax.swing.*;
@@ -12,7 +12,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
     public void Display() {
         if (value != null) {
             setText(value.getDescription());
-            setFont(Current.getTheme().Fonts.get(value.getFont()));
+            setFont(CommonUI.getTheme().Fonts.get(value.getFont()));
         }
     }
 }
diff --git a/src/Common_old/UI/Tables/StyledCellLabel.java b/src/Common_old/UI/Tables/StyledCellLabel.java
index 7158b05d..b5fd30da 100644
--- a/src/Common_old/UI/Tables/StyledCellLabel.java
+++ b/src/Common_old/UI/Tables/StyledCellLabel.java
@@ -1,13 +1,13 @@
 package Common_old.UI.Tables;
-import Common_old.Current;
-import _VisualDVM.Syntax.ThemeElement;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Themes.ThemeElement;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
 public class StyledCellLabel extends JLabel implements ThemeElement {
     public StyledCellLabel() {
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         setHorizontalAlignment(SwingConstants.LEFT);
         setVerticalAlignment(SwingConstants.CENTER);
         setOpaque(true);
@@ -15,7 +15,7 @@ public class StyledCellLabel extends JLabel implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(Current.getTheme().table_background);
-        setForeground(Current.getTheme().foreground);
+        setBackground(CommonUI.getTheme().table_background);
+        setForeground(CommonUI.getTheme().foreground);
     }
 }
diff --git a/src/Common_old/UI/Tables/StyledTable.java b/src/Common_old/UI/Tables/StyledTable.java
index ed9abcf3..e2f06704 100644
--- a/src/Common_old/UI/Tables/StyledTable.java
+++ b/src/Common_old/UI/Tables/StyledTable.java
@@ -1,8 +1,8 @@
 package Common_old.UI.Tables;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Menus.TableMenu;
-import _VisualDVM.Syntax.ThemeElement;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Themes.ThemeElement;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import javax.swing.table.*;
@@ -16,9 +16,9 @@ public abstract class StyledTable extends JTable implements ThemeElement {
         setFillsViewportHeight(true);
         setAutoCreateRowSorter(dataModel.getRowCount() > 0);
         Init();
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         JTableHeader header = getTableHeader();
-        header.setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        header.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         //текущий объет может определяться по первому столбцу. могут быть баги если не запретить
@@ -77,10 +77,10 @@ public abstract class StyledTable extends JTable implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(Current.getTheme().table_background);
-        setForeground(Current.getTheme().foreground);
-        setSelectionBackground(Current.getTheme().selection_background);
-        setSelectionForeground(Current.getTheme().foreground);
+        setBackground(CommonUI.getTheme().table_background);
+        setForeground(CommonUI.getTheme().foreground);
+        setSelectionBackground(CommonUI.getTheme().selection_background);
+        setSelectionForeground(CommonUI.getTheme().foreground);
     }
     public void SelectRow(int r) {
         getSelectionModel().setSelectionInterval(r, r);
diff --git a/src/Common_old/UI/Tables/WrapTextRenderer.java b/src/Common_old/UI/Tables/WrapTextRenderer.java
index 089cd99a..d55f252a 100644
--- a/src/Common_old/UI/Tables/WrapTextRenderer.java
+++ b/src/Common_old/UI/Tables/WrapTextRenderer.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Tables;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
@@ -10,7 +10,7 @@ public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
         setLineWrap(true);
         setWrapStyleWord(true);
         // setOpaque(false);
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
+        setFont(CommonUI.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_old/UI/Trees/GraphTreeCellRenderer.java b/src/Common_old/UI/Trees/GraphTreeCellRenderer.java
index d5d1d174..cc799c48 100644
--- a/src/Common_old/UI/Trees/GraphTreeCellRenderer.java
+++ b/src/Common_old/UI/Trees/GraphTreeCellRenderer.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Trees;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.SapforData.FileObjectWithMessages;
 
 import javax.swing.*;
@@ -16,10 +16,10 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
         if (o instanceof FileObjectWithMessages) {
             FileObjectWithMessages target = (FileObjectWithMessages) o;
             setIcon(CommonUtils.getIcon(target.ImageKey()));
-            setFont(Current.getTheme().Fonts.get(target.getFont()));
+            setFont(CommonUI.getTheme().Fonts.get(target.getFont()));
         } else {
             setIcon(null);
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         }
         setForeground(tree.getForeground());
         return this;
diff --git a/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java b/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
index 24b1f979..25d2421e 100644
--- a/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
+++ b/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Trees;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common.Visual.Selectable;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -17,7 +17,7 @@ public class SelectionTreeCellRenderer extends StyledTreeCellRenderer {
             setText(selectable.getSelectionText());
             setIcon(selectable.GetSelectionIcon());
         } else {
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
             setIcon(null);
         }
         setForeground(tree.getForeground());
diff --git a/src/Common_old/UI/Trees/StyledTree.java b/src/Common_old/UI/Trees/StyledTree.java
index 742d43af..179945e9 100644
--- a/src/Common_old/UI/Trees/StyledTree.java
+++ b/src/Common_old/UI/Trees/StyledTree.java
@@ -1,8 +1,8 @@
 package Common_old.UI.Trees;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Menus.GraphMenu;
-import _VisualDVM.Syntax.ThemeElement;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Themes.ThemeElement;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.UI;
 
 import javax.swing.*;
@@ -22,7 +22,7 @@ public class StyledTree extends JTree implements ThemeElement {
         super(root_in);
         root = root_in;
         setOpaque(true);
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         setToggleClickCount(0);  //отключение сворачивание разворачивания по двойному клику
         //--
         if (!getRenderer().equals(TreeRenderers.RendererUndefined))
@@ -86,8 +86,8 @@ public class StyledTree extends JTree implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(Current.getTheme().trees_background);
-        setForeground(Current.getTheme().foreground);
+        setBackground(CommonUI.getTheme().trees_background);
+        setForeground(CommonUI.getTheme().foreground);
         menu.applyTheme();
     }
     protected GraphMenu createMenu() {
diff --git a/src/Common_old/UI/Trees/StyledTreeCellRenderer.java b/src/Common_old/UI/Trees/StyledTreeCellRenderer.java
index 6659c534..d291d6e6 100644
--- a/src/Common_old/UI/Trees/StyledTreeCellRenderer.java
+++ b/src/Common_old/UI/Trees/StyledTreeCellRenderer.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Trees;
-import Common_old.Current;
-import _VisualDVM.Syntax.ThemeElement;
+import Common.Visual.CommonUI;
+import Common.Visual.Themes.ThemeElement;
 
 import javax.swing.tree.DefaultTreeCellRenderer;
 public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements ThemeElement {
@@ -9,7 +9,7 @@ public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements T
     }
     @Override
     public void applyTheme() {
-        setBackgroundNonSelectionColor(Current.getTheme().trees_background);
-        setBackgroundSelectionColor(Current.getTheme().selection_background);
+        setBackgroundNonSelectionColor(CommonUI.getTheme().trees_background);
+        setBackgroundSelectionColor(CommonUI.getTheme().selection_background);
     }
 }
diff --git a/src/Common_old/UI/UI.java b/src/Common_old/UI/UI.java
index d42fbd06..56974144 100644
--- a/src/Common_old/UI/UI.java
+++ b/src/Common_old/UI/UI.java
@@ -1,6 +1,6 @@
 package Common_old.UI;
-import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.Themes.ThemeElement;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar;
 import Common.Visual.DataMenuBar;
@@ -93,14 +93,10 @@ import Visual_DVM_2021.UI.Main.DebugForm;
 import Visual_DVM_2021.UI.Main.MainForm;
 import Visual_DVM_2021.UI.Main.ProfilesForm;
 import Visual_DVM_2021.UI.Main.VersionsForm;
-import _VisualDVM.Syntax.*;
-import _VisualDVM.Syntax.VisualiserTheme;
 
 import javax.swing.*;
-import javax.swing.event.ChangeListener;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
-import javax.swing.text.DefaultFormatter;
 import javax.swing.text.DefaultHighlighter;
 import javax.swing.text.Highlighter;
 import javax.swing.tree.TreeCellRenderer;
@@ -128,7 +124,6 @@ public class UI {
     public static LinkedHashMap<Common_old.UI.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
     public static LinkedHashMap<Common_old.UI.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
     public static LinkedHashMap<Common_old.UI.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
-    public static LinkedHashMap<VisualiserThemeName, VisualiserTheme> themes = new LinkedHashMap<>();
     public static LinkedHashMap<FormType, ThemeElement> windows = new LinkedHashMap<>();
     public static RemoteFileChooser getRemoteFileChooser() {
         return (RemoteFileChooser) windows.get(FormType.RemoteFileChooser);
@@ -239,10 +234,6 @@ public class UI {
         UIManager.put("OptionPane.cancelButtonText", "Отмена");
         UIManager.put("OptionPane.okButtonText", "Готово");
         //</editor-fold>
-        //<editor-fold desc="Темы(всегда создавать первыми)">
-        themes.put(VisualiserThemeName.Light, new LightVisualiserTheme());
-        //по умолчанию поставить светлую тему. потому что до загрузки бд работаем с таблицей компонент.
-        CurrentAnchestor.set(Current.Theme, themes.get(VisualiserThemeName.Light));
         //</editor-fold>
         //<editor-fold desc="Объекты отрисовки и редактирования деревьев и таблиц">
         TableRenderers.put(RendererDate, new DateRenderer_());
@@ -285,15 +276,6 @@ public class UI {
     public static ProfilesForm getProfilesWindow() {
         return (ProfilesForm) windows.get(FormType.Profiles);
     }
-    public static Component getFrontWindow() {
-        Component res = null;
-        try {
-            res = CommonUI.windowsStack.peek();
-        } catch (Exception ignored){
-
-        }
-        return res;
-    }
     //-----
     public static void ShowTabsNames(JTabbedPane tabs) {
         ShowTabsNames(tabs, 0);
@@ -309,43 +291,6 @@ public class UI {
             if (list.get(i).equals(line)) last_index = i;
         return (last_index >= max_index);
     }
-    public static void MakeSpinnerRapid(JSpinner spinner, ChangeListener listener) {
-        JComponent comp = spinner.getEditor();
-        JFormattedTextField field = (JFormattedTextField) comp.getComponent(0);
-        DefaultFormatter formatter = (DefaultFormatter) field.getFormatter();
-        formatter.setCommitsOnValidEdit(true);
-        formatter.setAllowsInvalid(true);
-        spinner.addChangeListener(listener);
-    }
-    //---------------
-    public static boolean Question(Component parent, String text) {
-        return !CommonUtils.hasUI() || (JOptionPane.showConfirmDialog(parent,
-                text + "?",
-                "Подтверждение",
-                JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == 0);
-    }
-    public static boolean Question(String text) {
-        return Question(getFrontWindow(), text);
-    }
-    public static void Info(String message) {
-        CommonUtils.CopyToClipboard(message);
-        if (CommonUtils.hasUI())
-            JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
-    }
-    public static void Error(String message) {
-        CommonUtils.CopyToClipboard(message);
-        if (CommonUtils.hasUI())
-            JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
-    }
-    public static boolean Warning(String text) {
-        return !CommonUtils.hasUI() ||
-                JOptionPane.showConfirmDialog(getFrontWindow(),
-                        text + "\nВы уверены?",
-                        "Подтверждение",
-                        JOptionPane.YES_NO_OPTION,
-                        JOptionPane.WARNING_MESSAGE) == 0;
-    }
     //--
     public static VersionsWindow getVersionsWindow() {
         return versionsWindow;
@@ -380,5 +325,4 @@ public class UI {
     public static void ShowProfilesWindow() {
         getProfilesWindow().ShowDialog("");
     }
-
 }
diff --git a/src/Common_old/UI/Windows/FormType.java b/src/Common_old/UI/Windows/FormType.java
index 1685caf1..e5f2471f 100644
--- a/src/Common_old/UI/Windows/FormType.java
+++ b/src/Common_old/UI/Windows/FormType.java
@@ -1,9 +1,9 @@
 package Common_old.UI.Windows;
 public enum FormType {
     Undefined,
-
     Main,
     SearchReplace,
     Components,
-    RemoteFileChooser, Profiles
+    RemoteFileChooser,
+    Profiles
 }
diff --git a/src/Common_old/UI/Windows/SearchReplaceForm.java b/src/Common_old/UI/Windows/SearchReplaceForm.java
index 760fff65..fd966cb8 100644
--- a/src/Common_old/UI/Windows/SearchReplaceForm.java
+++ b/src/Common_old/UI/Windows/SearchReplaceForm.java
@@ -1,6 +1,7 @@
 package Common_old.UI.Windows;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
+import Common.Visual.Windows.Form;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
 import Common_old.UI.Trees.StyledTree;
@@ -125,7 +126,7 @@ public class SearchReplaceForm extends Form {
         lCount.setText(String.valueOf(result.getMarkedCount()));
     }
     @Override
-    protected String getFormType() {
+    protected String getFormKey() {
         return FormType.SearchReplace.toString();
     }
     private void createUIComponents() {
diff --git a/src/Common_old/Utils/Utils.java b/src/Common_old/Utils/Utils.java
index 73d1bfdf..4614c781 100644
--- a/src/Common_old/Utils/Utils.java
+++ b/src/Common_old/Utils/Utils.java
@@ -3,6 +3,7 @@ import Common.Utils.CommonUtils;
 import Common.Utils.Index;
 import Common.Utils.StringTemplate;
 import Common.Utils.TextLog;
+import Common.Visual.CommonUI;
 import Common_old.Constants;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -141,7 +142,7 @@ public class Utils {
         return getTempFileName(name, "");
     }
     public static boolean isAnchestor(File child, File anchestor) {
-        return child.getAbsolutePath().startsWith(anchestor.getAbsolutePath() + (CommonUtils.isWindows ? "\\" : "/"));
+        return child.getAbsolutePath().startsWith(anchestor.getAbsolutePath() + (CommonUtils.isWindows() ? "\\" : "/"));
     }
     //при условии что это точно его предок
     public static String getRelativeAddress(File file, File anchestor) {
@@ -328,7 +329,7 @@ public class Utils {
     }
     public static File createScript(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception {
         //->
-        File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (CommonUtils.isWindows ? ".bat" : "")).toFile();
+        File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (CommonUtils.isWindows() ? ".bat" : "")).toFile();
         FileUtils.write(scriptFile, "cd " + CommonUtils.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText);
         if (!scriptFile.setExecutable(true)) throw new PassException("Не удалось создать исполняемый файл для скрипта");
         return scriptFile;
@@ -529,7 +530,7 @@ public class Utils {
             }
         }
         if (sources.isEmpty()) {
-            if (question) return UI.Question("Папка " + CommonUtils.Brackets(folder.getName()) + "\n" +
+            if (question) return CommonUI.Question("Папка " + CommonUtils.Brackets(folder.getName()) + "\n" +
                     "не содержит ни одного файла, распознанного как поддерживаемый код\n" +
                     "Всё равно открыть её как проект");
             else return false;
@@ -538,8 +539,8 @@ public class Utils {
     public static void Kill(String PID, boolean force) {
         if (!PID.isEmpty()) {
             String killCommand =
-                    force ? CommonUtils.isWindows ? "taskkill /PID " + CommonUtils.DQuotes(PID) + " /F /T" : "kill -9 " + CommonUtils.DQuotes(PID) :
-                            CommonUtils.isWindows ? "taskkill /PID " + CommonUtils.DQuotes(PID) : "kill -2 " + CommonUtils.DQuotes(PID);
+                    force ? CommonUtils.isWindows() ? "taskkill /PID " + CommonUtils.DQuotes(PID) + " /F /T" : "kill -9 " + CommonUtils.DQuotes(PID) :
+                            CommonUtils.isWindows() ? "taskkill /PID " + CommonUtils.DQuotes(PID) : "kill -2 " + CommonUtils.DQuotes(PID);
             System.out.println(killCommand);
             try {
                 Process killer = Utils.startScript(Global.TempDirectory, Global.TempDirectory, "killer", killCommand);
diff --git a/src/GlobalData/Compiler/CompilersDBTable.java b/src/GlobalData/Compiler/CompilersDBTable.java
index 9174a74c..ac0d6b58 100644
--- a/src/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/GlobalData/Compiler/CompilersDBTable.java
@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import Common_old.Utils.Validators.PathValidator;
 import Common.Database.Objects.DBObject;
diff --git a/src/GlobalData/Compiler/UI/CompilerFields.java b/src/GlobalData/Compiler/UI/CompilerFields.java
index c28569b0..efa7b1a2 100644
--- a/src/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/GlobalData/Compiler/UI/CompilerFields.java
@@ -1,8 +1,8 @@
 package GlobalData.Compiler.UI;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import Common_old.Utils.Files.VDirectoryChooser;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
@@ -42,7 +42,7 @@ public class CompilerFields implements DialogFields {
                 if (dst != null)
                     tfHome.setText(dst);
             } else
-                UI.Info("Назначение домашней папки поддерживается только для dvm системы.");
+                CommonUI.Info("Назначение домашней папки поддерживается только для dvm системы.");
         });
         tfHome.getDocument().addDocumentListener(new DocumentListener() {
                                                      @Override
diff --git a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
index 640685ca..52044dc5 100644
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
@@ -1,14 +1,13 @@
 package GlobalData.CompilerEnvironment.UI;
 import Common.Visual.CommonUI;
-import Common_old.Current;
 import Common_old.UI.Tables.DBObjectEditor;
-import _VisualDVM.Syntax.VisualiserFonts;
-import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
+import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
     @Override
     public void Action() {
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         setText(value.value.isEmpty() ? "не задано" : value.value);
         //-
         ComboTextDialog dialog = new ComboTextDialog() {
diff --git a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
index 5a45ff55..fccaa29c 100644
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
@@ -1,14 +1,14 @@
 package GlobalData.CompilerEnvironment.UI;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Tables.DBObjectRenderer;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
     @Override
     public void Display() {
         if (value != null) {
             CompilerEnvironment environment = (CompilerEnvironment) value;
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
             setText(environment.value.isEmpty() ? "не задано" : environment.value);
         }
     }
diff --git a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java
index 0683e645..a57e02dc 100644
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java
@@ -1,5 +1,5 @@
 package GlobalData.CompilerEnvironment.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
index c3393669..9b624ae6 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerOption.UI;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Tables.DBObjectRenderer;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
     @Override
@@ -9,10 +9,10 @@ public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
         if (value != null) {
             CompilerOption option = (CompilerOption) value;
             if (option.hasParameter()) {
-                setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
                 setText(option.parameterName);
             } else {
-                setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
                 setText("нет");
             }
         }
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
index bc8b3b20..071ad873 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
@@ -1,15 +1,14 @@
 package GlobalData.CompilerOption.UI;
 import Common.Visual.CommonUI;
-import Common_old.Current;
 import Common_old.UI.Tables.DBObjectEditor;
-import _VisualDVM.Syntax.VisualiserFonts;
-import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
+import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
     @Override
     public void Action() {
         if (value.hasParameter()) {
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
             //-
             setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
             //-
@@ -23,7 +22,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
                 setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
             }
         } else {
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
             setText("нет");
         }
     }
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
index aa5c6ccb..035eb898 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerOption.UI;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Tables.DBObjectRenderer;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
     @Override
@@ -9,10 +9,10 @@ public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
         if (value != null) {
             CompilerOption option = (CompilerOption) value;
             if (option.hasParameter()) {
-                setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
                 setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue);
             } else {
-                setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
                 setText("нет");
             }
         }
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java b/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java
index 44bfe52c..d32c3ea7 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java
@@ -1,5 +1,5 @@
 package GlobalData.CompilerOption.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
index c70abdb4..5487036e 100644
--- a/src/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import GlobalData.DVMParameter.UI.DVMParameterFields;
 import GlobalData.GlobalDatabase;
diff --git a/src/GlobalData/DVMParameter/UI/DVMParameterFields.java b/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
index 2c026c9a..9f3e7ddf 100644
--- a/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
+++ b/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
@@ -1,7 +1,7 @@
 package GlobalData.DVMParameter.UI;
 import Common.Visual.Controls.StyledTextComboBox;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index 613d379f..add43596 100644
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
 import GlobalData.GlobalDatabase;
diff --git a/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java b/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
index f74a4946..f28615e3 100644
--- a/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
+++ b/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
@@ -1,6 +1,6 @@
 package GlobalData.EnvironmentValue.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/FileObject/DirInfosFields.java b/src/GlobalData/FileObject/DirInfosFields.java
index 057f9e0e..36fb3bc4 100644
--- a/src/GlobalData/FileObject/DirInfosFields.java
+++ b/src/GlobalData/FileObject/DirInfosFields.java
@@ -1,5 +1,5 @@
 package GlobalData.FileObject;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/Machine/MachinesDBTable.java b/src/GlobalData/Machine/MachinesDBTable.java
index 13e36f6e..678e42b6 100644
--- a/src/GlobalData/Machine/MachinesDBTable.java
+++ b/src/GlobalData/Machine/MachinesDBTable.java
@@ -3,7 +3,7 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/GlobalData/Machine/UI/MachineFields.java b/src/GlobalData/Machine/UI/MachineFields.java
index 8639c324..2e448b8a 100644
--- a/src/GlobalData/Machine/UI/MachineFields.java
+++ b/src/GlobalData/Machine/UI/MachineFields.java
@@ -1,6 +1,6 @@
 package GlobalData.Machine.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.Machine.MachineType;
 
 import javax.swing.*;
diff --git a/src/GlobalData/Makefile/MakefilesDBTable.java b/src/GlobalData/Makefile/MakefilesDBTable.java
index 6e40bf89..9aa86217 100644
--- a/src/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/GlobalData/Makefile/MakefilesDBTable.java
@@ -1,7 +1,7 @@
 package GlobalData.Makefile;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/GlobalData/Makefile/UI/MakefilePreviewForm.java b/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
index a224f43f..ade8abb3 100644
--- a/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
+++ b/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
@@ -1,6 +1,6 @@
 package GlobalData.Makefile.UI;
 import Common_old.UI.Editor.Viewer;
-import Common_old.UI.Windows.Dialog.Text.TextDialog;
+import Common.Visual.Windows.Dialog.Text.TextDialog;
 public class MakefilePreviewForm extends TextDialog<Viewer> {
     public MakefilePreviewForm() {
         super(Viewer.class);
diff --git a/src/GlobalData/Module/ModulesDBTable.java b/src/GlobalData/Module/ModulesDBTable.java
index cad81c60..801692b4 100644
--- a/src/GlobalData/Module/ModulesDBTable.java
+++ b/src/GlobalData/Module/ModulesDBTable.java
@@ -2,8 +2,8 @@ package GlobalData.Module;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.Module.UI.ModuleAnchestorForm;
 public class ModulesDBTable extends iDBTable<Module> {
     public ModulesDBTable() {
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
index 696616f8..bcf41f52 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -2,8 +2,7 @@ package GlobalData.Module.UI;
 import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Visual.Controls.StyledTextComboBox;
-import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Module.Module;
@@ -33,7 +32,7 @@ public class ModuleAnchestorFields implements DialogFields {
         bHelp.addActionListener(e -> {
             if (cbCompilers.getSelectedItem() != null) {
                 Pass_2021.passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, true);
-            } else UI.Info("Компилятор не выбран");
+            } else CommonUI.Info("Компилятор не выбран");
         });
         BPickOptions.addActionListener(new ActionListener() {
             @Override
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
index d53ce3b4..55f765e2 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -2,7 +2,7 @@ package GlobalData.Module.UI;
 import Common.CommonConstants;
 import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Makefile.Makefile;
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
index 131aa6d6..9f40e9ad 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
@@ -1,9 +1,9 @@
 package GlobalData.RemoteFile.UI;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
@@ -84,7 +84,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
     public void goUp() {
         if (!root_file.full_name.equals("/")) {
             Refresh(root_file.parent);
-        } else UI.Info("Корневая папка файловой системы достигнута.");
+        } else CommonUI.Info("Корневая папка файловой системы достигнута.");
     }
     @Override
     public void validateFields() {
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java b/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
index 17c8ee5d..d5a9234f 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
@@ -1,7 +1,7 @@
 package GlobalData.RemoteFile.UI;
 import Common_old.UI.Trees.TreeForm;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java b/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
index 10bd5326..4c477178 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
@@ -1,6 +1,6 @@
 package GlobalData.RemoteFile.UI;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import GlobalData.RemoteFile.RemoteFile;
 
@@ -16,7 +16,7 @@ public class RemoteFileRenderer extends StyledTreeCellRenderer {
         if (o instanceof RemoteFile) {
             RemoteFile file = (RemoteFile) o;
             setText(file.name);
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
             if (file.isDirectory())
                 setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
         }
diff --git a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index 8e568efc..f881bee0 100644
--- a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -4,7 +4,7 @@ import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java b/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
index def44ef1..1bc46ba5 100644
--- a/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
+++ b/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
@@ -1,6 +1,6 @@
 package GlobalData.RunConfiguration.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/SapforProfile/SapforProfilesDBTable.java b/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
index c6588237..b505c67c 100644
--- a/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -1,7 +1,7 @@
 package GlobalData.SapforProfile;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/GlobalData/SapforProfile/UI/SapforProfileFields.java b/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
index 3595e49c..e916f280 100644
--- a/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
+++ b/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
@@ -1,6 +1,6 @@
 package GlobalData.SapforProfile.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/Settings/SettingsDBTable.java b/src/GlobalData/Settings/SettingsDBTable.java
index 64d020e7..c038b470 100644
--- a/src/GlobalData/Settings/SettingsDBTable.java
+++ b/src/GlobalData/Settings/SettingsDBTable.java
@@ -43,7 +43,7 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
         AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
-        if (CommonUtils.isWindows)
+        if (CommonUtils.isWindows())
             AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         //совместимость. указываем явно чтобы не были видны в меню.
diff --git a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
index 81a32ae2..399c9f33 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
@@ -44,7 +44,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
         return Paths.get(task.getUser().getLocalProjectsDir().getAbsolutePath(), project.getUniqKey()).toFile();
     }
     protected File getBinary() {
-        return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows ? ".exe" : "")).toFile();
+        return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows() ? ".exe" : "")).toFile();
     }
     protected File getProjectOutput() {
         return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();
diff --git a/src/GlobalData/Tasks/TaskState.java b/src/GlobalData/Tasks/TaskState.java
index 732356c3..3a0a0956 100644
--- a/src/GlobalData/Tasks/TaskState.java
+++ b/src/GlobalData/Tasks/TaskState.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks;
 import Common.Visual.StatusEnum;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 public enum TaskState implements StatusEnum {
     Inactive,
     //--
diff --git a/src/GlobalData/User/UI/UserFields.java b/src/GlobalData/User/UI/UserFields.java
index 671c6dee..ede8d2f0 100644
--- a/src/GlobalData/User/UI/UserFields.java
+++ b/src/GlobalData/User/UI/UserFields.java
@@ -3,7 +3,7 @@ import Common.Utils.CommonUtils;
 import Common_old.UI.Menus.TextEditorMenu;
 import Common_old.UI.TextField.StyledPasswordField;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/GlobalData/User/UserState.java b/src/GlobalData/User/UserState.java
index 85080479..fb309ed3 100644
--- a/src/GlobalData/User/UserState.java
+++ b/src/GlobalData/User/UserState.java
@@ -1,6 +1,6 @@
 package GlobalData.User;
 import Common.Visual.StatusEnum;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 public enum UserState implements StatusEnum {
     initial, //на пользователя еще не заходили.
     ready,   //рудимент.
diff --git a/src/GlobalData/User/UsersDBTable.java b/src/GlobalData/User/UsersDBTable.java
index c23988df..8467ccfe 100644
--- a/src/GlobalData/User/UsersDBTable.java
+++ b/src/GlobalData/User/UsersDBTable.java
@@ -3,7 +3,7 @@ import Common_old.Current;
 import Common.Visual.DataSetControlForm;
 import Common_old.UI.Tables.TableRenderers;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/ProjectData/Files/UI/FilesHyperlinksPanel.java b/src/ProjectData/Files/UI/FilesHyperlinksPanel.java
index 2b55112f..35ff486a 100644
--- a/src/ProjectData/Files/UI/FilesHyperlinksPanel.java
+++ b/src/ProjectData/Files/UI/FilesHyperlinksPanel.java
@@ -1,6 +1,6 @@
 package ProjectData.Files.UI;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.UI;
 
 import javax.swing.*;
@@ -41,7 +41,7 @@ public class FilesHyperlinksPanel extends JPanel {
             }
         });
         Hyperlinks.setLayoutOrientation(JList.VERTICAL);
-        Hyperlinks.setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        Hyperlinks.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         add(Hyperlinks, BorderLayout.CENTER);
     }
 }
diff --git a/src/ProjectData/Files/UI/FilesTreeCellRenderer.java b/src/ProjectData/Files/UI/FilesTreeCellRenderer.java
index 587ceace..44658a5a 100644
--- a/src/ProjectData/Files/UI/FilesTreeCellRenderer.java
+++ b/src/ProjectData/Files/UI/FilesTreeCellRenderer.java
@@ -1,7 +1,7 @@
 package ProjectData.Files.UI;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
@@ -23,7 +23,7 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
             File dir = (File) o;
             setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
             setText(dir.getName());
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
         } else if (o instanceof DBProjectFile) {
             DBProjectFile file = (DBProjectFile) o;
             if (Global.files_multiselection) {
@@ -32,8 +32,8 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
                 setIcon(file.GetIcon());
             }
             setText(file.file.getName());
-            if (file.IsMain()) setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeBold));
-            else setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            if (file.IsMain()) setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold));
+            else setFont(CommonUI.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/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index 0f1ee69f..b470555c 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -4,6 +4,7 @@ import Common.Mode;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
+import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.FileObject;
 import ProjectData.SapforData.FileObjectWithMessages;
@@ -27,10 +28,10 @@ public class Message extends FileObject {
         setGroup(group_in);
         if ((group == Constants.parser_group) ||
                 (group == Constants.compiler_group) ||
-                (CommonUtils.mode != Mode.Normal)) {
+                (Global.mode != Mode.Normal)) {
             value = value_in;
         } else {
-            value = !Global.getSetting(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
+            value = !((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
         }
     }
     // last code - 183
diff --git a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
index ca7d4c49..d5865c36 100644
--- a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -1,8 +1,9 @@
 package ProjectData.Project.UI;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common.Visual.Selectable;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.Project.db_project_info;
 
@@ -41,7 +42,7 @@ public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
             }
         }
         setForeground(tree.getForeground());
-        setFont(Current.getTheme().Fonts.get(
+        setFont(CommonUI.getTheme().Fonts.get(
                 version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain));
         setText(version.getTitle());
         return this;
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index a691c38f..b9ac0200 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -2,9 +2,11 @@ package ProjectData.Project;
 import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Constants;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
+import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
 import Common.Utils.Index;
@@ -170,7 +172,7 @@ public class db_project_info extends DBObject {
         parent = parent_in;
         name = parent.GenerateVersionName(letter_in);
         languageName = parent.languageName;
-        style = Global.getSetting(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
+        style = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
         description = description_in;
         original = original_in;
         Home = Paths.get(parent_in.Home.getAbsolutePath(), name).toFile();
@@ -691,7 +693,7 @@ public class db_project_info extends DBObject {
         Utils.forceDeleteWithCheck(file);
     }
     public void CreateInterruptFile() throws Exception {
-        FileUtils.write(getInterruptFile(), CommonUtils.mode.toString());
+        FileUtils.write(getInterruptFile(), Global.mode.toString());
     }
     public void AppendScenario(String line_in) {
         Scenario += (line_in + "\n");
@@ -864,7 +866,7 @@ public class db_project_info extends DBObject {
         for (DBProjectFile file : parent.db.files.Data.values()) {
             Files.copy(file.file.toPath(),
                     Paths.get(Home.getAbsolutePath(),
-                            CommonUtils.isWindows ? file.name :
+                            CommonUtils.isWindows() ? file.name :
                                     file.name.replace('\\', '/')));
         }
     }
@@ -904,7 +906,7 @@ public class db_project_info extends DBObject {
         }
     }
     public void createEmptyVersion(String versionLetter, String versionDescription) throws Exception {
-        boolean needsM = Global.getSetting(SettingName.SaveModifications).toBoolean();
+        boolean needsM = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SaveModifications).toBoolean();
         if (needsM)
             createModification();
         last_version = new db_project_info(
@@ -1088,7 +1090,7 @@ public class db_project_info extends DBObject {
         for (DBProjectFile file : db.files.Data.values()) {
             File src_file = file.file;
             File dst_file = Paths.get(dst.getAbsolutePath(),
-                    CommonUtils.isWindows ? file.name :
+                    CommonUtils.isWindows() ? file.name :
                             file.name.replace('\\', '/')).toFile();
             Files.copy(src_file.toPath(), dst_file.toPath());
         }
@@ -1160,7 +1162,7 @@ public class db_project_info extends DBObject {
                     String[] localSplit = splited[idx++].split(" ");
                     int m_type = Integer.parseInt(localSplit[0]);
                     if (m_type == 1) {
-                        UI.Info(packed_messages);
+                        CommonUI.Info(packed_messages);
                         return true;
                     }
                 }
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java b/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
index 9f422598..05f9e9b8 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Tables.RendererCell;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
 import javax.swing.*;
@@ -14,7 +14,7 @@ public class DimensionRenderer extends RendererCell<TemplateDimension> {
     public void Display() {
         if (value != null) {
             setText(value.state.getMaskDescription());
-            setFont(value.isBlocked() ? Current.getTheme().Fonts.get(VisualiserFonts.Disabled) : Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(value.isBlocked() ? CommonUI.getTheme().Fonts.get(VisualiserFonts.Disabled) : CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         }
     }
 }
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index 6c66167f..b18f9ca8 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Tables.DBObjectEditor;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.UI;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
@@ -17,7 +17,7 @@ public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
     }
     @Override
     public void Action() {
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         value.SwitchState();
         setText(value.state.getMaskDescription());
         UI.getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();
diff --git a/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java b/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
index c8b554a8..d221b0ea 100644
--- a/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
+++ b/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common_old.Current;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.CommonUI;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.SapforData.Regions.ParallelRegion;
 
@@ -14,9 +14,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(Current.getTheme().Fonts.get(VisualiserFonts.Distribution));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Distribution));
         } else if (o instanceof ParallelRegion)
-            setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         setForeground(tree.getForeground());
         return this;
     }
diff --git a/src/ProjectData/SapforData/FileObjectWithMessages.java b/src/ProjectData/SapforData/FileObjectWithMessages.java
index e3beaf85..beed0dbf 100644
--- a/src/ProjectData/SapforData/FileObjectWithMessages.java
+++ b/src/ProjectData/SapforData/FileObjectWithMessages.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Messages.Message;
diff --git a/src/ProjectData/SapforData/Functions/FuncCall.java b/src/ProjectData/SapforData/Functions/FuncCall.java
index 5f5cc2f0..e6f4ab98 100644
--- a/src/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/ProjectData/SapforData/Functions/FuncCall.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions;
 import Common.Utils.CommonUtils;
-import Common_old.UI.UI;
+import Common.Visual.CommonUI;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -32,7 +32,7 @@ public class FuncCall extends FileObjectWithMessages {
         if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
             super.Select(flag);
         } else {
-            UI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
+            CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
         }
     }
 }
diff --git a/src/ProjectData/SapforData/Functions/FuncCallH.java b/src/ProjectData/SapforData/Functions/FuncCallH.java
index 8c0ac5be..4a727d69 100644
--- a/src/ProjectData/SapforData/Functions/FuncCallH.java
+++ b/src/ProjectData/SapforData/Functions/FuncCallH.java
@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions;
 import Common.Utils.CommonUtils;
-import Common_old.UI.UI;
+import Common.Visual.CommonUI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -41,7 +41,7 @@ public class FuncCallH extends FuncCall {
         if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
             super.Select(flag);
         } else {
-            UI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
+            CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
         }
     }
 }
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
index cff03527..39612d7c 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Functions.UI.Graph;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.UI;
 import ProjectData.SapforData.Functions.FuncCoordinates;
 import ProjectData.SapforData.Functions.FuncInfo;
 import ProjectData.SapforData.Functions.FunctionType;
@@ -244,7 +244,7 @@ public class FunctionsGraphUI extends mxGraph {
                                         break;
                                     case Standard:
                                     case NotFound:
-                                        UI.Info("процедура " + CommonUtils.Brackets(func_name) + " " + fi.type.getDescription());
+                                        CommonUI.Info("процедура " + CommonUtils.Brackets(func_name) + " " + fi.type.getDescription());
                                         break;
                                 }
                                 break;
diff --git a/src/ProjectData/SapforData/Loops/EGoto.java b/src/ProjectData/SapforData/Loops/EGoto.java
index eebf148c..58f541b8 100644
--- a/src/ProjectData/SapforData/Loops/EGoto.java
+++ b/src/ProjectData/SapforData/Loops/EGoto.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class EGoto extends FileObjectWithMessages {
diff --git a/src/ProjectData/SapforData/Loops/IGoto.java b/src/ProjectData/SapforData/Loops/IGoto.java
index 316b3ae5..79e0930d 100644
--- a/src/ProjectData/SapforData/Loops/IGoto.java
+++ b/src/ProjectData/SapforData/Loops/IGoto.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class IGoto extends FileObjectWithMessages {
diff --git a/src/ProjectData/SapforData/Loops/IO.java b/src/ProjectData/SapforData/Loops/IO.java
index 14694bd9..e8654e2f 100644
--- a/src/ProjectData/SapforData/Loops/IO.java
+++ b/src/ProjectData/SapforData/Loops/IO.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class IO extends FileObjectWithMessages {
diff --git a/src/ProjectData/SapforData/Loops/Loop.java b/src/ProjectData/SapforData/Loops/Loop.java
index 07aea847..91d08793 100644
--- a/src/ProjectData/SapforData/Loops/Loop.java
+++ b/src/ProjectData/SapforData/Loops/Loop.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common.Utils.Index;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Messages.Message;
diff --git a/src/ProjectData/SapforData/Loops/LoopState.java b/src/ProjectData/SapforData/Loops/LoopState.java
index 3eaf0231..eecb548c 100644
--- a/src/ProjectData/SapforData/Loops/LoopState.java
+++ b/src/ProjectData/SapforData/Loops/LoopState.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Common_old.UI.UI;
 
 import javax.swing.text.Highlighter;
diff --git a/src/ProjectData/SapforData/Loops/NonRectIter.java b/src/ProjectData/SapforData/Loops/NonRectIter.java
index 7e958cb4..f5be46cf 100644
--- a/src/ProjectData/SapforData/Loops/NonRectIter.java
+++ b/src/ProjectData/SapforData/Loops/NonRectIter.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class NonRectIter extends FileObjectWithMessages {
diff --git a/src/ProjectData/SapforData/Loops/Stop.java b/src/ProjectData/SapforData/Loops/Stop.java
index 1b77b762..9c50890e 100644
--- a/src/ProjectData/SapforData/Loops/Stop.java
+++ b/src/ProjectData/SapforData/Loops/Stop.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class Stop extends FileObjectWithMessages {
diff --git a/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java b/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java
index 9fd2f780..76b2ea4c 100644
--- a/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java
+++ b/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Regions.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Repository/BugReport/BugReportState.java b/src/Repository/BugReport/BugReportState.java
index 4f040ba7..e320ad71 100644
--- a/src/Repository/BugReport/BugReportState.java
+++ b/src/Repository/BugReport/BugReportState.java
@@ -1,6 +1,6 @@
 package Repository.BugReport;
 import Common.Visual.StatusEnum;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import java.io.Serializable;
 public enum BugReportState implements Serializable, StatusEnum {
diff --git a/src/Repository/Component/ComponentState.java b/src/Repository/Component/ComponentState.java
index eefb4ef9..e97fdecf 100644
--- a/src/Repository/Component/ComponentState.java
+++ b/src/Repository/Component/ComponentState.java
@@ -1,6 +1,6 @@
 package Repository.Component;
 import Common.Visual.StatusEnum;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 public enum ComponentState implements StatusEnum {
     Undefined,
     Actual,
diff --git a/src/Repository/Component/ComponentsMenuBar.java b/src/Repository/Component/ComponentsMenuBar.java
index f7113d3a..a1c240f6 100644
--- a/src/Repository/Component/ComponentsMenuBar.java
+++ b/src/Repository/Component/ComponentsMenuBar.java
@@ -1,8 +1,8 @@
 package Repository.Component;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.VisualiserMenu;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class ComponentsMenuBar extends DataMenuBar {
@@ -12,7 +12,7 @@ public class ComponentsMenuBar extends DataMenuBar {
                 new VisualiserMenu(
                         "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
                     {
-                        setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
+                        setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
                         add(Pass_2021.passes.get(PassCode_2021.ResurrectComponent).createMenuItem());
                         add(Pass_2021.passes.get(PassCode_2021.ResurrectComponentFromServer).createMenuItem());
                     }
diff --git a/src/Repository/Component/OSDComponent.java b/src/Repository/Component/OSDComponent.java
index 3a315b6c..f35d839a 100644
--- a/src/Repository/Component/OSDComponent.java
+++ b/src/Repository/Component/OSDComponent.java
@@ -3,10 +3,10 @@ import Common.Utils.CommonUtils;
 public abstract class OSDComponent extends Component {
     @Override
     public String getFileName() {
-        return getComponentType().toString() + (CommonUtils.isWindows ? ".exe" : "");
+        return getComponentType().toString() + (CommonUtils.isWindows() ? ".exe" : "");
     }
     @Override
     public String getNewFileName() {
-        return getComponentType().toString() + "_new" + (CommonUtils.isWindows ? ".exe" : "");
+        return getComponentType().toString() + "_new" + (CommonUtils.isWindows() ? ".exe" : "");
     }
 }
diff --git a/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
index 69f656ee..3f0af2d0 100644
--- a/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
+++ b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
@@ -1,9 +1,9 @@
 package Repository.Component.PerformanceAnalyzer;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import analyzer.common.MessageJtoJ;
-import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import Repository.Component.Component;
 import Repository.Component.ComponentType;
@@ -144,7 +144,7 @@ public class PerformanceAnalyzer extends Component {
     }
     public void Start() {
         if (isActive) {
-            UI.Info("Анализатор уже запущен");
+            CommonUI.Info("Анализатор уже запущен");
         } else {
             main_thread = new Thread(this::ServerBody);
             main_thread.start();
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index 62c503f6..42a4fdbc 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -1,8 +1,10 @@
 package Repository.Component.Sapfor;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Constants;
 import Common_old.Current;
+import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -139,7 +141,7 @@ public abstract class Sapfor extends OSDComponent {
             Visualizer_2.UnpackVersionInfo(this, getResult());
         } catch (Exception e) {
             CommonUtils.MainLog.PrintException(e);
-            UI.Error("Не удалось получить версию компонента " + CommonUtils.DQuotes(getComponentType().getDescription()));
+            CommonUI.Error("Не удалось получить версию компонента " + CommonUtils.DQuotes(getComponentType().getDescription()));
         }
     }
     public abstract String getUpdateCommand();
@@ -334,7 +336,7 @@ public abstract class Sapfor extends OSDComponent {
                     Utils.WriteToFile(file, OldFiles.get(name));
                 }
                 OldFiles.clear();
-            } else UI.Info("Сохранение файлов отсутствует.");
+            } else CommonUI.Info("Сохранение файлов отсутствует.");
         }
         if (cuf != null)
             Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(cuf);
@@ -351,20 +353,20 @@ public abstract class Sapfor extends OSDComponent {
         for (PassCode_2021 code : getAnalysesCodes())
             (Pass_2021.passes.get(code)).Reset();
         //------------------------------------------------------------------------------------------>>>> пакетный режим.
-        if (CommonUtils.hasUI()) {
+        if (CommonUI.isActive()) {
             Pass_2021.passes.get(PassCode_2021.Precompilation).Reset();
             Pass_2021.passes.get(PassCode_2021.SPF_GetGCovInfo).Reset();
         }
         Global.enable_text_changed = false;
         Global.transformationPermission = TransformationPermission.None;
-        if ((CommonUtils.hasUI()) && (UI.getMainWindow() != null) && (UI.getVersionsWindow() != null))
+        if ((CommonUI.isActive()) && (UI.getMainWindow() != null) && (UI.getVersionsWindow() != null))
             UI.getVersionsWindow().BlockVariants();
     }
     //--------------------------------------------------------------------------->>
     //временный (?) проход, по тихому получить размерность теста, предварительно выполнив тихий парс.
     //тут все одноразовое. считаем что таблицы бд уже заполнены как надо.
     public LanguageStyle getStyle() throws Exception {
-        return Global.getSetting(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
+        return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
     }
     //----------
     public static Vector<PassCode_2021> getScenariosCodes() {
@@ -409,12 +411,12 @@ public abstract class Sapfor extends OSDComponent {
     //------------------------------------------------------------------------------------------------------------------
     public String getConsoleFlags() throws Exception {
         Vector<String> res = new Vector<>();
-        if (Global.getSetting(SettingName.FREE_FORM).toBoolean())
+        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean())
             res.add("-f90");
-        if (Global.getSetting(SettingName.STATIC_SHADOW_ANALYSIS).toBoolean())
+        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.STATIC_SHADOW_ANALYSIS).toBoolean())
             res.add("-sh");
-        res.add("-shwidth " + Global.getSetting(SettingName.MAX_SHADOW_WIDTH));
-        if (Global.getSetting(SettingName.KEEP_SPF_DIRECTIVES).toBoolean())
+        res.add("-shwidth " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MAX_SHADOW_WIDTH));
+        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.KEEP_SPF_DIRECTIVES).toBoolean())
             res.add("-keepSPF");
         return String.join(" ", res);
     }
@@ -455,7 +457,7 @@ public abstract class Sapfor extends OSDComponent {
         Utils.delete_with_check(outputFile);
         Utils.delete_with_check(errorsFile);
         //---
-        File file = new File(data_workspace, name + (CommonUtils.isWindows ? ".bat" : ".sh"));
+        File file = new File(data_workspace, name + (CommonUtils.isWindows() ? ".bat" : ".sh"));
         FileUtils.write(file,
                 CommonUtils.DQuotes(sapfor_drv)
                         + (flags.isEmpty() ? "" : (" " + flags))
@@ -529,7 +531,7 @@ public abstract class Sapfor extends OSDComponent {
     public static File temp_copy = null;
     public static File getTempCopy(File src) throws Exception {
         if (temp_copy == null || !temp_copy.exists()) {
-            temp_copy = Utils.getTempFileName("SAPFOR" + (CommonUtils.isWindows ? ".exe" : ""));
+            temp_copy = Utils.getTempFileName("SAPFOR" + (CommonUtils.isWindows() ? ".exe" : ""));
             FileUtils.copyFile(src, temp_copy);
             temp_copy.setExecutable(true);
         }
diff --git a/src/Repository/Component/UI/ComponentsFields.java b/src/Repository/Component/UI/ComponentsFields.java
index 9681dbc5..80d408b8 100644
--- a/src/Repository/Component/UI/ComponentsFields.java
+++ b/src/Repository/Component/UI/ComponentsFields.java
@@ -1,6 +1,6 @@
 package Repository.Component.UI;
 import _VisualDVM.Global;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Repository/Component/UI/ComponentsForm.java b/src/Repository/Component/UI/ComponentsForm.java
index de562e6a..8a4e0bf7 100644
--- a/src/Repository/Component/UI/ComponentsForm.java
+++ b/src/Repository/Component/UI/ComponentsForm.java
@@ -1,6 +1,6 @@
 package Repository.Component.UI;
 import _VisualDVM.Global;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 
 import java.awt.*;
 public class ComponentsForm extends Dialog<Object, ComponentsFields> {
diff --git a/src/Repository/Component/UI/PickUpComponentFields.java b/src/Repository/Component/UI/PickUpComponentFields.java
index e7afe683..9b4cd36a 100644
--- a/src/Repository/Component/UI/PickUpComponentFields.java
+++ b/src/Repository/Component/UI/PickUpComponentFields.java
@@ -1,5 +1,5 @@
 package Repository.Component.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Repository/Component/UI/PublishFields.java b/src/Repository/Component/UI/PublishFields.java
index dbede85a..0a2f2409 100644
--- a/src/Repository/Component/UI/PublishFields.java
+++ b/src/Repository/Component/UI/PublishFields.java
@@ -1,6 +1,6 @@
 package Repository.Component.UI;
 import Common_old.UI.Editor.BaseEditor;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Repository/Component/UI/PublishForm.java b/src/Repository/Component/UI/PublishForm.java
index 9ae43856..5f856ab4 100644
--- a/src/Repository/Component/UI/PublishForm.java
+++ b/src/Repository/Component/UI/PublishForm.java
@@ -1,5 +1,5 @@
 package Repository.Component.UI;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 public class PublishForm extends Dialog<String, PublishFields> {
     public PublishForm() {
         super(PublishFields.class);
diff --git a/src/Repository/Component/Visualizer_2.java b/src/Repository/Component/Visualizer_2.java
index 077deecf..d669abc6 100644
--- a/src/Repository/Component/Visualizer_2.java
+++ b/src/Repository/Component/Visualizer_2.java
@@ -1,7 +1,7 @@
 package Repository.Component;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassException;
 
@@ -40,7 +40,7 @@ public class Visualizer_2 extends OSDComponent {
     }
     @Override
     public String getHome() {
-        return CommonUtils.Home;
+        return CommonUtils.getHomePath();
     }
     @Override
     public void GetVersionInfo() {
@@ -66,7 +66,7 @@ public class Visualizer_2 extends OSDComponent {
         super.Update();
         SendRequest("update_server: ");
         ReplaceOldFile();
-        UI.Info("Сервер успешно обновлен.\n" +
+        CommonUI.Info("Сервер успешно обновлен.\n" +
                 "Визуализатор завершает работу.\n" +
                 "Для продолжения перезапустите визуализатор вручную.");
         System.exit(0);
diff --git a/src/Repository/Server/ComponentsServer.java b/src/Repository/Server/ComponentsServer.java
index 2317a5f6..faf35be0 100644
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -139,20 +139,20 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     break;
                 case ReceiveBugReport:
                     Print("Скачать баг репорт по ключу " + request.arg);
-                    File bugArchive = Paths.get(CommonUtils.Home, "Bugs", request.arg).toFile();
+                    File bugArchive = Paths.get(CommonUtils.getHomePath(), "Bugs", request.arg).toFile();
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                     response.object = CommonUtils.fileToBytes(bugArchive);
                     break;
                 case SendBugReport:
                     Print("Отправить баг репорт " + request.arg);
-                    File bugArchive1 = Paths.get(CommonUtils.Home, "Bugs", request.arg).toFile();
+                    File bugArchive1 = Paths.get(CommonUtils.getHomePath(), "Bugs", request.arg).toFile();
                     CommonUtils.bytesToFile((byte[]) request.object, bugArchive1);
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                     break;
                 //</editor-fold>
                 case GetComponentsBackups:
                     Print("Получить список сохраненных версий компонента " + request.arg);
-                    File backupsDirectory = Paths.get(CommonUtils.Home, "Components", request.arg, "Backups").toFile();
+                    File backupsDirectory = Paths.get(CommonUtils.getHomePath(), "Components", request.arg, "Backups").toFile();
                     //--
                     if (backupsDirectory.exists()) {
                         File[] files = backupsDirectory.listFiles(File::isFile);
@@ -182,9 +182,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                                     3
                     );
                     Print("Опубликовать компонент " + sComponentType);
-                    File componentFile = Paths.get(CommonUtils.Home, "Components", sComponentType, componentFileName).toFile();
-                    File versionFile = Paths.get(CommonUtils.Home, "Components", sComponentType, "version.txt").toFile();
-                    File backupsFolder = Paths.get(CommonUtils.Home, "Components", sComponentType, "Backups").toFile();
+                    File componentFile = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, componentFileName).toFile();
+                    File versionFile = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "version.txt").toFile();
+                    File backupsFolder = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "Backups").toFile();
                     //0 архивация старой версии, если она есть.
                     if (componentFile.exists()) {
                         String versionText = "";
@@ -204,7 +204,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     //2 запись версии компонента
                     FileUtils.writeStringToFile(versionFile, sComponentVersion);
                     //3 запись в журнал компонента
-                    File changesLog = Paths.get(CommonUtils.Home, "Components", sComponentType, "changes.txt").toFile();
+                    File changesLog = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "changes.txt").toFile();
                     FileWriter writer = new FileWriter(changesLog.getAbsolutePath(), true);
                     BufferedWriter bufferWriter = new BufferedWriter(writer);
                     bufferWriter.write(componentChangeRecord);
@@ -217,11 +217,11 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     String sComponentType_ = packed_[0];
                     String sComponentMinimalVersion = packed_[1];
                     Print("Поднять минимальную версию компонента " + sComponentType_);
-                    File minimal_versionFile = Paths.get(CommonUtils.Home, "Components", sComponentType_, "minimal_version.txt").toFile();
+                    File minimal_versionFile = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType_, "minimal_version.txt").toFile();
                     FileUtils.writeStringToFile(minimal_versionFile, sComponentMinimalVersion);
                     //-
                     //3 запись в журнал компонента
-                    File changesLog_ = Paths.get(CommonUtils.Home, "Components", sComponentType_, "changes.txt").toFile();
+                    File changesLog_ = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType_, "changes.txt").toFile();
                     FileWriter writer_ = new FileWriter(changesLog_.getAbsolutePath(), true);
                     BufferedWriter bufferWriter_ = new BufferedWriter(writer_);
                     bufferWriter_.write("Минимальная версия поднята до " + sComponentMinimalVersion + "\n");
@@ -233,7 +233,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 case ReceiveComponent:
                     String[] packed1 = request.arg.split("\n");
                     //тип/имя файла
-                    File componentFile1 = Paths.get(CommonUtils.Home, "Components", packed1[0], packed1[1]).toFile();
+                    File componentFile1 = Paths.get(CommonUtils.getHomePath(), "Components", packed1[0], packed1[1]).toFile();
                     Print("Получить компонент " + packed1[0]);
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                     response.object = CommonUtils.fileToBytes(componentFile1);
@@ -246,7 +246,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     LinkedHashMap<ComponentType, String> response_actual_versions_ = new LinkedHashMap<>();
                     for (String sType : types) {
                         ComponentType componentType = ComponentType.valueOf(sType);
-                        File vFile = Paths.get(CommonUtils.Home, "Components", sType, "version.txt").toFile();
+                        File vFile = Paths.get(CommonUtils.getHomePath(), "Components", sType, "version.txt").toFile();
                         String v_string = CommonUtils.removeCharacters(
                                 Utils.ReadAllText(vFile),
                                 "\n", "\r"
@@ -262,7 +262,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     LinkedHashMap<ComponentType, String> response_minimal_versions_ = new LinkedHashMap<>();
                     for (String sType : types_) {
                         ComponentType componentType = ComponentType.valueOf(sType);
-                        File vFile = Paths.get(CommonUtils.Home, "Components", sType, "minimal_version.txt").toFile();
+                        File vFile = Paths.get(CommonUtils.getHomePath(), "Components", sType, "minimal_version.txt").toFile();
                         String mv_string = CommonUtils.removeCharacters(
                                 Utils.ReadAllText(vFile),
                                 "\n", "\r"
@@ -275,7 +275,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 case GetComponentChangesLog:
                     Print("Получить журнал изменений компонента " + request.arg);
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
-                    response.object = CommonUtils.fileToBytes(Paths.get(CommonUtils.Home, "Components", request.arg, "changes.txt").toFile());
+                    response.object = CommonUtils.fileToBytes(Paths.get(CommonUtils.getHomePath(), "Components", request.arg, "changes.txt").toFile());
                     break;
                 case CheckURLRegistered:
                     Print("Проверить учетную запись на машине");
diff --git a/src/Repository/Subscribes/SubsribersDBTable.java b/src/Repository/Subscribes/SubsribersDBTable.java
index e7de2fe0..53ac093b 100644
--- a/src/Repository/Subscribes/SubsribersDBTable.java
+++ b/src/Repository/Subscribes/SubsribersDBTable.java
@@ -1,7 +1,7 @@
 package Repository.Subscribes;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.FKBehaviour;
diff --git a/src/Repository/Subscribes/UI/SubscriberFields.java b/src/Repository/Subscribes/UI/SubscriberFields.java
index 329cf541..998d8b29 100644
--- a/src/Repository/Subscribes/UI/SubscriberFields.java
+++ b/src/Repository/Subscribes/UI/SubscriberFields.java
@@ -1,6 +1,6 @@
 package Repository.Subscribes.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.Account.AccountRole;
 
 import javax.swing.*;
diff --git a/src/Repository/Subscribes/UI/SubscriberForm.java b/src/Repository/Subscribes/UI/SubscriberForm.java
index 7fdc6e15..4be2a4aa 100644
--- a/src/Repository/Subscribes/UI/SubscriberForm.java
+++ b/src/Repository/Subscribes/UI/SubscriberForm.java
@@ -2,7 +2,7 @@ package Repository.Subscribes.UI;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import GlobalData.Account.AccountRole;
 import Repository.Subscribes.Subscriber;
 public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields> {
diff --git a/src/TestingSystem/Common/Group/Group.java b/src/TestingSystem/Common/Group/Group.java
index 246a7b0d..19e395a6 100644
--- a/src/TestingSystem/Common/Group/Group.java
+++ b/src/TestingSystem/Common/Group/Group.java
@@ -1,5 +1,6 @@
 package TestingSystem.Common.Group;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -45,7 +46,7 @@ public class Group extends riDBObject {
     @Override
     public void select(boolean flag) {
         super.select(flag);
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             UI.getMainWindow().ShowCheckedTestsCount();
     }
     //--
diff --git a/src/TestingSystem/Common/Group/GroupsDBTable.java b/src/TestingSystem/Common/Group/GroupsDBTable.java
index 9e052187..f7e2db85 100644
--- a/src/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Common/Group/GroupsDBTable.java
@@ -2,7 +2,7 @@ package TestingSystem.Common.Group;
 import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/TestingSystem/Common/Group/UI/GroupFields.java b/src/TestingSystem/Common/Group/UI/GroupFields.java
index 91151867..dcd8ac06 100644
--- a/src/TestingSystem/Common/Group/UI/GroupFields.java
+++ b/src/TestingSystem/Common/Group/UI/GroupFields.java
@@ -1,6 +1,6 @@
 package TestingSystem.Common.Group.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import ProjectData.LanguageName;
 import TestingSystem.Common.Test.TestType;
 
diff --git a/src/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
index 24cdf4bb..009942b8 100644
--- a/src/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -33,7 +33,7 @@ public class MachineProcess extends DBObject {
         userName = p.user_name;
         userPassword = p.user_password;
         userWorkspace = p.user_workspace;
-        testingSystemRoot = CommonUtils.Home;
+        testingSystemRoot =CommonUtils.getHomePath();
         serverName = Global.testingServer.name;
         id = CommonUtils.getDateName(machineAddress + "_" + machinePort + "_" + userName);
     }
@@ -96,7 +96,7 @@ public class MachineProcess extends DBObject {
             File workspace = getWorkspace();
             Utils.CheckAndCleanDirectory(workspace);
             //копирование визуализатора
-            File src = new File(CommonUtils.Home, "TestingSystem.jar");
+            File src = new File(CommonUtils.getHomeDirectory(), "TestingSystem.jar");
             File supervisor = new File(workspace, "VisualSapfor.jar");
             FileUtils.copyFile(src, supervisor);
             //создание настроек
diff --git a/src/TestingSystem/Common/TasksPackageState.java b/src/TestingSystem/Common/TasksPackageState.java
index 66a906f4..8381c6ca 100644
--- a/src/TestingSystem/Common/TasksPackageState.java
+++ b/src/TestingSystem/Common/TasksPackageState.java
@@ -1,6 +1,6 @@
 package TestingSystem.Common;
 import Common.Visual.StatusEnum;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 
 import java.util.Arrays;
 import java.util.Vector;
diff --git a/src/TestingSystem/Common/Test/Test.java b/src/TestingSystem/Common/Test/Test.java
index c14fc251..22836d54 100644
--- a/src/TestingSystem/Common/Test/Test.java
+++ b/src/TestingSystem/Common/Test/Test.java
@@ -1,6 +1,7 @@
 package TestingSystem.Common.Test;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
@@ -53,7 +54,7 @@ public class Test extends riDBObject {
     @Override
     public void select(boolean flag) {
         super.select(flag);
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             UI.getMainWindow().ShowCheckedTestsCount();
     }
     //---
diff --git a/src/TestingSystem/Common/Test/TestDBTable.java b/src/TestingSystem/Common/Test/TestDBTable.java
index 54937377..0053ab73 100644
--- a/src/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/TestingSystem/Common/Test/TestDBTable.java
@@ -2,7 +2,7 @@ package TestingSystem.Common.Test;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.UI.TestFields;
 
diff --git a/src/TestingSystem/Common/Test/UI/TestFields.java b/src/TestingSystem/Common/Test/UI/TestFields.java
index 7876b46c..87a22252 100644
--- a/src/TestingSystem/Common/Test/UI/TestFields.java
+++ b/src/TestingSystem/Common/Test/UI/TestFields.java
@@ -1,6 +1,6 @@
 package TestingSystem.Common.Test.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/TestingSystem/Common/TestingBar.java b/src/TestingSystem/Common/TestingBar.java
index 9cf3e439..a7cb2489 100644
--- a/src/TestingSystem/Common/TestingBar.java
+++ b/src/TestingSystem/Common/TestingBar.java
@@ -1,11 +1,10 @@
 package TestingSystem.Common;
 import Common.Utils.CommonUtils;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import _VisualDVM.Syntax.VisualiserFonts;
-import Common_old.UI.UI;
+import Common.Visual.Fonts.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
@@ -76,13 +75,13 @@ public class TestingBar extends VisualiserMenuBar {
         sCheckTime.setMaximumSize(new Dimension(60, 26));
         sCheckTime.setModel(new SpinnerNumberModel(Global.properties.CheckTestingIntervalSeconds, 10, 3600, 1));
         sCheckTime.setValue(Global.properties.CheckTestingIntervalSeconds);
-        UI.MakeSpinnerRapid(sCheckTime, e -> {
+        CommonUI.MakeSpinnerRapid(sCheckTime, e -> {
             Global.properties.updateField("CheckTestingIntervalSeconds", sCheckTime.getValue());
             if (Global.properties.AutoCheckTesting) TestingServer.ResetTimer();
         });
         add(new JLabel(" сек ") {
             {
-                setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
             }
         });
         addSeparator();
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 79e0f84d..0055292e 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -187,7 +187,6 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
     //---
     public TestingPlanner(){}
     public TestingPlanner(String... args) {
-        CommonUtils.isWindows = System.getProperty("os.name").startsWith("Windows");
         //---
         String machineAddress = args[0];
         int machinePort = Integer.parseInt(args[1]);
@@ -196,7 +195,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
         String userWorkspace = args[4];
         String testingSystemRoot = args[5];
         serverName = args[6];
-        supervisorHome = new File(CommonUtils.Home); //при инициализации это текущая папка.
+        supervisorHome = CommonUtils.getHomeDirectory(); //при инициализации это текущая папка.
         //---
         CommonUtils.MainLog = new Loggable() {
             @Override
@@ -205,12 +204,12 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
             }
             @Override
             public String getLogName() {
-                return CommonUtils.mode.toString();
+                return Global.mode.toString();
             }
         };
         CommonUtils.MainLog.ClearLog();
         //--
-        CommonUtils.Home = testingSystemRoot;
+        CommonUtils.setHomePath(testingSystemRoot);
         Global.CheckTestingSystemDirectories();
         //---
         machine = new Machine(machineAddress, machineAddress, machinePort, MachineType.Server);
@@ -221,7 +220,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
         Print("userName=" + CommonUtils.Brackets(userName));
         Print("userPassword=" + CommonUtils.Brackets(userPassword));
         Print("userWorkspace=" + CommonUtils.Brackets(userWorkspace));
-        Print("root=" + CommonUtils.Brackets(CommonUtils.Home));
+        Print("root=" + CommonUtils.Brackets(CommonUtils.getHomePath()));
         Print("serverName=" + serverName);
         Print("=====");
         //----
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 5e0dc43e..e696ef54 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -6,7 +6,7 @@ import Common.Visual.DataSetControlForm;
 import Common_old.UI.Tables.TableRenderers;
 import Common_old.UI.VisualCache.ConfigurationCache;
 import Common_old.UI.VisualCache.VisualCaches;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
 public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
     public DVMConfigurationDBTable() {
diff --git a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
index 785a6cf0..78915c2a 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
@@ -1,8 +1,7 @@
 package TestingSystem.DVM.DVMConfiguration.UI;
 import Common_old.Constants;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
-import Common_old.Utils.Utils;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java b/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
index 58d644c2..c7091c6d 100644
--- a/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
+++ b/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
@@ -3,7 +3,7 @@ import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
 public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     public DVMSettingsDBTable() {
diff --git a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
index 499e9f5f..70eb9793 100644
--- a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
+++ b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
@@ -1,7 +1,7 @@
 package TestingSystem.DVM.DVMSettings.UI;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index 2c303c65..f474c560 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -55,7 +55,7 @@ public class SapforVersion_json implements Serializable {
         state = SapforVersionState.Empty;
         comparisonState = VersionComparisonState.Unknown;
         //--
-        String relativePath = CommonUtils.isWindows ? CommonUtils.toW(version) : version;
+        String relativePath = CommonUtils.isWindows() ? CommonUtils.toW(version) : version;
         Home = Paths.get(configurationRoot.getAbsolutePath(), relativePath).toFile();
         files = new LinkedHashMap<>();
         //--
@@ -251,7 +251,7 @@ public class SapforVersion_json implements Serializable {
     //--
     public void createProject(File rootHome) throws Exception {
         project = null;
-        String version_ = CommonUtils.isWindows ? CommonUtils.toW(version) : CommonUtils.toU(version);
+        String version_ = CommonUtils.isWindows() ? CommonUtils.toW(version) : CommonUtils.toU(version);
         project = new db_project_info();
         project.Home = Paths.get(rootHome.getAbsolutePath(), version_).toFile();
         project.name = project.Home.getName();
diff --git a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
index 2b39d281..1595af57 100644
--- a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
+++ b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
@@ -19,7 +19,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
         package_json = (SapforPackage_json) CommonUtils.jsonFromFile(new File(Constants.package_json), SapforPackage_json.class);
         //--
         File sapfor_src = new File(package_json.sapfor_drv);
-        sapfor_drv = new File(CommonUtils.Home, CommonUtils.getDateName("SAPFOR_F"));
+        sapfor_drv = new File(CommonUtils.getHomeDirectory(), CommonUtils.getDateName("SAPFOR_F"));
         FileUtils.copyFile(sapfor_src, sapfor_drv);
         if (!sapfor_drv.setExecutable(true))
             throw new Exception("Не удалось сделать файл " + sapfor_drv.getName() + " исполняемым!");
@@ -49,7 +49,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
             //--
             //Очистка
             //очистка служебных файлов.
-            Utils.deleteFilesByExtensions(new File(CommonUtils.Home),
+            Utils.deleteFilesByExtensions(CommonUtils.getHomeDirectory(),
                     "proj", "dep", "jar"
                     //  ,"sh", "exe", "bat"
             );
diff --git a/src/TestingSystem/SAPFOR/PerformSapforTask.java b/src/TestingSystem/SAPFOR/PerformSapforTask.java
index 230620f0..e4e29ea0 100644
--- a/src/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -41,11 +41,11 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         //--
         version_json = null;
         //--->>
-        parentTask = Paths.get(CommonUtils.Home,
+        parentTask = Paths.get(CommonUtils.getHomePath(),
                 String.valueOf(target.set_id),
                 String.valueOf(target.sapfor_configuration_id),
                 target.test_description).toFile();
-        root = Paths.get(CommonUtils.Home, String.valueOf(target.set_id), String.valueOf(target.sapfor_configuration_id)).toFile();
+        root = Paths.get(CommonUtils.getHomePath(), String.valueOf(target.set_id), String.valueOf(target.sapfor_configuration_id)).toFile();
         task = null;
         //--->>
         return true;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index bba22656..0a173646 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -5,7 +5,7 @@ import Common_old.UI.Tables.TableEditors;
 import Common_old.UI.Tables.TableRenderers;
 import Common_old.UI.VisualCache.ConfigurationCache;
 import Common_old.UI.VisualCache.VisualCaches;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Vector_;
 import Common.Database.Tables.iDBTable;
 import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
index 98417607..cb385753 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -1,8 +1,7 @@
 package TestingSystem.SAPFOR.SapforConfiguration.UI;
 import Common_old.Constants;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
-import Common_old.Utils.Utils;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
index eab2565f..fd97ee5b 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
@@ -2,7 +2,7 @@ package TestingSystem.SAPFOR.SapforSettings;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
index 3b6f4b46..e4501e58 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR.SapforSettings.UI;
-import Common_old.Current;
+import Common.Visual.CommonUI;
 import Common_old.UI.Tables.StyledCellLabel;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import Repository.Component.Sapfor.Sapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
@@ -21,7 +21,7 @@ public class SapforSettingsCommandFields implements DialogFields {
             JLabel res = new StyledCellLabel();
             res.setText(value.getDescription());
             res.setBackground(isSelected ?
-                    Current.getTheme().selection_background : Current.getTheme().background
+                    CommonUI.getTheme().selection_background : CommonUI.getTheme().background
             );
             return res;
         });
diff --git a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java
index 2e5db67c..19105ac9 100644
--- a/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforSettings.UI;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
index 75e659a0..020b972f 100644
--- a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -3,7 +3,7 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
index 3e91a4ef..d6b61140 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforTask;
 import Common.Visual.StatusEnum;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 public enum ComparisonState implements StatusEnum {
     Unknown,
     NotMatch,
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index b340f686..682d1f9a 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -40,8 +40,8 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     File repo_err;
     //--
     public SapforTestingPlanner() {
-        repo = new File(CommonUtils.Home, "Repo");
-        repoSapforHome = Paths.get(CommonUtils.Home, "Repo", Constants.SAPFOR_REPOSITORY_BIN).toFile();
+        repo = new File(CommonUtils.getHomeDirectory(), "Repo");
+        repoSapforHome = Paths.get(CommonUtils.getHomePath(), "Repo", Constants.SAPFOR_REPOSITORY_BIN).toFile();
         repo_bin = new File(repoSapforHome, "Sapfor_F");
         repo_out = new File(repoSapforHome, Constants.out_file);
         repo_err = new File(repoSapforHome, Constants.err_file);
@@ -91,7 +91,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     protected void PackageWorkspaceCreation() throws Exception {
         //копирование визуализатора
         File visualiser = new File(workspace, "VisualSapfor.jar");
-        FileUtils.copyFile(new File(CommonUtils.Home, "TestingSystem.jar"), visualiser);
+        FileUtils.copyFile(new File(CommonUtils.getHomeDirectory(), "TestingSystem.jar"), visualiser);
         //создание настроек
         GlobalProperties properties = new GlobalProperties(Global.properties);
         properties.Mode = Mode.Package;
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
index 42997469..5d1294a4 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.ServerSapfor;
 import Common.Visual.StatusEnum;
-import _VisualDVM.Syntax.VisualiserFonts;
+import Common.Visual.Fonts.VisualiserFonts;
 public enum ServerSapforState implements StatusEnum {
     Queued,
     DVMRepositorySynchronization,
diff --git a/src/Visual_DVM_2021/Passes/All/AddBugReport.java b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
index ece711b0..d62200bf 100644
--- a/src/Visual_DVM_2021/Passes/All/AddBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/AddBugReport.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Database;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import GlobalData.Account.AccountRole;
 import Repository.BugReport.BugReport;
 import Repository.BugReport.BugReportInterface;
@@ -40,7 +40,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
                     "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version);
             return true;
         } else {
-            if (UI.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
+            if (CommonUI.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
                 target = new BugReport();
                 target.genName();
                 target.sender_name = Current.getAccount().name;
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
index 45c0b6c5..ad920a0e 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import GlobalData.DVMParameter.DVMParameter;
 import GlobalData.DVMParameter.UI.DVMParameterFields;
diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/Visual_DVM_2021/Passes/All/AddFile.java
index d57ca7e3..fcc505a4 100644
--- a/src/Visual_DVM_2021/Passes/All/AddFile.java
+++ b/src/Visual_DVM_2021/Passes/All/AddFile.java
@@ -1,9 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.Text.FileNameForm;
+import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
index eb5ad853..4eb61256 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
+++ b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
@@ -3,7 +3,7 @@ import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
+import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import ProjectData.SapforData.Functions.FuncInfo;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java b/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
index adc2a26b..532a37c8 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
@@ -209,7 +209,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
                 target.tasksCount++;
             }
         }
-        return inexistingTests.isEmpty() || UI.Question(inexistingTests.size() + " тестов отсутствует. Продолжить");
+        return inexistingTests.isEmpty() || CommonUI.Question(inexistingTests.size() + " тестов отсутствует. Продолжить");
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
index 9a571bae..be59fb61 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Database;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.TasksPackageState;
@@ -174,7 +174,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
          */
         //--
         return inexistingTests.isEmpty() && inexistingConfigurations.isEmpty() ||
-                UI.Question(
+                CommonUI.Question(
                         (inexistingTests.isEmpty() ? "" : (inexistingTests.size() + " тестов отсутствует;")) +
                                 (inexistingConfigurations.isEmpty() ? "" : (inexistingConfigurations.size() + " конфигураций отсутствует;")) +
                                 "Будет добавлено " + target.package_json.tasks.size() + " задач. Продолжить"
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
index c914d873..8f1e77fe 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
@@ -41,7 +41,7 @@ public class CloseCurrentProject extends Pass_2021<db_project_info> {
         Global.files_multiselection = false;
         //--
         Current.getSapfor().ResetAllAnalyses();
-        Current.getSapfor().cd(new File(CommonUtils.Home));
+        Current.getSapfor().cd(CommonUtils.getHomeDirectory());
         CurrentAnchestor.set(Current.Project, null);
         CurrentAnchestor.set(Current.File, null);
         CurrentAnchestor.set(Current.Function, null);
diff --git a/src/Visual_DVM_2021/Passes/All/CloseProject.java b/src/Visual_DVM_2021/Passes/All/CloseProject.java
index e9e272da..e57f3238 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CloseProject.java
@@ -18,7 +18,7 @@ public class CloseProject extends Pass_2021<db_project_info> {
     @Override
     protected void performDone() throws Exception {
         Current.getSapfor().ResetAllAnalyses();
-        Current.getSapfor().cd(new File(CommonUtils.Home));
+        Current.getSapfor().cd(CommonUtils.getHomeDirectory());
         CurrentAnchestor.set(Current.Project, null);
         //-
     }
diff --git a/src/Visual_DVM_2021/Passes/All/CombineFiles.java b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
index c2eb3a67..2177d2c0 100644
--- a/src/Visual_DVM_2021/Passes/All/CombineFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CombineFiles.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
+import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import Repository.Component.Sapfor.TransformationPermission;
@@ -47,7 +47,7 @@ public class CombineFiles extends Transformation {
     @Override
     protected void body() throws Exception {
         result = Paths.get(target.last_version.Home.getAbsolutePath(),
-                CommonUtils.isWindows ? fd.Result : CommonUtils.toU(fd.Result)).toFile();
+                CommonUtils.isWindows() ? fd.Result : CommonUtils.toU(fd.Result)).toFile();
         //-----------------------
         //получить список хедеров.
         //-----------------------
diff --git a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
index 6ed01e92..c0f08bf7 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -25,7 +26,7 @@ public class CompareDVMRunTasks extends Pass_2021<Vector<DVMRunTask>> {
         //--
         target = Global.testingServer.db.dvmRunTasks.getCheckedItems();
         if (target.size() == 2) {
-            if (UI.Question("Назначить задачу " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
+            if (CommonUI.Question("Назначить задачу " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
                     "\n(в случае отказа, будет назначена задача " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) {
                 master = target.get(0);
                 slave = target.get(1);
@@ -37,11 +38,11 @@ public class CompareDVMRunTasks extends Pass_2021<Vector<DVMRunTask>> {
         } else if (target.size() == 1) {
             master = target.get(0);
             slave = null;
-            return UI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
+            return CommonUI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
         } else if ((target.size() == 0) && (Current.HasDVMRunTask())) {
             master = Current.getDVMRunTask();
             slave = null;
-            return UI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
+            return CommonUI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK()));
         } else {
             Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу,или выделить её.");
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
index cb84f7b1..debf62a9 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -25,7 +26,7 @@ public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
         //--
         target = Global.testingServer.db.sapforPackages.getCheckedItems();
         if (target.size() == 2) {
-            if (UI.Question("Назначить пакет " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
+            if (CommonUI.Question("Назначить пакет " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" +
                     "\n(в случае отказа, будет назначен пакет " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) {
                 master = target.get(0);
                 slave = target.get(1);
@@ -37,11 +38,11 @@ public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
         } else if (target.size() == 1) {
             master = target.get(0);
             slave = null;
-            return UI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
+            return CommonUI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
         } else if ((target.size() == 0) && (Current.HasSapforPackage())) {
             master = Current.getSapforPackage();
             slave = null;
-            return UI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
+            return CommonUI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK()));
         } else {
             Log.Writeln_("Для сравнения требуется отметить два пакета.\nДля отображения требуется отметить один пакет,или выделить его");
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/Visual_DVM_2021/Passes/All/Compile.java
index ace4e981..7a5bfffb 100644
--- a/src/Visual_DVM_2021/Passes/All/Compile.java
+++ b/src/Visual_DVM_2021/Passes/All/Compile.java
@@ -66,7 +66,7 @@ public class Compile extends Pass_2021<db_project_info> {
 
         switch (Current.getMachine().type) {
             case Local:
-                if (CommonUtils.isWindows) {
+                if (CommonUtils.isWindows()) {
                     subpass = passes.get(PassCode_2021.WindowsLocalCompilation);
                 } else
                     subpass = passes.get(PassCode_2021.LinuxLocalCompilation);
diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
index 861ba3e8..8f2da243 100644
--- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Repository.Server.ServerCode;
@@ -30,7 +31,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
         if (!CurrentAnchestor.Check(Log, Current.ServerSapfor)){
             return false;
         }
-        return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
+        return CommonUI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
     }
     @Override
     protected boolean needsAnimation() {
diff --git a/src/Visual_DVM_2021/Passes/All/CopyProject.java b/src/Visual_DVM_2021/Passes/All/CopyProject.java
index 29dc7bc7..677d9a0c 100644
--- a/src/Visual_DVM_2021/Passes/All/CopyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CopyProject.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -62,7 +62,7 @@ public class CopyProject extends CurrentProjectPass {
     }
     @Override
     protected void performDone() throws Exception {
-        if (UI.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
+        if (CommonUI.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
             passes.get(PassCode_2021.CloseCurrentProject).Do();
             passes.get(PassCode_2021.OpenCurrentProject).Do(dstFile);
         }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
index 47d82e5b..417cc169 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
@@ -3,7 +3,7 @@ import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.Text.FileNameForm;
+import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import Visual_DVM_2021.Passes.ChangeFilePass;
 import Visual_DVM_2021.Passes.PassException;
 
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
index 11ce3695..06d5e5c1 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import _VisualDVM.Global;
-import Common_old.UI.Windows.Dialog.Text.FileNameForm;
+import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 0602ac5c..c6588819 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.UI;
 import ProjectData.Project.db_project_info;
 import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -46,7 +46,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
             return false;
         }
         //---
-        return UI.Question("В группу " + CommonUtils.Brackets(group.description) +
+        return CommonUI.Question("В группу " + CommonUtils.Brackets(group.description) +
                 "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
index d5ed7b8a..3b782ab8 100644
--- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.PassMenuItem;
 import Common_old.UI.UI;
@@ -140,7 +141,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
                 Current.getFile().form.FocusCompilationOut();
         }
         if (!badFiles.isEmpty())
-            UI.Error(badFiles);
+            CommonUI.Error(badFiles);
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
index 4531c091..1c35d40e 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -27,7 +28,7 @@ public class DeleteDirectory extends ChangeFilePass {
                 Log.Writeln("Нельзя удалять домашнюю папку проекта.");
                 return false;
             }
-            return (UI.Warning("Удалить папку\n" + CommonUtils.Brackets(target_dir.getAbsolutePath())
+            return (CommonUI.Warning("Удалить папку\n" + CommonUtils.Brackets(target_dir.getAbsolutePath())
                     + "\n и всё её содержимое."));
         } else Log.Writeln_("Папка не выделена.");
         return false;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
index 918f168c..f52dd66c 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
@@ -1,7 +1,9 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
+import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import Common_old.Utils.Utils;
 import GlobalData.FileObject.DirInfo;
 import GlobalData.FileObject.DirInfosDataSet;
@@ -23,7 +25,7 @@ public class DeleteDownloadedBugReports extends Pass_2021<DirInfosDataSet> {
             target = (DirInfosDataSet) passes.get(PassCode_2021.GetOldBugReports).target;
             if (target.Data.isEmpty()){
                 Log.Writeln_("Не найдено отчетов, не использовавшихся " +
-                       Global.getSetting(SettingName.BugReportsAgeLimit).toInt32() +
+                        ((GlobalDatabase) CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32() +
                         " месяцев и более!");
                 return false;
             }
@@ -47,7 +49,7 @@ public class DeleteDownloadedBugReports extends Pass_2021<DirInfosDataSet> {
                 }
             };
             if (dialog.ShowDialog("Найдено "+target.size()+" отчетов, не использовавшихся " +
-                    Global.getSetting(SettingName.BugReportsAgeLimit).toInt32()+
+                    ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32()+
                     " месяцев и более. Удалить?")) {
                 return true;
             }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteFile.java b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
index 68cb8edb..02f63788 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteFile.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteFile.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -16,7 +17,7 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
     protected boolean canStart(Object... args) {
         resetArgs();
         return (CurrentAnchestor.Check(Log, Current.SelectedFile)) &&
-                UI.Warning("Удалить файл "
+                CommonUI.Warning("Удалить файл "
                         + CommonUtils.Brackets((target = Current.getSelectedFile()).name));
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
index 9bd8a52d..9de72dd4 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -17,7 +18,7 @@ public class DeleteSelectedFiles extends Pass_2021 {
             Log.Writeln_("Не отмечено ни одного файла.");
             return false;
         }
-        return UI.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов.");
+        return CommonUI.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов.");
     }
     @Override
     protected void performPreparation() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
index bd39b7e2..b12daf4f 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -45,7 +45,7 @@ public class DeleteSelectedVersions extends Pass_2021<Vector<db_project_info>> {
                 }
             }
         }
-        return UI.Warning("Удалить " + q + " версий.");
+        return CommonUI.Warning("Удалить " + q + " версий.");
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
index b4f1d96b..4c3b502d 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -21,8 +22,8 @@ public class DeleteVersion extends Pass_2021<db_project_info> {
             current = (Current.getVersion() != null) && Current.getVersion().Home.equals(target.Home);
             return true;
         } else {
-            if (((target = Current.getVersion()) != null) && (!CommonUtils.hasUI() ||
-                    UI.Warning("Удалить " +
+            if (((target = Current.getVersion()) != null) && (!CommonUI.isActive() ||
+                    CommonUI.Warning("Удалить " +
                             ((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ")
                             + CommonUtils.Brackets(target.name)))) {
                 current = true;
@@ -39,7 +40,7 @@ public class DeleteVersion extends Pass_2021<db_project_info> {
             if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath())))
                 passes.get(PassCode_2021.CloseCurrentProject).Do();
         }
-        if (CommonUtils.hasUI()) {
+        if (CommonUI.isActive()) {
             UI.getVersionsWindow().RemoveVersionFromComparison(target);
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
index fc0fdf44..427c164a 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -54,7 +55,7 @@ public class DownloadProject extends CurrentConnectionPass {
         File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
                 CommonUtils.getDateName(src.name)).toFile();
         if (passes.get(PassCode_2021.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
-            if (UI.Question("Проект " + CommonUtils.Brackets(src.name) + " успешно загружен. Открыть его"))
+            if (CommonUI.Question("Проект " + CommonUtils.Brackets(src.name) + " успешно загружен. Открыть его"))
                 passes.get(PassCode_2021.OpenCurrentProject).Do(project);
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
index ea45a00f..0a1e5e19 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadTest.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
@@ -50,7 +50,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
                 target.getArchive().getAbsolutePath(),
                 Global.visualiser.getWorkspace().getAbsolutePath(), false
         ))
-            if (UI.Question("Тестовый проект успешно загружен под именем\n" +
+            if (CommonUI.Question("Тестовый проект успешно загружен под именем\n" +
                     CommonUtils.Brackets(target.getHomePath().getName()) +
                     "\nОткрыть его"))
                 passes.get(PassCode_2021.OpenCurrentProject).Do(target.getHomePath());
diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/Visual_DVM_2021/Passes/All/EditAccount.java
index adab045d..bae845d7 100644
--- a/src/Visual_DVM_2021/Passes/All/EditAccount.java
+++ b/src/Visual_DVM_2021/Passes/All/EditAccount.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.UI;
 import Repository.EmailMessage;
 import Repository.Subscribes.Subscriber;
 import Repository.Subscribes.UI.SubscriberForm;
@@ -46,13 +46,13 @@ public class EditAccount extends Email {
                     JOptionPane.INFORMATION_MESSAGE);
             if (attempt != null) {
                 if (attempt.equals(password)) {
-                    UI.Info("Почта успешно подтверждена!");
+                    CommonUI.Info("Почта успешно подтверждена!");
                     return true;
                 } else {
-                    UI.Error("Неверный код активации.\nПовторите попытку.");
+                    CommonUI.Error("Неверный код активации.\nПовторите попытку.");
                 }
             } else {
-                UI.Info("Подтверждение почты отменено");
+                CommonUI.Info("Подтверждение почты отменено");
                 return false;
             }
         } while (true);
diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
index 1078d355..51c26fdf 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
+++ b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.SessionMaxtimeDialog;
+import Common.Visual.Windows.Dialog.SessionMaxtimeDialog;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class EditProjectCompilationMaxtime extends CurrentProjectPass {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
index 3303258e..f083892f 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
+++ b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.SessionMaxtimeDialog;
+import Common.Visual.Windows.Dialog.SessionMaxtimeDialog;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class EditProjectRunMaxtime extends CurrentProjectPass {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java b/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
index 8284d769..f7b78a56 100644
--- a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
+++ b/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
@@ -19,7 +19,7 @@ public class EraseBadSymbols extends Transformation {
                     res_text.append(CommonUtils.Translit(c));
                 else res_text.append(' ');
             }
-            File dst = Paths.get(target.last_version.Home.getAbsolutePath(), CommonUtils.isWindows ? file.name : file.name.replace('\\', '/')).toFile();
+            File dst = Paths.get(target.last_version.Home.getAbsolutePath(), CommonUtils.isWindows() ? file.name : file.name.replace('\\', '/')).toFile();
             FileUtils.write(dst, res_text.toString());
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
index 0d827323..79ee3881 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
@@ -1,10 +1,10 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import Common_old.Utils.Files.VDirectoryChooser;
 import Common.Utils.Index;
 import Common_old.Utils.Utils;
@@ -398,7 +398,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
     protected void performDone() throws Exception {
         super.performDone();
         if (Desktop.isDesktopSupported()) {
-            if (UI.Question("Таблица сформирована в файле\n" + CommonUtils.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её"
+            if (CommonUI.Question("Таблица сформирована в файле\n" + CommonUtils.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её"
             )) {
                 Desktop.getDesktop().open(res);
             }
diff --git a/src/Visual_DVM_2021/Passes/All/GCOV.java b/src/Visual_DVM_2021/Passes/All/GCOV.java
index df5e4562..fe2c6358 100644
--- a/src/Visual_DVM_2021/Passes/All/GCOV.java
+++ b/src/Visual_DVM_2021/Passes/All/GCOV.java
@@ -16,7 +16,7 @@ public class GCOV extends Precompilation {
         return new File(workspace, getBinaryName());
     }
     protected String getBinaryName() {
-        return CommonUtils.isWindows ? "0.exe" : "0";
+        return CommonUtils.isWindows() ? "0.exe" : "0";
     }
     @Override
     public boolean needsConfirmations() {
@@ -67,7 +67,7 @@ public class GCOV extends Precompilation {
         if (getBinary().exists()) {
             ShowMessage1("Запуск для GCOV");
             name_to_kill = "0.exe";
-            StartProcess(CommonUtils.isWindows?"0.exe":"./0", target.run_maxtime);
+            StartProcess(CommonUtils.isWindows()?"0.exe":"./0", target.run_maxtime);
             target.updateRunOut(output);
         } else {
             Log.Writeln_("Не удалось собрать проект.");
@@ -93,7 +93,7 @@ public class GCOV extends Precompilation {
                 target.db.Update(file);
                 File targetGcov = Paths.get(
                         target.getGCOVDirectory().getAbsolutePath(),
-                        (CommonUtils.isWindows?file.name:file.getUnixName()) + ".gcov").toFile();
+                        (CommonUtils.isWindows()?file.name:file.getUnixName()) + ".gcov").toFile();
                 Files.copy(gcov.toPath(), targetGcov.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java b/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
index 8739779b..019f478e 100644
--- a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
+++ b/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Visual.CommonUI;
 import Common_old.UI.UI;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -27,7 +28,7 @@ public class GenerateParallelVariants extends CurrentProjectPass {
                 Log.Writeln_("Количество вариантов " + amount + "\nпревышает 1600. Отображение запрещено.");
                 return false;
             }
-            return UI.Question("Будет отображено " + amount + " вариантов. Хотите продолжить");
+            return CommonUI.Question("Будет отображено " + amount + " вариантов. Хотите продолжить");
         }
         return false;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
index 67d80393..2363deb1 100644
--- a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
@@ -1,4 +1,6 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
+import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common_old.Utils.Utils;
 import GlobalData.FileObject.DirInfo;
@@ -28,7 +30,7 @@ public class GetOldBugReports extends Pass_2021<DirInfosDataSet> {
             //---
             Calendar c = new GregorianCalendar();
             c.setTimeInMillis(System.currentTimeMillis());
-            c.add(Calendar.MONTH, -Global.getSetting(SettingName.BugReportsAgeLimit).toInt32());
+            c.add(Calendar.MONTH, -((GlobalDatabase) CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32());
             Date date = c.getTime();
             System.out.println(date);
             long border = date.getTime();
diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
index 5fbb58e0..23e4ea80 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
@@ -17,13 +17,13 @@ public class LocalInitaliseUser extends ProcessPass<User> {
     }
     @Override
     protected void body() throws Exception {
-        File workspace = Paths.get(CommonUtils.Home, "User").toFile();
+        File workspace = new File(CommonUtils.getHomeDirectory(), "User");
         target.workspace = workspace.getAbsolutePath();
         Utils.CheckAndCleanDirectory(workspace);
         FileUtils.forceMkdir(target.getLocalProjectsDir());
         FileUtils.forceMkdir(target.getLocalModulesDir());
         //-
-        if (!CommonUtils.isWindows) {
+        if (!CommonUtils.isWindows()) {
             File headerCode = target.getHeaderCodeFile();
             //-
             File starterCode = target.getStarterCodeFile();
diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
index 6290daab..eac846bd 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
@@ -30,7 +30,7 @@ public class OpenBugReportTestProject extends Pass_2021<BugReport> {
                 root = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
                         target.id).toFile();
                 project = Paths.get(root.getAbsolutePath(),
-                        CommonUtils.isWindows ? CommonUtils.toW(target.project_version)
+                        CommonUtils.isWindows() ? CommonUtils.toW(target.project_version)
                                 : CommonUtils.toU(target.project_version)).toFile();
                 return true;
             }else {
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
index b4b8593f..3b7567da 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
@@ -3,7 +3,7 @@ import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
index 3e9c8b23..df26e135 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java b/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java
index 261ae94d..e9deea57 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.CompilerOption.CompilerOption;
diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java
index 16a3e76a..86d6c088 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CommonConstants;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Constants;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
@@ -49,7 +50,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = Current.getProject();
-        if (CommonUtils.isWindows) {
+        if (CommonUtils.isWindows()) {
             //--
             makepath = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).toString();
             if (makepath.isEmpty()) {
@@ -185,7 +186,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
     }
     @Override
     protected void body() throws Exception {
-        if (CommonUtils.isWindows) {
+        if (CommonUtils.isWindows()) {
             name_to_kill = "make.exe";
             StartProcess(CommonUtils.DQuotes(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Kernels).toString(),
                     target.compilation_maxtime);
@@ -247,14 +248,14 @@ public class Precompilation extends Pass_2021<db_project_info> {
     }
     @Override
     public void Interrupt() throws Exception {
-        if (CommonUtils.isWindows) {
+        if (CommonUtils.isWindows()) {
             if (!name_to_kill.isEmpty()) {
                 killed = true;
                 Process killer = Runtime.getRuntime().exec("taskkill /FI \"IMAGENAME eq " + name_to_kill + "\" /F /T");
                 killer.waitFor();
             }
         } else {
-            UI.Info("Прерывание процессов под Linux не реализовано");
+            CommonUI.Info("Прерывание процессов под Linux не реализовано");
         }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
index ad9a2d63..0e3d1b50 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -32,7 +33,7 @@ public class PublishBugReport extends Pass_2021<BugReport> {
             }
             if (target.executor.isEmpty()) {
                 UI.getMainWindow().getCallbackWindow().FocusRecipients();
-                if (!UI.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
+                if (!CommonUI.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
                     return false;
             }
             if (!Current.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponent.java b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
index 41c96576..d21b7d1b 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
@@ -32,7 +32,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!CommonUtils.isWindows) {
+        if (!CommonUtils.isWindows()) {
             Log.Writeln_("Публикация компонент разрешена только для Windows");
             return false;
         }
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTests.java b/src/Visual_DVM_2021/Passes/All/PublishTests.java
index c28fcdc9..fa4ad3c8 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTests.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTests.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.UI.UI;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
@@ -66,7 +67,7 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
             return false;
         }
         //---
-        return UI.Question("В группу " + CommonUtils.Brackets(group.description) +
+        return CommonUI.Question("В группу " + CommonUtils.Brackets(group.description) +
                 "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
index f6401370..30a2bb60 100644
--- a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java
@@ -3,7 +3,7 @@ import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.Text.FileNameForm;
+import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.ChangeFilePass;
diff --git a/src/Visual_DVM_2021/Passes/All/RenameFile.java b/src/Visual_DVM_2021/Passes/All/RenameFile.java
index 9a6ee014..6ebefdaf 100644
--- a/src/Visual_DVM_2021/Passes/All/RenameFile.java
+++ b/src/Visual_DVM_2021/Passes/All/RenameFile.java
@@ -3,7 +3,7 @@ import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.Text.FileNameForm;
+import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import Visual_DVM_2021.Passes.ChangeFilePass;
diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
index 2bd1c92a..6a3edd9c 100644
--- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Constants;
 import Common_old.Current;
-import Common_old.UI.UI;
 import Common_old.Utils.Files.VFileChooser;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
@@ -92,7 +92,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
             return false;
         }
         //--
-        if (UI.Question(
+        if (CommonUI.Question(
                 testForReplaceNames.size() + " тестов будет заменено,\n" +
                         newTestsNames.size() + " тестов будет добавлено.\n" +
                         "Продолжить"
diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
index 51cb902c..fc7ccdb9 100644
--- a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
+++ b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
@@ -4,7 +4,7 @@ import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.PassMenuItem;
 import Common_old.UI.Trees.DataTree;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/Visual_DVM_2021/Passes/All/Run.java
index 5ba703b5..36619613 100644
--- a/src/Visual_DVM_2021/Passes/All/Run.java
+++ b/src/Visual_DVM_2021/Passes/All/Run.java
@@ -60,7 +60,7 @@ public class Run extends Pass_2021<db_project_info> {
     protected void body() throws Exception {
         switch (Current.getMachine().type) {
             case Local:
-                if (CommonUtils.isWindows) {
+                if (CommonUtils.isWindows()) {
                     subpass = passes.get(PassCode_2021.WindowsLocalRun);
                 } else
                     subpass = passes.get(PassCode_2021.LinuxLocalRun);
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
index 9fa8740d..25698f5a 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Mode;
-import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import ProjectData.SapforData.Variants.ParallelVariant;
 import Repository.Component.Sapfor.TransformationPermission;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -66,15 +65,11 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
     protected void performDone() throws Exception {
         Global.transformationPermission = TransformationPermission.VariantsOnly;
         target.migrateFilesSettings(target.last_version, true, true);
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name);
     }
     @Override
-    protected void performFinish() throws Exception {
-        //в пакетном режиме вариант всегда один. поэтому, сообщения надо распаковать сразу.
-        if (CommonUtils.mode.equals(Mode.Package))
-            super.performFinish();
-    }
+    protected void performFinish() throws Exception {}
     @Override
     protected void showFinish() throws Exception {
     }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
index c30b6985..fe1775e0 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.UI.UI;
 import GlobalData.GlobalDatabase;
 import GlobalData.Settings.SettingName;
@@ -30,7 +31,7 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
     @Override
     protected boolean canStart(Object... args) throws Exception {
         if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()) {
-            UI.Info("Включена настройка SAPFOR 'MPI программа'." +
+            CommonUI.Info("Включена настройка SAPFOR 'MPI программа'." +
                     "\nПостроение распределения данных невозможно.");
             passes.get(PassCode_2021.SPF_SharedMemoryParallelization).Do();
             return false;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
index f1dabb14..390d5c49 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
@@ -1,9 +1,9 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Visual_DVM_2021.Passes.PassState;
 import Common_old.UI.Menus_2023.PassControl;
-import Common_old.UI.UI;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.SilentSapforPass;
@@ -21,7 +21,7 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (UI.Question("Все анализы будут сброшены.Продолжить")) {
+        if (CommonUI.Question("Все анализы будут сброшены.Продолжить")) {
             SPF_ParseFilesWithOrder.silent = true;
             return super.canStart(args) && passes.get(PassCode_2021.GCOV).Do()&&passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do();
         }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java
index aac7c261..95e66c8c 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common_old.Current;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import ProjectData.SapforData.Arrays.Distribution.Dimension;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import ProjectData.SapforData.Regions.ParallelRegion;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
index 77bf45ac..c6487173 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
@@ -1,6 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
+import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
@@ -43,7 +45,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
         precompilation_done = false;
         boolean res = (
                 silent ||
-                        (!Global.getSetting(SettingName.Precompilation).toBoolean() ||
+                        (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Precompilation).toBoolean() ||
                                 (precompilation_done = passes.get(PassCode_2021.Precompilation).Do())))
                 && super.canStart(args) && checkActiveFiles();
         return res;
@@ -111,7 +113,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     protected void performPreparation() throws Exception {
         super.performPreparation(); //удаление интеррупта.
         //------------------------------------------------------------------------------------------>>> пакетный режим.
-        if (!precompilation_done && CommonUtils.hasUI()) {
+        if (!precompilation_done && CommonUI.isActive()) {
             passes.get(PassCode_2021.Save).Do();
             target.CleanAnalyses();
         }
diff --git a/src/Visual_DVM_2021/Passes/All/SaveGraph.java b/src/Visual_DVM_2021/Passes/All/SaveGraph.java
index 0f21a8e1..9b8ad8f2 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveGraph.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveGraph.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
@@ -63,6 +64,6 @@ public class SaveGraph extends Pass_2021<File> {
     }
     @Override
     protected void showDone() throws Exception {
-        UI.Info("Граф успешно сохранен в файл: " + CommonUtils.Brackets(target.getAbsolutePath()));
+        CommonUI.Info("Граф успешно сохранен в файл: " + CommonUtils.Brackets(target.getAbsolutePath()));
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java
index 39681cbd..8b7d85d5 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
+import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Machine.MachineType;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
index ecce67fb..8f19fd9b 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
+import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import GlobalData.Compiler.Compiler;
 import GlobalData.GlobalDatabase;
 import GlobalData.Machine.MachineType;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
index 08dc0c58..a7f474d1 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
+import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import Common_old.Utils.Utils;
 import Repository.Component.Component;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java b/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
index 71f69729..1cb429e0 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.UI.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
+import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
 import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Repository.Server.ServerCode;
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
index 6c0e1c91..b9647740 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.UserState;
@@ -63,6 +63,6 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
             Log.Writeln_("Задач не найдено.");
             return false;
         }
-        return UI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить");
+        return CommonUI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить");
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
index b6776980..d13f27ee 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
@@ -50,6 +50,6 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
             Log.Writeln_("Не сформировано ни одной новой задачи.");
             return false;
         }
-        return (UI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить"));
+        return (CommonUI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить"));
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java
index 0893d8fa..0a1c9bd5 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.CurrentAnchestor;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.PercentsForm;
+import Common.Visual.Windows.Dialog.PercentsForm;
 public class UpdateBugReportProgress extends UpdateBugReportField {
     @Override
     public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
index 922e6517..cae35075 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java
@@ -22,7 +22,7 @@ public class UpdateComponent extends Pass_2021<Component> {
         switch (Current.getComponent().getComponentType()) {
             case Sapfor_F:
             case Visualizer_2:
-                subPass = CommonUtils.isWindows ? PassCode_2021.DownloadComponent : PassCode_2021.BuildComponent;
+                subPass = CommonUtils.isWindows() ? PassCode_2021.DownloadComponent : PassCode_2021.BuildComponent;
                 break;
             case Visualiser:
             case Instruction:
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
index 8a61b4ce..98ec91c7 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
@@ -4,10 +4,10 @@ import Common_old.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Dialog.PercentsForm;
-import Common_old.UI.Windows.Dialog.SliderNumberForm;
-import Common_old.UI.Windows.Dialog.SpinnerNumberForm;
-import Common_old.UI.Windows.Dialog.Text.TextFieldDialog;
+import Common.Visual.Windows.Dialog.PercentsForm;
+import Common.Visual.Windows.Dialog.SliderNumberForm;
+import Common.Visual.Windows.Dialog.SpinnerNumberForm;
+import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
 import Common_old.Utils.Files.VDirectoryChooser;
 import Common_old.Utils.Files.VFileChooser;
 import Common_old.Utils.Utils;
diff --git a/src/Visual_DVM_2021/Passes/ChangeFilePass.java b/src/Visual_DVM_2021/Passes/ChangeFilePass.java
index 8d629a55..a5dbba86 100644
--- a/src/Visual_DVM_2021/Passes/ChangeFilePass.java
+++ b/src/Visual_DVM_2021/Passes/ChangeFilePass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.Text.FileNameForm;
+import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import ProjectData.Project.db_project_info;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
index 92f8b125..5c3f1cd9 100644
--- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
+++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
+import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import GlobalData.Settings.SettingName;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
@@ -35,7 +36,7 @@ public abstract class OpenSapforVersionPass extends Pass_2021<SapforVersion_json
     protected void body() throws Exception {
         SapforTask task = target.task;
         ShowMessage1("Построение дерева версий и создание баз данных...");
-        File rootHome = Paths.get(Global.getSetting(SettingName.Workspace).Value,
+        File rootHome = Paths.get(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).Value,
                 CommonUtils.getDateName(task.test_description)).toFile();
         for (SapforVersion_json version_json : task.versions) {
             ShowMessage2(version_json.version);
diff --git a/src/Visual_DVM_2021/Passes/Pass_2021.java b/src/Visual_DVM_2021/Passes/Pass_2021.java
index 6f5aa455..36a0aec9 100644
--- a/src/Visual_DVM_2021/Passes/Pass_2021.java
+++ b/src/Visual_DVM_2021/Passes/Pass_2021.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
@@ -191,30 +192,30 @@ public class Pass_2021<T> {
     //-
     private void PerformCanNotStart() throws Exception {
         performCanNotStart();
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             showCanNotStart();
     }
     protected void PerformPreparation() throws Exception {
         performPreparation();
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             showPreparation();
     }
     private void PerformFinish() throws Exception {
         performFinish();
         //-
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             showFinish();
     }
     private void PerformDone() throws Exception {
         performDone();
         //-
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             showDone();
     }
     private void PerformFail() throws Exception {
         performFail();
         //-
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             showFail();
     }
     //------
@@ -246,7 +247,7 @@ public class Pass_2021<T> {
         Vector<String> ToPrint = new Vector<>();
         createStack_r(ToDo, ToPrint);
         if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() &&
-                !UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
+                !CommonUI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
         ) return false;
         while (ToDo.size() > 1) {
             if (!ToDo.pop().start()) return false;
@@ -257,7 +258,7 @@ public class Pass_2021<T> {
             //-
             if (Global.properties.ShowPassesDone && !ToPrint.isEmpty()
             ) {
-                UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
+                CommonUI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
                         "\nуспешно выполнен(ы)!");
             }
             //-
@@ -271,7 +272,7 @@ public class Pass_2021<T> {
         return false;
     }
     public void Interrupt() throws Exception {
-        UI.Info("Проход " + CommonUtils.Brackets(getDescription()) + " не разрешено прерывать.");
+        CommonUI.Info("Проход " + CommonUtils.Brackets(getDescription()) + " не разрешено прерывать.");
     }
     public boolean needsConfirmations() {
         return false;
@@ -298,11 +299,11 @@ public class Pass_2021<T> {
         timer.Start();
         //------------------------------->
         try {
-            if (CommonUtils.hasUI()) FocusBeforeStart();
+            if (CommonUI.isActive()) FocusBeforeStart();
             if (canStart(args)) {
                 PerformPreparation();
                 //todo тут должна быть вилка на анимацию?
-                if (CommonUtils.hasUI() && needsAnimation()) {
+                if (CommonUI.isActive() && needsAnimation()) {
                     animation_sem = new Semaphore(1);
                     animation_sem.acquire();
                     //---
@@ -386,8 +387,8 @@ public class Pass_2021<T> {
                             " окончен за " + timer.Print() +
                             " состояние " + CommonUtils.Brackets(state.getDescription())
             );
-            if (!Log.isEmpty() && CommonUtils.hasUI())
-                UI.Error(
+            if (!Log.isEmpty() && CommonUI.isActive())
+                CommonUI.Error(
                         "проход " + CommonUtils.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
                                 Log.toString());
         }
@@ -396,7 +397,7 @@ public class Pass_2021<T> {
     }
     //--
     public void ShowSapforMessage(String message) {
-        if (CommonUtils.hasUI() && form != null) {
+        if (CommonUI.isActive() && form != null) {
             String[] data = message.split(":");
             switch (data[0]) {
                 case "message_1":
diff --git a/src/Visual_DVM_2021/Passes/ProcessPass.java b/src/Visual_DVM_2021/Passes/ProcessPass.java
index 9e3a6768..813174c5 100644
--- a/src/Visual_DVM_2021/Passes/ProcessPass.java
+++ b/src/Visual_DVM_2021/Passes/ProcessPass.java
@@ -61,7 +61,7 @@ public abstract class ProcessPass<T> extends Pass_2021<T> {
         return brStdout.readLine();
     }
     public void PerformScript(String script_text) throws Exception {
-        PerformScript(Utils.CreateTempFile("script", CommonUtils.isWindows ? "bat" : "", script_text), true);
+        PerformScript(Utils.CreateTempFile("script", CommonUtils.isWindows() ? "bat" : "", script_text), true);
     }
     public void PerformScript(File script, boolean wait) throws Exception {
         if (!script.setExecutable(true)) throw new PassException("Не удалось создать исполняемый файл для скрипта");
diff --git a/src/Visual_DVM_2021/Passes/SapforAnalysis.java b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
index 78fc9c41..64aec123 100644
--- a/src/Visual_DVM_2021/Passes/SapforAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common_old.UI.DebugPrintLevel;
 import Common_old.UI.Menus_2023.PassControl;
@@ -48,7 +49,7 @@ public class SapforAnalysis extends SapforPass {
     @Override
     protected void PerformPreparation() throws Exception {
         //-
-        if (CommonUtils.hasUI())
+        if (CommonUI.isActive())
             showPreparation(); // отображение пустых данных
         //-
         performPreparation(); //в данном случае удаление данных
diff --git a/src/Visual_DVM_2021/Passes/SapforFilesModification.java b/src/Visual_DVM_2021/Passes/SapforFilesModification.java
index 73030a63..32ce408d 100644
--- a/src/Visual_DVM_2021/Passes/SapforFilesModification.java
+++ b/src/Visual_DVM_2021/Passes/SapforFilesModification.java
@@ -1,5 +1,7 @@
 package Visual_DVM_2021.Passes;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
+import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import GlobalData.Settings.SettingName;
 public class SapforFilesModification extends SapforModification {
@@ -10,7 +12,7 @@ public class SapforFilesModification extends SapforModification {
     @Override
     protected void performPreparation() throws Exception {
         super.performPreparation();
-        if (Global.getSetting(SettingName.SaveModifications).toBoolean()) {
+        if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.SaveModifications).toBoolean()) {
             Current.getProject().createModification();
         }
     }
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
index 3a8d27af..bfe6173d 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
@@ -3,7 +3,7 @@ import Common.CurrentAnchestor;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Database;
-import Common_old.UI.UI;
+import Common.Visual.CommonUI;
 import Common_old.UI.VisualCache.VisualCaches;
 import Repository.RepositoryServer;
 import Repository.Server.ServerCode;
@@ -37,7 +37,7 @@ public class DeleteServerObjects <S extends RepositoryServer, D extends DBObject
         DBTable table =getDb().tables.get(d);
         if (table.getCheckedCount()>0) {
             target = table.getCheckedKeys();
-            return UI.Warning(table.getCheckedCount()+" объектов будет удален(о).");
+            return CommonUI.Warning(table.getCheckedCount()+" объектов будет удален(о).");
         }
         else {
             if (CurrentAnchestor.Check(Log, table.CurrentName())){
diff --git a/src/Visual_DVM_2021/Passes/StartTestingPackage.java b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
index 733e0c39..b7490502 100644
--- a/src/Visual_DVM_2021/Passes/StartTestingPackage.java
+++ b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes;
 import Common.CurrentAnchestor;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import TestingSystem.Common.TestingPackage.TestingPackage;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.Common.TasksPackageState;
@@ -36,7 +36,7 @@ public abstract class StartTestingPackage<P extends TestingPackage> extends Publ
                 Log.Writeln_("В пакете отсутствуют задачи.");
                 return false;
             }
-            if (UI.Question("Будет запущено:\n"
+            if (CommonUI.Question("Будет запущено:\n"
                     + target.tasksCount + " задач.\n" +
                     "Продолжить")) {
                 target.state = TasksPackageState.Queued;
diff --git a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
index 1483f6ee..944aa8b8 100644
--- a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
+++ b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.UI;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import Common_old.Utils.Files.VDirectoryChooser;
 
 import javax.swing.*;
diff --git a/src/Visual_DVM_2021/Passes/UI/PassFields.java b/src/Visual_DVM_2021/Passes/UI/PassFields.java
index 0cf12b14..788f87d2 100644
--- a/src/Visual_DVM_2021/Passes/UI/PassFields.java
+++ b/src/Visual_DVM_2021/Passes/UI/PassFields.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.UI;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Visual_DVM_2021/Passes/UI/PassForm.java b/src/Visual_DVM_2021/Passes/UI/PassForm.java
index 3aafc4ae..4bb6c56c 100644
--- a/src/Visual_DVM_2021/Passes/UI/PassForm.java
+++ b/src/Visual_DVM_2021/Passes/UI/PassForm.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.UI;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.awt.event.WindowAdapter;
diff --git a/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java b/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java
index c0759e52..9e837c87 100644
--- a/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java
+++ b/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common_old.Current;
-import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
+import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import Common_old.Utils.Utils;
 
 import java.util.Vector;
diff --git a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
index 3bde2aec..2efdc074 100644
--- a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
@@ -2,6 +2,7 @@ package Visual_DVM_2021.UI.Main;
 import Common.CommonConstants;
 import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common_old.UI.Editor.BaseEditor;
@@ -80,7 +81,7 @@ public abstract class ComparisonForm<T> {
             applyObject();
             showObject();
         } else
-            UI.Info(log.toString());
+            CommonUI.Info(log.toString());
     }
     public void ApplyObject(DBObject object_in){
         RemoveObject();
diff --git a/src/Visual_DVM_2021/UI/Main/FunctionsForm.java b/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
index 7d8b8b60..2f7334e7 100644
--- a/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FunctionsForm.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
-import Common_old.UI.UI;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI;
 import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
@@ -115,19 +115,19 @@ public class FunctionsForm implements FunctionsWindow {
         sDepth.setModel(new SpinnerNumberModel(1,
                 0, 64, 1
         ));
-        UI.MakeSpinnerRapid(sIterations, e -> {
+        CommonUI.MakeSpinnerRapid(sIterations, e -> {
             Current.getProject().UpdatefgIterations((int) sIterations.getValue());
             FunctionsGraphUI.ffTimer.restart();
         });
-        UI.MakeSpinnerRapid(sResistance, e -> {
+        CommonUI.MakeSpinnerRapid(sResistance, e -> {
             Current.getProject().UpdatefgResistance((int) sResistance.getValue());
             FunctionsGraphUI.ffTimer.restart();
         });
-        UI.MakeSpinnerRapid(sScreen, e -> {
+        CommonUI.MakeSpinnerRapid(sScreen, e -> {
             Current.getProject().UpdatefgScreen((double) sScreen.getValue());
             FunctionsGraphUI.ffTimer.restart();
         });
-        UI.MakeSpinnerRapid(sDepth, e -> {
+        CommonUI.MakeSpinnerRapid(sDepth, e -> {
                 SPF_GetGraphFunctionPositions.depth = (int) sDepth.getValue();
                 FunctionsGraphUI.ffTimer.restart();
         });
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index c1b2f7ec..bf117f7a 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -6,7 +6,7 @@ import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
 import Common_old.UI.UI;
-import Common_old.UI.Windows.Form;
+import Common.Visual.Windows.Form;
 import Common_old.UI.Windows.FormType;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
@@ -35,12 +35,12 @@ public class MainForm extends Form implements MainWindow {
         return Content;
     }
     @Override
-    protected String getFormType() {
+    protected String getFormKey() {
         return FormType.Main.toString();
     }
     @Override
-    public String getIconName() {
-        return "Sapfor.png";
+    public String getIconPath() {
+        return "/icons/Sapfor.png";
     }
     @Override
     public String getWTitleText() {
diff --git a/src/Visual_DVM_2021/UI/Main/ProfilesFields.java b/src/Visual_DVM_2021/UI/Main/ProfilesFields.java
index 8dd80870..3d4f1393 100644
--- a/src/Visual_DVM_2021/UI/Main/ProfilesFields.java
+++ b/src/Visual_DVM_2021/UI/Main/ProfilesFields.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Windows.Dialog.DialogFields;
+import Common.Visual.Windows.Dialog.DialogFields;
 import GlobalData.GlobalDatabase;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 
diff --git a/src/Visual_DVM_2021/UI/Main/ProfilesForm.java b/src/Visual_DVM_2021/UI/Main/ProfilesForm.java
index d56f3965..76e593d0 100644
--- a/src/Visual_DVM_2021/UI/Main/ProfilesForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ProfilesForm.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Windows.Dialog.Dialog;
+import Common.Visual.Windows.Dialog.Dialog;
 import Common_old.UI.Windows.FormType;
 import Common.Database.Objects.DBForm.DBForm;
 import GlobalData.GlobalDatabase;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index e06da966..c5dfefe5 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -75,7 +75,7 @@ public class SapforPackagesComparisonForm {
                 showObject();
             }
         } else
-            UI.Info(log.toString());
+            CommonUI.Info(log.toString());
     }
     public void ApplyObject(DBObject object_in) {
         RemoveObject();
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index e64080b5..21fabc55 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -1,6 +1,7 @@
 package _VisualDVM;
 import Common.CurrentAnchestor;
 import Common.Database.Tables.DataSet;
+import Common.Mode;
 import Common.Utils.CommonUtils;
 import Common.Utils.Loggable;
 import Common.Visual.CommonUI;
@@ -27,6 +28,7 @@ import TestingSystem.DVM.RemoteDVMTestingPlanner;
 import TestingSystem.SAPFOR.PackageModeSupervisor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
+import _VisualDVM.Syntax.LightSPFEditorTheme;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 
@@ -74,9 +76,11 @@ public class Global {
     public static int bad_state = 0;
     public static int need_update = 0;
     public static int need_publish = 0;
+    //Режим
+    public static Mode mode = Mode.Undefined;
     public static void SynschronizeProperties() {
         try {
-            File new_propertiesFile = Paths.get(CommonUtils.Home, "properties").toFile();
+            File new_propertiesFile = new File(CommonUtils.getHomeDirectory(), "properties");
             if (new_propertiesFile.exists())
                 properties = (GlobalProperties) CommonUtils.jsonFromFile(new_propertiesFile, GlobalProperties.class);
             CommonUtils.jsonToFile(properties, new_propertiesFile);
@@ -85,45 +89,45 @@ public class Global {
         }
     }
     public static void CheckVisualiserDirectories() {
-        Utils.CheckDirectory(ComponentsDirectory = Paths.get(CommonUtils.Home, Constants.ComponentsDirectoryName).toFile());
-        Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(CommonUtils.Home, Constants.TempDirectoryName).toFile());
-        Utils.CheckDirectory(DataDirectory = Paths.get(CommonUtils.Home, Constants.DataDirectoryName).toFile());
+        Utils.CheckDirectory(ComponentsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ComponentsDirectoryName));
+        Utils.CheckAndCleanDirectory(TempDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TempDirectoryName));
+        Utils.CheckDirectory(DataDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataDirectoryName));
         //-
-        Utils.CheckDirectory(RepoDirectory = Paths.get(CommonUtils.Home, Constants.RepoDirectoryName).toFile());
-        Utils.CheckDirectory(BugReportsDirectory = Paths.get(CommonUtils.Home, Constants.BugsDirectoryName).toFile());
-        Utils.CheckDirectory(BackUpsDirectory = Paths.get(CommonUtils.Home, Constants.BackUpsDirectoryName).toFile());
-        Utils.CheckDirectory(ProjectsDirectory = Paths.get(CommonUtils.Home, Constants.ProjectsDirectoryName).toFile());
-        Utils.CheckDirectory(CompilationTasksDirectory = Paths.get(CommonUtils.Home, Constants.CompilationTasksDirectoryName).toFile());
-        Utils.CheckDirectory(RunTasksDirectory = Paths.get(CommonUtils.Home, Constants.RunTasksDirectoryName).toFile());
-        Utils.CheckDirectory(StsDirectory = Paths.get(CommonUtils.Home, Constants.StsDirectoryName).toFile());
-        Utils.CheckDirectory(TestsDirectory = Paths.get(CommonUtils.Home, Constants.TestsDirectoryName).toFile());
-        Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(CommonUtils.Home, Constants.PerformanceAnalyzerDirectoryName).toFile());
-        Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(CommonUtils.Home, Constants.DVMPackagesDirectoryName).toFile());
+        Utils.CheckDirectory(RepoDirectory = new File(CommonUtils.getHomeDirectory(), Constants.RepoDirectoryName));
+        Utils.CheckDirectory(BugReportsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils.CheckDirectory(BackUpsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.BackUpsDirectoryName));
+        Utils.CheckDirectory(ProjectsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ProjectsDirectoryName));
+        Utils.CheckDirectory(CompilationTasksDirectory = new File(CommonUtils.getHomeDirectory(), Constants.CompilationTasksDirectoryName));
+        Utils.CheckDirectory(RunTasksDirectory = new File(CommonUtils.getHomeDirectory(), Constants.RunTasksDirectoryName));
+        Utils.CheckDirectory(StsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.StsDirectoryName));
+        Utils.CheckDirectory(TestsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TestsDirectoryName));
+        Utils.CheckDirectory(PerformanceAnalyzerDirectory = new File(CommonUtils.getHomeDirectory(), Constants.PerformanceAnalyzerDirectoryName));
+        Utils.CheckDirectory(DVMPackagesDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
         //через пару версий заменить на clean.
-        Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(CommonUtils.Home, "SapforPackages").toFile());
-        Utils.CheckDirectory(MachinesDirectory = Paths.get(CommonUtils.Home, "Machines").toFile());
+        Utils.CheckDirectory(SapforPackagesDirectory = new File(CommonUtils.getHomeDirectory(), "SapforPackages"));
+        Utils.CheckDirectory(MachinesDirectory = new File(CommonUtils.getHomeDirectory(), "Machines"));
     }
     public static void CheckServerDirectories() {
-        Utils.CheckDirectory(ComponentsDirectory = Paths.get(CommonUtils.Home, Constants.ComponentsDirectoryName).toFile());
-        Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(CommonUtils.Home, Constants.TempDirectoryName).toFile());
-        Utils.CheckDirectory(DataDirectory = Paths.get(CommonUtils.Home, Constants.DataDirectoryName).toFile());
+        Utils.CheckDirectory(ComponentsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ComponentsDirectoryName));
+        Utils.CheckAndCleanDirectory(TempDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TempDirectoryName));
+        Utils.CheckDirectory(DataDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataDirectoryName));
         //-
-        Utils.CheckDirectory(BugReportsDirectory = Paths.get(CommonUtils.Home, Constants.BugsDirectoryName).toFile());
-        Utils.CheckDirectory(DataBackUpsDirectory = Paths.get(CommonUtils.Home, Constants.DataBackUpsDirectoryName).toFile());
-        Utils.CheckDirectory(MachinesDirectory = Paths.get(CommonUtils.Home, "Machines").toFile());
+        Utils.CheckDirectory(BugReportsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils.CheckDirectory(DataBackUpsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
+        Utils.CheckDirectory(MachinesDirectory = new File(CommonUtils.getHomeDirectory(), "Machines"));
     }
     public static void CheckTestingSystemDirectories() {
-        Utils.CheckDirectory(ComponentsDirectory = Paths.get(CommonUtils.Home, Constants.ComponentsDirectoryName).toFile());
-        Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(CommonUtils.Home, Constants.TempDirectoryName).toFile());
-        Utils.CheckDirectory(DataDirectory = Paths.get(CommonUtils.Home, Constants.DataDirectoryName).toFile());
+        Utils.CheckDirectory(ComponentsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.ComponentsDirectoryName));
+        Utils.CheckAndCleanDirectory(TempDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TempDirectoryName));
+        Utils.CheckDirectory(DataDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DataDirectoryName));
         //-
-        Utils.CheckDirectory(TestsDirectory = Paths.get(CommonUtils.Home, Constants.TestsDirectoryName).toFile());
-        Utils.CheckDirectory(RepoDirectory = Paths.get(CommonUtils.Home, Constants.RepoDirectoryName).toFile());
-        Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(CommonUtils.Home, Constants.DVMPackagesDirectoryName).toFile());
-        Utils.CheckDirectory(SapforsDirectory = Paths.get(CommonUtils.Home, "Sapfors").toFile());
-        Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(CommonUtils.Home, "SapforPackages").toFile());
+        Utils.CheckDirectory(TestsDirectory = new File(CommonUtils.getHomeDirectory(), Constants.TestsDirectoryName));
+        Utils.CheckDirectory(RepoDirectory = new File(CommonUtils.getHomeDirectory(), Constants.RepoDirectoryName));
+        Utils.CheckDirectory(DVMPackagesDirectory = new File(CommonUtils.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
+        Utils.CheckDirectory(SapforsDirectory = new File(CommonUtils.getHomeDirectory(), "Sapfors"));
+        Utils.CheckDirectory(SapforPackagesDirectory = new File(CommonUtils.getHomeDirectory(), "SapforPackages"));
         //CheclAndClean через неделю
-        Utils.CheckDirectory(MachinesDirectory = Paths.get(CommonUtils.Home, "Machines").toFile());
+        Utils.CheckDirectory(MachinesDirectory = new File(CommonUtils.getHomeDirectory(), "Machines"));
     }
     public static void CreateLogAtComponentsPath() {
         CommonUtils.MainLog = new Loggable() {
@@ -142,11 +146,11 @@ public class Global {
         CommonUtils.MainLog = new Loggable() {
             @Override
             public String getLogHomePath() {
-                return CommonUtils.Home;
+                return CommonUtils.getHomePath();
             }
             @Override
             public String getLogName() {
-                return CommonUtils.mode.toString();
+                return mode.toString();
             }
         };
         CommonUtils.MainLog.ClearLog();
@@ -214,15 +218,6 @@ public class Global {
         }
         return (bad_state == 0);
     }
-    //возможно заменить settings на properties
-    public static DBSetting getSetting(SettingName settingName) throws Exception {
-        switch (CommonUtils.mode) {
-            case Normal:
-                return ((GlobalDatabase)CommonUtils.db).settings.get(settingName);
-            default:
-                return null;
-        }
-    }
     public static void changeSetting(SettingName settingName, Object new_value) throws Exception {
         Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(settingName, new_value);
     }
@@ -233,7 +228,7 @@ public class Global {
         forbidden.add(SettingName.Precompilation);
         forbidden.add(SettingName.DVMConvertationOptions);
         forbidden.add(SettingName.SaveModifications);
-        for (DBSetting setting : ((GlobalDatabase)CommonUtils.db).settings.getSettingsByOwner(ComponentType.SapforOptions)) {
+        for (DBSetting setting : ((GlobalDatabase) CommonUtils.db).settings.getSettingsByOwner(ComponentType.SapforOptions)) {
             if (!forbidden.contains(setting.Name))
                 res_.add(setting.Value);
         }
@@ -256,7 +251,8 @@ public class Global {
         }
     }
     public static void NormalMode(int port) throws Exception {
-        CommonUtils.isWindows = System.getProperty("os.name").startsWith("Windows");
+        CommonUI.active = true;
+        CommonUI.setTheme(new LightSPFEditorTheme());
         removeOldDatabases();
         CheckVisualiserDirectories();
         CreateLogAtComponentsPath();
@@ -265,8 +261,8 @@ public class Global {
         visualizer_2.Connect();
         visualizer_2.refreshPid();
         //если делать раньше, то не удастся убить сервер.
-        if (CommonUtils.ContainsCyrillic(CommonUtils.Home)) {
-            UI.Info("В пути к корневой папке " + CommonUtils.DQuotes(CommonUtils.Home) + "\n" +
+        if (CommonUtils.ContainsCyrillic(CommonUtils.getHomePath())) {
+            CommonUI.Info("В пути к корневой папке " + CommonUtils.DQuotes(CommonUtils.getHomePath()) + "\n" +
                     "Найдены русские буквы.\n" +
                     "Визуализатор завершает работу."); //
             FinishApplication();
@@ -304,10 +300,10 @@ public class Global {
             do {
                 UI.ShowComponentsWindow();
                 if (flag = (!ValidateComponentsStates())) {
-                    if (!UI.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
+                    if (!CommonUI.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
                             "Вернуться к окну компонент"
                     )) {
-                        UI.Info("Визуализатор завершает работу.");
+                        CommonUI.Info("Визуализатор завершает работу.");
                         FinishApplication();
                     }
                 }
@@ -316,24 +312,23 @@ public class Global {
         //---
         ActivateDB();  //тут current getAccount; роль по умолчанию всегда неизвестна.
         ///--------------
-
-        CurrentAnchestor.set(Current.Account, new Account(){
+        CurrentAnchestor.set(Current.Account, new Account() {
             {
                 name = "M";
-                email= "vmk-post@yandex.ru";
+                email = "vmk-post@yandex.ru";
                 role = AccountRole.Admin;
             }
         });
-      //  Pass_2021.passes.get(PassCode_2021.CheckAccount).Do();
+        //  Pass_2021.passes.get(PassCode_2021.CheckAccount).Do();
         //---------------
         componentsServer.ActivateDB();
         testingServer.ActivateDB();
         //в проперти их!
         //-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится.
-        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.AutoBugReportsLoad).toBoolean())
+        if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.AutoBugReportsLoad).toBoolean())
             Pass_2021.passes.get(PassCode_2021.SynchronizeBugReports).Do();
         //--
-        if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.AutoTestsLoad).toBoolean())
+        if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.AutoTestsLoad).toBoolean())
             Pass_2021.passes.get(PassCode_2021.SynchronizeTests).Do();
         Pass_2021.CheckAllStats();
         Current.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.
@@ -341,7 +336,6 @@ public class Global {
         UI.CreateWindows();
     }
     public static void ServerMode() throws Exception {
-        CommonUtils.isWindows = false;
         CheckServerDirectories();
         CreateLogAtComponentsPath();
         Utils.createEmptyFile("kek");
@@ -351,18 +345,16 @@ public class Global {
         System.exit(0);
     }
     public static void TestingSystemMode() throws Exception {
-        CommonUtils.isWindows = false;
         CheckTestingSystemDirectories();
         CreateLogAtComponentsPath();
         testingServer = new TestingServer();
         testingServer.ActivateDB();
-     //   testingServer.PATCH();
+        //   testingServer.PATCH();
         testingServer.Start();
         System.exit(0);
     }
     //режим запуска пакета Сапфор
     public static void PackageMode() throws Exception {
-        CommonUtils.isWindows = System.getProperty("os.name").startsWith("Windows");
         CreateLogAtHome();
         PackageModeSupervisor planner = new PackageModeSupervisor();
         planner.Start();
@@ -382,14 +374,13 @@ public class Global {
     //---
     public static void Init(String... args) {
         System.out.println("VisualSapfor.jar started..");
-        CommonUtils.Home = System.getProperty("user.dir"); //если Linux, дает без слеша в конце !!!
-        System.out.println("home directory is" + CommonUtils.Brackets(CommonUtils.Home));
+        System.out.println("home directory is" + CommonUtils.Brackets(CommonUtils.getHomePath()));
         //---
         SynschronizeProperties();
-        CommonUtils.mode = properties.Mode;
-        System.out.println("mode is " + CommonUtils.mode);
+        mode = properties.Mode;
+        System.out.println("mode is " + mode);
         try {
-            switch (CommonUtils.mode) {
+            switch (mode) {
                 case Normal:
                     NormalMode(Integer.parseInt(args[1]));
                     break;
diff --git a/src/_VisualDVM/Syntax/DarkVisualiserTheme.java b/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
index 609b3086..83c4606c 100644
--- a/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
+++ b/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
@@ -1,6 +1,8 @@
 package _VisualDVM.Syntax;
+import Common.Visual.Themes.VisualiserTheme;
+
 import java.awt.*;
-public class DarkVisualiserTheme extends VisualiserTheme {
+public class DarkVisualiserTheme extends SPFEditorTheme {
     @Override
     protected String getEditorThemePath() {
         return "/_VisualDVM/Syntax/dark_editor.xml";
diff --git a/src/_VisualDVM/Syntax/LightVisualiserTheme.java b/src/_VisualDVM/Syntax/LightSPFEditorTheme.java
similarity index 93%
rename from src/_VisualDVM/Syntax/LightVisualiserTheme.java
rename to src/_VisualDVM/Syntax/LightSPFEditorTheme.java
index f1230da5..8a4fe626 100644
--- a/src/_VisualDVM/Syntax/LightVisualiserTheme.java
+++ b/src/_VisualDVM/Syntax/LightSPFEditorTheme.java
@@ -1,6 +1,8 @@
 package _VisualDVM.Syntax;
+import Common.Visual.Themes.VisualiserTheme;
+
 import java.awt.*;
-public class LightVisualiserTheme extends VisualiserTheme {
+public class LightSPFEditorTheme extends SPFEditorTheme {
     @Override
     protected String getEditorThemePath() {
         return "/_VisualDVM/Syntax/light_editor.xml";
diff --git a/src/_VisualDVM/Syntax/SPFEditorTheme.java b/src/_VisualDVM/Syntax/SPFEditorTheme.java
new file mode 100644
index 00000000..ecc4557b
--- /dev/null
+++ b/src/_VisualDVM/Syntax/SPFEditorTheme.java
@@ -0,0 +1,20 @@
+package _VisualDVM.Syntax;
+import Common.Utils.CommonUtils;
+import Common.Visual.Themes.VisualiserTheme;
+import org.fife.ui.rsyntaxtextarea.Theme;
+
+import java.awt.*;
+public abstract class SPFEditorTheme extends VisualiserTheme {
+    protected abstract String getEditorThemePath();    //-
+    //если использовать один и тот же объект на все едиторы пявляются странности
+    //значит при применении выделяем новый экземпляр.
+    public Theme getEditorTheme() {
+        Theme res = null;
+        try {
+            res = Theme.load(getClass().getResourceAsStream(getEditorThemePath()));
+        } catch (Exception ex) {
+            CommonUtils.MainLog.PrintException(ex);
+        }
+        return res;
+    }
+}
diff --git a/src/_VisualDVM/Syntax/VisualiserTheme.java b/src/_VisualDVM/Syntax/VisualiserTheme.java
deleted file mode 100644
index 2fff6b8a..00000000
--- a/src/_VisualDVM/Syntax/VisualiserTheme.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package _VisualDVM.Syntax;
-import Common.Utils.CommonUtils;
-import org.fife.ui.rsyntaxtextarea.Theme;
-
-import java.awt.*;
-import java.awt.font.TextAttribute;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-
-import static java.awt.Font.MONOSPACED;
-public abstract class VisualiserTheme {
-    public Color foreground;
-    public Color background;
-    public Color selection_background;
-    public Color trees_background;
-    public Color bar_foreground;
-    public Color bar_background;
-    public Color table_background;
-    public LinkedHashMap<VisualiserFonts, Font> Fonts = new LinkedHashMap<>();
-    public LinkedHashMap<VisualiserColor, Color> Colors = new LinkedHashMap<>();
-    public VisualiserTheme() {
-        try {
-            //-----------------------------------------------
-            //-----------------------------------------------
-            foreground = Color.decode(getForegroundHex());
-            background = Color.decode(getBackgroundHex());
-            selection_background = Color.decode(getSelectionBackgroundHex());
-            trees_background = Color.decode(getTreeBackgroundHex());
-            bar_foreground = Color.decode(getBarForegroundHex());
-            bar_background = Color.decode(getBarBackgroundHex());
-            table_background = Color.decode(getTableBackgroundHex());
-            //<editor-fold desc="шрифты">
-            Fonts.put(VisualiserFonts.GoodState,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, "Times New Roman");
-                                    put(TextAttribute.FOREGROUND, getGoodFontColor());
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.ReadyState,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, "Times New Roman");
-                                    put(TextAttribute.FOREGROUND, getReadyFontColor2());
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.BadState,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, "Times New Roman");
-                                    put(TextAttribute.FOREGROUND, getBadFontColor());
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.BlueState,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, "Times New Roman");
-                                    put(TextAttribute.FOREGROUND, getHyperlinkFontColor());
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.Fatal,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, "Times New Roman");
-                                    put(TextAttribute.FOREGROUND, getFatalFontColor());
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.UnknownState,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, "Times New Roman");
-                                    put(TextAttribute.FOREGROUND, getUnknownFontColor());
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.Hyperlink,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, MONOSPACED);
-                                    put(TextAttribute.FOREGROUND, getHyperlinkFontColor());
-                                    put(TextAttribute.SIZE, 18);
-                                    put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
-                                    put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.ProgressState,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, "Times New Roman");
-                                    put(TextAttribute.FOREGROUND, getProgressFontColor());
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    ));
-            Fonts.put(VisualiserFonts.Disabled, new Font(
-                    new HashMap<TextAttribute, Object>() {
-                        {
-                            put(TextAttribute.FAMILY, MONOSPACED);
-                            put(TextAttribute.BACKGROUND, Color.lightGray);
-                            put(TextAttribute.FOREGROUND, Color.lightGray);
-                            put(TextAttribute.SIZE, 18);
-                            put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
-                        }
-                    }
-            ));
-            Fonts.put(VisualiserFonts.Distribution,
-                    new Font(
-                            new HashMap<TextAttribute, Object>() {
-                                {
-                                    put(TextAttribute.FAMILY, MONOSPACED);
-                                    put(TextAttribute.SIZE, 16);
-                                }
-                            }
-                    )
-            );
-            Fonts.put(VisualiserFonts.TreePlain, new Font("Times New Roman", Font.PLAIN, 16));
-            Fonts.put(VisualiserFonts.TreeItalic, new Font("Times New Roman", Font.ITALIC, 16));
-            Fonts.put(VisualiserFonts.TreeBold, new Font("Times New Roman", Font.BOLD, 16));
-            Fonts.put(VisualiserFonts.TreeBoldItalic, new Font("Times New Roman", Font.BOLD|Font.ITALIC, 16));
-            Fonts.put(VisualiserFonts.Menu, new Font("Times New Roman", Font.ITALIC, 16));
-            Fonts.put(VisualiserFonts.NewVersion, new Font(
-                    new HashMap<TextAttribute, Object>() {
-                        {
-                            put(TextAttribute.FAMILY, "Times New Roman");
-                            put(TextAttribute.FOREGROUND, Color.BLACK);
-                            put(TextAttribute.BACKGROUND, Color.YELLOW);
-                            put(TextAttribute.SIZE, 16);
-                        }
-                    }
-
-            ));
-            //</editor-fold>
-        } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
-        }
-    }
-    protected abstract String getEditorThemePath();
-    protected abstract String getForegroundHex();
-    protected abstract String getBackgroundHex();
-    protected abstract String getSelectionBackgroundHex();
-    protected abstract String getTreeBackgroundHex();
-    protected abstract String getBarForegroundHex();
-    protected abstract String getBarBackgroundHex();
-    protected abstract String getTableBackgroundHex();
-    protected abstract Color getGoodFontColor();
-    protected abstract Color getReadyFontColor2();
-    protected abstract Color getProgressFontColor();
-    protected abstract Color getBadFontColor();
-    protected abstract Color getFatalFontColor();
-    protected abstract Color getUnknownFontColor();
-    protected abstract Color getHyperlinkFontColor();    //-
-    //если использовать один и тот же объект на все едиторы пявляются странности
-    //значит при применении выделяем новый экземпляр.
-    public Theme getEditorTheme() {
-        Theme res = null;
-        try {
-            res = Theme.load(getClass().getResourceAsStream(getEditorThemePath()));
-        } catch (Exception ex) {
-            CommonUtils.MainLog.PrintException(ex);
-        }
-        return res;
-    }
-}
diff --git a/src/_VisualDVM/Syntax/VisualiserThemeName.java b/src/_VisualDVM/Syntax/VisualiserThemeName.java
deleted file mode 100644
index 17533381..00000000
--- a/src/_VisualDVM/Syntax/VisualiserThemeName.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package _VisualDVM.Syntax;
-public enum VisualiserThemeName {
-    Light,
-    Dark
-}
diff --git a/src/Common_old/UI/Windows/Sapfor.png b/src/icons/Sapfor.png
similarity index 100%
rename from src/Common_old/UI/Windows/Sapfor.png
rename to src/icons/Sapfor.png