diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0c17ade8..151d420b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,251 +7,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <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/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/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/Properties.java" beforeDir="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/FormType.java" beforeDir="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/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/ParallelVariant.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/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.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" />
diff --git a/src/Common/Visual/CommonUI.java b/src/Common/Visual/CommonUI.java
index 14bf69ff..691ddc5a 100644
--- a/src/Common/Visual/CommonUI.java
+++ b/src/Common/Visual/CommonUI.java
@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
 import Common.Mode;
 import Common.Utils.CommonUtils;
 import Common.Visual.Themes.DefaultTheme;
+import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Themes.VisualiserTheme;
 import _VisualDVM.Global;
 
diff --git a/src/Common_old/Current.java b/src/Common_old/Current.java
index f9c458b9..2b5c3f16 100644
--- a/src/Common_old/Current.java
+++ b/src/Common_old/Current.java
@@ -91,8 +91,6 @@ public enum Current implements CurrentAnchestor {
     //-
     Credentials,
     //-
-    DialogWindow,
-    //-
     PackageVersion,
     SapforConfiguration,
     SapforProfile,
@@ -201,8 +199,6 @@ public enum Current implements CurrentAnchestor {
                 return "Пользователь";
             case Compiler:
                 return "Компилятор";
-            case DialogWindow:
-                return "Диалоговое окно";
             default:
                 return "";
         }
diff --git a/src/Common_old/GlobalProperties.java b/src/Common_old/GlobalProperties.java
index d1b37526..a70fa1ed 100644
--- a/src/Common_old/GlobalProperties.java
+++ b/src/Common_old/GlobalProperties.java
@@ -1,10 +1,94 @@
 package Common_old;
+import Common.Utils.CommonUtils;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
 import com.google.gson.annotations.Expose;
 
+import javax.swing.*;
 import java.io.File;
+import java.lang.reflect.Field;
 import java.nio.file.Paths;
-public class GlobalProperties extends Properties {
-    @Override
+public class GlobalProperties {
+    @Expose
+    public Common.Mode Mode = Common.Mode.Normal;
+    @Expose
+    public String ServerAddress = "alex-freenas.ddns.net";
+    @Expose
+    public String ServerUserName = "testuser";
+    @Expose
+    public int ServerUserSHHPort = 23;
+    @Expose
+    public int ComponentsServerPort = 7995;
+    @Expose
+    public int TestingServerPort = 7998;
+    @Expose
+    public int SocketTimeout = 5000;
+    @Expose
+    public boolean OldServer = false;
+    @Expose
+    public String SMTPHost = "smtp.mail.ru";
+    @Expose
+    public int SMTPPort = 465;
+    @Expose
+    public int MailSocketPort = 465;
+    @Expose
+    public boolean collapseCredentials = false;
+    @Expose
+    public boolean collapseFileGraphs = false;
+    @Expose
+    public boolean collapseFileMessages = false;
+    @Expose
+    public boolean collapseProjectTrees = false;
+    @Expose
+    public String BackupWorkspace = "_sapfor_x64_backups";
+    @Expose
+    public int BackupHour = 5;
+    @Expose
+    public int BackupMinute = 0;
+    @Expose
+    public boolean EmailAdminsOnStart = false;
+    @Expose
+    public boolean AutoUpdateSearch = true;
+    @Expose
+    public boolean ConfirmPassesStart = true;
+    @Expose
+    public boolean ShowPassesDone = true;
+    @Expose
+    public boolean FocusPassesResult = true;
+    @Expose
+    public String GlobalDBName = "db7.sqlite";
+    @Expose
+    public String ProjectDBName = "new_project_base.sqlite";
+    @Expose
+    public String BugReportsDBName = "bug_reports.sqlite";
+    @Expose
+    public String TestsDBName = "tests.sqlite";
+    @Expose
+    public int ComponentsWindowWidth = 650;
+    @Expose
+    public int ComponentsWindowHeight = 250;
+    @Expose
+    public String VisualiserPath = "";
+    @Expose
+    public String Sapfor_FPath = "";
+    @Expose
+    public String Visualizer_2Path = "";
+    @Expose
+    public String InstructionPath = "";
+    @Expose
+    public String PerformanceAnalyzerPath = "";
+    @Expose
+    public int ComponentsBackUpsCount = 10;
+    @Expose
+    public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
+    @Expose
+    public int CheckTestingIntervalSeconds = 10; //интервал автопроверки тестирования
+    @Expose
+    public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
+    @Expose
+    public boolean eraseTestingWorkspaces = true; //удалять ли рабочее пространство пакетов тестирования после его завершения
+    //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
             case "ShowPassesDone":
@@ -25,101 +109,6 @@ public class GlobalProperties extends Properties {
                 return "?";
         }
     }
-    @Expose
-    public Common.Mode Mode = Common.Mode.Normal;
-    @Expose
-    public String ServerAddress = "alex-freenas.ddns.net";
-    @Expose
-    public String ServerUserName = "testuser";
-    @Expose
-    public int ServerUserSHHPort = 23;
-    @Expose
-    public int ComponentsServerPort = 7995;
-    @Expose
-    public int TestingServerPort = 7998;
-    //---
-    @Expose
-    public int SocketTimeout = 5000;
-    @Expose
-    public boolean OldServer = false;
-    //---
-    @Expose
-    public String SMTPHost = "smtp.mail.ru";
-    @Expose
-    public int SMTPPort = 465;
-    @Expose
-    public int MailSocketPort = 465;
-    //---
-    //СВОРАЧИВАНИЕ ОБЛАСТЕЙ----------------------
-    @Expose
-    public boolean collapseCredentials = false;
-    @Expose
-    public boolean collapseFileGraphs = false;
-    @Expose
-    public boolean collapseFileMessages = false;
-    @Expose
-    public boolean collapseProjectTrees = false;
-    //-------------------------------------------
-    @Expose
-    public String BackupWorkspace = "_sapfor_x64_backups";
-    @Expose
-    public int BackupHour = 5;
-    @Expose
-    public int BackupMinute = 0;
-    @Expose
-    public boolean EmailAdminsOnStart = false;
-    //---
-    @Expose
-    public boolean AutoUpdateSearch = true;
-    @Expose
-    public boolean ConfirmPassesStart = true;
-    @Expose
-    public boolean ShowPassesDone = true;
-    @Expose
-    public boolean FocusPassesResult = true;
-    @Expose
-    public String GlobalDBName = "db7.sqlite";
-    @Expose
-    public String ProjectDBName = "new_project_base.sqlite";
-    @Expose
-    public String BugReportsDBName = "bug_reports.sqlite";
-    @Expose
-    public String TestsDBName = "tests.sqlite";
-    //-
-    @Expose
-    public int ComponentsWindowWidth = 650;
-    @Expose
-    public int ComponentsWindowHeight = 250;
-    //-
-    @Expose
-    public String VisualiserPath = "";
-    @Expose
-    public String Sapfor_FPath = "";
-    @Expose
-    public String Visualizer_2Path = "";
-    @Expose
-    public String InstructionPath = "";
-    @Expose
-    public String PerformanceAnalyzerPath = "";
-    @Expose
-    public int ComponentsBackUpsCount = 10;
-    //- тестирование.
-    @Expose
-    public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
-    @Expose
-    public int CheckTestingIntervalSeconds = 10; //интервал автопроверки тестирования
-    @Expose
-    public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
-    @Expose
-    public boolean eraseTestingWorkspaces = true; //удалять ли рабочее пространство пакетов тестирования после его завершения.
-    //-
-    @Override
-    public File getFile() {
-        return Paths.get(System.getProperty("user.dir"), "properties").toFile();
-    }
-    //--
-    public GlobalProperties() {
-    }
     public GlobalProperties(GlobalProperties p) {
         super();
         Mode = p.Mode;
@@ -162,4 +151,80 @@ public class GlobalProperties extends Properties {
         EmailOnTestingProgress = p.EmailOnTestingProgress;
         eraseTestingWorkspaces = p.eraseTestingWorkspaces;
     }
+    //-----------------
+    public void addFlagMenuItem(JMenu menu, String fieldName) {
+        JMenuItem menu_item = new StableMenuItem(getFieldDescription(fieldName),
+                getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
+        //-
+        menu_item.addActionListener(e -> {
+            if (Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
+                menu_item.setIcon(CommonUtils.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+        });
+        menu.add(menu_item);
+    }
+    public boolean getFlag(String fieldName) {
+        boolean field = false;
+        try {
+            field = (boolean) getClass().getField(fieldName).get(this);
+            //
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return field;
+    }
+    public void switchFlag(String fieldName) {
+        boolean field = false;
+        try {
+            field = (boolean) getClass().getField(fieldName).get(this);
+            getClass().getField(fieldName).set(this, !field);
+            //
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+    public void Update() {
+        try {
+            CommonUtils.jsonToFile(this, getFile());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    //--
+    public boolean updateField(String name, Object newValue) {
+        try {
+            Field field = getClass().getField(name);
+            Object oldValue = field.get(this);
+            //---
+            if (newValue.equals(oldValue))
+                return false;
+            //--
+            field.set(this, newValue);
+            this.Update();
+            return true;
+            //--
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+        return false;
+    }
+    public void switchAndUpdateFlag(String name) {
+        try {
+            Field field = getClass().getField(name);
+            boolean oldValue = (boolean) field.get(this);
+            boolean newValue = !oldValue;
+            //---
+            field.set(this, newValue);
+            this.Update();
+            //--
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    public File getFile() {
+        return Paths.get(System.getProperty("user.dir"), "properties").toFile();
+    }
+    //--
+    public GlobalProperties() {
+    }
 }
diff --git a/src/Common_old/Properties.java b/src/Common_old/Properties.java
deleted file mode 100644
index 22e71ee2..00000000
--- a/src/Common_old/Properties.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package Common_old;
-import Common.Utils.CommonUtils;
-import Common_old.UI.Menus_2023.StableMenuItem;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
-
-import javax.swing.*;
-import java.io.File;
-import java.lang.reflect.Field;
-public abstract class Properties {
-    public void addFlagMenuItem(JMenu menu, String fieldName) {
-        JMenuItem menu_item = new StableMenuItem(getFieldDescription(fieldName),
-                getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
-        //-
-        menu_item.addActionListener(e -> {
-            if (Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
-                menu_item.setIcon(CommonUtils.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-        });
-        menu.add(menu_item);
-    }
-    public boolean getFlag(String fieldName) {
-        boolean field = false;
-        try {
-            field = (boolean) GlobalProperties.class.getField(fieldName).get(this);
-            //
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return field;
-    }
-    public void switchFlag(String fieldName) {
-        boolean field = false;
-        try {
-            field = (boolean) GlobalProperties.class.getField(fieldName).get(this);
-            GlobalProperties.class.getField(fieldName).set(this, !field);
-            //
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-    public void Update() {
-        try {
-            CommonUtils.jsonToFile(this, getFile());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    //--
-    public abstract String getFieldDescription(String fieldName);
-    public abstract File getFile();
-    public boolean updateField(String name, Object newValue) {
-        try {
-            Field field = getClass().getField(name);
-            Object oldValue = field.get(this);
-            //---
-            if (newValue.equals(oldValue))
-                return false;
-            //--
-            field.set(this, newValue);
-            this.Update();
-            return true;
-            //--
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return false;
-    }
-    public void switchAndUpdateFlag(String name) {
-        try {
-            Field field = getClass().getField(name);
-            boolean oldValue = (boolean) field.get(this);
-            boolean newValue = !oldValue;
-            //---
-            field.set(this, newValue);
-            this.Update();
-            //--
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-    }
-}
diff --git a/src/Common_old/UI/UI.java b/src/Common_old/UI/UI.java
index 56974144..2c9f9f3a 100644
--- a/src/Common_old/UI/UI.java
+++ b/src/Common_old/UI/UI.java
@@ -1,9 +1,10 @@
 package Common_old.UI;
+import Common.Database.Tables.DataSet;
 import Common.Utils.CommonUtils;
-import Common.Visual.Themes.ThemeElement;
+import Common.Visual.CommonUI;
+import Common.Visual.DataMenuBar;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar;
-import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
 import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
 import Common_old.UI.Menus_2023.MainMenuBar.MainMenuBar;
@@ -13,10 +14,7 @@ import Common_old.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
 import Common_old.UI.Tables.*;
 import Common_old.UI.Trees.GraphTreeCellRenderer;
 import Common_old.UI.Trees.SelectionTreeCellRenderer;
-import Common_old.UI.Windows.FormType;
 import Common_old.UI.Windows.SearchReplaceForm;
-import Common.Database.Tables.DataSet;
-import Common.Visual.CommonUI;
 import GlobalData.Compiler.CompilersDBTable;
 import GlobalData.Compiler.CompilersMenuBar;
 import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
@@ -102,7 +100,6 @@ import javax.swing.text.Highlighter;
 import javax.swing.tree.TreeCellRenderer;
 import java.awt.*;
 import java.util.LinkedHashMap;
-import java.util.Vector;
 
 import static Common_old.UI.Tables.TableEditors.*;
 import static Common_old.UI.Tables.TableRenderers.*;
@@ -115,27 +112,22 @@ public class UI {
     public static FileMenuBar fileMenuBar = null;
     public static VersionsMenuBar versionsMenuBar = null;
     public static FastAccessMenuBar fastAccessMenuBar = null;
-    //------------
-    public static VersionsWindow versionsWindow = null;
-    public static DebugWindow debugWindow = null;
+    //ФОРМЫ
+    static MainWindow mainWindow = null;
+    static ComponentsForm componentsWindow = null;
+    static SearchReplaceForm searchReplaceWindow = null;
+    static ProfilesForm profilesWindow = null;
+    static VersionsWindow versionsWindow = null;
+    static DebugWindow debugWindow = null;
+    static RemoteFileChooser remoteFileChooser = null;
     //------------
     public static final Highlighter.HighlightPainter GoodLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
     public static final Highlighter.HighlightPainter BadLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
     public static LinkedHashMap<Common_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<FormType, ThemeElement> windows = new LinkedHashMap<>();
-    public static RemoteFileChooser getRemoteFileChooser() {
-        return (RemoteFileChooser) windows.get(FormType.RemoteFileChooser);
-    }
-    public static ComponentsForm getComponentsWindow() {
-        return (ComponentsForm) windows.get(FormType.Components);
-    }
     public static boolean HasMainWindow() {
-        return getMainWindow() != null;
-    }
-    public static SearchReplaceForm getSearchReplaceForm() {
-        return (SearchReplaceForm) windows.get(FormType.SearchReplace);
+        return mainWindow != null;
     }
     public static void CreateMenus() {
         mainMenuBar = new MainMenuBar();
@@ -185,15 +177,12 @@ public class UI {
         //---->>
     }
     public static void CreateWindows() {
-        windows.put(FormType.SearchReplace, new SearchReplaceForm());
-        windows.put(FormType.RemoteFileChooser, new RemoteFileChooser());
-        windows.put(FormType.Profiles, new ProfilesForm());
-        windows.put(FormType.Main, new MainForm());
+        searchReplaceWindow = new SearchReplaceForm();
+        remoteFileChooser = new RemoteFileChooser();
+        profilesWindow = new ProfilesForm();
+        mainWindow = new MainForm();
         //---------------------------------------
-        getMainWindow().Show();
-    }
-    public static MainWindow getMainWindow() {
-        return (MainWindow) windows.get(FormType.Main);
+        mainWindow.Show();
     }
     //-
     public static void CreateAll() {
@@ -203,18 +192,15 @@ public class UI {
         UIManager.put("FileChooser.lookInLabelText", "Смотреть в");
         UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
         UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файла");
-
         UIManager.put("FileChooser.saveButtonText", "Сохранить");
         UIManager.put("FileChooser.saveButtonToolTipText", "Сохранить");
         UIManager.put("FileChooser.openButtonToolTipText", "Открыть");
         UIManager.put("FileChooser.cancelButtonText", "Отмена");
         UIManager.put("FileChooser.cancelButtonToolTipText", "Отмена");
-
         UIManager.put("FileChooser.lookInLabelText", "Папка");
         UIManager.put("FileChooser.saveInLabelText", "Папка");
         UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
         UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файлов");
-
         UIManager.put("FileChooser.upFolderToolTipText", "На один уровень вверх");
         UIManager.put("FileChooser.newFolderToolTipText", "Создание новой папки");
         UIManager.put("FileChooser.listViewButtonToolTipText", "Список");
@@ -224,9 +210,7 @@ public class UI {
         UIManager.put("FileChooser.fileTypeHeaderText", "Тип");
         UIManager.put("FileChooser.fileDateHeaderText", "Изменен");
         UIManager.put("FileChooser.fileAttrHeaderText", "Атрибуты");
-
         UIManager.put("FileChooser.acceptAllFileFilterText", "Все файлы");
-
         //</editor-fold>
         //<editor-fold desc="Локализация компонентов окна подтверждения">
         UIManager.put("OptionPane.yesButtonText", "Да");
@@ -260,7 +244,6 @@ public class UI {
         TreeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
         TreeRenderers.put(RendererRule, new RulesTreeCellRenderer());
         TreeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
-
         //----------------------------------------------
         TableEditors.put(EditorSelect, new DBObjectSelector());
         TableEditors.put(EditorHyperlinks, new VectorEditor());
@@ -271,58 +254,53 @@ public class UI {
         //</editor-fold>
     }
     public static void CreateComponentsForm() {
-        windows.put(FormType.Components, new ComponentsForm());
-    }
-    public static ProfilesForm getProfilesWindow() {
-        return (ProfilesForm) windows.get(FormType.Profiles);
+        componentsWindow = new ComponentsForm();
     }
     //-----
     public static void ShowTabsNames(JTabbedPane tabs) {
         ShowTabsNames(tabs, 0);
     }
     public static void ShowTabsNames(JTabbedPane tabs, int startIndex) {
-        boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
+        boolean flag = ((GlobalDatabase) CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         for (int i = startIndex; i < tabs.getTabCount(); ++i)
             tabs.setTitleAt(i, flag ? tabs.getToolTipTextAt(i) : "");
     }
-    public static boolean Contains(Vector<String> list, String line, int max_index) {
-        int last_index = -1;
-        for (int i = 0; i < list.size(); ++i)
-            if (list.get(i).equals(line)) last_index = i;
-        return (last_index >= max_index);
-    }
-    //--
-    public static VersionsWindow getVersionsWindow() {
-        return versionsWindow;
-    }
     public static void CreateVersionsWindow() {
         versionsWindow = new VersionsForm(Current.getRoot());
     }
+    //-
+    public static void ShowSearchForm(boolean replace) {
+        searchReplaceWindow.setMode(replace);
+        searchReplaceWindow.ShowMode();
+        ShowSearchForm();
+    }
+    public static void HideSearchForm() {
+        if (searchReplaceWindow.isVisible())
+            searchReplaceWindow.setVisible(false);
+    }
+    public static void ShowSearchForm() {
+        if (searchReplaceWindow.isVisible())
+            searchReplaceWindow.Refresh();
+        else
+            searchReplaceWindow.Show();
+    }
+    public static void ShowComponentsWindow() {
+        componentsWindow.ShowDialog("");
+    }
+    public static void ShowProfilesWindow() {
+        profilesWindow.ShowDialog("");
+    }
+    //----
+    public static MainWindow getMainWindow(){return mainWindow;}
+    public static VersionsWindow getVersionsWindow(){return versionsWindow;}
+    public static ComponentsForm getComponentsWindow(){return componentsWindow;}
+    public static SearchReplaceForm getSearchReplaceWindow(){return searchReplaceWindow;}
+    public static ProfilesForm getProfilesWindow(){return profilesWindow;}
+    public static RemoteFileChooser getRemoteFileChooser(){return remoteFileChooser;}
+    //возможно перекинуть на тестирование. потом.
     public static DebugWindow getDebugWindow() {
         if (debugWindow == null)
             debugWindow = new DebugForm();
         return debugWindow;
     }
-    //-
-    public static void ShowSearchForm(boolean replace) {
-        getSearchReplaceForm().setMode(replace);
-        getSearchReplaceForm().ShowMode();
-        ShowSearchForm();
-    }
-    public static void HideSearchForm() {
-        if (getSearchReplaceForm().isVisible())
-            getSearchReplaceForm().setVisible(false);
-    }
-    public static void ShowSearchForm() {
-        if (getSearchReplaceForm().isVisible())
-            getSearchReplaceForm().Refresh();
-        else
-            getSearchReplaceForm().Show();
-    }
-    public static void ShowComponentsWindow() {
-        getComponentsWindow().ShowDialog("");
-    }
-    public static void ShowProfilesWindow() {
-        getProfilesWindow().ShowDialog("");
-    }
 }
diff --git a/src/Common_old/UI/Windows/FormType.java b/src/Common_old/UI/Windows/FormType.java
deleted file mode 100644
index e5f2471f..00000000
--- a/src/Common_old/UI/Windows/FormType.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package Common_old.UI.Windows;
-public enum FormType {
-    Undefined,
-    Main,
-    SearchReplace,
-    Components,
-    RemoteFileChooser,
-    Profiles
-}
diff --git a/src/Common_old/Utils/Utils.java b/src/Common_old/Utils/Utils.java
index 4614c781..0a258de7 100644
--- a/src/Common_old/Utils/Utils.java
+++ b/src/Common_old/Utils/Utils.java
@@ -373,6 +373,12 @@ public class Utils {
                         file.getAbsolutePath()
                 ;
     }
+    public static boolean containsLine(Vector<String> list, String line, int max_index) {
+        int last_index = -1;
+        for (int i = 0; i < list.size(); ++i)
+            if (list.get(i).equals(line)) last_index = i;
+        return (last_index >= max_index);
+    }
     public static String compareTexts(String master, String slave) {
         Vector<String> lines = new Vector<>(Arrays.asList(master.split("\n")));
         Vector<String> slavelines = new Vector<>(Arrays.asList(slave.split("\n")));
@@ -380,7 +386,7 @@ public class Utils {
         int old_j = 0;
         int j = 0;
         for (int i = 0; i < lines.size(); ++i) {
-            if (UI.Contains(slavelines, lines.get(i), old_j)) {
+            if (containsLine(slavelines, lines.get(i), old_j)) {
                 for (int k = old_j; k < slavelines.size(); ++k) {
                     j = k;
                     if (lines.get(i).equals(slavelines.get(k))) {
diff --git a/src/ProjectData/SapforData/Variants/ParallelVariant.java b/src/ProjectData/SapforData/Variants/ParallelVariant.java
index d7ae4684..59b4b05d 100644
--- a/src/ProjectData/SapforData/Variants/ParallelVariant.java
+++ b/src/ProjectData/SapforData/Variants/ParallelVariant.java
@@ -72,19 +72,6 @@ public class ParallelVariant extends DBObject {
         return String.join(";", templates_description);
     }
 
-    /*
-    @Override
-    public boolean isVisible() {
-        boolean res = true;
-        if (father.f_distributed())
-            res = Match(true);
-        if (res && father.f_multiplied()) {
-            res = Match(false);
-        }
-        if (!res) Select(false);
-        return res;
-    }
-     */
     @Override
     public Object getPK() {
         return UniqKey;
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index 42a4fdbc..94c567c5 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -359,7 +359,7 @@ public abstract class Sapfor extends OSDComponent {
         }
         Global.enable_text_changed = false;
         Global.transformationPermission = TransformationPermission.None;
-        if ((CommonUI.isActive()) && (UI.getMainWindow() != null) && (UI.getVersionsWindow() != null))
+        if ((CommonUI.isActive()) && (UI.HasMainWindow()) && (UI.getVersionsWindow() != null))
             UI.getVersionsWindow().BlockVariants();
     }
     //--------------------------------------------------------------------------->>
diff --git a/src/Visual_DVM_2021/UI/Main/FileForm.java b/src/Visual_DVM_2021/UI/Main/FileForm.java
index 3da2cbe0..ae8eb26b 100644
--- a/src/Visual_DVM_2021/UI/Main/FileForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FileForm.java
@@ -218,9 +218,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     public void ShowText() {
         CommonUI.Clear(editorPanel);
         editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file)));
-        UI.getSearchReplaceForm().setEditor(Body);
-        if (UI.getSearchReplaceForm().isVisible())
-            UI.getSearchReplaceForm().requestFocus();
+        UI.getSearchReplaceWindow().updateEditor(Body);
     }
     @Override
     public void ShowMessages() {
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 21fabc55..2a56bd40 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -36,6 +36,8 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.Vector;
 public class Global {
+    //Режим
+    public static Mode mode = Mode.Undefined;
     //--------------------------------------------------
     public static GlobalProperties properties = new GlobalProperties();
     //</editor-fold>
@@ -76,8 +78,7 @@ 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 = new File(CommonUtils.getHomeDirectory(), "properties");