diff --git a/Alice b/Alice
index bdba4c52..91eff9b3 160000
--- a/Alice
+++ b/Alice
@@ -1 +1 @@
-Subproject commit bdba4c526da2b8e9d0a39b1ff8d182eaa4ede3a9
+Subproject commit 91eff9b3e6f4b864af87a7ca6ae192bce2cf41a4
diff --git a/Demos/DemoDependencyPlugin/CMakeLists.txt b/Demos/DemoDependencyPlugin/CMakeLists.txt
index a93cf1ef..16ede380 100644
--- a/Demos/DemoDependencyPlugin/CMakeLists.txt
+++ b/Demos/DemoDependencyPlugin/CMakeLists.txt
@@ -78,7 +78,7 @@ if(SOLIDRENDER_WIN)
elseif(SOLIDRENDER_LINUX)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/Plugins)
endif()
diff --git a/Demos/DemoPlugin/CMakeLists.txt b/Demos/DemoPlugin/CMakeLists.txt
index 7213f2b4..72746e8a 100644
--- a/Demos/DemoPlugin/CMakeLists.txt
+++ b/Demos/DemoPlugin/CMakeLists.txt
@@ -78,7 +78,7 @@ if(SOLIDRENDER_WIN)
elseif(SOLIDRENDER_LINUX)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/Plugins)
endif()
diff --git a/Designer/DB/SolidDesignerModel/SolidDesignerModel.h b/Designer/DB/SolidDesignerModel/SolidDesignerModel.h
index 8bb79e4e..b565cc83 100644
--- a/Designer/DB/SolidDesignerModel/SolidDesignerModel.h
+++ b/Designer/DB/SolidDesignerModel/SolidDesignerModel.h
@@ -12,32 +12,9 @@
#define SOLIDDESIGNER_MODEL_EXPORT __attribute__((visibility("default")))
#endif
-namespace
-{
- void InitTest()
- {
- int i = 0;
- std::cout << "Here is init test..." << std::endl;
- }
- void UnInitTest()
- {
- int i = 0;
- std::cout << "Here is uninit test..." << std::endl;
- }
-}
-extern "C" void InitializePlugin()
-{
- InitTest();
-}
-
-
-extern "C" void UnInitializePlugin()
-{
- UnInitTest();
-}
diff --git a/Designer/Data/CommandsConfig.xml b/Designer/Data/CommandsConfig.xml
index f57ebca1..f0200d5d 100644
--- a/Designer/Data/CommandsConfig.xml
+++ b/Designer/Data/CommandsConfig.xml
@@ -174,163 +174,7 @@
icon="icons/window/tile_horizontal.svg"
environments="part,sketch,asm,sheet"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1068,6 +1377,630 @@
icon="icons/gc/settings.svg"
environments="part,asm,sheet"/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Designer/Data/FunctionAreaConfig.xml b/Designer/Data/FunctionAreaConfig.xml
index 2b62fe95..34b4e409 100644
--- a/Designer/Data/FunctionAreaConfig.xml
+++ b/Designer/Data/FunctionAreaConfig.xml
@@ -36,62 +36,115 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -231,119 +284,119 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
@@ -385,8 +438,8 @@
-
-
+
+
@@ -711,10 +764,10 @@