diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 39e090ae..922aa0aa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,178 +7,80 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/CommonConstants.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/Filter.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/SelectAll.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/icons/UnselectAll.png" 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/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/iDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/iDBObject.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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/Visual/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TableMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualiserStringList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/VisualiserStringList.java" 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/Files/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/ProjectsChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VDirectoryChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/VDirectoryChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Files/VFileChooser.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/Common_old/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/Compiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/Compiler.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/CompilerOption/CompilerOption.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/CompilerOption.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.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/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValue.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/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/Makefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/Makefile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.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/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.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/SapforProfileSetting/SapforProfileSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/DBSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/DBSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Splitter/Splitter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Splitter/Splitter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/QueueSystem/QueueSystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/QueueSystem/QueueSystem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.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/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.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/Messages/Recommendations/MessageRecommendation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Recommendations/MessageRecommendation.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/ArrayDecl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ArrayDecl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObject.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/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.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/Functions/UI/Graph/GraphInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/DependencyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/DependencyInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/ParallelRegion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/ParallelRegion.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportInterface.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.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/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryClient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.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/Server/ServerExchangeUnit_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerExchangeUnit_2021.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/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.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/TestingPackageToKill/TestingPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.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/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.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/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.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/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.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/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.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/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.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/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/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/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.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/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/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/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/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/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.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/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/PrepareForModulesAssembly.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.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/RemoteSingleCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.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/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_GetFileLineInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.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/SPF_StatisticAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.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/SaveProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveProfile.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/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteTestingPackages.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/UI/Interface/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/Loggable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.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/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/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.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/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/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/StatusEnum.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/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/Themes/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/FortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/FreeFortranSPFTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/LightVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightVisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/ProvidedTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/ProvidedTokenMaker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/ThemeElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/ThemeElement.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/TokenProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/TokenProvider.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserColor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserColor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserFonts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserFonts.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/VisualiserThemeName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserThemeName.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/dark_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/dark_editor.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Themes/light_editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/light_editor.xml" 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/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogWrapText.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/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/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/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.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/UserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UserState.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/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.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/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/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/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.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/SAPFOR/SapforTask/ComparisonState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.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/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Common/Utils/CommonUtils.java b/src/Common/Utils/CommonUtils.java
index dd784bf7..70bdabb0 100644
--- a/src/Common/Utils/CommonUtils.java
+++ b/src/Common/Utils/CommonUtils.java
@@ -44,7 +44,7 @@ public class CommonUtils {
     }
     public static String TBrackets(Object o) {
         return "<" + o.toString() + ">";
-    }
+    }//FortranSPFTokenMaker
     public static boolean ContainsCyrillic(String string) {
         return string.chars()
                 .mapToObj(Character.UnicodeBlock::of)
diff --git a/src/Common_old/Current.java b/src/Common_old/Current.java
index fc721e8b..9eeeb457 100644
--- a/src/Common_old/Current.java
+++ b/src/Common_old/Current.java
@@ -1,6 +1,6 @@
 package Common_old;
 import Common.Database.Objects.iDBObject;
-import Common_old.UI.Themes.VisualiserTheme;
+import _VisualDVM.Syntax.VisualiserTheme;
 import Common.Utils.TextLog;
 import GlobalData.Account.Account;
 import GlobalData.Compiler.Compiler;
diff --git a/src/Common_old/UI/Editor/BaseEditor.java b/src/Common_old/UI/Editor/BaseEditor.java
index 1f4a515f..0edd3feb 100644
--- a/src/Common_old/UI/Editor/BaseEditor.java
+++ b/src/Common_old/UI/Editor/BaseEditor.java
@@ -3,7 +3,7 @@ import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus.StyledPopupMenu;
 import Common_old.UI.Menus.TextEditorMenu;
-import Common_old.UI.Themes.ThemeElement;
+import _VisualDVM.Syntax.ThemeElement;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DialogFields;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
diff --git a/src/Common_old/UI/List/HyperlinksStyledList.java b/src/Common_old/UI/List/HyperlinksStyledList.java
index 6ca455ef..a557b85f 100644
--- a/src/Common_old/UI/List/HyperlinksStyledList.java
+++ b/src/Common_old/UI/List/HyperlinksStyledList.java
@@ -1,6 +1,6 @@
 package Common_old.UI.List;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 public class HyperlinksStyledList extends StyledList {
     @Override
     public void applyTheme() {
diff --git a/src/Common_old/UI/List/StyledList.java b/src/Common_old/UI/List/StyledList.java
index 8dc92851..a1da1d5f 100644
--- a/src/Common_old/UI/List/StyledList.java
+++ b/src/Common_old/UI/List/StyledList.java
@@ -1,7 +1,7 @@
 package Common_old.UI.List;
 import Common_old.Current;
-import Common_old.UI.Themes.ThemeElement;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.ThemeElement;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 public class StyledList extends JList implements ThemeElement {
diff --git a/src/Common_old/UI/Menus/PassesSubMenu.java b/src/Common_old/UI/Menus/PassesSubMenu.java
index 243ab386..f49c2616 100644
--- a/src/Common_old/UI/Menus/PassesSubMenu.java
+++ b/src/Common_old/UI/Menus/PassesSubMenu.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus/PropertiesSubmenu.java b/src/Common_old/UI/Menus/PropertiesSubmenu.java
index ae98c50c..357e3e2d 100644
--- a/src/Common_old/UI/Menus/PropertiesSubmenu.java
+++ b/src/Common_old/UI/Menus/PropertiesSubmenu.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus/StyledPopupMenu.java b/src/Common_old/UI/Menus/StyledPopupMenu.java
index 4496ad8c..fac95e93 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 Common_old.UI.Themes.ThemeElement;
+import _VisualDVM.Syntax.ThemeElement;
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuEvent;
diff --git a/src/Common_old/UI/Menus/VisualiserMenuItem.java b/src/Common_old/UI/Menus/VisualiserMenuItem.java
index 481d9fcd..01dc47ee 100644
--- a/src/Common_old/UI/Menus/VisualiserMenuItem.java
+++ b/src/Common_old/UI/Menus/VisualiserMenuItem.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java b/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java
index 6a6d23be..2ef22519 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 Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
diff --git a/src/Common_old/UI/Menus_2023/MenuBarButton.java b/src/Common_old/UI/Menus_2023/MenuBarButton.java
index cd2d0ed6..0f53281b 100644
--- a/src/Common_old/UI/Menus_2023/MenuBarButton.java
+++ b/src/Common_old/UI/Menus_2023/MenuBarButton.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus_2023;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java b/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
index bfb3b576..e78c196a 100644
--- a/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
+++ b/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus_2023.ProjectMenuBar;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.VisualiserMenu;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import ProjectData.ProjectView;
diff --git a/src/Common_old/UI/Menus_2023/SettingsSubmenu.java b/src/Common_old/UI/Menus_2023/SettingsSubmenu.java
index aa6a7acf..b87db1bb 100644
--- a/src/Common_old/UI/Menus_2023/SettingsSubmenu.java
+++ b/src/Common_old/UI/Menus_2023/SettingsSubmenu.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus_2023;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 
diff --git a/src/Common_old/UI/Menus_2023/VisualiserMenu.java b/src/Common_old/UI/Menus_2023/VisualiserMenu.java
index aaa84e11..26a9a29c 100644
--- a/src/Common_old/UI/Menus_2023/VisualiserMenu.java
+++ b/src/Common_old/UI/Menus_2023/VisualiserMenu.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus_2023;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java b/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
index 680d82ad..fd117e74 100644
--- a/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
+++ b/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Menus_2023;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
diff --git a/src/Common_old/UI/ProgressBar/StyledProgressBar.java b/src/Common_old/UI/ProgressBar/StyledProgressBar.java
index 6e14f3a9..96a50b14 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 Common_old.UI.Themes.ThemeElement;
+import _VisualDVM.Syntax.ThemeElement;
 
 import javax.swing.*;
 public class StyledProgressBar extends JProgressBar implements ThemeElement {
diff --git a/src/Common_old/UI/StatusEnum.java b/src/Common_old/UI/StatusEnum.java
index 99e02722..574ee1fe 100644
--- a/src/Common_old/UI/StatusEnum.java
+++ b/src/Common_old/UI/StatusEnum.java
@@ -1,5 +1,5 @@
 package Common_old.UI;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 public interface StatusEnum {
     default String getDescription() {
         return toString();
diff --git a/src/Common_old/UI/Tables/HiddenListRenderer.java b/src/Common_old/UI/Tables/HiddenListRenderer.java
index 8e5cbe41..47010791 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 Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 import java.util.Vector;
diff --git a/src/Common_old/UI/Tables/StyledCellLabel.java b/src/Common_old/UI/Tables/StyledCellLabel.java
index 7eadd64f..7158b05d 100644
--- a/src/Common_old/UI/Tables/StyledCellLabel.java
+++ b/src/Common_old/UI/Tables/StyledCellLabel.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Tables;
 import Common_old.Current;
-import Common_old.UI.Themes.ThemeElement;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.ThemeElement;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
diff --git a/src/Common_old/UI/Tables/StyledTable.java b/src/Common_old/UI/Tables/StyledTable.java
index 885e546f..ed9abcf3 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_old.UI.Menus.TableMenu;
-import Common_old.UI.Themes.ThemeElement;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.ThemeElement;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 import javax.swing.table.*;
diff --git a/src/Common_old/UI/Tables/WrapTextRenderer.java b/src/Common_old/UI/Tables/WrapTextRenderer.java
index 3bd21db3..089cd99a 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 Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
diff --git a/src/Common_old/UI/Trees/GraphTreeCellRenderer.java b/src/Common_old/UI/Trees/GraphTreeCellRenderer.java
index 8fc77dc5..de36b0c9 100644
--- a/src/Common_old/UI/Trees/GraphTreeCellRenderer.java
+++ b/src/Common_old/UI/Trees/GraphTreeCellRenderer.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Trees;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.Utils.Utils;
 import ProjectData.SapforData.FileObjectWithMessages;
 
diff --git a/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java b/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
index 3d9b8419..7bce045d 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_old.UI.Selectable;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/Common_old/UI/Trees/StyledTree.java b/src/Common_old/UI/Trees/StyledTree.java
index 6ea55d7c..742d43af 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_old.UI.Menus.GraphMenu;
-import Common_old.UI.Themes.ThemeElement;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.ThemeElement;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 
 import javax.swing.*;
diff --git a/src/Common_old/UI/Trees/StyledTreeCellRenderer.java b/src/Common_old/UI/Trees/StyledTreeCellRenderer.java
index 4f06998e..6659c534 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 Common_old.UI.Themes.ThemeElement;
+import _VisualDVM.Syntax.ThemeElement;
 
 import javax.swing.tree.DefaultTreeCellRenderer;
 public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements ThemeElement {
diff --git a/src/Common_old/UI/UI.java b/src/Common_old/UI/UI.java
index 8d003eaf..a281fce7 100644
--- a/src/Common_old/UI/UI.java
+++ b/src/Common_old/UI/UI.java
@@ -9,7 +9,6 @@ import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
 import Common_old.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar;
 import Common_old.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
 import Common_old.UI.Tables.*;
-import Common_old.UI.Themes.*;
 import Common_old.UI.Trees.GraphTreeCellRenderer;
 import Common_old.UI.Trees.SelectionTreeCellRenderer;
 import Common_old.UI.Windows.FormType;
@@ -93,6 +92,8 @@ import Visual_DVM_2021.UI.Main.MainForm;
 import Visual_DVM_2021.UI.Main.ProfilesForm;
 import Visual_DVM_2021.UI.Main.VersionsForm;
 import _VisualDVM.Global;
+import _VisualDVM.Syntax.*;
+import _VisualDVM.Syntax.VisualiserTheme;
 
 import javax.swing.*;
 import javax.swing.event.ChangeListener;
diff --git a/src/Common_old/UI/Windows/Dialog/Dialog.java b/src/Common_old/UI/Windows/Dialog/Dialog.java
index 76fd77c2..4ab74f79 100644
--- a/src/Common_old/UI/Windows/Dialog/Dialog.java
+++ b/src/Common_old/UI/Windows/Dialog/Dialog.java
@@ -1,8 +1,8 @@
 package Common_old.UI.Windows.Dialog;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Themes.ThemeElement;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.ThemeElement;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 import Common.Utils.TextLog;
 import Common_old.Utils.Utils;
diff --git a/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java b/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java
index 0db4cc34..3fdfaf55 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java
+++ b/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Windows.Dialog;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Common_old/UI/Windows/Dialog/DialogWrapText.java b/src/Common_old/UI/Windows/Dialog/DialogWrapText.java
index f19d6864..ed18c465 100644
--- a/src/Common_old/UI/Windows/Dialog/DialogWrapText.java
+++ b/src/Common_old/UI/Windows/Dialog/DialogWrapText.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Windows.Dialog;
 import Common_old.Current;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Common_old/UI/Windows/Form.java b/src/Common_old/UI/Windows/Form.java
index e6b7ecfa..f232808c 100644
--- a/src/Common_old/UI/Windows/Form.java
+++ b/src/Common_old/UI/Windows/Form.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Windows;
 import _VisualDVM.Global;
-import Common_old.UI.Themes.ThemeElement;
+import _VisualDVM.Syntax.ThemeElement;
 import GlobalData.FormsParams.DBForm;
 
 import javax.swing.*;
diff --git a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
index 1ee73ac4..6fc1053b 100644
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerEnvironment.UI;
 import Common_old.Current;
 import Common_old.UI.Tables.DBObjectEditor;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
diff --git a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
index e81c6022..5a45ff55 100644
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerEnvironment.UI;
 import Common_old.Current;
 import Common_old.UI.Tables.DBObjectRenderer;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
     @Override
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
index 452b3c67..c3393669 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_old.UI.Tables.DBObjectRenderer;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
     @Override
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
index ebe32b1b..4155f551 100644
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerOption.UI;
 import Common_old.Current;
 import Common_old.UI.Tables.DBObjectEditor;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerOption.CompilerOption;
diff --git a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
index c508b239..aa5c6ccb 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_old.UI.Tables.DBObjectRenderer;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
     @Override
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java b/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
index f12f32dc..10bd5326 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 Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import GlobalData.RemoteFile.RemoteFile;
 
diff --git a/src/GlobalData/Tasks/TaskState.java b/src/GlobalData/Tasks/TaskState.java
index 6cec81f5..8014df95 100644
--- a/src/GlobalData/Tasks/TaskState.java
+++ b/src/GlobalData/Tasks/TaskState.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks;
 import Common_old.UI.StatusEnum;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 public enum TaskState implements StatusEnum {
     Inactive,
     //--
diff --git a/src/GlobalData/User/UserState.java b/src/GlobalData/User/UserState.java
index e3fd571f..35170382 100644
--- a/src/GlobalData/User/UserState.java
+++ b/src/GlobalData/User/UserState.java
@@ -1,6 +1,6 @@
 package GlobalData.User;
 import Common_old.UI.StatusEnum;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 public enum UserState implements StatusEnum {
     initial, //на пользователя еще не заходили.
     ready,   //рудимент.
diff --git a/src/ProjectData/Files/UI/FilesHyperlinksPanel.java b/src/ProjectData/Files/UI/FilesHyperlinksPanel.java
index 1fd5ce22..2b55112f 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 Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 
 import javax.swing.*;
diff --git a/src/ProjectData/Files/UI/FilesTreeCellRenderer.java b/src/ProjectData/Files/UI/FilesTreeCellRenderer.java
index 0388dfdf..587ceace 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 _VisualDVM.Global;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
diff --git a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
index f159253c..1e5bdc6a 100644
--- a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -2,7 +2,7 @@ package ProjectData.Project.UI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Selectable;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.Project.db_project_info;
 
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java b/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
index dec93c09..9f422598 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_old.UI.Tables.RendererCell;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
 import javax.swing.*;
diff --git a/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index 241edcb7..6c66167f 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_old.UI.Tables.DBObjectEditor;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
diff --git a/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java b/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
index 3ee3628f..c8b554a8 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 Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.SapforData.Regions.ParallelRegion;
 
diff --git a/src/ProjectData/SapforData/FileObjectWithMessages.java b/src/ProjectData/SapforData/FileObjectWithMessages.java
index 40371324..e3beaf85 100644
--- a/src/ProjectData/SapforData/FileObjectWithMessages.java
+++ b/src/ProjectData/SapforData/FileObjectWithMessages.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Messages.Message;
diff --git a/src/ProjectData/SapforData/Loops/EGoto.java b/src/ProjectData/SapforData/Loops/EGoto.java
index 50b5615e..eebf148c 100644
--- a/src/ProjectData/SapforData/Loops/EGoto.java
+++ b/src/ProjectData/SapforData/Loops/EGoto.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.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 40c35afc..316b3ae5 100644
--- a/src/ProjectData/SapforData/Loops/IGoto.java
+++ b/src/ProjectData/SapforData/Loops/IGoto.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.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 21d758d5..14694bd9 100644
--- a/src/ProjectData/SapforData/Loops/IO.java
+++ b/src/ProjectData/SapforData/Loops/IO.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.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 bc03f2db..07aea847 100644
--- a/src/ProjectData/SapforData/Loops/Loop.java
+++ b/src/ProjectData/SapforData/Loops/Loop.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.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 9378fdb2..3eaf0231 100644
--- a/src/ProjectData/SapforData/Loops/LoopState.java
+++ b/src/ProjectData/SapforData/Loops/LoopState.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.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 2ff7dc14..7e958cb4 100644
--- a/src/ProjectData/SapforData/Loops/NonRectIter.java
+++ b/src/ProjectData/SapforData/Loops/NonRectIter.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.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 9033372e..1b77b762 100644
--- a/src/ProjectData/SapforData/Loops/Stop.java
+++ b/src/ProjectData/SapforData/Loops/Stop.java
@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class Stop extends FileObjectWithMessages {
diff --git a/src/Repository/BugReport/BugReportState.java b/src/Repository/BugReport/BugReportState.java
index d89de710..3b1bd282 100644
--- a/src/Repository/BugReport/BugReportState.java
+++ b/src/Repository/BugReport/BugReportState.java
@@ -1,6 +1,6 @@
 package Repository.BugReport;
 import Common_old.UI.StatusEnum;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.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 d37bdf6c..72682a3a 100644
--- a/src/Repository/Component/ComponentState.java
+++ b/src/Repository/Component/ComponentState.java
@@ -1,6 +1,6 @@
 package Repository.Component;
 import Common_old.UI.StatusEnum;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 public enum ComponentState implements StatusEnum {
     Undefined,
     Actual,
diff --git a/src/Repository/Component/ComponentsMenuBar.java b/src/Repository/Component/ComponentsMenuBar.java
index 9b5729eb..c1ad8460 100644
--- a/src/Repository/Component/ComponentsMenuBar.java
+++ b/src/Repository/Component/ComponentsMenuBar.java
@@ -2,7 +2,7 @@ package Repository.Component;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.DataMenuBar;
 import Common_old.UI.Menus_2023.VisualiserMenu;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class ComponentsMenuBar extends DataMenuBar {
diff --git a/src/TestingSystem/Common/TasksPackageState.java b/src/TestingSystem/Common/TasksPackageState.java
index 5a9acbe7..aa702160 100644
--- a/src/TestingSystem/Common/TasksPackageState.java
+++ b/src/TestingSystem/Common/TasksPackageState.java
@@ -1,6 +1,6 @@
 package TestingSystem.Common;
 import Common_old.UI.StatusEnum;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 
 import java.util.Arrays;
 import java.util.Vector;
diff --git a/src/TestingSystem/Common/TestingBar.java b/src/TestingSystem/Common/TestingBar.java
index b2434e2c..190c99ed 100644
--- a/src/TestingSystem/Common/TestingBar.java
+++ b/src/TestingSystem/Common/TestingBar.java
@@ -3,7 +3,7 @@ import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.UI;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
index b5fe0940..906b7e94 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_old.UI.StatusEnum;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 public enum ComparisonState implements StatusEnum {
     Unknown,
     NotMatch,
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
index 9b8273f8..61cf24b5 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_old.UI.StatusEnum;
-import Common_old.UI.Themes.VisualiserFonts;
+import _VisualDVM.Syntax.VisualiserFonts;
 public enum ServerSapforState implements StatusEnum {
     Queued,
     DVMRepositorySynchronization,
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 8def3ca6..30bc3c13 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -300,8 +300,8 @@ public class Global {
         //-
         UI.CreateComponentsForm();
         AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
-        atmf.putMapping("text/FortranSPF", "Common.UI.Themes.FortranSPFTokenMaker");
-        atmf.putMapping("text/FreeFortranSPF", "Common.UI.Themes.FreeFortranSPFTokenMaker");
+        atmf.putMapping("text/FortranSPF", "_VisualDVM.Syntax.FortranSPFTokenMaker");
+        atmf.putMapping("text/FreeFortranSPF", "_VisualDVM.Syntax.FreeFortranSPFTokenMaker");
         //  FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
         //-------->>
         //-------->>
diff --git a/src/Common_old/UI/Themes/DarkVisualiserTheme.java b/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
similarity index 94%
rename from src/Common_old/UI/Themes/DarkVisualiserTheme.java
rename to src/_VisualDVM/Syntax/DarkVisualiserTheme.java
index d82bfe5f..609b3086 100644
--- a/src/Common_old/UI/Themes/DarkVisualiserTheme.java
+++ b/src/_VisualDVM/Syntax/DarkVisualiserTheme.java
@@ -1,9 +1,9 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 import java.awt.*;
 public class DarkVisualiserTheme extends VisualiserTheme {
     @Override
     protected String getEditorThemePath() {
-        return "/Common_old/UI/Themes/dark_editor.xml";
+        return "/_VisualDVM/Syntax/dark_editor.xml";
     }
     @Override
     protected String getForegroundHex() {
diff --git a/src/Common_old/UI/Themes/FortranSPFTokenMaker.java b/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
similarity index 99%
rename from src/Common_old/UI/Themes/FortranSPFTokenMaker.java
rename to src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
index 5945d770..03187d57 100644
--- a/src/Common_old/UI/Themes/FortranSPFTokenMaker.java
+++ b/src/_VisualDVM/Syntax/FortranSPFTokenMaker.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.TokenMap;
diff --git a/src/Common_old/UI/Themes/FreeFortranSPFTokenMaker.java b/src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java
similarity index 99%
rename from src/Common_old/UI/Themes/FreeFortranSPFTokenMaker.java
rename to src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java
index 8b0c7d4b..b958766a 100644
--- a/src/Common_old/UI/Themes/FreeFortranSPFTokenMaker.java
+++ b/src/_VisualDVM/Syntax/FreeFortranSPFTokenMaker.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.TokenMap;
diff --git a/src/Common_old/UI/Themes/LightVisualiserTheme.java b/src/_VisualDVM/Syntax/LightVisualiserTheme.java
similarity index 94%
rename from src/Common_old/UI/Themes/LightVisualiserTheme.java
rename to src/_VisualDVM/Syntax/LightVisualiserTheme.java
index 94a3c420..f1230da5 100644
--- a/src/Common_old/UI/Themes/LightVisualiserTheme.java
+++ b/src/_VisualDVM/Syntax/LightVisualiserTheme.java
@@ -1,9 +1,9 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 import java.awt.*;
 public class LightVisualiserTheme extends VisualiserTheme {
     @Override
     protected String getEditorThemePath() {
-        return "/Common_old/UI/Themes/light_editor.xml";
+        return "/_VisualDVM/Syntax/light_editor.xml";
     }
     @Override
     protected String getForegroundHex() {
diff --git a/src/Common_old/UI/Themes/ProvidedTokenMaker.java b/src/_VisualDVM/Syntax/ProvidedTokenMaker.java
similarity index 98%
rename from src/Common_old/UI/Themes/ProvidedTokenMaker.java
rename to src/_VisualDVM/Syntax/ProvidedTokenMaker.java
index 938626e4..092d1c8c 100644
--- a/src/Common_old/UI/Themes/ProvidedTokenMaker.java
+++ b/src/_VisualDVM/Syntax/ProvidedTokenMaker.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMaker;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.TokenMap;
diff --git a/src/Common_old/UI/Themes/ThemeElement.java b/src/_VisualDVM/Syntax/ThemeElement.java
similarity index 80%
rename from src/Common_old/UI/Themes/ThemeElement.java
rename to src/_VisualDVM/Syntax/ThemeElement.java
index 7578dd99..35ff699f 100644
--- a/src/Common_old/UI/Themes/ThemeElement.java
+++ b/src/_VisualDVM/Syntax/ThemeElement.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 public interface ThemeElement {
     default void FontUp() {
     }
diff --git a/src/Common_old/UI/Themes/TokenProvider.java b/src/_VisualDVM/Syntax/TokenProvider.java
similarity index 99%
rename from src/Common_old/UI/Themes/TokenProvider.java
rename to src/_VisualDVM/Syntax/TokenProvider.java
index 13a4ad68..06ad86e0 100644
--- a/src/Common_old/UI/Themes/TokenProvider.java
+++ b/src/_VisualDVM/Syntax/TokenProvider.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 import org.fife.ui.rsyntaxtextarea.Token;
 
 import javax.swing.text.Segment;
diff --git a/src/Common_old/UI/Themes/VisualiserColor.java b/src/_VisualDVM/Syntax/VisualiserColor.java
similarity index 72%
rename from src/Common_old/UI/Themes/VisualiserColor.java
rename to src/_VisualDVM/Syntax/VisualiserColor.java
index d0bd436b..2f202773 100644
--- a/src/Common_old/UI/Themes/VisualiserColor.java
+++ b/src/_VisualDVM/Syntax/VisualiserColor.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 public enum VisualiserColor {
     ToolTip_background,
     ToolTip_foreground
diff --git a/src/Common_old/UI/Themes/VisualiserFonts.java b/src/_VisualDVM/Syntax/VisualiserFonts.java
similarity index 91%
rename from src/Common_old/UI/Themes/VisualiserFonts.java
rename to src/_VisualDVM/Syntax/VisualiserFonts.java
index 372c6e6a..7e76c61d 100644
--- a/src/Common_old/UI/Themes/VisualiserFonts.java
+++ b/src/_VisualDVM/Syntax/VisualiserFonts.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 public enum VisualiserFonts {
     GoodState,
     ReadyState,
diff --git a/src/Common_old/UI/Themes/VisualiserTheme.java b/src/_VisualDVM/Syntax/VisualiserTheme.java
similarity index 99%
rename from src/Common_old/UI/Themes/VisualiserTheme.java
rename to src/_VisualDVM/Syntax/VisualiserTheme.java
index c35d4d34..ed764df5 100644
--- a/src/Common_old/UI/Themes/VisualiserTheme.java
+++ b/src/_VisualDVM/Syntax/VisualiserTheme.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 import _VisualDVM.Global;
 import org.fife.ui.rsyntaxtextarea.Theme;
 
diff --git a/src/Common_old/UI/Themes/VisualiserThemeName.java b/src/_VisualDVM/Syntax/VisualiserThemeName.java
similarity index 65%
rename from src/Common_old/UI/Themes/VisualiserThemeName.java
rename to src/_VisualDVM/Syntax/VisualiserThemeName.java
index a1209e0b..17533381 100644
--- a/src/Common_old/UI/Themes/VisualiserThemeName.java
+++ b/src/_VisualDVM/Syntax/VisualiserThemeName.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Themes;
+package _VisualDVM.Syntax;
 public enum VisualiserThemeName {
     Light,
     Dark
diff --git a/src/Common_old/UI/Themes/dark_editor.xml b/src/_VisualDVM/Syntax/dark_editor.xml
similarity index 100%
rename from src/Common_old/UI/Themes/dark_editor.xml
rename to src/_VisualDVM/Syntax/dark_editor.xml
diff --git a/src/Common_old/UI/Themes/light_editor.xml b/src/_VisualDVM/Syntax/light_editor.xml
similarity index 100%
rename from src/Common_old/UI/Themes/light_editor.xml
rename to src/_VisualDVM/Syntax/light_editor.xml