diff --git a/3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb b/3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb
deleted file mode 100644
index 0e13c9d..0000000
--- a/3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb
+++ /dev/null
@@ -1,89 +0,0 @@
-Imports EgtWPFLib5
-
-Public Class CurrMachiningPanelVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_CurrMachining As CurrMachining
-   Public ReadOnly Property CurrMachining As CurrMachining
-      Get
-         Return m_CurrMachining
-      End Get
-   End Property
-   Friend Sub SetCurrMachining(CurrMachining As CurrMachining)
-      m_CurrMachining = CurrMachining
-      NotifyPropertyChanged(NameOf(CurrMachining))
-      Map.refTopPanelVM.UpdateCurrMachining()
-   End Sub
-
-   ' Definizione comandi
-   Private m_cmdOk As ICommand
-   Private m_cmdCancel As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTORS"
-
-   Sub New()
-      ' Creo riferimento a questa classe in Map
-      Map.SetRefCurrMachiningPanelVM(Me)
-   End Sub
-
-#End Region    ' CONSTRUCTORS
-
-   Friend Sub ReadMachParamFromSelPart()
-      If IsNothing(Map.refTopPanelVM.SelPart) Then Return
-      Dim nData As Integer = 0
-      m_CurrMachining = New CurrMachining(Map.refTopPanelVM.SelPart.nPartId)
-      SetCurrMachining(m_CurrMachining)
-      ' aggiorno parametri mostrati nella barra
-      NotifyPropertyChanged(NameOf(CurrMachining))
-      Map.refTopPanelVM.UpdateCurrMachining()
-   End Sub
-
-
-#Region "COMMANDS"
-
-#Region "Ok"
-
-   Public ReadOnly Property Ok_Command As ICommand
-      Get
-         If m_cmdOk Is Nothing Then
-            m_cmdOk = New Command(AddressOf Ok)
-         End If
-         Return m_cmdOk
-      End Get
-   End Property
-
-   Public Sub Ok()
-      ' scrivo i parametri modificati
-      m_CurrMachining.WriteCurrParamInPart(Map.refTopPanelVM.SelPart.nPartId)
-      ' ripristino modalita' standard
-      Map.refTopPanelVM.SelPage = Pages.MODIFY
-   End Sub
-
-#End Region    ' Ok
-
-#Region "Cancel"
-
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   Public Sub Cancel()
-      ' ripristino modalita' standard
-      Map.refTopPanelVM.SelPage = Pages.MODIFY
-   End Sub
-
-#End Region    ' Cancel
-
-#End Region    ' COMMANDS
-
-End Class
-
diff --git a/3dPrintApp/TSFEditor/TFSEditorV.xaml b/3dPrintApp/TSFEditor/TFSEditorV.xaml
deleted file mode 100644
index 23ab95b..0000000
--- a/3dPrintApp/TSFEditor/TFSEditorV.xaml
+++ /dev/null
@@ -1,117 +0,0 @@
-<UserControl x:Class="TFSEditorV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp"
-             MaxHeight="600"
-             MaxWidth="600">
-   <Border VerticalAlignment="Center"
-           Style="{StaticResource RightPanel_Border}">
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-         <StackPanel Orientation="Horizontal">
-            <ComboBox ItemsSource="{Binding MediaTypeList}"
-                      SelectedIndex="{Binding ghSelMediaType}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
-            <TextBlock Text="Slice Number:"
-                       Visibility="{Binding MediaHeight_Visibility}"
-                       Style="{StaticResource OptionTextBlock}"/>
-            <TextBox Text="{Binding sMediaHeight}"
-                     Width="50"
-                     Visibility="{Binding MediaHeight_Visibility}"
-                     Style="{StaticResource ControllerInputPanel_TextBox}"/>
-            <TextBlock Text="Difference:"
-                       Visibility="{Binding Difference_Visibility}"
-                       Style="{StaticResource OptionTextBlock}"/>
-            <TextBox Text="{Binding sDifference}"
-                     Width="50"
-                     Visibility="{Binding Difference_Visibility}"
-                     Style="{StaticResource ControllerInputPanel_TextBox}"/>
-            <TextBlock Text="F:"
-                       Visibility="{Binding FCurr_Visibility}"
-                       Style="{StaticResource OptionTextBlock}"/>
-            <TextBox Text="{Binding sFCurr}"
-                     Width="50"
-                     Visibility="{Binding FCurr_Visibility}"
-                     Style="{StaticResource ControllerInputPanel_TextBox}"/>
-            <Button Content="Set"
-                    Command="{Binding Set_Command}"
-                    Visibility="{Binding FCurr_Visibility}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Media"
-                    Command="{Binding Media_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Reset"
-                    Command="{Binding Reset_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-         </StackPanel>
-         <DataGrid Grid.Row="1"
-                   ItemsSource="{Binding LayerList}"
-                   PrintApp:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding SelLayers}"
-                   SelectedItem="{Binding SelLayer}"
-                   CanUserAddRows="False"
-                   AutoGenerateColumns="False"
-                   CanUserResizeRows="False"
-                   SelectionMode="Extended"
-                   ScrollViewer.CanContentScroll="True" 
-                   ScrollViewer.VerticalScrollBarVisibility="Auto"
-                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                   Margin="0,0,0,5">
-            <DataGrid.Columns>
-               <DataGridTextColumn Header="Index" 
-                                   Binding="{Binding nIndex}"
-                                   IsReadOnly="True"
-                                   Width="Auto"/>
-               <DataGridTextColumn Header="Length"
-                                   Binding="{Binding sLength}"
-                                   IsReadOnly="True"
-                                   Width="2*"/>
-               <DataGridTextColumn Header="TMin" 
-                                   Binding="{Binding dTMin}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="TTrg" 
-                                   Binding="{Binding dTTrg}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="TMax" 
-                                   Binding="{Binding dTMax}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="TCurr" 
-                                   Binding="{Binding dTCurr}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FMin" 
-                                   Binding="{Binding dFMin}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FTrg" 
-                                   Binding="{Binding dFTrg}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FMax" 
-                                   Binding="{Binding dFMax}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FCurr" 
-                                   Binding="{Binding dFCurr}"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="Speed" 
-                                   Binding="{Binding dSpeed}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-            </DataGrid.Columns>
-            <DataGrid.RowStyle>
-               <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
-                  <Setter Property="Background" Value="{Binding Background}"/>
-                  <!--<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>-->
-               </Style>
-            </DataGrid.RowStyle>
-
-         </DataGrid>
-      </Grid>
-   </Border>
-</UserControl>
diff --git a/ExtLibs/EgtUILib.dll b/ExtLibs/EgtUILib.dll
index 6e7ae88..0b349c2 100644
Binary files a/ExtLibs/EgtUILib.dll and b/ExtLibs/EgtUILib.dll differ
diff --git a/3dPrintApp/3dPrintApp.sln b/Icarus.sln
similarity index 87%
rename from 3dPrintApp/3dPrintApp.sln
rename to Icarus.sln
index 7844821..35aba91 100644
--- a/3dPrintApp/3dPrintApp.sln
+++ b/Icarus.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32002.261
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "3dPrintApp", "3dPrintApp.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Icarus", "Icarus/Icarus.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/3dPrintApp/AboutBoxWindow/AboutBoxV.xaml b/Icarus/AboutBoxWindow/AboutBoxV.xaml
similarity index 100%
rename from 3dPrintApp/AboutBoxWindow/AboutBoxV.xaml
rename to Icarus/AboutBoxWindow/AboutBoxV.xaml
diff --git a/3dPrintApp/AboutBoxWindow/AboutBoxV.xaml.vb b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb
similarity index 100%
rename from 3dPrintApp/AboutBoxWindow/AboutBoxV.xaml.vb
rename to Icarus/AboutBoxWindow/AboutBoxV.xaml.vb
diff --git a/3dPrintApp/AirspacePopup.vb b/Icarus/AirspacePopup.vb
similarity index 98%
rename from 3dPrintApp/AirspacePopup.vb
rename to Icarus/AirspacePopup.vb
index 86b662e..c3aac95 100644
--- a/3dPrintApp/AirspacePopup.vb
+++ b/Icarus/AirspacePopup.vb
@@ -4,14 +4,14 @@
 ' Add this XmlNamespace attribute to the root element of the markup file where it is 
 ' to be used:
 '
-'     xmlns:MyNamespace="clr-namespace:_3dPrintApp"
+'     xmlns:MyNamespace="clr-namespace:Icarus"
 '
 '
 ' Step 1b) Using this custom control in a XAML file that exists in a different project.
 ' Add this XmlNamespace attribute to the root element of the markup file where it is 
 ' to be used:
 '
-'     xmlns:MyNamespace="clr-namespace:_3dPrintApp;assembly=_3dPrintApp"
+'     xmlns:MyNamespace="clr-namespace:Icarus;assembly=Icarus"
 '
 ' You will also need to add a project reference from the project where the XAML file lives
 ' to this project and Rebuild to avoid compilation errors:
diff --git a/3dPrintApp/App.config b/Icarus/App.config
similarity index 100%
rename from 3dPrintApp/App.config
rename to Icarus/App.config
diff --git a/3dPrintApp/Application.xaml b/Icarus/Application.xaml
similarity index 100%
rename from 3dPrintApp/Application.xaml
rename to Icarus/Application.xaml
diff --git a/3dPrintApp/Application.xaml.vb b/Icarus/Application.xaml.vb
similarity index 100%
rename from 3dPrintApp/Application.xaml.vb
rename to Icarus/Application.xaml.vb
diff --git a/3dPrintApp/ChooseReferenceWnd/ChooseReferenceWndV.xaml b/Icarus/ChooseReferenceWnd/ChooseReferenceWndV.xaml
similarity index 100%
rename from 3dPrintApp/ChooseReferenceWnd/ChooseReferenceWndV.xaml
rename to Icarus/ChooseReferenceWnd/ChooseReferenceWndV.xaml
diff --git a/3dPrintApp/ChooseReferenceWnd/ChooseReferenceWndV.xaml.vb b/Icarus/ChooseReferenceWnd/ChooseReferenceWndV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ChooseReferenceWnd/ChooseReferenceWndV.xaml.vb
rename to Icarus/ChooseReferenceWnd/ChooseReferenceWndV.xaml.vb
diff --git a/3dPrintApp/ChooseReferenceWnd/ChooseReferenceWndVM.vb b/Icarus/ChooseReferenceWnd/ChooseReferenceWndVM.vb
similarity index 100%
rename from 3dPrintApp/ChooseReferenceWnd/ChooseReferenceWndVM.vb
rename to Icarus/ChooseReferenceWnd/ChooseReferenceWndVM.vb
diff --git a/3dPrintApp/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb
similarity index 96%
rename from 3dPrintApp/Constants/Const3dPrint.vb
rename to Icarus/Constants/Const3dPrint.vb
index f8e6a69..5359e83 100644
--- a/3dPrintApp/Constants/Const3dPrint.vb
+++ b/Icarus/Constants/Const3dPrint.vb
@@ -100,8 +100,13 @@
 
    ' parametri StartMach
    Public Const LAY_NEWSTART = "NewStart"
+
+   ' parametri Rib
    Public Const LAY_NEWRIB = "NewRib"
    Public Const LAY_NEWEXTRUSION = "NewExtrusion"
+   Public Const KEY_EXTRUSION_ID = "ExtrusionId"
+   Public Const KEY_EXTRUSION_LENGTH = "ExtrusionLength"
+   Public Const KEY_RIB_TYPE = "RibType"
 
    Public Const FILE_PATH = "FilePath"
 
diff --git a/3dPrintApp/Constants/ConstBeam.vb b/Icarus/Constants/ConstBeam.vb
similarity index 100%
rename from 3dPrintApp/Constants/ConstBeam.vb
rename to Icarus/Constants/ConstBeam.vb
diff --git a/3dPrintApp/Constants/ConstColumns.vb b/Icarus/Constants/ConstColumns.vb
similarity index 100%
rename from 3dPrintApp/Constants/ConstColumns.vb
rename to Icarus/Constants/ConstColumns.vb
diff --git a/3dPrintApp/Constants/ConstDataGridColumnsIni.vb b/Icarus/Constants/ConstDataGridColumnsIni.vb
similarity index 100%
rename from 3dPrintApp/Constants/ConstDataGridColumnsIni.vb
rename to Icarus/Constants/ConstDataGridColumnsIni.vb
diff --git a/3dPrintApp/Constants/ConstDims.vb b/Icarus/Constants/ConstDims.vb
similarity index 100%
rename from 3dPrintApp/Constants/ConstDims.vb
rename to Icarus/Constants/ConstDims.vb
diff --git a/3dPrintApp/Constants/ConstGen.vb b/Icarus/Constants/ConstGen.vb
similarity index 93%
rename from 3dPrintApp/Constants/ConstGen.vb
rename to Icarus/Constants/ConstGen.vb
index 5463dfd..30e31c2 100644
--- a/3dPrintApp/Constants/ConstGen.vb
+++ b/Icarus/Constants/ConstGen.vb
@@ -19,7 +19,7 @@ Public Module ConstGen
    Public Const K_DATAROOT As String = "DataRoot"
 
    ' File con dati di licenza
-   Public Const LIC_FILE_NAME As String = "3dPrintApp.lic"
+   Public Const LIC_FILE_NAME As String = "Icarus.lic"
    Public Const S_LICENCE As String = "Licence"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
@@ -64,7 +64,7 @@ Public Module ConstGen
    End Enum
 
    ' File di log generale
-   Public Const GENLOG_FILE_NAME As String = "3dPrintApp#.txt"
+   Public Const GENLOG_FILE_NAME As String = "Icarus#.txt"
 
    ' Sottodirettorio di configurazione
    Public Const CONF_DIR As String = "Config"
@@ -77,7 +77,7 @@ Public Module ConstGen
    ' Sottodirettorio materiali
    Public Const MATERIALS_DIR As String = "Materials"
    ' Sottodirettorio per lavorazioni travi
-   Public Const _3DPRINTING_DIR As String = "3dPrintApp"
+   Public Const _3DPRINTING_DIR As String = "Icarus"
    ' Sottodirettorio di default per le macchine
    Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers
diff --git a/3dPrintApp/Constants/ConstIni.vb b/Icarus/Constants/ConstIni.vb
similarity index 98%
rename from 3dPrintApp/Constants/ConstIni.vb
rename to Icarus/Constants/ConstIni.vb
index d9f5dca..a6c69ad 100644
--- a/3dPrintApp/Constants/ConstIni.vb
+++ b/Icarus/Constants/ConstIni.vb
@@ -13,7 +13,7 @@
 
 Public Module ConstIni
 
-   Public Const INI_FILE_NAME As String = "3dPrintApp.ini"
+   Public Const INI_FILE_NAME As String = "Icarus.ini"
 
    'Public Const S_GENERAL As String = "General"
    'Public Const K_DEBUG As String = "Debug"
diff --git a/3dPrintApp/Constants/ConstMachComm.vb b/Icarus/Constants/ConstMachComm.vb
similarity index 100%
rename from 3dPrintApp/Constants/ConstMachComm.vb
rename to Icarus/Constants/ConstMachComm.vb
diff --git a/3dPrintApp/Constants/ConstMachIni.vb b/Icarus/Constants/ConstMachIni.vb
similarity index 86%
rename from 3dPrintApp/Constants/ConstMachIni.vb
rename to Icarus/Constants/ConstMachIni.vb
index ce8f6b2..ead4012 100644
--- a/3dPrintApp/Constants/ConstMachIni.vb
+++ b/Icarus/Constants/ConstMachIni.vb
@@ -24,4 +24,8 @@
 
    Public Const TS3DATA_FILE As String = "Ts3Data.lua"
 
+   ' Public Const S_PRINTING3D As String = "3dPrinting"
+   Public Const K_SPEED_MIN As String = "SpeedMin"
+   Public Const K_SPEED_MAX As String = "SpeedMax"
+
 End Module
diff --git a/3dPrintApp/Constants/ConstMsg.vb b/Icarus/Constants/ConstMsg.vb
similarity index 100%
rename from 3dPrintApp/Constants/ConstMsg.vb
rename to Icarus/Constants/ConstMsg.vb
diff --git a/3dPrintApp/ControllerInputPanel/ControllerInputPanelV.xaml b/Icarus/ControllerInputPanel/ControllerInputPanelV.xaml
similarity index 100%
rename from 3dPrintApp/ControllerInputPanel/ControllerInputPanelV.xaml
rename to Icarus/ControllerInputPanel/ControllerInputPanelV.xaml
diff --git a/3dPrintApp/ControllerInputPanel/ControllerInputPanelV.xaml.vb b/Icarus/ControllerInputPanel/ControllerInputPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ControllerInputPanel/ControllerInputPanelV.xaml.vb
rename to Icarus/ControllerInputPanel/ControllerInputPanelV.xaml.vb
diff --git a/3dPrintApp/ControllerInputPanel/ControllerInputPanelVM.vb b/Icarus/ControllerInputPanel/ControllerInputPanelVM.vb
similarity index 100%
rename from 3dPrintApp/ControllerInputPanel/ControllerInputPanelVM.vb
rename to Icarus/ControllerInputPanel/ControllerInputPanelVM.vb
diff --git a/3dPrintApp/CurrLayerSlider/CurrLayerSliderV.xaml b/Icarus/CurrLayerSlider/CurrLayerSliderV.xaml
similarity index 100%
rename from 3dPrintApp/CurrLayerSlider/CurrLayerSliderV.xaml
rename to Icarus/CurrLayerSlider/CurrLayerSliderV.xaml
diff --git a/3dPrintApp/CurrLayerSlider/CurrLayerSliderV.xaml.vb b/Icarus/CurrLayerSlider/CurrLayerSliderV.xaml.vb
similarity index 100%
rename from 3dPrintApp/CurrLayerSlider/CurrLayerSliderV.xaml.vb
rename to Icarus/CurrLayerSlider/CurrLayerSliderV.xaml.vb
diff --git a/3dPrintApp/CurrLayerSlider/CurrLayerSliderVM.vb b/Icarus/CurrLayerSlider/CurrLayerSliderVM.vb
similarity index 100%
rename from 3dPrintApp/CurrLayerSlider/CurrLayerSliderVM.vb
rename to Icarus/CurrLayerSlider/CurrLayerSliderVM.vb
diff --git a/3dPrintApp/DataGridMultiselectManaging/IListItemConverter.vb b/Icarus/DataGridMultiselectManaging/IListItemConverter.vb
similarity index 100%
rename from 3dPrintApp/DataGridMultiselectManaging/IListItemConverter.vb
rename to Icarus/DataGridMultiselectManaging/IListItemConverter.vb
diff --git a/3dPrintApp/DataGridMultiselectManaging/MultiSelectorBehaviours.vb b/Icarus/DataGridMultiselectManaging/MultiSelectorBehaviours.vb
similarity index 100%
rename from 3dPrintApp/DataGridMultiselectManaging/MultiSelectorBehaviours.vb
rename to Icarus/DataGridMultiselectManaging/MultiSelectorBehaviours.vb
diff --git a/3dPrintApp/DataGridMultiselectManaging/TwoListSynchronizer.vb b/Icarus/DataGridMultiselectManaging/TwoListSynchronizer.vb
similarity index 100%
rename from 3dPrintApp/DataGridMultiselectManaging/TwoListSynchronizer.vb
rename to Icarus/DataGridMultiselectManaging/TwoListSynchronizer.vb
diff --git a/3dPrintApp/DispositionPanel/DispositionPanelV.xaml b/Icarus/DispositionPanel/DispositionPanelV.xaml
similarity index 98%
rename from 3dPrintApp/DispositionPanel/DispositionPanelV.xaml
rename to Icarus/DispositionPanel/DispositionPanelV.xaml
index f126e04..548b092 100644
--- a/3dPrintApp/DispositionPanel/DispositionPanelV.xaml
+++ b/Icarus/DispositionPanel/DispositionPanelV.xaml
@@ -2,7 +2,7 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-            xmlns:PrintApp="clr-namespace:_3dPrintApp"
+            xmlns:PrintApp="clr-namespace:Icarus"
             Margin="5">
    <StackPanel.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
diff --git a/3dPrintApp/DispositionPanel/DispositionPanelV.xaml.vb b/Icarus/DispositionPanel/DispositionPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/DispositionPanel/DispositionPanelV.xaml.vb
rename to Icarus/DispositionPanel/DispositionPanelV.xaml.vb
diff --git a/3dPrintApp/DispositionPanel/DispositionPanelVM.vb b/Icarus/DispositionPanel/DispositionPanelVM.vb
similarity index 99%
rename from 3dPrintApp/DispositionPanel/DispositionPanelVM.vb
rename to Icarus/DispositionPanel/DispositionPanelVM.vb
index 09a73b7..9274e6f 100644
--- a/3dPrintApp/DispositionPanel/DispositionPanelVM.vb
+++ b/Icarus/DispositionPanel/DispositionPanelVM.vb
@@ -259,7 +259,7 @@ Public Class DispositionPanelVM
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ROTATE)
    End Sub
 
-#End Region    ' DragMove
+#End Region    ' DragRotate
 
 #End Region    ' COMMANDS
 
diff --git a/3dPrintApp.sln b/Icarus/Icarus.sln
similarity index 86%
rename from 3dPrintApp.sln
rename to Icarus/Icarus.sln
index da87235..544feb0 100644
--- a/3dPrintApp.sln
+++ b/Icarus/Icarus.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32002.261
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "3dPrintApp", "3dPrintApp/3dPrintApp.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Icarus", "Icarus.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/3dPrintApp/3dPrintApp.vbproj b/Icarus/Icarus.vbproj
similarity index 95%
rename from 3dPrintApp/3dPrintApp.vbproj
rename to Icarus/Icarus.vbproj
index b5828ec..e4b1545 100644
--- a/3dPrintApp/3dPrintApp.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -6,8 +6,8 @@
     <ProjectGuid>{BCDE0368-2C69-4948-8723-D0FE71417986}</ProjectGuid>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>_3dPrintApp</RootNamespace>
-    <AssemblyName>3dPrintApp</AssemblyName>
+    <RootNamespace>Icarus</RootNamespace>
+    <AssemblyName>Icarus</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <MyType>Custom</MyType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -30,7 +30,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>3dPrintApp.xml</DocumentationFile>
+    <DocumentationFile>Icarus.xml</DocumentationFile>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -39,7 +39,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>3dPrintApp.xml</DocumentationFile>
+    <DocumentationFile>Icarus.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -136,6 +136,10 @@
     </Compile>
     <Compile Include="MachiningManager\CurrMachiningPanelVM.vb" />
     <Compile Include="MachiningManager\Machining.vb" />
+    <Compile Include="MachSaveInDbWnd\MachSaveInDbWindowV.xaml.vb">
+      <DependentUpon>MachSaveInDbWindowV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MachSaveInDbWnd\MachSaveInDbWndVM.vb" />
     <Compile Include="MaterialDb\Material.vb" />
     <Compile Include="MaterialDb\MaterialDbV.xaml.vb">
       <DependentUpon>MaterialDbV.xaml</DependentUpon>
@@ -153,6 +157,10 @@
       <DependentUpon>RibPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="RibPanel\RibPanelVM.vb" />
+    <Compile Include="RibParamPanel\RibParamPanelV.xaml.vb">
+      <DependentUpon>RibParamPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RibParamPanel\RibParamPanelVM.vb" />
     <Compile Include="RightPanel\RightPanelV.xaml.vb">
       <DependentUpon>RightPanelV.xaml</DependentUpon>
     </Compile>
@@ -255,6 +263,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MachSaveInDbWnd\MachSaveInDbWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -287,6 +299,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="RibParamPanel\RibParamPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="RightPanel\RightPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -493,9 +509,12 @@
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\Rotate.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\Extrude.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\3dPrintApp\3dPrintAppR64.exe
-IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\3dPrintApp\3dPrintAppD64.exe</PostBuildEvent>
+    <PostBuildEvent>IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR64.exe
+IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Icarus\IcarusD64.exe</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/3dPrintApp/ImportPanel/ImportPanelV.xaml b/Icarus/ImportPanel/ImportPanelV.xaml
similarity index 98%
rename from 3dPrintApp/ImportPanel/ImportPanelV.xaml
rename to Icarus/ImportPanel/ImportPanelV.xaml
index 12de09c..0677b1d 100644
--- a/3dPrintApp/ImportPanel/ImportPanelV.xaml
+++ b/Icarus/ImportPanel/ImportPanelV.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="ImportPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:_3dPrintApp"
+             xmlns:local="clr-namespace:Icarus"
              Width="150"
              Margin="5,0,0,0">
    <Grid DockPanel.Dock="Left">
diff --git a/3dPrintApp/ImportPanel/ImportPanelV.xaml.vb b/Icarus/ImportPanel/ImportPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ImportPanel/ImportPanelV.xaml.vb
rename to Icarus/ImportPanel/ImportPanelV.xaml.vb
diff --git a/3dPrintApp/ImportPanel/ImportPanelVM.vb b/Icarus/ImportPanel/ImportPanelVM.vb
similarity index 98%
rename from 3dPrintApp/ImportPanel/ImportPanelVM.vb
rename to Icarus/ImportPanel/ImportPanelVM.vb
index a66bbc1..9efec75 100644
--- a/3dPrintApp/ImportPanel/ImportPanelVM.vb
+++ b/Icarus/ImportPanel/ImportPanelVM.vb
@@ -211,7 +211,9 @@ Public Class ImportPanelVM
       Else
          ' Creo pezzi e layer necessari
          For Each ImportPart In m_ImportPartList
-            Dim nPartId As Integer = EgtCreateGroup(GDB_ID.ROOT)
+            Dim frImportedPart As New Frame3d
+            EgtGetGroupGlobFrame(m_nImportedPartId, frImportedPart)
+            Dim nPartId As Integer = EgtCreateGroup(GDB_ID.ROOT, frImportedPart)
             EgtSetName(nPartId, PART)
             Dim nFrameId As Integer = GDB_ID.NULL
             Dim b3PrintSolid As New BBox3d
diff --git a/3dPrintApp/ImportPanel/ImportUtility.vb b/Icarus/ImportPanel/ImportUtility.vb
similarity index 100%
rename from 3dPrintApp/ImportPanel/ImportUtility.vb
rename to Icarus/ImportPanel/ImportUtility.vb
diff --git a/3dPrintApp/ImportWnd/ImportSceneHostV.xaml b/Icarus/ImportWnd/ImportSceneHostV.xaml
similarity index 100%
rename from 3dPrintApp/ImportWnd/ImportSceneHostV.xaml
rename to Icarus/ImportWnd/ImportSceneHostV.xaml
diff --git a/3dPrintApp/ImportWnd/ImportSceneHostV.xaml.vb b/Icarus/ImportWnd/ImportSceneHostV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ImportWnd/ImportSceneHostV.xaml.vb
rename to Icarus/ImportWnd/ImportSceneHostV.xaml.vb
diff --git a/3dPrintApp/ImportWnd/ImportSceneHostVM.vb b/Icarus/ImportWnd/ImportSceneHostVM.vb
similarity index 100%
rename from 3dPrintApp/ImportWnd/ImportSceneHostVM.vb
rename to Icarus/ImportWnd/ImportSceneHostVM.vb
diff --git a/3dPrintApp/ImportWnd/ImportWndV.xaml b/Icarus/ImportWnd/ImportWndV.xaml
similarity index 95%
rename from 3dPrintApp/ImportWnd/ImportWndV.xaml
rename to Icarus/ImportWnd/ImportWndV.xaml
index baa7325..136b7dd 100644
--- a/3dPrintApp/ImportWnd/ImportWndV.xaml
+++ b/Icarus/ImportWnd/ImportWndV.xaml
@@ -2,7 +2,7 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:local="clr-namespace:_3dPrintApp">
+                            xmlns:local="clr-namespace:Icarus">
    <DockPanel>
       <Grid DockPanel.Dock="Left">
          <Grid.RowDefinitions>
diff --git a/3dPrintApp/ImportWnd/ImportWndV.xaml.vb b/Icarus/ImportWnd/ImportWndV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ImportWnd/ImportWndV.xaml.vb
rename to Icarus/ImportWnd/ImportWndV.xaml.vb
diff --git a/3dPrintApp/ImportWnd/ImportWndVM.vb b/Icarus/ImportWnd/ImportWndVM.vb
similarity index 100%
rename from 3dPrintApp/ImportWnd/ImportWndVM.vb
rename to Icarus/ImportWnd/ImportWndVM.vb
diff --git a/3dPrintApp/InstrumentPanel/InstrumentPanelV.xaml b/Icarus/InstrumentPanel/InstrumentPanelV.xaml
similarity index 100%
rename from 3dPrintApp/InstrumentPanel/InstrumentPanelV.xaml
rename to Icarus/InstrumentPanel/InstrumentPanelV.xaml
diff --git a/3dPrintApp/InstrumentPanel/InstrumentPanelV.xaml.vb b/Icarus/InstrumentPanel/InstrumentPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/InstrumentPanel/InstrumentPanelV.xaml.vb
rename to Icarus/InstrumentPanel/InstrumentPanelV.xaml.vb
diff --git a/3dPrintApp/InstrumentPanel/MyInstrumentPanelVM.vb b/Icarus/InstrumentPanel/MyInstrumentPanelVM.vb
similarity index 100%
rename from 3dPrintApp/InstrumentPanel/MyInstrumentPanelVM.vb
rename to Icarus/InstrumentPanel/MyInstrumentPanelVM.vb
diff --git a/3dPrintApp/LeftPanel/LeftPanelV.xaml b/Icarus/LeftPanel/LeftPanelV.xaml
similarity index 96%
rename from 3dPrintApp/LeftPanel/LeftPanelV.xaml
rename to Icarus/LeftPanel/LeftPanelV.xaml
index e1f526d..0c9e084 100644
--- a/3dPrintApp/LeftPanel/LeftPanelV.xaml
+++ b/Icarus/LeftPanel/LeftPanelV.xaml
@@ -2,7 +2,7 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-            xmlns:PrintApp="clr-namespace:_3dPrintApp"
+            xmlns:PrintApp="clr-namespace:Icarus"
             Margin="5">
    <TabControl SelectedIndex="{Binding SelPanel}"
                Background="Transparent"
diff --git a/3dPrintApp/LeftPanel/LeftPanelV.xaml.vb b/Icarus/LeftPanel/LeftPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/LeftPanel/LeftPanelV.xaml.vb
rename to Icarus/LeftPanel/LeftPanelV.xaml.vb
diff --git a/3dPrintApp/LeftPanel/LeftPanelVM.vb b/Icarus/LeftPanel/LeftPanelVM.vb
similarity index 100%
rename from 3dPrintApp/LeftPanel/LeftPanelVM.vb
rename to Icarus/LeftPanel/LeftPanelVM.vb
diff --git a/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml
new file mode 100644
index 0000000..fec8a2f
--- /dev/null
+++ b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml
@@ -0,0 +1,50 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="MachSaveInDbWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Title="Machining Param Name" 
+                            Height="150" Width="300"
+                            WindowStartupLocation="CenterOwner"
+                            Icon="/Resources/EgtBEAMWALL.ico"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            ShowInTaskbar="False"
+                            IsMinimizable="False">
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="10"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <TextBlock Grid.Column="1"
+                 Grid.Row="1"
+                 Text="Name"
+                 Margin="0,0,10,0"
+                 Style="{Binding OptionTextBlock}"/>
+      <EgtWPFLib5:EgtTextBox Grid.Column="2"
+                             Grid.Row="1"
+                             Width="180"
+                             Text="{Binding sName}"
+                             Style="{StaticResource LeftPanel_TextBox}"/>
+      <UniformGrid Grid.Column="1"
+                   Grid.ColumnSpan="2"
+                   Grid.Row="3" 
+                   Rows="1">
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Style="{StaticResource ToolBar_TextButton}"/>
+         <Button Content="Cancel"
+                 Command="{Binding Cancel_Command}"
+                 Style="{StaticResource ToolBar_TextButton}"/>
+      </UniformGrid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>
diff --git a/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml.vb b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml.vb
new file mode 100644
index 0000000..5533aac
--- /dev/null
+++ b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml.vb
@@ -0,0 +1,18 @@
+Public Class MachSaveInDbWndV
+
+   Private WithEvents m_MachSaveInDbWndVM As MachSaveInDbWndVM
+
+   Sub New(Owner As Window, MachSaveInDbWndVM As MachSaveInDbWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = MachSaveInDbWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_MachSaveInDbWndVM = MachSaveInDbWndVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachSaveInDbWndVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class
diff --git a/Icarus/MachSaveInDbWnd/MachSaveInDbWndVM.vb b/Icarus/MachSaveInDbWnd/MachSaveInDbWndVM.vb
new file mode 100644
index 0000000..be4eb59
--- /dev/null
+++ b/Icarus/MachSaveInDbWnd/MachSaveInDbWndVM.vb
@@ -0,0 +1,78 @@
+Imports EgtWPFLib5
+
+Public Class MachSaveInDbWndVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+
+   Private m_sOrigName As String
+
+   Private m_sName As String
+   Public Property sName As String
+      Get
+         Return m_sName
+      End Get
+      Set(value As String)
+         m_sName = value
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTORS"
+
+   Sub New(sOrigName As String)
+      m_sOrigName = sOrigName
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      If Map.refTopPanelVM.MachiningList.Any(Function(x As MachiningIndex) x.sName = m_sName) Then
+         MessageBox.Show("Name already used in Db! Please insert a different name.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         Return
+      End If
+      RaiseEvent m_CloseWindow(True)
+   End Sub
+
+#End Region    ' Ok
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      RaiseEvent m_CloseWindow(False)
+   End Sub
+
+#End Region    ' Cancel
+
+#End Region    ' COMMANDS
+
+End Class
diff --git a/3dPrintApp/MachinePanel/MachinePanelV.xaml b/Icarus/MachinePanel/MachinePanelV.xaml
similarity index 100%
rename from 3dPrintApp/MachinePanel/MachinePanelV.xaml
rename to Icarus/MachinePanel/MachinePanelV.xaml
diff --git a/3dPrintApp/MachinePanel/MachinePanelV.xaml.vb b/Icarus/MachinePanel/MachinePanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/MachinePanel/MachinePanelV.xaml.vb
rename to Icarus/MachinePanel/MachinePanelV.xaml.vb
diff --git a/3dPrintApp/MachinePanel/MachinePanelVM.vb b/Icarus/MachinePanel/MachinePanelVM.vb
similarity index 100%
rename from 3dPrintApp/MachinePanel/MachinePanelVM.vb
rename to Icarus/MachinePanel/MachinePanelVM.vb
diff --git a/3dPrintApp/MachiningDb/MachiningDbV.xaml b/Icarus/MachiningDb/MachiningDbV.xaml
similarity index 99%
rename from 3dPrintApp/MachiningDb/MachiningDbV.xaml
rename to Icarus/MachiningDb/MachiningDbV.xaml
index ac29966..013e1dd 100644
--- a/3dPrintApp/MachiningDb/MachiningDbV.xaml
+++ b/Icarus/MachiningDb/MachiningDbV.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp"
+             xmlns:PrintApp="clr-namespace:Icarus"
              Width="300">
    <Border VerticalAlignment="Center"
            Style="{StaticResource RightPanel_Border}">
diff --git a/3dPrintApp/MachiningDb/MachiningDbV.xaml.vb b/Icarus/MachiningDb/MachiningDbV.xaml.vb
similarity index 100%
rename from 3dPrintApp/MachiningDb/MachiningDbV.xaml.vb
rename to Icarus/MachiningDb/MachiningDbV.xaml.vb
diff --git a/3dPrintApp/MachiningDb/MachiningDbVM.vb b/Icarus/MachiningDb/MachiningDbVM.vb
similarity index 81%
rename from 3dPrintApp/MachiningDb/MachiningDbVM.vb
rename to Icarus/MachiningDb/MachiningDbVM.vb
index ecc9c5a..0463316 100644
--- a/3dPrintApp/MachiningDb/MachiningDbVM.vb
+++ b/Icarus/MachiningDb/MachiningDbVM.vb
@@ -21,29 +21,35 @@ Public Class MachiningDbVM
          Return m_SelMachining
       End Get
       Set(value As Machining)
-         ' verifico se modificato
-         If m_SelMachining.bIsModified Then
-            ' chiedo se salvare
-            Select Case MessageBox.Show("Salvare le modifiche apportate alla lavorazione selezionata?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
-               Case MessageBoxResult.Yes
-                  m_SelMachining.Save()
-               Case MessageBoxResult.No
-                  m_SelMachining.ResetModification()
-               Case MessageBoxResult.Cancel
-                  NotifyPropertyChanged(NameOf(SelMachining))
-                  Return
-            End Select
-         End If
-         ' recupero stato IsExpanded di tutte le categorie
          Dim IsExpandedList As New List(Of Boolean)
-         For Each Cathegory In m_SelMachining.CathegoryList
-            IsExpandedList.Add(Cathegory.Cathegory_IsExpanded)
-         Next
+         If Not IsNothing(m_SelMachining) Then
+            ' verifico se modificato
+            If m_SelMachining.bIsModified Then
+               ' chiedo se salvare
+               Select Case MessageBox.Show("Salvare le modifiche apportate alla lavorazione selezionata?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+                  Case MessageBoxResult.Yes
+                     m_SelMachining.Save()
+                  Case MessageBoxResult.No
+                     m_SelMachining.ResetModification()
+                  Case MessageBoxResult.Cancel
+                     NotifyPropertyChanged(NameOf(SelMachining))
+                     Return
+               End Select
+            End If
+            ' recupero stato IsExpanded di tutte le categorie
+            For Each Cathegory In m_SelMachining.CathegoryList
+               IsExpandedList.Add(Cathegory.Cathegory_IsExpanded)
+            Next
+         End If
          m_SelMachining = value
          ' ripristino stato IsExpanded di tutte le categorie
-         For Index = 0 To m_SelMachining.CathegoryList.Count - 1
-            m_SelMachining.CathegoryList(Index).Cathegory_IsExpanded = IsExpandedList(Index)
-         Next
+         If Not IsNothing(m_SelMachining) Then
+            For Index = 0 To m_SelMachining.CathegoryList.Count - 1
+               If IsExpandedList.Count() >= Index + 1 Then
+                  m_SelMachining.CathegoryList(Index).Cathegory_IsExpanded = IsExpandedList(Index)
+               End If
+            Next
+         End If
       End Set
    End Property
 
@@ -90,7 +96,7 @@ Public Class MachiningDbVM
 
 #Region "METHODS"
 
-   Private Sub Init()
+   Friend Sub Init()
       Dim sMachiningIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"
       MachiningList.Clear()
       Dim nIndex As Integer = 1
@@ -102,7 +108,7 @@ Public Class MachiningDbVM
       End While
       Dim sCurrMachining As String = ""
       GetMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, "", sCurrMachining)
-      m_SelMachining = MachiningList.FirstOrDefault(Function(x) x.sName = sCurrMachining)
+      m_SelMachining = MachiningList.FirstOrDefault(Function(x) x.sGUID = sCurrMachining)
    End Sub
 
 #End Region    ' METHODS
@@ -123,7 +129,7 @@ Public Class MachiningDbVM
    Public Sub Ok()
       If m_SelMachining.bIsModified Then
          ' chiedo se salvare
-         Select Case MessageBox.Show("Salvare le modifiche apportate alla lavorazione selezionata?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+         Select Case MessageBox.Show("Do you want to save modified parameters?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
             Case MessageBoxResult.Yes
                m_SelMachining.Save()
             Case MessageBoxResult.No
diff --git a/3dPrintApp/MachiningManager/CurrMachining - Copy.vb b/Icarus/MachiningManager/CurrMachining - Copy.vb
similarity index 100%
rename from 3dPrintApp/MachiningManager/CurrMachining - Copy.vb
rename to Icarus/MachiningManager/CurrMachining - Copy.vb
diff --git a/3dPrintApp/MachiningManager/CurrMachining.vb b/Icarus/MachiningManager/CurrMachining.vb
similarity index 99%
rename from 3dPrintApp/MachiningManager/CurrMachining.vb
rename to Icarus/MachiningManager/CurrMachining.vb
index 68991a1..f09c687 100644
--- a/3dPrintApp/MachiningManager/CurrMachining.vb
+++ b/Icarus/MachiningManager/CurrMachining.vb
@@ -658,7 +658,12 @@ Public Class CurrMachining
       EgtGetInfo(nPartId, MAC_GUID, m_sCurrGUID)
       If Not String.IsNullOrWhiteSpace(m_sCurrGUID) Then
          Dim CurrMachiningInDb As MachiningIndex = Map.refTopPanelVM.MachiningList.FirstOrDefault(Function(x) x.sGUID = m_sCurrGUID)
-         m_nIndex = CurrMachiningInDb.nIndex
+         If IsNothing(CurrMachiningInDb) Then
+            MessageBox.Show("Machining not found in Db!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            m_nIndex = 0
+         Else
+            m_nIndex = CurrMachiningInDb.nIndex
+         End If
       Else
          m_nIndex = 0
       End If
diff --git a/3dPrintApp/MachiningManager/CurrMachiningPanelV - Copy.xaml b/Icarus/MachiningManager/CurrMachiningPanelV - Copy.xaml
similarity index 99%
rename from 3dPrintApp/MachiningManager/CurrMachiningPanelV - Copy.xaml
rename to Icarus/MachiningManager/CurrMachiningPanelV - Copy.xaml
index 894c15e..276971d 100644
--- a/3dPrintApp/MachiningManager/CurrMachiningPanelV - Copy.xaml	
+++ b/Icarus/MachiningManager/CurrMachiningPanelV - Copy.xaml	
@@ -1,7 +1,7 @@
 <UserControl x:Class="CurrMachiningPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp">
+             xmlns:PrintApp="clr-namespace:Icarus">
    <Border VerticalAlignment="Center" 
            Style="{StaticResource RightPanel_Border}">
       <Grid>
diff --git a/3dPrintApp/MachiningManager/CurrMachiningPanelV - Copy.xaml.vb b/Icarus/MachiningManager/CurrMachiningPanelV - Copy.xaml.vb
similarity index 100%
rename from 3dPrintApp/MachiningManager/CurrMachiningPanelV - Copy.xaml.vb
rename to Icarus/MachiningManager/CurrMachiningPanelV - Copy.xaml.vb
diff --git a/3dPrintApp/MachiningManager/CurrMachiningPanelV.xaml b/Icarus/MachiningManager/CurrMachiningPanelV.xaml
similarity index 96%
rename from 3dPrintApp/MachiningManager/CurrMachiningPanelV.xaml
rename to Icarus/MachiningManager/CurrMachiningPanelV.xaml
index 8aa0dda..ac72a16 100644
--- a/3dPrintApp/MachiningManager/CurrMachiningPanelV.xaml
+++ b/Icarus/MachiningManager/CurrMachiningPanelV.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="CurrMachiningPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp"
+             xmlns:PrintApp="clr-namespace:Icarus"
              Width="300">
    <Border VerticalAlignment="Center" 
            Style="{StaticResource RightPanel_Border}">
@@ -41,7 +41,7 @@
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding sName}"/>
                                     <TextBox Grid.Column="1"
-                                                           Text="{Binding dValue}"/>
+                                             Text="{Binding dValue}"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
@@ -132,6 +132,9 @@
             <Button Content="Cancel"
                     Command="{Binding Cancel_Command}"
                     Style="{StaticResource ToolBar_TextButton}"/>
+            <Button Content="Save in Db"
+                    Command="{Binding SaveInDb_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
          </UniformGrid>
       </Grid>
    </Border>
diff --git a/3dPrintApp/MachiningManager/CurrMachiningPanelV.xaml.vb b/Icarus/MachiningManager/CurrMachiningPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/MachiningManager/CurrMachiningPanelV.xaml.vb
rename to Icarus/MachiningManager/CurrMachiningPanelV.xaml.vb
diff --git a/3dPrintApp/MachiningManager/CurrMachiningPanelVM - Copy.vb b/Icarus/MachiningManager/CurrMachiningPanelVM - Copy.vb
similarity index 100%
rename from 3dPrintApp/MachiningManager/CurrMachiningPanelVM - Copy.vb
rename to Icarus/MachiningManager/CurrMachiningPanelVM - Copy.vb
diff --git a/Icarus/MachiningManager/CurrMachiningPanelVM.vb b/Icarus/MachiningManager/CurrMachiningPanelVM.vb
new file mode 100644
index 0000000..ad60544
--- /dev/null
+++ b/Icarus/MachiningManager/CurrMachiningPanelVM.vb
@@ -0,0 +1,142 @@
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class CurrMachiningPanelVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_CurrMachining As CurrMachining
+   Public ReadOnly Property CurrMachining As CurrMachining
+      Get
+         Return m_CurrMachining
+      End Get
+   End Property
+   Friend Sub SetCurrMachining(CurrMachining As CurrMachining)
+      m_CurrMachining = CurrMachining
+      NotifyPropertyChanged(NameOf(CurrMachining))
+      Map.refTopPanelVM.UpdateCurrMachining()
+   End Sub
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+   Private m_cmdSaveInDb As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTORS"
+
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefCurrMachiningPanelVM(Me)
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+   Friend Sub ReadMachParamFromSelPart()
+      If IsNothing(Map.refTopPanelVM.SelPart) Then Return
+      Dim nData As Integer = 0
+      m_CurrMachining = New CurrMachining(Map.refTopPanelVM.SelPart.nPartId)
+      SetCurrMachining(m_CurrMachining)
+      ' aggiorno parametri mostrati nella barra
+      NotifyPropertyChanged(NameOf(CurrMachining))
+      Map.refTopPanelVM.UpdateCurrMachining()
+   End Sub
+
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      ' scrivo i parametri modificati
+      m_CurrMachining.WriteCurrParamInPart(Map.refTopPanelVM.SelPart.nPartId)
+      ' ripristino modalita' standard
+      Map.refTopPanelVM.SelPage = Pages.MODIFY
+   End Sub
+
+#End Region    ' Ok
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      ' ripristino modalita' standard
+      Map.refTopPanelVM.SelPage = Pages.MODIFY
+   End Sub
+
+#End Region    ' Cancel
+
+#Region "SaveInDb"
+
+   Public ReadOnly Property SaveInDb_Command As ICommand
+      Get
+         If m_cmdSaveInDb Is Nothing Then
+            m_cmdSaveInDb = New Command(AddressOf SaveInDb)
+         End If
+         Return m_cmdSaveInDb
+      End Get
+   End Property
+
+   Public Sub SaveInDb()
+      If IsNothing(m_CurrMachining) Then Return
+      ' apro finestra di scelta nome
+      Dim SaveInDbWndVM As New MachSaveInDbWndVM(Map.refTopPanelVM.SelMachining.sName)
+      Dim SaveInDbWndV As New MachSaveInDbWndV(Application.Current.MainWindow, SaveInDbWndVM)
+      If SaveInDbWndV.ShowDialog Then
+         ' recupero primo indice libero
+         Dim sMachiningIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"
+         Dim nIndex As Integer = 1
+         Dim sGUID As String = ""
+         While GetPrivateProfileString(nIndex, MAC_GUID, "", sGUID, sMachiningIniFilePath) > 0
+            nIndex += 1
+         End While
+         Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"
+         Dim sNewMachGUID As String = Guid.NewGuid.ToString()
+         WritePrivateProfileString(nIndex, MAC_GUID, sNewMachGUID, sMacIniFilePath)
+         WritePrivateProfileString(nIndex, MAC_NAME, SaveInDbWndVM.sName, sMacIniFilePath)
+         ' creo categoria materiali con attivo materiale corrente
+         Dim MaterialCathegory As New MachiningCathegory(MachiningCathegory.Cathegories.MATERIALS, 0)
+         Dim SelMaterialParam As MaterialMachiningParam = MaterialCathegory.MachiningParamList.FirstOrDefault(Function(x As MaterialMachiningParam) x.sGUID = Map.refTopPanelVM.SelMaterial.sGUID)
+         If Not IsNothing(SelMaterialParam) Then
+            SelMaterialParam.bValue = True
+         End If
+         ' aggiungo categoria materiali a lavorazione corrente
+         m_CurrMachining.CathegoryList.Add(MaterialCathegory)
+         ' scrivo parametri nuova lavorazione in Db
+         For Each Cathegory In m_CurrMachining.CathegoryList
+            Cathegory.WriteParamOnDb(nIndex)
+         Next
+         ' ricarico lista lavorazioni top panel e db
+         Map.refTopPanelVM.InitMachiningsList()
+         Map.refMachiningDbVM.Init()
+         ' seleziono quella appena creata
+         Map.refTopPanelVM.SelMachining = Map.refTopPanelVM.MachiningList.FirstOrDefault(Function(x) x.sGUID = sNewMachGUID)
+         Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refTopPanelVM.SelMachining))
+      End If
+   End Sub
+
+#End Region    ' SaveInDb
+
+#End Region    ' COMMANDS
+
+End Class
+
diff --git a/3dPrintApp/MachiningManager/Machining - Copy.vb b/Icarus/MachiningManager/Machining - Copy.vb
similarity index 100%
rename from 3dPrintApp/MachiningManager/Machining - Copy.vb
rename to Icarus/MachiningManager/Machining - Copy.vb
diff --git a/3dPrintApp/MachiningManager/Machining.vb b/Icarus/MachiningManager/Machining.vb
similarity index 99%
rename from 3dPrintApp/MachiningManager/Machining.vb
rename to Icarus/MachiningManager/Machining.vb
index 3725720..1f79fb1 100644
--- a/3dPrintApp/MachiningManager/Machining.vb
+++ b/Icarus/MachiningManager/Machining.vb
@@ -580,6 +580,10 @@ Public Class NumericMachiningParam
       End Get
    End Property
 
+   Sub New(Type As Params)
+      MyBase.New(Type)
+   End Sub
+
    Sub New(Type As Params, nIndex As Integer)
       MyBase.New(Type)
       Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"
diff --git a/3dPrintApp/MainWindow.xaml b/Icarus/MainWindow.xaml
similarity index 90%
rename from 3dPrintApp/MainWindow.xaml
rename to Icarus/MainWindow.xaml
index 6d76522..819c1e4 100644
--- a/3dPrintApp/MainWindow.xaml
+++ b/Icarus/MainWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:_3dPrintApp"
+        xmlns:local="clr-namespace:Icarus"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>
diff --git a/3dPrintApp/MainWindow.xaml.vb b/Icarus/MainWindow.xaml.vb
similarity index 100%
rename from 3dPrintApp/MainWindow.xaml.vb
rename to Icarus/MainWindow.xaml.vb
diff --git a/3dPrintApp/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb
similarity index 98%
rename from 3dPrintApp/MainWindow/MainWindowM.vb
rename to Icarus/MainWindow/MainWindowM.vb
index b8daf65..870a524 100644
--- a/3dPrintApp/MainWindow/MainWindowM.vb
+++ b/Icarus/MainWindow/MainWindowM.vb
@@ -259,7 +259,7 @@ Public Class MainWindowM
    Private Sub ManageInstance()
       Dim bCreated As Boolean
       Try
-         m_objMutex = New Mutex(False, "Global\3dPrintApp", bCreated)
+         m_objMutex = New Mutex(False, "Global\Icarus", bCreated)
       Catch
          bCreated = False
       End Try
@@ -285,7 +285,7 @@ Public Class MainWindowM
             ' porto in primo piano la prima istanza
             Dim bFound As Boolean = False
             ' processi del programma a 32 bit
-            Dim localProc As Process() = Process.GetProcessesByName("3dPrintAppR32")
+            Dim localProc As Process() = Process.GetProcessesByName("IcarusR32")
             For Each p As Process In localProc
                If p.Id <> Process.GetCurrentProcess().Id Then
                   bFound = True
@@ -295,7 +295,7 @@ Public Class MainWindowM
             Next
             ' se non trovati processi a 32 bit provo a 64 bit
             If Not bFound Then
-               localProc = Process.GetProcessesByName("3dPrintAppR64")
+               localProc = Process.GetProcessesByName("IcarusR64")
                For Each p As Process In localProc
                   If p.Id <> Process.GetCurrentProcess().Id Then
                      bFound = True
diff --git a/3dPrintApp/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml
similarity index 95%
rename from 3dPrintApp/MainWindow/MainWindowV.xaml
rename to Icarus/MainWindow/MainWindowV.xaml
index 1ebb7f7..0d6412c 100644
--- a/3dPrintApp/MainWindow/MainWindowV.xaml
+++ b/Icarus/MainWindow/MainWindowV.xaml
@@ -2,7 +2,7 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:PrintApp="clr-namespace:_3dPrintApp"
+                            xmlns:PrintApp="clr-namespace:Icarus"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             Foreground="Black"
                             Title="Buongiorno" Icon="/Resources/EgtBEAMWALL.ico"
diff --git a/3dPrintApp/MainWindow/MainWindowV.xaml.vb b/Icarus/MainWindow/MainWindowV.xaml.vb
similarity index 100%
rename from 3dPrintApp/MainWindow/MainWindowV.xaml.vb
rename to Icarus/MainWindow/MainWindowV.xaml.vb
diff --git a/3dPrintApp/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb
similarity index 86%
rename from 3dPrintApp/MainWindow/MainWindowVM.vb
rename to Icarus/MainWindow/MainWindowVM.vb
index 4f5495c..405f904 100644
--- a/3dPrintApp/MainWindow/MainWindowVM.vb
+++ b/Icarus/MainWindow/MainWindowVM.vb
@@ -178,20 +178,40 @@ Public Class MainWindowVM
    Friend Sub KeyDown(PressedKey As Key)
       ' Con ESC esco dall'azione corrente
       If PressedKey = Key.Escape Then
-         ' reset Azione corrente
-         Map.refSceneHostVM.MainController.ResetStatus()
-         If Not (Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage AndAlso
-            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS) AndAlso
-            Map.refRibPanelVM.bIsCreatingPath Then
+         ' resetto sempre input box a meno che non sia nelle ribs e stia creando il percorso
+         If Not (Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage = Pages.MODIFY AndAlso
+            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS AndAlso
+            Map.refRibPanelVM.bIsCreatingPath) Then
             Map.refControllerInputPanelVM.ResetInputBox()
          End If
-         ' se misura attiva, la disattivo
-         If Map.refInstrumentPanelVM.GetDistIsChecked Then
-            Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
+         If Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage = Pages.MODIFY AndAlso
+            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS Then
+            Dim nNewExtrusionLayerId As Integer = GDB_ID.NULL
+            ' cancello eventuali layer di modifica
+            If Not IsNothing(Map.refTopPanelVM.SelPart) AndAlso Not Map.refRibPanelVM.bIsCreatingPath Then
+               nNewExtrusionLayerId = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWEXTRUSION)
+               If nNewExtrusionLayerId <> GDB_ID.NULL Then
+                  EgtErase(nNewExtrusionLayerId)
+               End If
+               Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWRIB)
+               If nNewRibLayerId <> GDB_ID.NULL Then
+                  EgtErase(nNewRibLayerId)
+               End If
+            End If
+            ' annullo trasparenza attivata durante edit rib
+            If Not IsNothing(Map.refRibPanelVM.SelRib) Then
+               EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
+            End If
+         End If
+         ' reset Azione corrente
+         Map.refSceneHostVM.MainController.ResetStatus()
+            ' se misura attiva, la disattivo
+            If Map.refInstrumentPanelVM.GetDistIsChecked Then
+               Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
+            End If
+            ' pulisco output
+            Map.refMyStatusBarVM.ClearOutputMessage()
          End If
-         ' pulisco output
-         Map.refMyStatusBarVM.ClearOutputMessage()
-      End If
    End Sub
 
    '   Friend m_ManagingSupervisorStop As Boolean = False
diff --git a/3dPrintApp/MaterialDb/Material.vb b/Icarus/MaterialDb/Material.vb
similarity index 98%
rename from 3dPrintApp/MaterialDb/Material.vb
rename to Icarus/MaterialDb/Material.vb
index e7a0706..e02c394 100644
--- a/3dPrintApp/MaterialDb/Material.vb
+++ b/Icarus/MaterialDb/Material.vb
@@ -152,7 +152,7 @@ Public Class Material
       m_nIndex = nIndex
       Dim sMatIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
       GetPrivateProfileString(nIndex, MAT_GUID, "", m_sGUID, sMatIniFilePath)
-      GetPrivateProfileString(nIndex, MAT_NAME, "", m_sName, sMatIniFilePath)
+      EgtGetStringUtf8FromIni(nIndex, MAT_NAME, "", m_sName, sMatIniFilePath)
       m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.GENERAL, nIndex))
       m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.TEMPERATURES, nIndex))
       m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.CONSTANT, nIndex))
@@ -279,8 +279,8 @@ Public Class Material
 
    Friend Sub WriteParamsOnDb(nIndex As Integer)
       Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
-      WritePrivateProfileString(nIndex, MAC_GUID, m_sGUID, sMacIniFilePath)
-      WritePrivateProfileString(nIndex, MAC_NAME, m_sName, sMacIniFilePath)
+      WritePrivateProfileString(nIndex, MAT_GUID, m_sGUID, sMacIniFilePath)
+      EgtWriteStringUtf8toIni(nIndex, MAT_NAME, m_sName, sMacIniFilePath)
       For Each Cathegory In m_CathegoryList
          Cathegory.WriteParamOnDb(nIndex)
       Next
@@ -754,8 +754,7 @@ Public Class StringMaterialParam
                Dim OrigMaterial As MaterialIndex = Map.refTopPanelVM.MaterialList.FirstOrDefault(Function(x) x.sGUID = sOrigGUID)
                If Not IsNothing(OrigMaterial) Then
                   m_sGUID = OrigMaterial.sGUID
-                  Dim bytes() = Encoding.Default.GetBytes(OrigMaterial.sName)
-                  m_sValue = Encoding.UTF8.GetString(bytes)
+                  m_sValue = OrigMaterial.sName
                   '    m_sValue = OrigMaterial.sName
                End If
                m_String_Visibility = Visibility.Visible
diff --git a/3dPrintApp/MaterialDb/MaterialDbV.xaml b/Icarus/MaterialDb/MaterialDbV.xaml
similarity index 99%
rename from 3dPrintApp/MaterialDb/MaterialDbV.xaml
rename to Icarus/MaterialDb/MaterialDbV.xaml
index 411fee5..ecab7ea 100644
--- a/3dPrintApp/MaterialDb/MaterialDbV.xaml
+++ b/Icarus/MaterialDb/MaterialDbV.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp">
+             xmlns:PrintApp="clr-namespace:Icarus">
    <Border VerticalAlignment="Center"
            Style="{StaticResource RightPanel_Border}">
       <Grid>
diff --git a/3dPrintApp/MaterialDb/MaterialDbV.xaml.vb b/Icarus/MaterialDb/MaterialDbV.xaml.vb
similarity index 100%
rename from 3dPrintApp/MaterialDb/MaterialDbV.xaml.vb
rename to Icarus/MaterialDb/MaterialDbV.xaml.vb
diff --git a/3dPrintApp/MaterialDb/MaterialDbVM.vb b/Icarus/MaterialDb/MaterialDbVM.vb
similarity index 99%
rename from 3dPrintApp/MaterialDb/MaterialDbVM.vb
rename to Icarus/MaterialDb/MaterialDbVM.vb
index d338fff..a690d87 100644
--- a/3dPrintApp/MaterialDb/MaterialDbVM.vb
+++ b/Icarus/MaterialDb/MaterialDbVM.vb
@@ -102,7 +102,7 @@ Public Class MaterialDbVM
       End While
       Dim sCurrMaterial As String = ""
       GetMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, "", sCurrMaterial)
-      m_SelMaterial = MaterialList.FirstOrDefault(Function(x) x.sName = sCurrMaterial)
+      m_SelMaterial = MaterialList.FirstOrDefault(Function(x) x.sGUID = sCurrMaterial)
    End Sub
 
 #End Region    ' METHODS
diff --git a/3dPrintApp/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb
similarity index 96%
rename from 3dPrintApp/My Project/AssemblyInfo.vb
rename to Icarus/My Project/AssemblyInfo.vb
index f61215d..3cf0f28 100644
--- a/3dPrintApp/My Project/AssemblyInfo.vb	
+++ b/Icarus/My Project/AssemblyInfo.vb	
@@ -11,10 +11,10 @@ Imports System.Windows
 
 ' Review the values of the assembly attributes
 
-<Assembly: AssemblyTitle("_3dPrintApp")>
+<Assembly: AssemblyTitle("Icarus")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("_3dPrintApp")>
+<Assembly: AssemblyProduct("Icarus")>
 <Assembly: AssemblyCopyright("Copyright ©  2022")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
diff --git a/3dPrintApp/My Project/MyExtensions/MyWpfExtension.vb b/Icarus/My Project/MyExtensions/MyWpfExtension.vb
similarity index 100%
rename from 3dPrintApp/My Project/MyExtensions/MyWpfExtension.vb
rename to Icarus/My Project/MyExtensions/MyWpfExtension.vb
diff --git a/3dPrintApp/My Project/Resources.Designer.vb b/Icarus/My Project/Resources.Designer.vb
similarity index 100%
rename from 3dPrintApp/My Project/Resources.Designer.vb
rename to Icarus/My Project/Resources.Designer.vb
diff --git a/3dPrintApp/My Project/Resources.resx b/Icarus/My Project/Resources.resx
similarity index 100%
rename from 3dPrintApp/My Project/Resources.resx
rename to Icarus/My Project/Resources.resx
diff --git a/3dPrintApp/My Project/Settings.Designer.vb b/Icarus/My Project/Settings.Designer.vb
similarity index 95%
rename from 3dPrintApp/My Project/Settings.Designer.vb
rename to Icarus/My Project/Settings.Designer.vb
index 6e8e27f..031ec19 100644
--- a/3dPrintApp/My Project/Settings.Designer.vb	
+++ b/Icarus/My Project/Settings.Designer.vb	
@@ -64,9 +64,9 @@ Namespace My
    Friend Module MySettingsProperty
 
       <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
-      Friend ReadOnly Property Settings() As Global._3dPrintApp.My.MySettings
+      Friend ReadOnly Property Settings() As Global.Icarus.My.MySettings
          Get
-            Return Global._3dPrintApp.My.MySettings.Default
+            Return Global.Icarus.My.MySettings.Default
          End Get
       End Property
    End Module
diff --git a/3dPrintApp/My Project/Settings.settings b/Icarus/My Project/Settings.settings
similarity index 100%
rename from 3dPrintApp/My Project/Settings.settings
rename to Icarus/My Project/Settings.settings
diff --git a/3dPrintApp/ProjManager/ProjManagerV.xaml b/Icarus/ProjManager/ProjManagerV.xaml
similarity index 100%
rename from 3dPrintApp/ProjManager/ProjManagerV.xaml
rename to Icarus/ProjManager/ProjManagerV.xaml
diff --git a/3dPrintApp/ProjManager/ProjManagerV.xaml.vb b/Icarus/ProjManager/ProjManagerV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ProjManager/ProjManagerV.xaml.vb
rename to Icarus/ProjManager/ProjManagerV.xaml.vb
diff --git a/3dPrintApp/ProjManager/ProjManagerVM.vb b/Icarus/ProjManager/ProjManagerVM.vb
similarity index 100%
rename from 3dPrintApp/ProjManager/ProjManagerVM.vb
rename to Icarus/ProjManager/ProjManagerVM.vb
diff --git a/3dPrintApp/Project/ProjectV.xaml b/Icarus/Project/ProjectV.xaml
similarity index 85%
rename from 3dPrintApp/Project/ProjectV.xaml
rename to Icarus/Project/ProjectV.xaml
index 3cde4b3..5e6a188 100644
--- a/3dPrintApp/Project/ProjectV.xaml
+++ b/Icarus/Project/ProjectV.xaml
@@ -3,7 +3,7 @@
                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                                 xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                xmlns:PrintApp="clr-namespace:_3dPrintApp">
+                                xmlns:PrintApp="clr-namespace:Icarus">
    <!--<EgtFloating:EgtFloatingTray x:Name="PROJECTTOPTRAY" DockPanel.Dock="Top">
       -->
    <!--<EgtBEAMWALL:ProjManagerV DataContext="{StaticResource ProjManagerVM}"
@@ -33,26 +33,26 @@
                     Width="3"
                     HorizontalAlignment="Center" 
                     VerticalAlignment="Stretch"/>-->
-   <EgtFloating:EgtFloatingTray x:Name="SCENETOPTRAY" 
+   <!--<EgtFloating:EgtFloatingTray x:Name="SCENETOPTRAY" 
                                    DockPanel.Dock="Top"
                                    Background="Transparent">
       <WrapPanel Orientation="Horizontal" Width="{Binding ActualWidth, ElementName=TOPTRAY}">
          <PrintApp:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
-         <!--<EgtBEAMWALL:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
-                                        Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
+         --><!--<EgtBEAMWALL:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
+                                        Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>--><!--
          <PrintApp:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
          <PrintApp:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
-         <!--<EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
+         --><!--<EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
             <EgtBEAMWALL:FreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
-                                             Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
+                                             Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>--><!--
          <PrintApp:CurrLayerSliderV DataContext="{StaticResource CurrLayerSliderVM}"
                                     VerticalAlignment="Center"/>
          <PrintApp:Printing3DPanelV DataContext="{StaticResource Printing3DPanelVM}"/>
 
       </WrapPanel>
-   </EgtFloating:EgtFloatingTray>
+   </EgtFloating:EgtFloatingTray>-->
 
-   <Grid DockPanel.Dock="Top">
+   <Grid DockPanel.Dock="Top" Margin="0,20,0,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="0.5*"/>
          <ColumnDefinition Width="5*"/>
@@ -81,8 +81,31 @@
                                         DataContext="{StaticResource SliderManagerVM}"
                                         HorizontalAlignment="Center"/>
       <Grid DockPanel.Dock="Bottom"
-            HorizontalAlignment="Center">
-         <PrintApp:ControllerInputPanelV DataContext="{StaticResource ControllerInputPanelVM}"/>
+            HorizontalAlignment="Stretch">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Grid Width="50"/>
+         <PrintApp:ShowPanelV Grid.Column="1"
+                              DataContext="{StaticResource ShowPanelVM}"/>
+         <PrintApp:ControllerInputPanelV Grid.Column="3"
+                                         DataContext="{StaticResource ControllerInputPanelVM}"/>
+      </Grid>
+      <Grid DockPanel.Dock="Bottom"
+            HorizontalAlignment="Stretch">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <PrintApp:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
+         <PrintApp:InstrumentPanelV Grid.Column="1"
+                                    DataContext="{StaticResource InstrumentPanelVM}"/>
       </Grid>
    </DockPanel>
 
diff --git a/3dPrintApp/Project/ProjectV.xaml.vb b/Icarus/Project/ProjectV.xaml.vb
similarity index 100%
rename from 3dPrintApp/Project/ProjectV.xaml.vb
rename to Icarus/Project/ProjectV.xaml.vb
diff --git a/3dPrintApp/Project/ProjectVM.vb b/Icarus/Project/ProjectVM.vb
similarity index 100%
rename from 3dPrintApp/Project/ProjectVM.vb
rename to Icarus/Project/ProjectVM.vb
diff --git a/3dPrintApp/Resources/AboutBoxImage.png b/Icarus/Resources/AboutBoxImage.png
similarity index 100%
rename from 3dPrintApp/Resources/AboutBoxImage.png
rename to Icarus/Resources/AboutBoxImage.png
diff --git a/3dPrintApp/Resources/CALCPanel/ChooseMachine.png b/Icarus/Resources/CALCPanel/ChooseMachine.png
similarity index 100%
rename from 3dPrintApp/Resources/CALCPanel/ChooseMachine.png
rename to Icarus/Resources/CALCPanel/ChooseMachine.png
diff --git a/3dPrintApp/Resources/CALCPanel/Edit.png b/Icarus/Resources/CALCPanel/Edit.png
similarity index 100%
rename from 3dPrintApp/Resources/CALCPanel/Edit.png
rename to Icarus/Resources/CALCPanel/Edit.png
diff --git a/3dPrintApp/Resources/CALCPanel/ResetCalc.png b/Icarus/Resources/CALCPanel/ResetCalc.png
similarity index 100%
rename from 3dPrintApp/Resources/CALCPanel/ResetCalc.png
rename to Icarus/Resources/CALCPanel/ResetCalc.png
diff --git a/3dPrintApp/Resources/CALCPanel/Simulate.png b/Icarus/Resources/CALCPanel/Simulate.png
similarity index 100%
rename from 3dPrintApp/Resources/CALCPanel/Simulate.png
rename to Icarus/Resources/CALCPanel/Simulate.png
diff --git a/3dPrintApp/Resources/CALCPanel/Verify.png b/Icarus/Resources/CALCPanel/Verify.png
similarity index 100%
rename from 3dPrintApp/Resources/CALCPanel/Verify.png
rename to Icarus/Resources/CALCPanel/Verify.png
diff --git a/3dPrintApp/Resources/CALCPanel/VerifyAll.png b/Icarus/Resources/CALCPanel/VerifyAll.png
similarity index 100%
rename from 3dPrintApp/Resources/CALCPanel/VerifyAll.png
rename to Icarus/Resources/CALCPanel/VerifyAll.png
diff --git a/3dPrintApp/Resources/Configuration/MachiningsTable.png b/Icarus/Resources/Configuration/MachiningsTable.png
similarity index 100%
rename from 3dPrintApp/Resources/Configuration/MachiningsTable.png
rename to Icarus/Resources/Configuration/MachiningsTable.png
diff --git a/3dPrintApp/Resources/DrawPanel/AddPointCurve.png b/Icarus/Resources/DrawPanel/AddPointCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/AddPointCurve.png
rename to Icarus/Resources/DrawPanel/AddPointCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/ApproxCurve.png b/Icarus/Resources/DrawPanel/ApproxCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ApproxCurve.png
rename to Icarus/Resources/DrawPanel/ApproxCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/Arc3P.png b/Icarus/Resources/DrawPanel/Arc3P.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Arc3P.png
rename to Icarus/Resources/DrawPanel/Arc3P.png
diff --git a/3dPrintApp/Resources/DrawPanel/ArcCSE.png b/Icarus/Resources/DrawPanel/ArcCSE.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ArcCSE.png
rename to Icarus/Resources/DrawPanel/ArcCSE.png
diff --git a/3dPrintApp/Resources/DrawPanel/ArcFlip.png b/Icarus/Resources/DrawPanel/ArcFlip.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ArcFlip.png
rename to Icarus/Resources/DrawPanel/ArcFlip.png
diff --git a/3dPrintApp/Resources/DrawPanel/ArcPDP.png b/Icarus/Resources/DrawPanel/ArcPDP.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ArcPDP.png
rename to Icarus/Resources/DrawPanel/ArcPDP.png
diff --git a/3dPrintApp/Resources/DrawPanel/BreakCurve.png b/Icarus/Resources/DrawPanel/BreakCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/BreakCurve.png
rename to Icarus/Resources/DrawPanel/BreakCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/Chamfer.png b/Icarus/Resources/DrawPanel/Chamfer.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Chamfer.png
rename to Icarus/Resources/DrawPanel/Chamfer.png
diff --git a/3dPrintApp/Resources/DrawPanel/ChangeColor.png b/Icarus/Resources/DrawPanel/ChangeColor.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ChangeColor.png
rename to Icarus/Resources/DrawPanel/ChangeColor.png
diff --git a/3dPrintApp/Resources/DrawPanel/ChangeColorAlpha.png b/Icarus/Resources/DrawPanel/ChangeColorAlpha.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ChangeColorAlpha.png
rename to Icarus/Resources/DrawPanel/ChangeColorAlpha.png
diff --git a/3dPrintApp/Resources/DrawPanel/ChangeLayer.png b/Icarus/Resources/DrawPanel/ChangeLayer.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ChangeLayer.png
rename to Icarus/Resources/DrawPanel/ChangeLayer.png
diff --git a/3dPrintApp/Resources/DrawPanel/ChangeStart.png b/Icarus/Resources/DrawPanel/ChangeStart.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ChangeStart.png
rename to Icarus/Resources/DrawPanel/ChangeStart.png
diff --git a/3dPrintApp/Resources/DrawPanel/Circle3P.png b/Icarus/Resources/DrawPanel/Circle3P.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Circle3P.png
rename to Icarus/Resources/DrawPanel/Circle3P.png
diff --git a/3dPrintApp/Resources/DrawPanel/CircleCD.png b/Icarus/Resources/DrawPanel/CircleCD.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/CircleCD.png
rename to Icarus/Resources/DrawPanel/CircleCD.png
diff --git a/3dPrintApp/Resources/DrawPanel/CircleCP.png b/Icarus/Resources/DrawPanel/CircleCP.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/CircleCP.png
rename to Icarus/Resources/DrawPanel/CircleCP.png
diff --git a/3dPrintApp/Resources/DrawPanel/Delete.png b/Icarus/Resources/DrawPanel/Delete.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Delete.png
rename to Icarus/Resources/DrawPanel/Delete.png
diff --git a/3dPrintApp/Resources/DrawPanel/ExplodeCurve.png b/Icarus/Resources/DrawPanel/ExplodeCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ExplodeCurve.png
rename to Icarus/Resources/DrawPanel/ExplodeCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/ExplodeSurf.png b/Icarus/Resources/DrawPanel/ExplodeSurf.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ExplodeSurf.png
rename to Icarus/Resources/DrawPanel/ExplodeSurf.png
diff --git a/3dPrintApp/Resources/DrawPanel/ExtendCurve.png b/Icarus/Resources/DrawPanel/ExtendCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ExtendCurve.png
rename to Icarus/Resources/DrawPanel/ExtendCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/ExtractFacetLoops.png b/Icarus/Resources/DrawPanel/ExtractFacetLoops.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ExtractFacetLoops.png
rename to Icarus/Resources/DrawPanel/ExtractFacetLoops.png
diff --git a/3dPrintApp/Resources/DrawPanel/ExtractLoops.png b/Icarus/Resources/DrawPanel/ExtractLoops.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ExtractLoops.png
rename to Icarus/Resources/DrawPanel/ExtractLoops.png
diff --git a/3dPrintApp/Resources/DrawPanel/ExtractSurfFacet.png b/Icarus/Resources/DrawPanel/ExtractSurfFacet.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ExtractSurfFacet.png
rename to Icarus/Resources/DrawPanel/ExtractSurfFacet.png
diff --git a/3dPrintApp/Resources/DrawPanel/Extrude.png b/Icarus/Resources/DrawPanel/Extrude.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Extrude.png
rename to Icarus/Resources/DrawPanel/Extrude.png
diff --git a/3dPrintApp/Resources/DrawPanel/Fillet.png b/Icarus/Resources/DrawPanel/Fillet.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Fillet.png
rename to Icarus/Resources/DrawPanel/Fillet.png
diff --git a/3dPrintApp/Resources/DrawPanel/IntersectSurfSurf.png b/Icarus/Resources/DrawPanel/IntersectSurfSurf.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/IntersectSurfSurf.png
rename to Icarus/Resources/DrawPanel/IntersectSurfSurf.png
diff --git a/3dPrintApp/Resources/DrawPanel/InvertCurve.png b/Icarus/Resources/DrawPanel/InvertCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/InvertCurve.png
rename to Icarus/Resources/DrawPanel/InvertCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/InvertSurf.png b/Icarus/Resources/DrawPanel/InvertSurf.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/InvertSurf.png
rename to Icarus/Resources/DrawPanel/InvertSurf.png
diff --git a/3dPrintApp/Resources/DrawPanel/JoinCurve.png b/Icarus/Resources/DrawPanel/JoinCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/JoinCurve.png
rename to Icarus/Resources/DrawPanel/JoinCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/Line2P.png b/Icarus/Resources/DrawPanel/Line2P.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Line2P.png
rename to Icarus/Resources/DrawPanel/Line2P.png
diff --git a/3dPrintApp/Resources/DrawPanel/LinePDL.png b/Icarus/Resources/DrawPanel/LinePDL.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/LinePDL.png
rename to Icarus/Resources/DrawPanel/LinePDL.png
diff --git a/3dPrintApp/Resources/DrawPanel/LinearDimension.png b/Icarus/Resources/DrawPanel/LinearDimension.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/LinearDimension.png
rename to Icarus/Resources/DrawPanel/LinearDimension.png
diff --git a/3dPrintApp/Resources/DrawPanel/MergeSurf.png b/Icarus/Resources/DrawPanel/MergeSurf.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/MergeSurf.png
rename to Icarus/Resources/DrawPanel/MergeSurf.png
diff --git a/3dPrintApp/Resources/DrawPanel/Mirror.png b/Icarus/Resources/DrawPanel/Mirror.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Mirror.png
rename to Icarus/Resources/DrawPanel/Mirror.png
diff --git a/3dPrintApp/Resources/DrawPanel/Mirror3D.png b/Icarus/Resources/DrawPanel/Mirror3D.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Mirror3D.png
rename to Icarus/Resources/DrawPanel/Mirror3D.png
diff --git a/3dPrintApp/Resources/DrawPanel/ModifyCurve.png b/Icarus/Resources/DrawPanel/ModifyCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ModifyCurve.png
rename to Icarus/Resources/DrawPanel/ModifyCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/ModifyText.png b/Icarus/Resources/DrawPanel/ModifyText.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ModifyText.png
rename to Icarus/Resources/DrawPanel/ModifyText.png
diff --git a/3dPrintApp/Resources/DrawPanel/Move.png b/Icarus/Resources/DrawPanel/Move.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Move.png
rename to Icarus/Resources/DrawPanel/Move.png
diff --git a/3dPrintApp/Resources/DrawPanel/Offset.png b/Icarus/Resources/DrawPanel/Offset.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Offset.png
rename to Icarus/Resources/DrawPanel/Offset.png
diff --git a/3dPrintApp/Resources/DrawPanel/Plane.png b/Icarus/Resources/DrawPanel/Plane.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Plane.png
rename to Icarus/Resources/DrawPanel/Plane.png
diff --git a/3dPrintApp/Resources/DrawPanel/Point.png b/Icarus/Resources/DrawPanel/Point.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Point.png
rename to Icarus/Resources/DrawPanel/Point.png
diff --git a/3dPrintApp/Resources/DrawPanel/Polygon.png b/Icarus/Resources/DrawPanel/Polygon.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Polygon.png
rename to Icarus/Resources/DrawPanel/Polygon.png
diff --git a/3dPrintApp/Resources/DrawPanel/PolygonSide.png b/Icarus/Resources/DrawPanel/PolygonSide.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/PolygonSide.png
rename to Icarus/Resources/DrawPanel/PolygonSide.png
diff --git a/3dPrintApp/Resources/DrawPanel/Rectangle2P.png b/Icarus/Resources/DrawPanel/Rectangle2P.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Rectangle2P.png
rename to Icarus/Resources/DrawPanel/Rectangle2P.png
diff --git a/3dPrintApp/Resources/DrawPanel/RemoveColor.png b/Icarus/Resources/DrawPanel/RemoveColor.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/RemoveColor.png
rename to Icarus/Resources/DrawPanel/RemoveColor.png
diff --git a/3dPrintApp/Resources/DrawPanel/RemovePointCurve.png b/Icarus/Resources/DrawPanel/RemovePointCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/RemovePointCurve.png
rename to Icarus/Resources/DrawPanel/RemovePointCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/Revolve.png b/Icarus/Resources/DrawPanel/Revolve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Revolve.png
rename to Icarus/Resources/DrawPanel/Revolve.png
diff --git a/3dPrintApp/Resources/DrawPanel/Rotate.png b/Icarus/Resources/DrawPanel/Rotate.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Rotate.png
rename to Icarus/Resources/DrawPanel/Rotate.png
diff --git a/3dPrintApp/Resources/DrawPanel/Rotate3D.png b/Icarus/Resources/DrawPanel/Rotate3D.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Rotate3D.png
rename to Icarus/Resources/DrawPanel/Rotate3D.png
diff --git a/3dPrintApp/Resources/DrawPanel/Ruled.png b/Icarus/Resources/DrawPanel/Ruled.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Ruled.png
rename to Icarus/Resources/DrawPanel/Ruled.png
diff --git a/3dPrintApp/Resources/DrawPanel/Scale.png b/Icarus/Resources/DrawPanel/Scale.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Scale.png
rename to Icarus/Resources/DrawPanel/Scale.png
diff --git a/3dPrintApp/Resources/DrawPanel/Scale3D.png b/Icarus/Resources/DrawPanel/Scale3D.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Scale3D.png
rename to Icarus/Resources/DrawPanel/Scale3D.png
diff --git a/3dPrintApp/Resources/DrawPanel/Screw.png b/Icarus/Resources/DrawPanel/Screw.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Screw.png
rename to Icarus/Resources/DrawPanel/Screw.png
diff --git a/3dPrintApp/Resources/DrawPanel/SolidAddSurf.png b/Icarus/Resources/DrawPanel/SolidAddSurf.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/SolidAddSurf.png
rename to Icarus/Resources/DrawPanel/SolidAddSurf.png
diff --git a/3dPrintApp/Resources/DrawPanel/SolidIntersectSurf.png b/Icarus/Resources/DrawPanel/SolidIntersectSurf.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/SolidIntersectSurf.png
rename to Icarus/Resources/DrawPanel/SolidIntersectSurf.png
diff --git a/3dPrintApp/Resources/DrawPanel/SolidSubtractSurf.png b/Icarus/Resources/DrawPanel/SolidSubtractSurf.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/SolidSubtractSurf.png
rename to Icarus/Resources/DrawPanel/SolidSubtractSurf.png
diff --git a/3dPrintApp/Resources/DrawPanel/SplitCurve.png b/Icarus/Resources/DrawPanel/SplitCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/SplitCurve.png
rename to Icarus/Resources/DrawPanel/SplitCurve.png
diff --git a/3dPrintApp/Resources/DrawPanel/Swept.png b/Icarus/Resources/DrawPanel/Swept.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Swept.png
rename to Icarus/Resources/DrawPanel/Swept.png
diff --git a/3dPrintApp/Resources/DrawPanel/Text.png b/Icarus/Resources/DrawPanel/Text.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/Text.png
rename to Icarus/Resources/DrawPanel/Text.png
diff --git a/3dPrintApp/Resources/DrawPanel/ThickCurve.png b/Icarus/Resources/DrawPanel/ThickCurve.png
similarity index 100%
rename from 3dPrintApp/Resources/DrawPanel/ThickCurve.png
rename to Icarus/Resources/DrawPanel/ThickCurve.png
diff --git a/3dPrintApp/Resources/EgtBEAMWALL.ico b/Icarus/Resources/EgtBEAMWALL.ico
similarity index 100%
rename from 3dPrintApp/Resources/EgtBEAMWALL.ico
rename to Icarus/Resources/EgtBEAMWALL.ico
diff --git a/3dPrintApp/Resources/Fonts/Roboto-Light.ttf b/Icarus/Resources/Fonts/Roboto-Light.ttf
similarity index 100%
rename from 3dPrintApp/Resources/Fonts/Roboto-Light.ttf
rename to Icarus/Resources/Fonts/Roboto-Light.ttf
diff --git a/3dPrintApp/Resources/Fonts/Roboto-Regular.ttf b/Icarus/Resources/Fonts/Roboto-Regular.ttf
similarity index 100%
rename from 3dPrintApp/Resources/Fonts/Roboto-Regular.ttf
rename to Icarus/Resources/Fonts/Roboto-Regular.ttf
diff --git a/3dPrintApp/Resources/GridViewPanel/Analyze.png b/Icarus/Resources/GridViewPanel/Analyze.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/Analyze.png
rename to Icarus/Resources/GridViewPanel/Analyze.png
diff --git a/3dPrintApp/Resources/GridViewPanel/Cplane3POINTS.png b/Icarus/Resources/GridViewPanel/Cplane3POINTS.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/Cplane3POINTS.png
rename to Icarus/Resources/GridViewPanel/Cplane3POINTS.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneBACK.png b/Icarus/Resources/GridViewPanel/CplaneBACK.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneBACK.png
rename to Icarus/Resources/GridViewPanel/CplaneBACK.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneBOTTOM.png b/Icarus/Resources/GridViewPanel/CplaneBOTTOM.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneBOTTOM.png
rename to Icarus/Resources/GridViewPanel/CplaneBOTTOM.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneELEVATION.png b/Icarus/Resources/GridViewPanel/CplaneELEVATION.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneELEVATION.png
rename to Icarus/Resources/GridViewPanel/CplaneELEVATION.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneFRONT.png b/Icarus/Resources/GridViewPanel/CplaneFRONT.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneFRONT.png
rename to Icarus/Resources/GridViewPanel/CplaneFRONT.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneLEFT.png b/Icarus/Resources/GridViewPanel/CplaneLEFT.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneLEFT.png
rename to Icarus/Resources/GridViewPanel/CplaneLEFT.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneOBJECT.png b/Icarus/Resources/GridViewPanel/CplaneOBJECT.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneOBJECT.png
rename to Icarus/Resources/GridViewPanel/CplaneOBJECT.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneORIGIN.png b/Icarus/Resources/GridViewPanel/CplaneORIGIN.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneORIGIN.png
rename to Icarus/Resources/GridViewPanel/CplaneORIGIN.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplanePERPCURVE.png b/Icarus/Resources/GridViewPanel/CplanePERPCURVE.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplanePERPCURVE.png
rename to Icarus/Resources/GridViewPanel/CplanePERPCURVE.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneRIGHT.png b/Icarus/Resources/GridViewPanel/CplaneRIGHT.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneRIGHT.png
rename to Icarus/Resources/GridViewPanel/CplaneRIGHT.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneROTATE.png b/Icarus/Resources/GridViewPanel/CplaneROTATE.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneROTATE.png
rename to Icarus/Resources/GridViewPanel/CplaneROTATE.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneTOP.png b/Icarus/Resources/GridViewPanel/CplaneTOP.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneTOP.png
rename to Icarus/Resources/GridViewPanel/CplaneTOP.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CplaneView.png b/Icarus/Resources/GridViewPanel/CplaneView.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CplaneView.png
rename to Icarus/Resources/GridViewPanel/CplaneView.png
diff --git a/3dPrintApp/Resources/GridViewPanel/CurveDir.png b/Icarus/Resources/GridViewPanel/CurveDir.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/CurveDir.png
rename to Icarus/Resources/GridViewPanel/CurveDir.png
diff --git a/3dPrintApp/Resources/GridViewPanel/GetDist.png b/Icarus/Resources/GridViewPanel/GetDist.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/GetDist.png
rename to Icarus/Resources/GridViewPanel/GetDist.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromBACK.png b/Icarus/Resources/GridViewPanel/LookFromBACK.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromBACK.png
rename to Icarus/Resources/GridViewPanel/LookFromBACK.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromBOTTOM.png b/Icarus/Resources/GridViewPanel/LookFromBOTTOM.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromBOTTOM.png
rename to Icarus/Resources/GridViewPanel/LookFromBOTTOM.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromFRONT.png b/Icarus/Resources/GridViewPanel/LookFromFRONT.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromFRONT.png
rename to Icarus/Resources/GridViewPanel/LookFromFRONT.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromGrid.png b/Icarus/Resources/GridViewPanel/LookFromGrid.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromGrid.png
rename to Icarus/Resources/GridViewPanel/LookFromGrid.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromISO_NE.png b/Icarus/Resources/GridViewPanel/LookFromISO_NE.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromISO_NE.png
rename to Icarus/Resources/GridViewPanel/LookFromISO_NE.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromISO_NW.png b/Icarus/Resources/GridViewPanel/LookFromISO_NW.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromISO_NW.png
rename to Icarus/Resources/GridViewPanel/LookFromISO_NW.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromISO_SE.png b/Icarus/Resources/GridViewPanel/LookFromISO_SE.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromISO_SE.png
rename to Icarus/Resources/GridViewPanel/LookFromISO_SE.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromISO_SW.png b/Icarus/Resources/GridViewPanel/LookFromISO_SW.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromISO_SW.png
rename to Icarus/Resources/GridViewPanel/LookFromISO_SW.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromLEFT.png b/Icarus/Resources/GridViewPanel/LookFromLEFT.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromLEFT.png
rename to Icarus/Resources/GridViewPanel/LookFromLEFT.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromRIGHT.png b/Icarus/Resources/GridViewPanel/LookFromRIGHT.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromRIGHT.png
rename to Icarus/Resources/GridViewPanel/LookFromRIGHT.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookFromTOP.png b/Icarus/Resources/GridViewPanel/LookFromTOP.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookFromTOP.png
rename to Icarus/Resources/GridViewPanel/LookFromTOP.png
diff --git a/3dPrintApp/Resources/GridViewPanel/LookToCplane.png b/Icarus/Resources/GridViewPanel/LookToCplane.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/LookToCplane.png
rename to Icarus/Resources/GridViewPanel/LookToCplane.png
diff --git a/3dPrintApp/Resources/GridViewPanel/RenderingHL.png b/Icarus/Resources/GridViewPanel/RenderingHL.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/RenderingHL.png
rename to Icarus/Resources/GridViewPanel/RenderingHL.png
diff --git a/3dPrintApp/Resources/GridViewPanel/RenderingSH.png b/Icarus/Resources/GridViewPanel/RenderingSH.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/RenderingSH.png
rename to Icarus/Resources/GridViewPanel/RenderingSH.png
diff --git a/3dPrintApp/Resources/GridViewPanel/RenderingWF.png b/Icarus/Resources/GridViewPanel/RenderingWF.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/RenderingWF.png
rename to Icarus/Resources/GridViewPanel/RenderingWF.png
diff --git a/3dPrintApp/Resources/GridViewPanel/ZoomAll.png b/Icarus/Resources/GridViewPanel/ZoomAll.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/ZoomAll.png
rename to Icarus/Resources/GridViewPanel/ZoomAll.png
diff --git a/3dPrintApp/Resources/GridViewPanel/ZoomIn.png b/Icarus/Resources/GridViewPanel/ZoomIn.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/ZoomIn.png
rename to Icarus/Resources/GridViewPanel/ZoomIn.png
diff --git a/3dPrintApp/Resources/GridViewPanel/ZoomOut.png b/Icarus/Resources/GridViewPanel/ZoomOut.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/ZoomOut.png
rename to Icarus/Resources/GridViewPanel/ZoomOut.png
diff --git a/3dPrintApp/Resources/GridViewPanel/ZoomSel.png b/Icarus/Resources/GridViewPanel/ZoomSel.png
similarity index 100%
rename from 3dPrintApp/Resources/GridViewPanel/ZoomSel.png
rename to Icarus/Resources/GridViewPanel/ZoomSel.png
diff --git a/3dPrintApp/Resources/InstrumentPanel/Analyze.png b/Icarus/Resources/InstrumentPanel/Analyze.png
similarity index 100%
rename from 3dPrintApp/Resources/InstrumentPanel/Analyze.png
rename to Icarus/Resources/InstrumentPanel/Analyze.png
diff --git a/3dPrintApp/Resources/InstrumentPanel/ChangeParam.png b/Icarus/Resources/InstrumentPanel/ChangeParam.png
similarity index 100%
rename from 3dPrintApp/Resources/InstrumentPanel/ChangeParam.png
rename to Icarus/Resources/InstrumentPanel/ChangeParam.png
diff --git a/3dPrintApp/Resources/InstrumentPanel/GetDist.png b/Icarus/Resources/InstrumentPanel/GetDist.png
similarity index 100%
rename from 3dPrintApp/Resources/InstrumentPanel/GetDist.png
rename to Icarus/Resources/InstrumentPanel/GetDist.png
diff --git a/3dPrintApp/Resources/InstrumentPanel/Statistics.png b/Icarus/Resources/InstrumentPanel/Statistics.png
similarity index 100%
rename from 3dPrintApp/Resources/InstrumentPanel/Statistics.png
rename to Icarus/Resources/InstrumentPanel/Statistics.png
diff --git a/3dPrintApp/Resources/LeftPanel/AddFeature.png b/Icarus/Resources/LeftPanel/AddFeature.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/AddFeature.png
rename to Icarus/Resources/LeftPanel/AddFeature.png
diff --git a/3dPrintApp/Resources/LeftPanel/AddPart.png b/Icarus/Resources/LeftPanel/AddPart.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/AddPart.png
rename to Icarus/Resources/LeftPanel/AddPart.png
diff --git a/3dPrintApp/Resources/LeftPanel/AddToRawPart.png b/Icarus/Resources/LeftPanel/AddToRawPart.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/AddToRawPart.png
rename to Icarus/Resources/LeftPanel/AddToRawPart.png
diff --git a/3dPrintApp/Resources/LeftPanel/CopyFeature.png b/Icarus/Resources/LeftPanel/CopyFeature.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/CopyFeature.png
rename to Icarus/Resources/LeftPanel/CopyFeature.png
diff --git a/3dPrintApp/Resources/LeftPanel/CopyPart.png b/Icarus/Resources/LeftPanel/CopyPart.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/CopyPart.png
rename to Icarus/Resources/LeftPanel/CopyPart.png
diff --git a/3dPrintApp/Resources/LeftPanel/MacroFeature.png b/Icarus/Resources/LeftPanel/MacroFeature.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/MacroFeature.png
rename to Icarus/Resources/LeftPanel/MacroFeature.png
diff --git a/3dPrintApp/Resources/LeftPanel/NewRawPart.png b/Icarus/Resources/LeftPanel/NewRawPart.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/NewRawPart.png
rename to Icarus/Resources/LeftPanel/NewRawPart.png
diff --git a/3dPrintApp/Resources/LeftPanel/RemoveFeature.png b/Icarus/Resources/LeftPanel/RemoveFeature.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/RemoveFeature.png
rename to Icarus/Resources/LeftPanel/RemoveFeature.png
diff --git a/3dPrintApp/Resources/LeftPanel/RemovePart.png b/Icarus/Resources/LeftPanel/RemovePart.png
similarity index 100%
rename from 3dPrintApp/Resources/LeftPanel/RemovePart.png
rename to Icarus/Resources/LeftPanel/RemovePart.png
diff --git a/3dPrintApp/Resources/MainMenu/Send.png b/Icarus/Resources/MainMenu/Send.png
similarity index 100%
rename from 3dPrintApp/Resources/MainMenu/Send.png
rename to Icarus/Resources/MainMenu/Send.png
diff --git a/3dPrintApp/Resources/MovePartInRawPart/MoveLeftParts.png b/Icarus/Resources/MovePartInRawPart/MoveLeftParts.png
similarity index 100%
rename from 3dPrintApp/Resources/MovePartInRawPart/MoveLeftParts.png
rename to Icarus/Resources/MovePartInRawPart/MoveLeftParts.png
diff --git a/3dPrintApp/Resources/MovePartInRawPart/MoveRightParts.png b/Icarus/Resources/MovePartInRawPart/MoveRightParts.png
similarity index 100%
rename from 3dPrintApp/Resources/MovePartInRawPart/MoveRightParts.png
rename to Icarus/Resources/MovePartInRawPart/MoveRightParts.png
diff --git a/3dPrintApp/Resources/OptimizePanel/FlipRot.png b/Icarus/Resources/OptimizePanel/FlipRot.png
similarity index 100%
rename from 3dPrintApp/Resources/OptimizePanel/FlipRot.png
rename to Icarus/Resources/OptimizePanel/FlipRot.png
diff --git a/3dPrintApp/Resources/OptimizePanel/UnlockFlip.png b/Icarus/Resources/OptimizePanel/UnlockFlip.png
similarity index 100%
rename from 3dPrintApp/Resources/OptimizePanel/UnlockFlip.png
rename to Icarus/Resources/OptimizePanel/UnlockFlip.png
diff --git a/3dPrintApp/Resources/OptimizePanel/UnlockRotation.png b/Icarus/Resources/OptimizePanel/UnlockRotation.png
similarity index 100%
rename from 3dPrintApp/Resources/OptimizePanel/UnlockRotation.png
rename to Icarus/Resources/OptimizePanel/UnlockRotation.png
diff --git a/3dPrintApp/Resources/OptimizePanel/Warehouse.png b/Icarus/Resources/OptimizePanel/Warehouse.png
similarity index 100%
rename from 3dPrintApp/Resources/OptimizePanel/Warehouse.png
rename to Icarus/Resources/OptimizePanel/Warehouse.png
diff --git a/3dPrintApp/Resources/PartManager/LeftInvert.png b/Icarus/Resources/PartManager/LeftInvert.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/LeftInvert.png
rename to Icarus/Resources/PartManager/LeftInvert.png
diff --git a/3dPrintApp/Resources/PartManager/LeftRotate.png b/Icarus/Resources/PartManager/LeftRotate.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/LeftRotate.png
rename to Icarus/Resources/PartManager/LeftRotate.png
diff --git a/3dPrintApp/Resources/PartManager/Locked.old.png b/Icarus/Resources/PartManager/Locked.old.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/Locked.old.png
rename to Icarus/Resources/PartManager/Locked.old.png
diff --git a/3dPrintApp/Resources/PartManager/Locked.png b/Icarus/Resources/PartManager/Locked.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/Locked.png
rename to Icarus/Resources/PartManager/Locked.png
diff --git a/3dPrintApp/Resources/PartManager/RightInvert.png b/Icarus/Resources/PartManager/RightInvert.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/RightInvert.png
rename to Icarus/Resources/PartManager/RightInvert.png
diff --git a/3dPrintApp/Resources/PartManager/RightRotate.png b/Icarus/Resources/PartManager/RightRotate.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/RightRotate.png
rename to Icarus/Resources/PartManager/RightRotate.png
diff --git a/3dPrintApp/Resources/PartManager/Unlocked.old.png b/Icarus/Resources/PartManager/Unlocked.old.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/Unlocked.old.png
rename to Icarus/Resources/PartManager/Unlocked.old.png
diff --git a/3dPrintApp/Resources/PartManager/Unlocked.png b/Icarus/Resources/PartManager/Unlocked.png
similarity index 100%
rename from 3dPrintApp/Resources/PartManager/Unlocked.png
rename to Icarus/Resources/PartManager/Unlocked.png
diff --git a/3dPrintApp/Resources/ProjectManager/ExportProject.png b/Icarus/Resources/ProjectManager/ExportProject.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/ExportProject.png
rename to Icarus/Resources/ProjectManager/ExportProject.png
diff --git a/3dPrintApp/Resources/ProjectManager/GoToProd.png b/Icarus/Resources/ProjectManager/GoToProd.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/GoToProd.png
rename to Icarus/Resources/ProjectManager/GoToProd.png
diff --git a/3dPrintApp/Resources/ProjectManager/GoToProj.png b/Icarus/Resources/ProjectManager/GoToProj.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/GoToProj.png
rename to Icarus/Resources/ProjectManager/GoToProj.png
diff --git a/3dPrintApp/Resources/ProjectManager/Import.png b/Icarus/Resources/ProjectManager/Import.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/Import.png
rename to Icarus/Resources/ProjectManager/Import.png
diff --git a/3dPrintApp/Resources/ProjectManager/ImportBTL.png b/Icarus/Resources/ProjectManager/ImportBTL.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/ImportBTL.png
rename to Icarus/Resources/ProjectManager/ImportBTL.png
diff --git a/3dPrintApp/Resources/ProjectManager/ImportProject.png b/Icarus/Resources/ProjectManager/ImportProject.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/ImportProject.png
rename to Icarus/Resources/ProjectManager/ImportProject.png
diff --git a/3dPrintApp/Resources/ProjectManager/New.png b/Icarus/Resources/ProjectManager/New.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/New.png
rename to Icarus/Resources/ProjectManager/New.png
diff --git a/3dPrintApp/Resources/ProjectManager/Open.png b/Icarus/Resources/ProjectManager/Open.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/Open.png
rename to Icarus/Resources/ProjectManager/Open.png
diff --git a/3dPrintApp/Resources/ProjectManager/Options.png b/Icarus/Resources/ProjectManager/Options.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/Options.png
rename to Icarus/Resources/ProjectManager/Options.png
diff --git a/3dPrintApp/Resources/ProjectManager/Save.png b/Icarus/Resources/ProjectManager/Save.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/Save.png
rename to Icarus/Resources/ProjectManager/Save.png
diff --git a/3dPrintApp/Resources/ProjectManager/SaveAs.png b/Icarus/Resources/ProjectManager/SaveAs.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/SaveAs.png
rename to Icarus/Resources/ProjectManager/SaveAs.png
diff --git a/3dPrintApp/Resources/ProjectManager/Send.png b/Icarus/Resources/ProjectManager/Send.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/Send.png
rename to Icarus/Resources/ProjectManager/Send.png
diff --git a/3dPrintApp/Resources/ProjectManager/UpdateBTL.png b/Icarus/Resources/ProjectManager/UpdateBTL.png
similarity index 100%
rename from 3dPrintApp/Resources/ProjectManager/UpdateBTL.png
rename to Icarus/Resources/ProjectManager/UpdateBTL.png
diff --git a/3dPrintApp/Resources/ShowBeamPanel/ShowAll.png b/Icarus/Resources/ShowBeamPanel/ShowAll.png
similarity index 100%
rename from 3dPrintApp/Resources/ShowBeamPanel/ShowAll.png
rename to Icarus/Resources/ShowBeamPanel/ShowAll.png
diff --git a/3dPrintApp/Resources/ShowBeamPanel/ShowBuilding.png b/Icarus/Resources/ShowBeamPanel/ShowBuilding.png
similarity index 100%
rename from 3dPrintApp/Resources/ShowBeamPanel/ShowBuilding.png
rename to Icarus/Resources/ShowBeamPanel/ShowBuilding.png
diff --git a/3dPrintApp/Resources/ShowBeamPanel/ShowSolid.png b/Icarus/Resources/ShowBeamPanel/ShowSolid.png
similarity index 100%
rename from 3dPrintApp/Resources/ShowBeamPanel/ShowSolid.png
rename to Icarus/Resources/ShowBeamPanel/ShowSolid.png
diff --git a/3dPrintApp/Resources/ShowPanel/CurveDir.png b/Icarus/Resources/ShowPanel/CurveDir.png
similarity index 100%
rename from 3dPrintApp/Resources/ShowPanel/CurveDir.png
rename to Icarus/Resources/ShowPanel/CurveDir.png
diff --git a/3dPrintApp/Resources/ShowPanel/RenderingHL.png b/Icarus/Resources/ShowPanel/RenderingHL.png
similarity index 100%
rename from 3dPrintApp/Resources/ShowPanel/RenderingHL.png
rename to Icarus/Resources/ShowPanel/RenderingHL.png
diff --git a/3dPrintApp/Resources/ShowPanel/RenderingSH.png b/Icarus/Resources/ShowPanel/RenderingSH.png
similarity index 100%
rename from 3dPrintApp/Resources/ShowPanel/RenderingSH.png
rename to Icarus/Resources/ShowPanel/RenderingSH.png
diff --git a/3dPrintApp/Resources/ShowPanel/RenderingWF.png b/Icarus/Resources/ShowPanel/RenderingWF.png
similarity index 100%
rename from 3dPrintApp/Resources/ShowPanel/RenderingWF.png
rename to Icarus/Resources/ShowPanel/RenderingWF.png
diff --git a/3dPrintApp/Resources/Statistics/CopyToClipboard.png b/Icarus/Resources/Statistics/CopyToClipboard.png
similarity index 100%
rename from 3dPrintApp/Resources/Statistics/CopyToClipboard.png
rename to Icarus/Resources/Statistics/CopyToClipboard.png
diff --git a/3dPrintApp/Resources/Statistics/PrintPDF.png b/Icarus/Resources/Statistics/PrintPDF.png
similarity index 100%
rename from 3dPrintApp/Resources/Statistics/PrintPDF.png
rename to Icarus/Resources/Statistics/PrintPDF.png
diff --git a/3dPrintApp/Resources/TopPanel/CopyRawPart.png b/Icarus/Resources/TopPanel/CopyRawPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/CopyRawPart.png
rename to Icarus/Resources/TopPanel/CopyRawPart.png
diff --git a/3dPrintApp/Resources/TopPanel/MoveDownPart.png b/Icarus/Resources/TopPanel/MoveDownPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/MoveDownPart.png
rename to Icarus/Resources/TopPanel/MoveDownPart.png
diff --git a/3dPrintApp/Resources/TopPanel/MovePartInRawPart.png b/Icarus/Resources/TopPanel/MovePartInRawPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/MovePartInRawPart.png
rename to Icarus/Resources/TopPanel/MovePartInRawPart.png
diff --git a/3dPrintApp/Resources/TopPanel/MoveUpPart.png b/Icarus/Resources/TopPanel/MoveUpPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/MoveUpPart.png
rename to Icarus/Resources/TopPanel/MoveUpPart.png
diff --git a/3dPrintApp/Resources/TopPanel/ProduceAllRawPart.png b/Icarus/Resources/TopPanel/ProduceAllRawPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/ProduceAllRawPart.png
rename to Icarus/Resources/TopPanel/ProduceAllRawPart.png
diff --git a/3dPrintApp/Resources/TopPanel/ProduceRawPart.png b/Icarus/Resources/TopPanel/ProduceRawPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/ProduceRawPart.png
rename to Icarus/Resources/TopPanel/ProduceRawPart.png
diff --git a/3dPrintApp/Resources/TopPanel/RemovePart.old.png b/Icarus/Resources/TopPanel/RemovePart.old.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/RemovePart.old.png
rename to Icarus/Resources/TopPanel/RemovePart.old.png
diff --git a/3dPrintApp/Resources/TopPanel/RemovePart.png b/Icarus/Resources/TopPanel/RemovePart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/RemovePart.png
rename to Icarus/Resources/TopPanel/RemovePart.png
diff --git a/3dPrintApp/Resources/TopPanel/RemoveRawPart.png b/Icarus/Resources/TopPanel/RemoveRawPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/RemoveRawPart.png
rename to Icarus/Resources/TopPanel/RemoveRawPart.png
diff --git a/3dPrintApp/Resources/TopPanel/ReorderPart.png b/Icarus/Resources/TopPanel/ReorderPart.png
similarity index 100%
rename from 3dPrintApp/Resources/TopPanel/ReorderPart.png
rename to Icarus/Resources/TopPanel/ReorderPart.png
diff --git a/3dPrintApp/Resources/TreeView/Folder.png b/Icarus/Resources/TreeView/Folder.png
similarity index 100%
rename from 3dPrintApp/Resources/TreeView/Folder.png
rename to Icarus/Resources/TreeView/Folder.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromBACK.png b/Icarus/Resources/ViewPanel/LookFromBACK.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromBACK.png
rename to Icarus/Resources/ViewPanel/LookFromBACK.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromBOTTOM.png b/Icarus/Resources/ViewPanel/LookFromBOTTOM.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromBOTTOM.png
rename to Icarus/Resources/ViewPanel/LookFromBOTTOM.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromFRONT.png b/Icarus/Resources/ViewPanel/LookFromFRONT.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromFRONT.png
rename to Icarus/Resources/ViewPanel/LookFromFRONT.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromISO_NE.png b/Icarus/Resources/ViewPanel/LookFromISO_NE.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromISO_NE.png
rename to Icarus/Resources/ViewPanel/LookFromISO_NE.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromISO_NW.png b/Icarus/Resources/ViewPanel/LookFromISO_NW.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromISO_NW.png
rename to Icarus/Resources/ViewPanel/LookFromISO_NW.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromISO_SE.png b/Icarus/Resources/ViewPanel/LookFromISO_SE.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromISO_SE.png
rename to Icarus/Resources/ViewPanel/LookFromISO_SE.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromISO_SW.png b/Icarus/Resources/ViewPanel/LookFromISO_SW.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromISO_SW.png
rename to Icarus/Resources/ViewPanel/LookFromISO_SW.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromLEFT.png b/Icarus/Resources/ViewPanel/LookFromLEFT.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromLEFT.png
rename to Icarus/Resources/ViewPanel/LookFromLEFT.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromRIGHT.png b/Icarus/Resources/ViewPanel/LookFromRIGHT.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromRIGHT.png
rename to Icarus/Resources/ViewPanel/LookFromRIGHT.png
diff --git a/3dPrintApp/Resources/ViewPanel/LookFromTOP.png b/Icarus/Resources/ViewPanel/LookFromTOP.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/LookFromTOP.png
rename to Icarus/Resources/ViewPanel/LookFromTOP.png
diff --git a/3dPrintApp/Resources/ViewPanel/ZoomAll.png b/Icarus/Resources/ViewPanel/ZoomAll.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/ZoomAll.png
rename to Icarus/Resources/ViewPanel/ZoomAll.png
diff --git a/3dPrintApp/Resources/ViewPanel/ZoomIn.png b/Icarus/Resources/ViewPanel/ZoomIn.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/ZoomIn.png
rename to Icarus/Resources/ViewPanel/ZoomIn.png
diff --git a/3dPrintApp/Resources/ViewPanel/ZoomOut.png b/Icarus/Resources/ViewPanel/ZoomOut.png
similarity index 100%
rename from 3dPrintApp/Resources/ViewPanel/ZoomOut.png
rename to Icarus/Resources/ViewPanel/ZoomOut.png
diff --git a/3dPrintApp/RibPanel/RibPanelV.xaml b/Icarus/RibPanel/RibPanelV.xaml
similarity index 97%
rename from 3dPrintApp/RibPanel/RibPanelV.xaml
rename to Icarus/RibPanel/RibPanelV.xaml
index c4c1e6a..5138853 100644
--- a/3dPrintApp/RibPanel/RibPanelV.xaml
+++ b/Icarus/RibPanel/RibPanelV.xaml
@@ -2,13 +2,14 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-            xmlns:PrintApp="clr-namespace:_3dPrintApp"
+            xmlns:PrintApp="clr-namespace:Icarus"
             Margin="5">
    <StackPanel.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
    </StackPanel.Resources>
    <ComboBox ItemsSource="{Binding RibList}"
              SelectedItem="{Binding SelRib}"
+             IsEnabled="{Binding RibList_IsEnabled}"
              DisplayMemberPath="ghName"/>
     <!--Add Button--> 
    <ToggleButton x:Name="AddBtn" 
@@ -86,13 +87,13 @@
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
             </Button>
-            <!--<Button Grid.Column="4"
+            <Button Grid.Column="4"
                     Command="{Binding Extrude_Command}"
                     ToolTip="{Binding Extrude_ToolTip}"
                     Visibility="{Binding Compo_Visibility}"
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
-            </Button>-->
+            </Button>
          </Grid>
       </Border>
    </Popup>
@@ -178,12 +179,12 @@
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
             </Button>
-            <Button Grid.Column="10"
+            <!--<Button Grid.Column="10"
                     Command="{Binding CPlaneObj_Command}"
                     ToolTip="{Binding CPlaneObjToolTip}" 
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
-            </Button>
+            </Button>-->
          </Grid>
       </Border>
    </Popup>
@@ -292,5 +293,8 @@
          </Grid>
       </Border>
    </Popup>
+   <ToggleButton Content="Parameters"
+                 IsChecked="{Binding bMachParam_IsChecked}"
+                 Style="{StaticResource ToolBar_TextToggleButton}"/>
 
 </StackPanel>
diff --git a/3dPrintApp/RibPanel/RibPanelV.xaml.vb b/Icarus/RibPanel/RibPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/RibPanel/RibPanelV.xaml.vb
rename to Icarus/RibPanel/RibPanelV.xaml.vb
diff --git a/3dPrintApp/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb
similarity index 65%
rename from 3dPrintApp/RibPanel/RibPanelVM.vb
rename to Icarus/RibPanel/RibPanelVM.vb
index 54bcecf..19c9de2 100644
--- a/3dPrintApp/RibPanel/RibPanelVM.vb
+++ b/Icarus/RibPanel/RibPanelVM.vb
@@ -14,6 +14,11 @@ Public Class RibPanelVM
       POINT = 1
       COMPO = 2
    End Enum
+   Public Enum RibSelectionTypes As Integer
+      CURVE = 1
+      EXTRUSION = 2
+      BOTH = 3
+   End Enum
 
    Private m_nPartId As Integer = GDB_ID.NULL
    Private m_nRibLayerId As Integer = GDB_ID.NULL
@@ -38,7 +43,10 @@ Public Class RibPanelVM
          m_SelRib = value
          EgtDeselectLayerObjs(m_nRibLayerId)
          If Not IsNothing(value) Then
-            EgtSelectObj(value.nId)
+            EgtSelectObj(value.nCurveId)
+            EgtSelectObj(value.nExtrusionId)
+            ' aggiorno visibilita' bottoni edit
+            NotifyPropertyChanged(NameOf(Compo_Visibility))
             ' aggiorno campi di testo posizione
             NotifyPropertyChanged(NameOf(sXPos))
             NotifyPropertyChanged(NameOf(sYPos))
@@ -51,20 +59,23 @@ Public Class RibPanelVM
    Public Property sXPos As String
       Get
          If Not IsNothing(m_SelRib) Then
+            Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId)
             Dim b3Reference As New BBox3d
-            EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference)
+            EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
             Return LenToString(b3Reference.Min.x, 1)
          Else
             Return ""
          End If
       End Get
       Set(value As String)
+         Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId)
          Dim b3Reference As New BBox3d
-         EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference)
+         EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewXPos As Double = b3Reference.Min.x
          StringToLen(value, dNewXPos)
          If dNewXPos >= 0 AndAlso dNewXPos <= CurrentMachine.b3Tab.DimX Then
-            EgtMove(m_SelRib.nId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min)
+            EgtMove(m_SelRib.nCurveId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min)
+            EgtMove(m_SelRib.nExtrusionId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min)
             EgtDraw()
          Else
             NotifyPropertyChanged(NameOf(sXPos))
@@ -75,20 +86,23 @@ Public Class RibPanelVM
    Public Property sYPos As String
       Get
          If Not IsNothing(m_SelRib) Then
+            Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId)
             Dim b3Reference As New BBox3d
-            EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference)
+            EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
             Return LenToString(b3Reference.Min.y, 1)
          Else
             Return ""
          End If
       End Get
       Set(value As String)
+         Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId)
          Dim b3Reference As New BBox3d
-         EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference)
+         EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewYPos As Double = b3Reference.Min.y
          StringToLen(value, dNewYPos)
          If dNewYPos >= 0 AndAlso dNewYPos <= CurrentMachine.b3Tab.DimY Then
-            EgtMove(m_SelRib.nId, New Point3d(b3Reference.Min.x, dNewyPos, b3Reference.Min.z) - b3Reference.Min)
+            EgtMove(m_SelRib.nCurveId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min)
+            EgtMove(m_SelRib.nExtrusionId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min)
             EgtDraw()
          Else
             NotifyPropertyChanged(NameOf(sYPos))
@@ -99,20 +113,23 @@ Public Class RibPanelVM
    Public Property sZPos As String
       Get
          If Not IsNothing(m_SelRib) Then
+            Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId)
             Dim b3Reference As New BBox3d
-            EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference)
+            EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
             Return LenToString(b3Reference.Min.z, 1)
          Else
             Return ""
          End If
       End Get
       Set(value As String)
+         Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId)
          Dim b3Reference As New BBox3d
-         EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference)
+         EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewZPos As Double = b3Reference.Min.y
          StringToLen(value, dNewZPos)
          If dNewZPos >= 0 Then
-            EgtMove(m_SelRib.nId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min)
+            EgtMove(m_SelRib.nCurveId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min)
+            EgtMove(m_SelRib.nExtrusionId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min)
             EgtDraw()
          Else
             NotifyPropertyChanged(NameOf(sZPos))
@@ -154,9 +171,13 @@ Public Class RibPanelVM
             NotifyPropertyChanged(NameOf(sRotAngle))
             Return
          End If
+         Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId)
          Dim b3Rib As New BBox3d
-         EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Rib)
-         If EgtRotate(m_SelRib.nId, b3Rib.Center, vtSelRotAxes, dNewAngle) Then
+         EgtGetBBox(nId, GDB_BB.STANDARD, b3Rib)
+         Dim bOk As Boolean = False
+         bOk = EgtRotate(nId, b3Rib.Center(), vtSelRotAxes, dNewAngle)
+         If bOk AndAlso m_SelRib.Type = RibEntity.RibTypes.FROMDRAW Then EgtRotate(m_SelRib.nExtrusionId, b3Rib.Center, vtSelRotAxes, dNewAngle)
+         If bOk Then
             EgtDraw()
             RefreshPos()
             m_sRotAngle = 0
@@ -173,16 +194,18 @@ Public Class RibPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         m_bAdd_IsChecked = value
-         If value Then
-            m_bEdit_IsChecked = False
-            m_bGrid_IsChecked = False
-            m_bMove_IsChecked = False
-            m_bRotate_IsChecked = False
-            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
-            NotifyPropertyChanged(NameOf(bGrid_IsChecked))
-            NotifyPropertyChanged(NameOf(bMove_IsChecked))
-            NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+         If Not m_bMachParam_IsChecked Then
+            m_bAdd_IsChecked = value
+            If value Then
+               m_bEdit_IsChecked = False
+               m_bGrid_IsChecked = False
+               m_bMove_IsChecked = False
+               m_bRotate_IsChecked = False
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+               NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            End If
          End If
       End Set
    End Property
@@ -193,7 +216,7 @@ Public Class RibPanelVM
          Return m_bEdit_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -217,16 +240,18 @@ Public Class RibPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         m_bGrid_IsChecked = value
-         If value Then
-            m_bAdd_IsChecked = False
-            m_bEdit_IsChecked = False
-            m_bMove_IsChecked = False
-            m_bRotate_IsChecked = False
-            NotifyPropertyChanged(NameOf(bAdd_IsChecked))
-            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
-            NotifyPropertyChanged(NameOf(bMove_IsChecked))
-            NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+         If Not m_bMachParam_IsChecked Then
+            m_bGrid_IsChecked = value
+            If value Then
+               m_bAdd_IsChecked = False
+               m_bEdit_IsChecked = False
+               m_bMove_IsChecked = False
+               m_bRotate_IsChecked = False
+               NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+               NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            End If
          End If
       End Set
    End Property
@@ -237,7 +262,7 @@ Public Class RibPanelVM
          Return m_bMove_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -261,7 +286,7 @@ Public Class RibPanelVM
          Return m_bRotate_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then
             m_bRotate_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -279,6 +304,48 @@ Public Class RibPanelVM
       End Set
    End Property
 
+   Private m_bMachParam_IsChecked As Boolean
+   Public Property bMachParam_IsChecked As Boolean
+      Get
+         Return m_bMachParam_IsChecked
+      End Get
+      Set(value As Boolean)
+         If Not IsNothing(m_SelRib) AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
+            m_bMachParam_IsChecked = True
+            m_bAdd_IsChecked = False
+            m_bEdit_IsChecked = False
+            m_bGrid_IsChecked = False
+            m_bMove_IsChecked = False
+            m_bRotate_IsChecked = False
+            NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+            NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+            NotifyPropertyChanged(NameOf(bMove_IsChecked))
+            NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.RIBPARAM)
+            NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+         Else
+            NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
+         End If
+      End Set
+   End Property
+   Friend Sub ResetMachParamIsChecked()
+      m_bMachParam_IsChecked = False
+      NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
+      NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+   End Sub
+
+   Public ReadOnly Property Compo_Visibility As Visibility
+      Get
+         Return If(Not IsNothing(m_SelRib) AndAlso m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+   Public ReadOnly Property RibList_IsEnabled As Boolean
+      Get
+         Return Not m_bMachParam_IsChecked
+      End Get
+   End Property
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -296,13 +363,15 @@ Public Class RibPanelVM
       End Get
    End Property
 
+
    ' Definizione comandi
    Private m_cmdImport As ICommand
-   Private m_cmdPoint As ICommand
    Private m_cmdLine2P As ICommand
+   Private m_cmdDelete As ICommand
    Private m_cmdModifyCurve As ICommand
    Private m_cmdAddPointCurve As ICommand
    Private m_cmdRemovePointCurve As ICommand
+   Private m_cmdExtrude As ICommand
    Private m_cmdCPlaneTop As ICommand
    Private m_cmdCPlaneFront As ICommand
    Private m_cmdCPlaneRight As ICommand
@@ -317,7 +386,8 @@ Public Class RibPanelVM
    Private m_cmdCPlanePerpObj As ICommand
    Private m_cmdCPlaneObj As ICommand
    Private m_cmdDragMove As ICommand
-   Private m_cmdDelete As ICommand
+   Private m_cmdDragRotate As ICommand
+   Private m_cmdMachParam As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -344,7 +414,21 @@ Public Class RibPanelVM
       m_RibList.Clear()
       Dim nRibId As Integer = EgtGetFirstInGroup(m_nRibLayerId)
       While nRibId <> GDB_ID.NULL
-         m_RibList.Add(New RibEntity(nRibId))
+         Dim EntityType As GDB_TY = EgtGetType(nRibId)
+         Dim DrawType As Integer = RibEntity.RibTypes.FROMDRAW
+         EgtGetInfo(nRibId, KEY_RIB_TYPE, DrawType)
+         If EntityType = GDB_TY.CRV_COMPO AndAlso DrawType = RibEntity.RibTypes.FROMDRAW Then
+            Dim nExtrusionId As Integer = GDB_ID.NULL
+            EgtGetInfo(nRibId, KEY_EXTRUSION_ID, nExtrusionId)
+            Dim RibEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMDRAW, nRibId)
+            If nExtrusionId <> GDB_ID.NULL Then
+               RibEntity.SetExtrusionId(nExtrusionId)
+            End If
+            m_RibList.Add(RibEntity)
+         ElseIf (EntityType = GDB_TY.SRF_BEZ OrElse EntityType = GDB_TY.SRF_MESH OrElse EntityType = GDB_TY.SRF_FRGN) AndAlso DrawType = RibEntity.RibTypes.FROMIMPORT Then
+            Dim RibEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMIMPORT, nRibId)
+            m_RibList.Add(RibEntity)
+         End If
          nRibId = EgtGetNext(nRibId)
       End While
       If m_RibList.Count > 0 Then
@@ -357,6 +441,12 @@ Public Class RibPanelVM
    Friend Sub Dispose()
       ' ripristino frame originale
       EgtSetGridFrame(m_OriginalGridFrame)
+      ' se in modifica parametri
+      If m_bMachParam_IsChecked Then
+         ' ripristino modalita' standard
+         Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+         Map.refRibPanelVM.ResetMachParamIsChecked()
+      End If
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
@@ -367,12 +457,27 @@ Public Class RibPanelVM
       NotifyPropertyChanged(NameOf(sZPos))
    End Sub
 
-   Private Function InitCommand() As Boolean
+   Private Function InitCommand(RibSelectionType As RibSelectionTypes) As Boolean
       ' attivo modifiche su scena
       Map.refSceneHostVM.MainScene.ResetStatus()
+      ' rendo traspanete estrusione
+      EgtSetAlpha(m_SelRib.nExtrusionId, 50)
       ' seleziono percorso corrente
       EgtDeselectAll()
-      EgtSelectObj(m_SelRib.nId)
+      Select Case RibSelectionType
+         Case RibSelectionTypes.CURVE
+            EgtSelectObj(m_SelRib.nCurveId)
+         Case RibSelectionTypes.EXTRUSION
+            ' creo layer per estrusione
+            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
+            EgtSelectObj(m_SelRib.nCurveId)
+         Case RibSelectionTypes.BOTH
+            EgtSelectObj(m_SelRib.nCurveId)
+            EgtSelectObj(m_SelRib.nExtrusionId)
+      End Select
+      EgtDraw()
    End Function
 
    Friend Sub UpdateUi()
@@ -381,53 +486,96 @@ Public Class RibPanelVM
    End Sub
 
    Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      Select Case command
+         Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
+            ' leggo altezza estrusione
+            Dim dExtrusionLength As Double = 0
+            EgtGetInfo(m_SelRib.nExtrusionId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
+            ' cancello estrusione
+            EgtErase(m_SelRib.nExtrusionId)
+            Dim nNewEntityId As Integer = EgtCreateSurfTmByRegionExtrusion(m_nRibLayerId, 1, {m_SelRib.nCurveId}, Vector3d.Z_AX * dExtrusionLength, EPS_STM)
+            EgtSetName(nNewEntityId, RIB_EXTRUSION)
+            EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
+            ' coloro l'entita' di blu
+            Dim c3LightBlue As Color3d
+            c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
+            EgtSetColor(nNewEntityId, c3LightBlue)
+            ' aggiorno riferimento nella curva
+            m_SelRib.SetExtrusionId(nNewEntityId)
+            ' seleziono nuova estrusione
+            EgtSelectObj(m_SelRib.nExtrusionId)
+            ' ripristino trasparenza estrusione
+            EgtSetAlpha(m_SelRib.nExtrusionId, 100)
+            EgtDraw()
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+         Case Controller.CMD.MOVE, Controller.CMD.ROTATE
+            EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
+            ' seleziono nuova estrusione
+            EgtSelectObj(m_SelRib.nExtrusionId)
+            EgtDraw()
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+         Case Controller.CMD.GRID_ELEVATION, Controller.CMD.GRID_3P, Controller.CMD.GRID_ORIGIN, Controller.CMD.GRID_PERPCURVE, Controller.CMD.GRID_ROTATE, Controller.CMD.GRID_ROTATE3D
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+      End Select
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
-         Dim NewEntity As RibEntity = Nothing
          m_bIsCreatingExtrusion = False
+         ' se riferimento non nullo, elimino vecchia estrusione
+         If m_SelRib.nExtrusionId <> GDB_ID.NULL Then
+            EgtErase(m_SelRib.nExtrusionId)
+         End If
+         Dim NewEntity As RibEntity = Nothing
          Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewExtrusionLayerId)
          Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
          If NewGeomType = GDB_TY.SRF_FRGN OrElse NewGeomType = GDB_TY.SRF_MESH Then
             EgtSetName(nNewEntityId, RIB_EXTRUSION)
+            Dim dExtrusionLength As Double = 0
+            StringToLen(Map.refControllerInputPanelVM.Text, dExtrusionLength)
+            EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
             ' coloro l'entita' di blu
             Dim c3LightBlue As Color3d
             c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
             EgtSetColor(nNewEntityId, c3LightBlue)
             '' lo sposto nel layer dei rib
             EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
-            '' lo aggiungo alla lista
-            NewEntity = New RibEntity(nNewEntityId)
-            m_RibList.Add(NewEntity)
-            ' cancello layer
-            Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
-            EgtErase(nNewRibLayerId)
-            EgtErase(nNewExtrusionLayerId)
+            ' aggiungo riferimento a curva
+            m_SelRib.SetExtrusionId(nNewEntityId)
          End If
+         ' cancello layer estrusione
+         EgtErase(nNewExtrusionLayerId)
          ' aggiorno posizione
          RefreshPos()
-         ' se aggiunta entita'
-         If Not IsNothing(NewEntity) Then
-            SelRib = NewEntity
-            NotifyPropertyChanged(NameOf(SelRib))
-         End If
+         EgtDraw()
          ' rimetto la selezione scena a null
          Map.refSceneHostVM.MainScene.SetStatusNull()
       End If
       ' se finita creazione curva 
       If bIsCreatingPath Then
-         Dim NewEntity As RibEntity = Nothing
          m_bIsCreatingPath = False
+         Dim NewEntity As RibEntity = Nothing
          Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewRibLayerId)
          Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
          If NewGeomType = GDB_TY.CRV_COMPO Then
-            EgtSetName(nNewEntityId, RIB_EXTRUSION)
+            EgtSetName(nNewEntityId, RIB_CURVE)
             ' coloro l'entita' di blu
             Dim c3LightBlue As Color3d
             c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
             EgtSetColor(nNewEntityId, c3LightBlue)
+            ' lo sposto nel layer dei rib
+            EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
+            ' lo aggiungo alla lista
+            NewEntity = New RibEntity(RibEntity.RibTypes.FROMDRAW, nNewEntityId)
+            m_RibList.Add(NewEntity)
+            ' lo seleziono
+            SelRib = NewEntity
+            NotifyPropertyChanged(NameOf(SelRib))
+            ' creo layer per estrusione
             Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
             EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
@@ -438,32 +586,12 @@ Public Class RibPanelVM
                m_bIsCreatingExtrusion = True
             Else
                ' cancello layer
-               EgtErase(nNewRibLayerId)
+               'EgtErase(nNewRibLayerId)
                EgtErase(nNewExtrusionLayerId)
             End If
-
-            '' lo sposto nel layer degli start
-            'EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
-            '' lo aggiungo alla lista
-            'NewEntity = New RibEntity(nNewEntityId)
-            'm_RibList.Add(NewEntity)
-            '' cancello layer di disegno
-            'EgtErase(nNewRibLayerId)
          End If
-         'If NewGeomType = GDB_TY.CRV_COMPO Then
-         '   EgtSetName(nNewEntityId, RIB_GEOM)
-         '   ' coloro l'entita' di blu
-         '   Dim c3LightBlue As Color3d
-         '   c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-         '   EgtSetColor(nNewEntityId, c3LightBlue)
-         '   ' lo sposto nel layer degli start
-         '   EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
-         '   ' lo aggiungo alla lista
-         '   NewEntity = New RibEntity(nNewEntityId)
-         '   m_RibList.Add(NewEntity)
-         '   ' cancello layer di disegno
-         '   EgtErase(nNewRibLayerId)
-         'End If
+         ' cancello layer di disegno
+         EgtErase(nNewRibLayerId)
       End If
    End Sub
 
@@ -478,17 +606,46 @@ Public Class RibPanelVM
    End Function
 
    Friend Sub SelStartFromId(nId)
-      Dim SelRibEntity As RibEntity = m_RibList.FirstOrDefault(Function(x) x.nId = nId)
+      Dim SelRibEntity As RibEntity = m_RibList.FirstOrDefault(Function(x) x.nCurveId = nId OrElse x.nExtrusionId = nId)
       If Not IsNothing(SelRibEntity) Then
          SelRib = SelRibEntity
          NotifyPropertyChanged(NameOf(SelRib))
       End If
    End Sub
 
+   Friend Sub SelLastRib()
+      If RibList.Count <= 0 Then Return
+      SelRib = RibList(RibList.Count - 1)
+      NotifyPropertyChanged(NameOf(SelRib))
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
 
+#Region "Import"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneTop.
+   ''' </summary>
+   Public ReadOnly Property Import_Command As ICommand
+      Get
+         If m_cmdImport Is Nothing Then
+            m_cmdImport = New Command(AddressOf Import)
+         End If
+         Return m_cmdImport
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
+   ''' </summary>
+   Public Sub Import(ByVal param As Object)
+      Map.refSceneHostVM.InsertRib()
+   End Sub
+
+#End Region ' Import
+
 #Region "Line2P"
 
    ''' <summary>
@@ -518,6 +675,43 @@ Public Class RibPanelVM
 
 #End Region ' Line2P
 
+#Region "Delete"
+
+   Public ReadOnly Property Delete_Command As ICommand
+      Get
+         If m_cmdDelete Is Nothing Then
+            m_cmdDelete = New Command(AddressOf Delete)
+         End If
+         Return m_cmdDelete
+      End Get
+   End Property
+
+   Public Sub Delete()
+      If IsNothing(SelRib) Then Return
+      Dim bOk As Boolean = False
+      Select Case m_SelRib.Type
+         Case RibEntity.RibTypes.FROMDRAW
+            bOk = EgtErase(m_SelRib.nCurveId)
+            If bOk Then EgtErase(m_SelRib.nExtrusionId)
+         Case RibEntity.RibTypes.FROMIMPORT
+            bOk = EgtErase(m_SelRib.nExtrusionId)
+      End Select
+      If bOk Then
+         Dim nSelStartIndex As Integer = m_RibList.IndexOf(SelRib)
+         m_RibList.Remove(SelRib)
+         If nSelStartIndex < m_RibList.Count Then
+            SelRib = m_RibList(nSelStartIndex)
+         ElseIf m_RibList.Count > 0 Then
+            SelRib = m_RibList(m_RibList.Count - 1)
+         Else
+            SelRib = Nothing
+         End If
+         NotifyPropertyChanged(NameOf(SelRib))
+      End If
+   End Sub
+
+#End Region    ' Delete
+
 #Region "ModifyCurve"
 
    ''' <summary>
@@ -536,7 +730,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
-      InitCommand()
+      InitCommand(RibSelectionTypes.CURVE)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
 
@@ -560,7 +754,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
-      InitCommand()
+      InitCommand(RibSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
       Else
@@ -588,17 +782,42 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
+      InitCommand(RibSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-         InitCommand()
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
       Else
-         InitCommand()
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.REMOVEPOINTCURVE)
       End If
    End Sub
 
 #End Region ' RemovePointCurve
 
+#Region "Extrude"
+
+   ''' <summary>
+   ''' Returns a command that do Extrude.
+   ''' </summary>
+   Public ReadOnly Property Extrude_Command As ICommand
+      Get
+         If m_cmdExtrude Is Nothing Then
+            m_cmdExtrude = New Command(AddressOf Extrude)
+         End If
+         Return m_cmdExtrude
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Extrude.  This method is invoked by the ExtrudeCommand.
+   ''' </summary>
+   Public Sub Extrude(ByVal param As Object)
+      InitCommand(RibSelectionTypes.EXTRUSION)
+      If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
+         m_bIsCreatingExtrusion = True
+      End If
+   End Sub
+
+#End Region ' Extrude
+
 #Region "CPlaneTop"
 
    ''' <summary>
@@ -897,40 +1116,57 @@ Public Class RibPanelVM
    End Property
 
    Public Sub DragMove()
-      InitCommand()
+      InitCommand(RibSelectionTypes.BOTH)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
    End Sub
 
 #End Region    ' DragMove
 
-#Region "Delete"
+#Region "DragRotate"
 
-   Public ReadOnly Property Delete_Command As ICommand
+   Public ReadOnly Property DragRotate_Command As ICommand
       Get
-         If m_cmdDelete Is Nothing Then
-            m_cmdDelete = New Command(AddressOf Delete)
+         If m_cmdDragRotate Is Nothing Then
+            m_cmdDragRotate = New Command(AddressOf DragRotate)
          End If
-         Return m_cmdDelete
+         Return m_cmdDragRotate
       End Get
    End Property
 
-   Public Sub Delete()
-      If IsNothing(SelRib) Then Return
-      If EgtErase(m_SelRib.nId) Then
-         Dim nSelStartIndex As Integer = m_RibList.IndexOf(SelRib)
-         m_RibList.Remove(SelRib)
-         If nSelStartIndex < m_RibList.Count Then
-            SelRib = m_RibList(nSelStartIndex)
-         ElseIf m_RibList.Count > 0 Then
-            SelRib = m_RibList(m_RibList.Count - 1)
-         Else
-            SelRib = Nothing
-         End If
-         NotifyPropertyChanged(NameOf(SelRib))
-      End If
+   Public Sub DragRotate()
+      InitCommand(RibSelectionTypes.BOTH)
+      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ROTATE)
    End Sub
 
-#End Region    ' Delete
+#End Region    ' DragRotate
+
+#Region "MachParam"
+
+   Public ReadOnly Property MachParam_Command As ICommand
+      Get
+         If m_cmdMachParam Is Nothing Then
+            m_cmdMachParam = New Command(AddressOf MachParam)
+         End If
+         Return m_cmdMachParam
+      End Get
+   End Property
+
+   Public Sub MachParam()
+      If IsNothing(Map.refTopPanelVM.SelMachining) Then Return
+      m_bAdd_IsChecked = False
+      m_bEdit_IsChecked = False
+      m_bGrid_IsChecked = False
+      m_bMove_IsChecked = False
+      m_bRotate_IsChecked = False
+      NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+      NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+      NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+      NotifyPropertyChanged(NameOf(bMove_IsChecked))
+      NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.RIBPARAM)
+   End Sub
+
+#End Region    ' MachParam
 
 #End Region    ' COMMANDS
 
@@ -939,6 +1175,11 @@ End Class
 Public Class RibEntity
    Inherits VMBase
 
+   Public Enum RibTypes As Integer
+      FROMDRAW = 1
+      FROMIMPORT = 2
+   End Enum
+
    Private Shared m_nSharedIndex As Integer = 0
    Private ReadOnly Property nSharedIndex As Integer
       Get
@@ -950,13 +1191,31 @@ Public Class RibEntity
       m_nSharedIndex = 0
    End Sub
 
-   Private m_nId As Integer
-   Public ReadOnly Property nId As Integer
+   Private m_Type As RibTypes
+   Public ReadOnly Property Type As RibTypes
       Get
-         Return m_nId
+         Return m_Type
       End Get
    End Property
 
+   Private m_nCurveId As Integer = GDB_ID.NULL
+   Public ReadOnly Property nCurveId As Integer
+      Get
+         Return m_nCurveId
+      End Get
+   End Property
+
+   Private m_nExtrusionId As Integer = GDB_ID.NULL
+   Public ReadOnly Property nExtrusionId As Integer
+      Get
+         Return m_nExtrusionId
+      End Get
+   End Property
+   Friend Sub SetExtrusionId(nId As Integer)
+      m_nExtrusionId = nId
+      EgtSetInfo(m_nCurveId, KEY_EXTRUSION_ID, m_nExtrusionId)
+   End Sub
+
    Private m_nIndex As Integer
    Public ReadOnly Property nIndex As Integer
       Get
@@ -966,13 +1225,20 @@ Public Class RibEntity
 
    Public ReadOnly Property ghName As String
       Get
-         Return String.Format("[{0}] {1}", {m_nIndex, "Rib"})
+         Return String.Format("[{0}] {1}", {m_nIndex, If(m_Type = RibTypes.FROMDRAW, "Draw Rib", "Import Rib")})
       End Get
    End Property
 
-   Sub New(nId As Integer)
-      m_nId = nId
+   Sub New(Type As RibTypes, nId As Integer)
       m_nIndex = nSharedIndex
+      m_Type = Type
+      EgtSetInfo(nId, KEY_RIB_TYPE, Type)
+      Select Case Type
+         Case RibTypes.FROMDRAW
+            m_nCurveId = nId
+         Case RibTypes.FROMIMPORT
+            m_nExtrusionId = nId
+      End Select
    End Sub
 
 End Class
diff --git a/Icarus/RibParamPanel/RibParamPanelV.xaml b/Icarus/RibParamPanel/RibParamPanelV.xaml
new file mode 100644
index 0000000..470520d
--- /dev/null
+++ b/Icarus/RibParamPanel/RibParamPanelV.xaml
@@ -0,0 +1,126 @@
+<UserControl x:Class="RibParamPanelV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:PrintApp="clr-namespace:Icarus"
+             Width="300">
+   <Border VerticalAlignment="Center" 
+           Style="{StaticResource RightPanel_Border}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <ScrollViewer VerticalScrollBarVisibility="Auto"
+                       HorizontalScrollBarVisibility="Disabled">
+            <Expander Header="{Binding sName}"
+                      IsExpanded="True"
+                      VerticalContentAlignment="Top">
+               <ItemsControl ItemsSource="{Binding MachiningParamList}">
+                  <ItemsControl.ItemsPanel>
+                     <ItemsPanelTemplate>
+                        <UniformGrid Columns="1"
+                                       HorizontalAlignment="Stretch"/>
+                     </ItemsPanelTemplate>
+                  </ItemsControl.ItemsPanel>
+                  <ItemsControl.Resources>
+                     <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="2*"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding sName}"/>
+                           <TextBox Grid.Column="1"
+                                                   Text="{Binding dValue}"/>
+                           <Button Grid.Column="2"
+                                    Content="R"
+                                    Command="{Binding ResetParam_Command}"
+                                    IsEnabled="{Binding bIsModifiedFromPart}"
+                                    VerticalContentAlignment="Center"
+                                    HorizontalContentAlignment="Center"
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource ToolBar_SmallButton}"/>
+                        </Grid>
+                     </DataTemplate>
+                     <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="2*"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding sName}"/>
+                           <ComboBox Grid.Column="1"
+                                       ItemsSource="{Binding ValueList}"
+                                       SelectedItem="{Binding SelValue}"
+                                       HorizontalAlignment="Stretch"/>
+                           <Button Grid.Column="2"
+                                    Content="R"
+                                    Command="{Binding ResetParam_Command}"
+                                    IsEnabled="{Binding bIsModifiedFromDb}"
+                                    VerticalContentAlignment="Center"
+                                    HorizontalContentAlignment="Center"
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource ToolBar_SmallButton}"/>
+                        </Grid>
+                     </DataTemplate>
+                     <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="2*"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding sName}"/>
+                           <CheckBox Grid.Column="1"
+                                       IsChecked="{Binding bValue}"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"/>
+                           <Button Grid.Column="2"
+                                    Content="R"
+                                    Command="{Binding ResetParam_Command}"
+                                    IsEnabled="{Binding bIsModifiedFromDb}"
+                                    VerticalContentAlignment="Center"
+                                    HorizontalContentAlignment="Center"
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource ToolBar_SmallButton}"/>
+                        </Grid>
+                     </DataTemplate>
+                     <DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="2*"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding sName}"/>
+                           <CheckBox Grid.Column="1"
+                                       IsChecked="{Binding bValue}"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"/>
+                           <Button Grid.Column="2"
+                                    Content="R"
+                                    Command="{Binding ResetParam_Command}"
+                                    IsEnabled="{Binding bIsModifiedFromDb}"
+                                    VerticalContentAlignment="Center"
+                                    HorizontalContentAlignment="Center"
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource ToolBar_SmallButton}"/>
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.Resources>
+               </ItemsControl>
+            </Expander>
+         </ScrollViewer>
+         <UniformGrid Grid.Row="1" Rows="1">
+            <Button Content="Ok"
+                    Command="{Binding Ok_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
+            <Button Content="Cancel"
+                    Command="{Binding Cancel_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
+         </UniformGrid>
+      </Grid>
+   </Border>
+</UserControl>
diff --git a/Icarus/RibParamPanel/RibParamPanelV.xaml.vb b/Icarus/RibParamPanel/RibParamPanelV.xaml.vb
new file mode 100644
index 0000000..0ef93f4
--- /dev/null
+++ b/Icarus/RibParamPanel/RibParamPanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class RibParamPanelV
+
+End Class
diff --git a/Icarus/RibParamPanel/RibParamPanelVM.vb b/Icarus/RibParamPanel/RibParamPanelVM.vb
new file mode 100644
index 0000000..6e8e6ba
--- /dev/null
+++ b/Icarus/RibParamPanel/RibParamPanelVM.vb
@@ -0,0 +1,375 @@
+Imports System.Collections.ObjectModel
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class RibParamPanelVM
+   Inherits MachiningCathegory
+
+#Region "FIELDS & PROPERTIES"
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTORS"
+
+   Sub New()
+      ' Creo riferimento a questa classe in EgtCAM5Map
+      Map.SetRefRibParamPanelVM(Me)
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#Region "METHODS"
+
+   Friend Sub Init()
+      If IsNothing(Map.refRibPanelVM.SelRib) Then
+         ' ripristino modalita' standard
+         Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+         Return
+      End If
+      Dim nPartId As Integer = Map.refTopPanelVM.SelPart.nPartId
+      Dim nRibId As Integer = GDB_ID.NULL
+      Select Case Map.refRibPanelVM.SelRib.Type
+         Case RibEntity.RibTypes.FROMDRAW
+            nRibId = Map.refRibPanelVM.SelRib.nCurveId
+         Case RibEntity.RibTypes.FROMIMPORT
+            nRibId = Map.refRibPanelVM.SelRib.nExtrusionId
+      End Select
+
+      m_Type = Cathegories.RIBS
+      m_sName = "Ribs"
+      m_MachiningParamList = New List(Of MachiningParam)({New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nRibId, nPartId)})
+      NotifyPropertyChanged(NameOf(MachiningParamList))
+      NotifyPropertyChanged(NameOf(sName))
+   End Sub
+
+   Friend Sub SaveCurrParams()
+      For Each Param In m_MachiningParamList
+         Param.SaveParam()
+      Next
+   End Sub
+
+   Friend Sub ResetCurrParams()
+      For Each Param In m_MachiningParamList
+         Param.ResetParam()
+      Next
+   End Sub
+
+   Friend Sub WriteParamsInRib(nRibId As Integer)
+      For Each Param As RibNumericMachiningParam In m_MachiningParamList
+         Param.WriteParamInRib(nRibId)
+      Next
+   End Sub
+
+#End Region    ' METHODS
+
+
+
+   'Friend Sub UpdateIsModified()
+   '   m_bIsModified = m_CathegoryList.Any(Function(x) x.MachiningParamList.Any(Function(y) y.bIsModified))
+   'End Sub
+
+   'Sub New()
+   '   m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.RIBS, nIndex))
+   '   For Each Cathegory In m_CathegoryList
+   '      For Each MachiningParam In Cathegory.MachiningParamList
+   '         AddHandler MachiningParam.PropertyChanged, AddressOf OnMachiningParamPropertyChanged
+   '      Next
+   '   Next
+   'End Sub
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      If Not IsNothing(Map.refRibPanelVM.SelRib) Then
+         ' scrivo i parametri modificati
+         Select Case Map.refRibPanelVM.SelRib.Type
+            Case RibEntity.RibTypes.FROMDRAW
+               WriteParamsInRib(Map.refRibPanelVM.SelRib.nCurveId)
+               WriteParamsInRib(Map.refRibPanelVM.SelRib.nExtrusionId)
+            Case RibEntity.RibTypes.FROMIMPORT
+               WriteParamsInRib(Map.refRibPanelVM.SelRib.nExtrusionId)
+         End Select
+      End If
+      ' ripristino modalita' standard
+      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+      Map.refRibPanelVM.ResetMachParamIsChecked()
+   End Sub
+
+#End Region    ' Ok
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      ' ripristino modalita' standard
+      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+      Map.refRibPanelVM.ResetMachParamIsChecked()
+   End Sub
+
+#End Region    ' Cancel
+
+#End Region    ' COMMANDS
+
+End Class
+
+'Public Class RibMachiningCathegory
+'   Inherits MachiningCathegory
+
+'   Sub New(Type As Cathegories, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean)
+'      m_Type = Type
+'      Select Case m_Type
+'         Case Cathegories.RIBS
+'            m_sName = "Ribs"
+'            m_MachiningParamList = New List(Of MachiningParam)({New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb),
+'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb)})
+'      End Select
+'   End Sub
+
+'   Friend Sub SaveCurrParams()
+'      For Each Param In m_MachiningParamList
+'         Param.SaveParam()
+'      Next
+'   End Sub
+
+'   Friend Sub ResetCurrParams()
+'      For Each Param In m_MachiningParamList
+'         Param.ResetParam()
+'      Next
+'   End Sub
+
+'   Friend Sub WriteCurrParamInPart(nPartId As Integer)
+'      For Each Param In m_MachiningParamList
+'         Param.WriteParamInPart(nPartId)
+'      Next
+'   End Sub
+
+'End Class
+
+Public Class RibNumericMachiningParam
+   Inherits NumericMachiningParam
+
+   Public Overrides Property dValue As String
+      Get
+         Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
+      End Get
+      Set(value As String)
+         If m_bIsLen Then
+            StringToLen(value, m_dValue)
+         Else
+            m_dValue = value
+         End If
+         NotifyPropertyChanged(NameOf(dValue))
+         NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+      End Set
+   End Property
+
+   Private m_dPartValue As Double
+   Public ReadOnly Property dPartValue As Double
+      Get
+         Return m_dPartValue
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsModifiedFromPart As Boolean
+      Get
+         Return m_dValue <> m_dPartValue
+      End Get
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdResetParam As ICommand
+
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
+      MyBase.New(Type)
+      Dim bReadFromPart As Boolean = False
+      Select Case Type
+         Case Params.RIBSOVERLAP
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSOVERLAP, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSOVERLAP, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSSTRANDCOUNT
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSSTRANDCOUNT, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSSTRANDCOUNT, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSINVERTDIRECTION
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSLEADININVERT
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADININVERT, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSLEADINLEN
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADINLEN, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADINLEN, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSLEADOUTINVERT
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADOUTINVERT, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADOUTINVERT, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSLEADOUTLEN
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADOUTLEN, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADOUTLEN, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSLEADOUTCOASTING
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADOUTCOASTING, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADOUTCOASTING, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSLEADOUTWIPE
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADOUTWIPE, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADOUTWIPE, m_dPartValue)
+            m_bIsLen = True
+         Case Params.RIBSLEADOUTWIPEDIR
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADOUTWIPEDIR, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADOUTWIPEDIR, m_dPartValue)
+            m_bIsLen = True
+      End Select
+      m_dOrigValue = m_dValue
+      If Not bReadFromPart Then
+         m_dValue = m_dPartValue
+      End If
+   End Sub
+
+   Friend Sub WriteParamInRib(nRibId As Integer)
+      Dim sWriteValue As String = ""
+      If m_bIsLen Then
+         sWriteValue = LenToString(m_dValue, 2)
+      Else
+         sWriteValue = DoubleToString(m_dValue, 2)
+      End If
+      Select Case Type
+         Case Params.RIBSOVERLAP
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSOVERLAP, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSOVERLAP)
+            End If
+         Case Params.RIBSSTRANDCOUNT
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSSTRANDCOUNT, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSSTRANDCOUNT)
+            End If
+         Case Params.RIBSINVERTDIRECTION
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSINVERTDIRECTION, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSINVERTDIRECTION)
+            End If
+         Case Params.RIBSLEADININVERT
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADININVERT, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADININVERT)
+            End If
+         Case Params.RIBSLEADINLEN
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADINLEN, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADINLEN)
+            End If
+         Case Params.RIBSLEADOUTINVERT
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADOUTINVERT, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADOUTINVERT)
+            End If
+         Case Params.RIBSLEADOUTLEN
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADOUTLEN, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADOUTLEN)
+            End If
+         Case Params.RIBSLEADOUTCOASTING
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADOUTCOASTING, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADOUTCOASTING)
+            End If
+         Case Params.RIBSLEADOUTWIPE
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADOUTWIPE, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADOUTWIPE)
+            End If
+         Case Params.RIBSLEADOUTWIPEDIR
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADOUTWIPEDIR, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADOUTWIPEDIR)
+            End If
+      End Select
+   End Sub
+
+   Friend Overrides Sub SaveParam()
+      m_dOrigValue = m_dValue
+   End Sub
+
+   Friend Overrides Sub ResetParam()
+      m_dValue = m_dOrigValue
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "ResetParam"
+
+   Public ReadOnly Property ResetParam_Command As ICommand
+      Get
+         If m_cmdResetParam Is Nothing Then
+            m_cmdResetParam = New Command(AddressOf ResetParamCmd)
+         End If
+         Return m_cmdResetParam
+      End Get
+   End Property
+
+   Public Sub ResetParamCmd()
+      m_dValue = m_dPartValue
+      NotifyPropertyChanged(NameOf(dValue))
+      NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+   End Sub
+
+#End Region    ' ResetParam
+
+#End Region    ' COMMANDS
+
+End Class
diff --git a/3dPrintApp/RightPanel/RightPanelV.xaml b/Icarus/RightPanel/RightPanelV.xaml
similarity index 78%
rename from 3dPrintApp/RightPanel/RightPanelV.xaml
rename to Icarus/RightPanel/RightPanelV.xaml
index b4b394b..a4c4d29 100644
--- a/3dPrintApp/RightPanel/RightPanelV.xaml
+++ b/Icarus/RightPanel/RightPanelV.xaml
@@ -2,7 +2,7 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-            xmlns:PrintApp="clr-namespace:_3dPrintApp"
+            xmlns:PrintApp="clr-namespace:Icarus"
             Margin="5">
    <TabControl SelectedIndex="{Binding SelPanel}"
                Background="Transparent"
@@ -23,6 +23,15 @@
       <TabItem Header="PRINTPARAMDB">
          <PrintApp:MachiningDbV DataContext="{StaticResource MachiningDbVM}"/>
       </TabItem>
+      <TabItem Header="RIBPARAM">
+         <PrintApp:RibParamPanelV DataContext="{StaticResource RibParamPanelVM}"/>
+      </TabItem>
+      <TabItem Header="SHELLNUMBER">
+         <Button/>
+      </TabItem>
+      <TabItem Header="AUXSOLIDPARAM">
+         <Button/>
+      </TabItem>
       <TabItem Header="TFSEDITOR">
          <PrintApp:TFSEditorV DataContext="{StaticResource TFSEditorVM}"/>
       </TabItem>
diff --git a/3dPrintApp/RightPanel/RightPanelV.xaml.vb b/Icarus/RightPanel/RightPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/RightPanel/RightPanelV.xaml.vb
rename to Icarus/RightPanel/RightPanelV.xaml.vb
diff --git a/3dPrintApp/RightPanel/RightPanelVM.vb b/Icarus/RightPanel/RightPanelVM.vb
similarity index 82%
rename from 3dPrintApp/RightPanel/RightPanelVM.vb
rename to Icarus/RightPanel/RightPanelVM.vb
index ef60e8a..72f0eb7 100644
--- a/3dPrintApp/RightPanel/RightPanelVM.vb
+++ b/Icarus/RightPanel/RightPanelVM.vb
@@ -10,7 +10,10 @@ Public Class RightPanelVM
       MATERIALDB = 1
       CURRPRINTPARAM = 2
       PRINTPARAMDB = 3
-      TFSEDITOR = 4
+      RIBPARAM = 4
+      SHELLNUMBER = 5
+      AUXSOLIDPARAM = 6
+      TFSEDITOR = 7
    End Enum
 
    Private m_SelPanel As Panels
@@ -23,6 +26,7 @@ Public Class RightPanelVM
       End Set
    End Property
    Friend Sub SetSelPanel(Panel As Panels)
+      If Panel = m_SelPanel Then Return
       m_SelPanel = Panel
       Select Case Panel
          Case Panels.NULL
@@ -31,6 +35,9 @@ Public Class RightPanelVM
 
          Case Panels.PRINTPARAMDB
 
+         Case Panels.RIBPARAM
+            Map.refRibParamPanelVM.Init()
+
          Case Panels.TFSEDITOR
             'Map.refTFSEditorVM.Refresh()
       End Select
diff --git a/3dPrintApp/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
similarity index 91%
rename from 3dPrintApp/SceneHost/MySceneHostVM.vb
rename to Icarus/SceneHost/MySceneHostVM.vb
index 019a669..8d9ecfd 100644
--- a/3dPrintApp/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -286,14 +286,82 @@ Public Class MySceneHostVM
       Dim sFile As String = String.Empty
       sFile = OpenFileDialog.FileName
       ' importo la nuova geometria
-      MainController.InsertProject(sFile, False)
-      ' la sposto in centro tavola
-      Dim nNewPartId As Integer = EgtGetLastPart()
-      Dim b3NewPart As New BBox3d
-      EgtGetBBoxGlob(nNewPartId, GDB_BB.STANDARD, b3NewPart)
-      EgtMove(nNewPartId, New Point3d((CurrentMachine.b3Tab.DimX / 2) - (b3NewPart.DimX / 2), (CurrentMachine.b3Tab.DimY / 2) - (b3NewPart.DimY / 2), 0) - b3NewPart.Min(), GDB_RT.GLOB)
-      ' imposto modalita' import
-      Map.refTopPanelVM.SelPage = Pages.IMPORT
+      If MainController.InsertProject(sFile, False) Then
+         ' la sposto in centro tavola
+         Dim nNewPartId As Integer = EgtGetLastPart()
+         Dim b3NewPart As New BBox3d
+         EgtGetBBoxGlob(nNewPartId, GDB_BB.STANDARD, b3NewPart)
+         EgtMove(nNewPartId, New Point3d((CurrentMachine.b3Tab.DimX / 2) - (b3NewPart.DimX / 2), (CurrentMachine.b3Tab.DimY / 2) - (b3NewPart.DimY / 2), 0) - b3NewPart.Min(), GDB_RT.GLOB)
+         ' imposto modalita' import
+         Map.refTopPanelVM.SelPage = Pages.IMPORT
+      End If
+   End Sub
+
+   Public Sub InsertRib()
+      ' Recupero cartella dell'ultimo progetto aperto
+      Dim sDir As String = MainController.GetCurrFile()
+      If String.IsNullOrWhiteSpace(sDir) Then
+         GetMainPrivateProfileString(S_MRUIMPORTFILES, K_FILE & 1, "", sDir)
+      End If
+      If Not String.IsNullOrWhiteSpace(sDir) Then
+         sDir = Path.GetDirectoryName(sDir)
+      End If
+      Dim OpenFileDialog As New OpenFileDialog With {.Title = "Insert",
+                                                     .Filter = "Stereolithography (*.stl)|*.stl" &
+                                                               "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|All Files (*.*)|*.*",
+                                                     .FilterIndex = 1,
+                                                     .InitialDirectory = sDir}
+      If Not OpenFileDialog.ShowDialog Then
+         Return
+      End If
+      Dim sFile As String = String.Empty
+      sFile = OpenFileDialog.FileName
+      ' importo la nuova geometria
+      If MainController.InsertProject(sFile, False) Then
+         ' sposto le nuove geometrie nel layer rib del pezzo
+         Dim nNewPartId As Integer = EgtGetLastPart()
+         Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
+         Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
+         While nNewEntityId <> GDB_ID.NULL
+            Dim EntityType As GDB_TY = EgtGetType(nNewEntityId)
+            Select Case EntityType
+               Case GDB_TY.CRV_COMPO, GDB_TY.CRV_LINE, GDB_TY.CRV_ARC
+                  Dim nNewRib = nNewEntityId
+                  If EntityType = GDB_TY.CRV_LINE OrElse EntityType = GDB_TY.CRV_ARC Then
+                     nNewRib = EgtCreateCurveCompo(Map.refTopPanelVM.SelPart.nPartId, nNewEntityId, False)
+                  Else
+                     ' lo copio nel layer dei rib
+                     nNewRib = EgtCopy(nNewEntityId, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
+                  End If
+                  EgtSetName(nNewRib, RIB_CURVE)
+                  ' coloro l'entita' di blu
+                  Dim c3LightBlue As Color3d
+                  c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
+                  EgtSetColor(nNewRib, c3LightBlue)
+                  ' lo aggiungo alla lista
+                  Dim NewEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMIMPORT, nNewRib)
+                  Map.refRibPanelVM.RibList.Add(NewEntity)
+               Case GDB_TY.SRF_MESH, GDB_TY.SRF_FRGN, GDB_TY.SRF_BEZ
+                  Dim nNewRib = nNewEntityId
+                  ' lo copio nel layer dei rib
+                  nNewRib = EgtCopy(nNewEntityId, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
+                  EgtSetName(nNewRib, RIB_EXTRUSION)
+                  ' coloro l'entita' di blu
+                  Dim c3LightBlue As Color3d
+                  c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
+                  EgtSetColor(nNewRib, c3LightBlue)
+                  ' lo aggiungo alla lista
+                  Dim NewEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMIMPORT, nNewRib)
+                  Map.refRibPanelVM.RibList.Add(NewEntity)
+            End Select
+            nNewEntityId = EgtGetNext(nNewEntityId)
+         End While
+         EgtErase(nNewPartId)
+         ' seleziono ultima rib
+         Map.refRibPanelVM.SelLastRib()
+         EgtDraw()
+      End If
    End Sub
 
    Public Overrides Sub ImportProject()
@@ -359,6 +427,8 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
+      ' se sto eseguendo comandi, esco
+      If MainController.GetStep() <> 0 Then Return
       If e.Button = Forms.MouseButtons.Middle Then Return
       If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
       ' Se in modalità modifica
@@ -398,6 +468,8 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnMouseMoveScene(sender As Object, e As Forms.MouseEventArgs)
+      ' se sto eseguendo comandi, esco
+      If MainController.GetStep() <> 0 Then Return
       If e.Button = Forms.MouseButtons.Middle Then Return
       If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
       ' Se in modalità modifica
@@ -436,6 +508,8 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnMouseUpScene(sender As Object, e As Forms.MouseEventArgs)
+      ' se sto eseguendo comandi, esco
+      If MainController.GetStep() <> 0 Then Return
       If e.Button = Forms.MouseButtons.Middle Then Return
       If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
       ' Se in modalità modifica
@@ -886,8 +960,6 @@ Public Class MySceneHostVM
 
 #End Region       ' Part
 
-
-
 #Region "StartMach"
 
    Friend Sub StartMach_OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
diff --git a/3dPrintApp/SceneHost/MySceneHostVM.vb.bak b/Icarus/SceneHost/MySceneHostVM.vb.bak
similarity index 100%
rename from 3dPrintApp/SceneHost/MySceneHostVM.vb.bak
rename to Icarus/SceneHost/MySceneHostVM.vb.bak
diff --git a/3dPrintApp/SceneHost/SceneHostV.xaml b/Icarus/SceneHost/SceneHostV.xaml
similarity index 100%
rename from 3dPrintApp/SceneHost/SceneHostV.xaml
rename to Icarus/SceneHost/SceneHostV.xaml
diff --git a/3dPrintApp/SceneHost/SceneHostV.xaml.vb b/Icarus/SceneHost/SceneHostV.xaml.vb
similarity index 100%
rename from 3dPrintApp/SceneHost/SceneHostV.xaml.vb
rename to Icarus/SceneHost/SceneHostV.xaml.vb
diff --git a/3dPrintApp/SecondaryWindow/SecondaryWindowV.xaml b/Icarus/SecondaryWindow/SecondaryWindowV.xaml
similarity index 95%
rename from 3dPrintApp/SecondaryWindow/SecondaryWindowV.xaml
rename to Icarus/SecondaryWindow/SecondaryWindowV.xaml
index d9c5d4b..747ef94 100644
--- a/3dPrintApp/SecondaryWindow/SecondaryWindowV.xaml
+++ b/Icarus/SecondaryWindow/SecondaryWindowV.xaml
@@ -2,7 +2,7 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:PrintApp="clr-namespace:_3dPrintApp"
+                            xmlns:PrintApp="clr-namespace:Icarus"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             Title="{Binding Title}" Icon="/Resources/EgtBEAMWALL.ico"
                             WindowStyle="None" ResizeMode="NoResize"
diff --git a/3dPrintApp/SecondaryWindow/SecondaryWindowV.xaml.vb b/Icarus/SecondaryWindow/SecondaryWindowV.xaml.vb
similarity index 100%
rename from 3dPrintApp/SecondaryWindow/SecondaryWindowV.xaml.vb
rename to Icarus/SecondaryWindow/SecondaryWindowV.xaml.vb
diff --git a/3dPrintApp/SecondaryWindow/SecondaryWindowVM.vb b/Icarus/SecondaryWindow/SecondaryWindowVM.vb
similarity index 100%
rename from 3dPrintApp/SecondaryWindow/SecondaryWindowVM.vb
rename to Icarus/SecondaryWindow/SecondaryWindowVM.vb
diff --git a/3dPrintApp/ShowPanel/ShowPanelV.xaml b/Icarus/ShowPanel/ShowPanelV.xaml
similarity index 100%
rename from 3dPrintApp/ShowPanel/ShowPanelV.xaml
rename to Icarus/ShowPanel/ShowPanelV.xaml
diff --git a/3dPrintApp/ShowPanel/ShowPanelV.xaml.vb b/Icarus/ShowPanel/ShowPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ShowPanel/ShowPanelV.xaml.vb
rename to Icarus/ShowPanel/ShowPanelV.xaml.vb
diff --git a/3dPrintApp/SliceManager/SliceManagerV.xaml b/Icarus/SliceManager/SliceManagerV.xaml
similarity index 100%
rename from 3dPrintApp/SliceManager/SliceManagerV.xaml
rename to Icarus/SliceManager/SliceManagerV.xaml
diff --git a/3dPrintApp/SliceManager/SliceManagerV.xaml.vb b/Icarus/SliceManager/SliceManagerV.xaml.vb
similarity index 100%
rename from 3dPrintApp/SliceManager/SliceManagerV.xaml.vb
rename to Icarus/SliceManager/SliceManagerV.xaml.vb
diff --git a/3dPrintApp/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb
similarity index 99%
rename from 3dPrintApp/SliceManager/SliceManagerVM.vb
rename to Icarus/SliceManager/SliceManagerVM.vb
index bc96b8a..34c1bdf 100644
--- a/3dPrintApp/SliceManager/SliceManagerVM.vb
+++ b/Icarus/SliceManager/SliceManagerVM.vb
@@ -125,6 +125,7 @@ Public Class SliceManagerVM
    End Function
 
    Friend Sub CalcSlice(bSlice As Boolean, bCalcTFS As Boolean)
+      If bCalcTFS Then Map.refTFSEditorVM.UpdateSpeedMinMax()
       ' eseguo file Lua
       SetLoadingVisibility(True)
       ExecSlice(bSlice, bCalcTFS)
diff --git a/3dPrintApp/SliderManager/LayerAdvancementSliderV.xaml b/Icarus/SliderManager/LayerAdvancementSliderV.xaml
similarity index 100%
rename from 3dPrintApp/SliderManager/LayerAdvancementSliderV.xaml
rename to Icarus/SliderManager/LayerAdvancementSliderV.xaml
diff --git a/3dPrintApp/SliderManager/LayerAdvancementSliderV.xaml.vb b/Icarus/SliderManager/LayerAdvancementSliderV.xaml.vb
similarity index 100%
rename from 3dPrintApp/SliderManager/LayerAdvancementSliderV.xaml.vb
rename to Icarus/SliderManager/LayerAdvancementSliderV.xaml.vb
diff --git a/3dPrintApp/SliderManager/LayerIndexSliderV.xaml b/Icarus/SliderManager/LayerIndexSliderV.xaml
similarity index 100%
rename from 3dPrintApp/SliderManager/LayerIndexSliderV.xaml
rename to Icarus/SliderManager/LayerIndexSliderV.xaml
diff --git a/3dPrintApp/SliderManager/LayerIndexSliderV.xaml.vb b/Icarus/SliderManager/LayerIndexSliderV.xaml.vb
similarity index 100%
rename from 3dPrintApp/SliderManager/LayerIndexSliderV.xaml.vb
rename to Icarus/SliderManager/LayerIndexSliderV.xaml.vb
diff --git a/3dPrintApp/SliderManager/SliderManagerVM.vb b/Icarus/SliderManager/SliderManagerVM.vb
similarity index 96%
rename from 3dPrintApp/SliderManager/SliderManagerVM.vb
rename to Icarus/SliderManager/SliderManagerVM.vb
index 05520a3..4734812 100644
--- a/3dPrintApp/SliderManager/SliderManagerVM.vb
+++ b/Icarus/SliderManager/SliderManagerVM.vb
@@ -6,12 +6,12 @@ Public Class SliderManagerVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Private m_nLayerIndex As Double
-   Public Property nLayerIndex As Double
+   Private m_nLayerIndex As Integer
+   Public Property nLayerIndex As Integer
       Get
          Return m_nLayerIndex
       End Get
-      Set(value As Double)
+      Set(value As Integer)
          m_nLayerIndex = value
          ' ciclo tutti i layer per nasconderli/mostrarli
          If IsNothing(Map.refTopPanelVM.SelPart) OrElse IsNothing(Map.refTopPanelVM.SelPart.LayerList) Then Return
diff --git a/3dPrintApp/Special-3dPrinting/Printing3DPanelV.xaml b/Icarus/Special-3dPrinting/Printing3DPanelV.xaml
similarity index 100%
rename from 3dPrintApp/Special-3dPrinting/Printing3DPanelV.xaml
rename to Icarus/Special-3dPrinting/Printing3DPanelV.xaml
diff --git a/3dPrintApp/Special-3dPrinting/Printing3DPanelV.xaml.vb b/Icarus/Special-3dPrinting/Printing3DPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/Special-3dPrinting/Printing3DPanelV.xaml.vb
rename to Icarus/Special-3dPrinting/Printing3DPanelV.xaml.vb
diff --git a/3dPrintApp/Special-3dPrinting/Printing3DPanelVM.vb b/Icarus/Special-3dPrinting/Printing3DPanelVM.vb
similarity index 100%
rename from 3dPrintApp/Special-3dPrinting/Printing3DPanelVM.vb
rename to Icarus/Special-3dPrinting/Printing3DPanelVM.vb
diff --git a/3dPrintApp/Special-3dPrinting/Printing3DUtility.vb b/Icarus/Special-3dPrinting/Printing3DUtility.vb
similarity index 100%
rename from 3dPrintApp/Special-3dPrinting/Printing3DUtility.vb
rename to Icarus/Special-3dPrinting/Printing3DUtility.vb
diff --git a/3dPrintApp/StartMachPanel/StartMachPanelV.xaml b/Icarus/StartMachPanel/StartMachPanelV.xaml
similarity index 99%
rename from 3dPrintApp/StartMachPanel/StartMachPanelV.xaml
rename to Icarus/StartMachPanel/StartMachPanelV.xaml
index 89d078d..99d455f 100644
--- a/3dPrintApp/StartMachPanel/StartMachPanelV.xaml
+++ b/Icarus/StartMachPanel/StartMachPanelV.xaml
@@ -2,7 +2,7 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-            xmlns:PrintApp="clr-namespace:_3dPrintApp"
+            xmlns:PrintApp="clr-namespace:Icarus"
             Margin="5">
    <StackPanel.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
diff --git a/3dPrintApp/StartMachPanel/StartMachPanelV.xaml.vb b/Icarus/StartMachPanel/StartMachPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/StartMachPanel/StartMachPanelV.xaml.vb
rename to Icarus/StartMachPanel/StartMachPanelV.xaml.vb
diff --git a/3dPrintApp/StartMachPanel/StartMachPanelVM.vb b/Icarus/StartMachPanel/StartMachPanelVM.vb
similarity index 100%
rename from 3dPrintApp/StartMachPanel/StartMachPanelVM.vb
rename to Icarus/StartMachPanel/StartMachPanelVM.vb
diff --git a/3dPrintApp/StatusBar/MyStatusBarVM.vb b/Icarus/StatusBar/MyStatusBarVM.vb
similarity index 100%
rename from 3dPrintApp/StatusBar/MyStatusBarVM.vb
rename to Icarus/StatusBar/MyStatusBarVM.vb
diff --git a/3dPrintApp/StatusBar/StatusBarV.xaml b/Icarus/StatusBar/StatusBarV.xaml
similarity index 100%
rename from 3dPrintApp/StatusBar/StatusBarV.xaml
rename to Icarus/StatusBar/StatusBarV.xaml
diff --git a/3dPrintApp/StatusBar/StatusBarV.xaml.vb b/Icarus/StatusBar/StatusBarV.xaml.vb
similarity index 100%
rename from 3dPrintApp/StatusBar/StatusBarV.xaml.vb
rename to Icarus/StatusBar/StatusBarV.xaml.vb
diff --git a/Icarus/TSFEditor/TFSEditorV.xaml b/Icarus/TSFEditor/TFSEditorV.xaml
new file mode 100644
index 0000000..0eaebd6
--- /dev/null
+++ b/Icarus/TSFEditor/TFSEditorV.xaml
@@ -0,0 +1,172 @@
+<UserControl x:Class="TFSEditorV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:PrintApp="clr-namespace:Icarus"
+             MaxHeight="600"
+             Width="{Binding ControlWidth}">
+   <Border VerticalAlignment="Center"
+           MinHeight="300"
+           Style="{StaticResource RightPanel_Border}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <WrapPanel Orientation="Horizontal" x:Name="TFSEditorStackPanel">
+            <ComboBox ItemsSource="{Binding MediaTypeList}"
+                      SelectedIndex="{Binding ghSelMediaType}"
+                      Margin="0,0,10,0"
+                      Style="{StaticResource PartParam_ComboBox}"/>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Text="Slice Number:"
+                             Visibility="{Binding MediaHeight_Visibility}"
+                             Style="{StaticResource TSFEditor_TextBlock}"/>
+                  <TextBox Grid.Column="1"
+                           Text="{Binding sMediaHeight}"
+                           Width="50"
+                           Visibility="{Binding MediaHeight_Visibility}"
+                           Style="{StaticResource ControllerInputPanel_TextBox}"/>
+               </Grid>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Text="Difference:"
+                             Visibility="{Binding Difference_Visibility}"
+                             Style="{StaticResource TSFEditor_TextBlock}"/>
+                  <TextBox Grid.Column="1"
+                           Text="{Binding sDifference}"
+                           Width="50"
+                           Visibility="{Binding Difference_Visibility}"
+                           Style="{StaticResource ControllerInputPanel_TextBox}"/>
+               </Grid>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Text="F:"
+                             Visibility="{Binding FCurr_Visibility}"
+                             Style="{StaticResource TSFEditor_TextBlock}"/>
+                  <TextBox Grid.Column="1"
+                           Text="{Binding sFCurr}"
+                           Width="50"
+                           Visibility="{Binding FCurr_Visibility}"
+                           Style="{StaticResource ControllerInputPanel_TextBox}"/>
+               </Grid>
+               <StackPanel Grid.Column="1"
+                           Orientation="Horizontal">
+                  <Button Content="Set"
+                          Command="{Binding Set_Command}"
+                          Visibility="{Binding FCurr_Visibility}"
+                          Style="{StaticResource ToolBar_TextButton}"/>
+                  <Button Content="Media"
+                          Command="{Binding Media_Command}"
+                          Style="{StaticResource ToolBar_TextButton}"/>
+                  <Button Content="Reset"
+                          Command="{Binding Reset_Command}"
+                          Style="{StaticResource ToolBar_TextButton}"/>
+               </StackPanel>
+            </Grid>
+         </WrapPanel>
+         <DataGrid Grid.Row="1"
+                   ItemsSource="{Binding LayerList}"
+                   PrintApp:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding SelLayers}"
+                   SelectedItem="{Binding SelLayer}"
+                   CanUserAddRows="False"
+                   AutoGenerateColumns="False"
+                   CanUserResizeRows="False"
+                   SelectionMode="Extended"
+                   ScrollViewer.CanContentScroll="True" 
+                   ScrollViewer.VerticalScrollBarVisibility="Auto"
+                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                   Margin="0,0,0,5">
+            <DataGrid.Columns>
+               <DataGridTextColumn Header="Index" 
+                                   Binding="{Binding nIndex}"
+                                   IsReadOnly="True"
+                                   Width="Auto"/>
+               <DataGridTextColumn Header="Length"
+                                   Binding="{Binding sLength}"
+                                   IsReadOnly="True"
+                                   Visibility="{Binding DataContext.ColExtend_Visibility,
+                                                        Source={x:Reference TFSEditorStackPanel}}"
+                                   Width="2*"/>
+               <DataGridTextColumn Header="TMin" 
+                                   Binding="{Binding sTMin}"
+                                   IsReadOnly="True"
+                                   Visibility="{Binding DataContext.ColExtend_Visibility,
+                                                        Source={x:Reference TFSEditorStackPanel}}"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="TTrg" 
+                                   Binding="{Binding sTTrg}"
+                                   IsReadOnly="True"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="TMax" 
+                                   Binding="{Binding sTMax}"
+                                   IsReadOnly="True"
+                                   Visibility="{Binding DataContext.ColExtend_Visibility,
+                                                        Source={x:Reference TFSEditorStackPanel}}"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="TCurr" 
+                                   Binding="{Binding sTCurr}"
+                                   IsReadOnly="True"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="FMin" 
+                                   Binding="{Binding sFMin}"
+                                   IsReadOnly="True"
+                                   Visibility="{Binding DataContext.ColExtend_Visibility,
+                                                        Source={x:Reference TFSEditorStackPanel}}"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="FTrg" 
+                                   Binding="{Binding sFTrg}"
+                                   IsReadOnly="True"
+                                   Visibility="{Binding DataContext.ColExtend_Visibility,
+                                                        Source={x:Reference TFSEditorStackPanel}}"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="FMax" 
+                                   Binding="{Binding sFMax}"
+                                   IsReadOnly="True"
+                                   Visibility="{Binding DataContext.ColExtend_Visibility,
+                                                        Source={x:Reference TFSEditorStackPanel}}"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="FCurr" 
+                                   Binding="{Binding sFCurr}"
+                                   Width="1*"/>
+               <DataGridTextColumn Header="Speed" 
+                                   Binding="{Binding sSpeed}"
+                                   IsReadOnly="True"
+                                   Width="1*"/>
+            </DataGrid.Columns>
+            <DataGrid.RowStyle>
+               <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+                  <Setter Property="Background" Value="{Binding Background}"/>
+                  <Setter Property="Foreground" Value="{Binding Foreground}"/>
+                  <Setter Property="FontWeight" Value="{Binding FontWeight}"/>
+                  <!--<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>-->
+               </Style>
+            </DataGrid.RowStyle>
+
+         </DataGrid>
+         <StackPanel Grid.Row="2" Orientation="Horizontal">
+            <ComboBox ItemsSource="{Binding FilterList}"
+                      SelectedIndex="{Binding nSelFilter}"
+                      Style="{StaticResource PartParam_ComboBox}"/>
+            <Button Content="Extend"
+                    Command="{Binding Extend_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
+         </StackPanel>
+      </Grid>
+   </Border>
+</UserControl>
diff --git a/3dPrintApp/TSFEditor/TFSEditorV.xaml.vb b/Icarus/TSFEditor/TFSEditorV.xaml.vb
similarity index 100%
rename from 3dPrintApp/TSFEditor/TFSEditorV.xaml.vb
rename to Icarus/TSFEditor/TFSEditorV.xaml.vb
diff --git a/3dPrintApp/TSFEditor/TFSEditorVM.vb b/Icarus/TSFEditor/TFSEditorVM.vb
similarity index 73%
rename from 3dPrintApp/TSFEditor/TFSEditorVM.vb
rename to Icarus/TSFEditor/TFSEditorVM.vb
index b6c1e9e..cb4804e 100644
--- a/3dPrintApp/TSFEditor/TFSEditorVM.vb
+++ b/Icarus/TSFEditor/TFSEditorVM.vb
@@ -14,6 +14,29 @@ Public Class TFSEditorVM
       SELECTION = 3
    End Enum
 
+   Public Enum Filters As Integer
+      NULL = 0
+      TIME_LOWER = 1
+      TIME_OK = 2
+      TIME_UPPER = 3
+      SPEED_MIN = 4
+      SPEED_MAX = 5
+   End Enum
+
+   Private m_dSpeedMin As Double
+   Public ReadOnly Property dSpeedMin As Double
+      Get
+         Return m_dSpeedMin
+      End Get
+   End Property
+   Private m_dSpeedMax As Double
+   Public ReadOnly Property dSpeedMax As Double
+      Get
+         Return m_dSpeedMax
+      End Get
+   End Property
+
+   Private m_LayerList_View As CollectionView = Nothing
    Private m_LayerList As New ObservableCollection(Of TFSLayer)
    Public ReadOnly Property LayerList As ObservableCollection(Of TFSLayer)
       Get
@@ -140,10 +163,41 @@ Public Class TFSEditorVM
       NotifyPropertyChanged(NameOf(FCurr_Visibility))
    End Sub
 
+   Private m_FilterList As New List(Of String)({"", "Time Lower", "Time Ok", "Time Upper", "Speed Min", "Speed Max"})
+   Public ReadOnly Property FilterList As List(Of String)
+      Get
+         Return m_FilterList
+      End Get
+   End Property
+
+   Private m_nSelFilter As Filters
+   Public Property nSelFilter As Integer
+      Get
+         Return m_nSelFilter
+      End Get
+      Set(value As Integer)
+         m_nSelFilter = value
+         m_LayerList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_bColExtend As Boolean = False
+   Public ReadOnly Property ColExtend_Visibility As Visibility
+      Get
+         Return If(m_bColExtend, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+   Public ReadOnly Property ControlWidth As Double
+      Get
+         Return If(m_bColExtend, 600, 300)
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdSet As ICommand
    Private m_cmdMedia As ICommand
    Private m_cmdReset As ICommand
+   Private m_cmdExtend As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -154,7 +208,10 @@ Public Class TFSEditorVM
       Map.SetRefTFSEditorVM(Me)
       m_nSelMediaType = MediaTypes.HEIGHT
       NotifyPropertyChanged(NameOf(ghSelMediaType))
+      m_LayerList_View = CollectionViewSource.GetDefaultView(m_LayerList)
+      m_LayerList_View.Filter = AddressOf LayerFilter
       AddHandler m_SelLayers.CollectionChanged, AddressOf SelLayers_CollectionChanged
+      UpdateSpeedMinMax()
    End Sub
 
 #End Region    ' CONSTRUCTORS
@@ -196,6 +253,30 @@ Public Class TFSEditorVM
       End While
    End Sub
 
+   Private Function LayerFilter(Layer As Object) As Boolean
+      Dim CurrLayer As TFSLayer = DirectCast(Layer, TFSLayer)
+      Select Case m_nSelFilter
+         Case Filters.NULL
+            Return True
+         Case Filters.TIME_LOWER
+            Return CurrLayer.dTCurr < CurrLayer.dTMin
+         Case Filters.TIME_OK
+            Return CurrLayer.dTCurr >= CurrLayer.dTMin AndAlso CurrLayer.dTCurr <= CurrLayer.dTMax
+         Case Filters.TIME_UPPER
+            Return CurrLayer.dTCurr > CurrLayer.dTMax
+         Case Filters.SPEED_MIN
+            Return CurrLayer.dSpeed <= m_dSpeedMin
+         Case Filters.SPEED_MAX
+            Return CurrLayer.dSpeed >= m_dSpeedMax
+      End Select
+      Return True
+   End Function
+
+   Friend Sub UpdateSpeedMinMax()
+      m_dSpeedMin = GetPrivateProfileDouble(S_PRINTING3D, K_SPEED_MIN, 0, CurrentMachine.sMachIniFile)
+      m_dSpeedMax = GetPrivateProfileDouble(S_PRINTING3D, K_SPEED_MAX, 50000, CurrentMachine.sMachIniFile)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -269,7 +350,7 @@ Public Class TFSEditorVM
                Dim dFSum As Double = 0
                Dim dFIndex As Double = 0
                For Index2 = (m_nMediaHeight * Index) To Math.Min(m_nMediaHeight * (Index + 1), m_LayerList.Count() - 1)
-                  dFSum += m_LayerList(Index2).dFCurr
+                  dFSum += m_LayerList(Index2).sFCurr
                   dFIndex += 1
                Next
                Dim dNewFCurr As Double = dFSum / dFIndex
@@ -296,7 +377,7 @@ Public Class TFSEditorVM
                Dim dFSum As Double = 0
                Dim dFIndex As Double = 0
                For Index2 = ChangeIndexList(Index) To ChangeIndexList(Index + 1)
-                  dFSum += m_LayerList(Index2).dFCurr
+                  dFSum += m_LayerList(Index2).sFCurr
                   dFIndex += 1
                Next
                Dim dNewFCurr As Double = dFSum / dFIndex
@@ -309,7 +390,7 @@ Public Class TFSEditorVM
             Dim dFSum As Double = 0
             Dim dFIndex As Double = 0
             For Each Layer In m_SelLayers
-               dFSum += Layer.dFCurr
+               dFSum += Layer.sFCurr
                dFIndex += 1
             Next
             Dim dNewFCurr As Double = dFSum / dFIndex
@@ -361,6 +442,31 @@ Public Class TFSEditorVM
 
 #End Region ' Reset
 
+#Region "Extend"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneTop.
+   ''' </summary>
+   Public ReadOnly Property Extend_Command As ICommand
+      Get
+         If m_cmdExtend Is Nothing Then
+            m_cmdExtend = New Command(AddressOf Extend)
+         End If
+         Return m_cmdExtend
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
+   ''' </summary>
+   Public Sub Extend()
+      m_bColExtend = Not m_bColExtend
+      NotifyPropertyChanged(NameOf(ColExtend_Visibility))
+      NotifyPropertyChanged(NameOf(ControlWidth))
+   End Sub
+
+#End Region ' Extend
+
 #End Region    ' COMMANDS
 
 End Class
@@ -383,16 +489,16 @@ Public Class TFSLayer
    End Property
 
    Private m_dLength As Double
-   Public ReadOnly Property sLength As String
-      Get
-         Return LenToString(m_dLength, 2)
-      End Get
-   End Property
    Public ReadOnly Property dLength As Double
       Get
          Return m_dLength
       End Get
    End Property
+   Public ReadOnly Property sLength As String
+      Get
+         Return LenToString(m_dLength, 0)
+      End Get
+   End Property
 
    Private m_dTMin As Double
    Public ReadOnly Property dTMin As Double
@@ -400,11 +506,16 @@ Public Class TFSLayer
          Return m_dTMin
       End Get
    End Property
+   Public ReadOnly Property sTMin As String
+      Get
+         Return DoubleToString(m_dTMin, 0)
+      End Get
+   End Property
 
    Private m_dTTrg As Double
-   Public ReadOnly Property dTTrg As Double
+   Public ReadOnly Property sTTrg As String
       Get
-         Return m_dTTrg
+         Return DoubleToString(m_dTTrg, 0)
       End Get
    End Property
 
@@ -414,6 +525,11 @@ Public Class TFSLayer
          Return m_dTMax
       End Get
    End Property
+   Public ReadOnly Property sTMax As String
+      Get
+         Return DoubleToString(m_dTMax, 0)
+      End Get
+   End Property
 
    Private m_dTCurr As Double
    Public ReadOnly Property dTCurr As Double
@@ -421,38 +537,48 @@ Public Class TFSLayer
          Return m_dTCurr
       End Get
    End Property
+   Public ReadOnly Property sTCurr As String
+      Get
+         Return DoubleToString(m_dTCurr, 0)
+      End Get
+   End Property
 
    Private m_dFMin As Double
-   Public ReadOnly Property dFMin As Double
+   Public ReadOnly Property sFMin As String
       Get
-         Return m_dFMin
+         Return LenToString(m_dFMin, 0)
       End Get
    End Property
 
    Private m_dFTrg As Double
-   Public ReadOnly Property dFTrg As Double
+   Public ReadOnly Property sFTrg As String
       Get
-         Return m_dFTrg
+         Return LenToString(m_dFTrg, 0)
       End Get
    End Property
 
    Private m_dFMax As Double
-   Public ReadOnly Property dFMax As Double
+   Public ReadOnly Property sFMax As String
       Get
-         Return m_dFMax
+         Return LenToString(m_dFMax, 0)
       End Get
    End Property
 
    Private m_dFCurr As Double
-   Public Property dFCurr As Double
+   Public Property sFCurr As String
       Get
-         Return m_dFCurr
+         Return LenToString(m_dFCurr, 0)
       End Get
-      Set(value As Double)
-         m_dFCurr = value
-         EgtSetInfo(nId, "FCur", m_dFCurr)
-         m_bFCurr_IsModified = True
-         NotifyPropertyChanged(NameOf(Background))
+      Set(value As String)
+         Dim dNewValue As Double
+         If StringToLen(value, dNewValue) Then
+            m_dFCurr = dNewValue
+            EgtSetInfo(nId, "FCur", m_dFCurr)
+            m_bFCurr_IsModified = True
+            NotifyPropertyChanged(NameOf(Background))
+         Else
+            NotifyPropertyChanged(NameOf(sFCurr))
+         End If
       End Set
    End Property
    Friend Sub SetFCurr(value As Double)
@@ -460,7 +586,7 @@ Public Class TFSLayer
       EgtSetInfo(nId, "FCur", m_dFCurr)
       m_bFCurr_IsModified = True
       NotifyPropertyChanged(NameOf(Background))
-      NotifyPropertyChanged(NameOf(dFCurr))
+      NotifyPropertyChanged(NameOf(sFCurr))
    End Sub
 
    Private m_bFCurr_IsModified As Boolean
@@ -476,6 +602,11 @@ Public Class TFSLayer
          Return m_dSpeed
       End Get
    End Property
+   Public ReadOnly Property sSpeed As String
+      Get
+         Return DoubleToString(m_dSpeed, 0)
+      End Get
+   End Property
 
    Private m_GeomSliceIdList As New List(Of Integer)
    Public ReadOnly Property GeomSliceIdList As List(Of Integer)
@@ -491,13 +622,38 @@ Public Class TFSLayer
          ElseIf m_dTCurr < m_dTMin Then
             Return Brushes.Red
          ElseIf m_dTCurr > m_dTMax Then
-            Return Brushes.MediumSlateBlue
+            Return Brushes.MediumOrchid
+            '  Return Brushes.MediumSlateBlue
          Else
             Return Brushes.LightGreen
          End If
       End Get
    End Property
 
+   Public ReadOnly Property Foreground As SolidColorBrush
+      Get
+         If m_bFCurr_IsModified Then
+            Return Brushes.Black
+         ElseIf m_dSpeed <= Map.refTFSEditorVM.dSpeedMin OrElse m_dSpeed >= Map.refTFSEditorVM.dSpeedMax Then
+            Return Brushes.Yellow
+         Else
+            Return Brushes.Black
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property FontWeight As FontWeight
+      Get
+         If m_bFCurr_IsModified Then
+            Return FontWeights.Normal
+         ElseIf m_dSpeed <= Map.refTFSEditorVM.dSpeedMin OrElse m_dSpeed >= Map.refTFSEditorVM.dSpeedMax Then
+            Return FontWeights.Bold
+         Else
+            Return FontWeights.Normal
+         End If
+      End Get
+   End Property
+
    Sub New(nId As Integer)
       m_nId = nId
       Dim sIndex As String = ""
diff --git a/3dPrintApp/Themes/Generic.xaml b/Icarus/Themes/Generic.xaml
similarity index 94%
rename from 3dPrintApp/Themes/Generic.xaml
rename to Icarus/Themes/Generic.xaml
index ce5777e..4d3ee27 100644
--- a/3dPrintApp/Themes/Generic.xaml
+++ b/Icarus/Themes/Generic.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:_3dPrintApp">
+    xmlns:local="clr-namespace:Icarus">
 
 
     <Style TargetType="{x:Type local:AirspacePopup}">
diff --git a/3dPrintApp/TopPanel/TopPanelV.xaml b/Icarus/TopPanel/TopPanelV.xaml
similarity index 100%
rename from 3dPrintApp/TopPanel/TopPanelV.xaml
rename to Icarus/TopPanel/TopPanelV.xaml
diff --git a/3dPrintApp/TopPanel/TopPanelV.xaml.vb b/Icarus/TopPanel/TopPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/TopPanel/TopPanelV.xaml.vb
rename to Icarus/TopPanel/TopPanelV.xaml.vb
diff --git a/3dPrintApp/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb
similarity index 95%
rename from 3dPrintApp/TopPanel/TopPanelVM.vb
rename to Icarus/TopPanel/TopPanelVM.vb
index 8bb8716..ec11442 100644
--- a/3dPrintApp/TopPanel/TopPanelVM.vb
+++ b/Icarus/TopPanel/TopPanelVM.vb
@@ -127,6 +127,10 @@ Public Class TopPanelVM
          Return m_SelPart
       End Get
       Set(value As Print3dPartVM)
+         If Not IsNothing(m_SelPart) Then
+            ' deseleziono eventuale pezzo precedente
+            EgtResetMark(m_SelPart.nPrintSolidId)
+         End If
          m_SelPart = value
          If Not IsNothing(value) Then
             ' visualizzo/nascondo tutti i layer
@@ -147,9 +151,9 @@ Public Class TopPanelVM
                nSliceLayerId = EgtGetNext(nSliceLayerId)
             End While
             ' Eseguo la selezione
-            EgtDeselectAll()
             EgtSetStatus(m_SelPart.nPartId, GDB_ST.ON_)
-            EgtSelectPartObjs(m_SelPart.nPartId)
+            EgtDeselectAll()
+            EgtSetMark(m_SelPart.nPrintSolidId)
             EgtDraw()
             ' imposto lavorazione e materiale del pezzo selezionato
             Map.refCurrMachiningPanelVM.ReadMachParamFromSelPart()
@@ -178,7 +182,7 @@ Public Class TopPanelVM
       End Get
       Set(value As MaterialIndex)
          m_SelMaterial = value
-         WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, value.sName)
+         WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, value.sGUID)
          ' ricarico lista lavorazioni valide per il materiale selezionato
          InitMachiningsList()
       End Set
@@ -203,11 +207,13 @@ Public Class TopPanelVM
       Set(value As MachiningIndex)
          ' verifico se vecchia modificata e chiedo se salvare??
 
-         If Not IsNothing(value) Then WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, value.sName)
-         ' imposto selezionata come corrente
-         If Not IsNothing(m_SelPart) AndAlso (IsNothing(m_SelMachining) OrElse value.sGUID <> m_SelMachining.sGUID) Then
-            Map.refCurrMachiningPanelVM.SetCurrMachining(New CurrMachining(m_SelPart.nPartId, value.nIndex))
-            'm_CurrMachining.UpdateMachParam()
+         If Not IsNothing(value) Then
+            WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, value.sGUID)
+            ' imposto selezionata come corrente
+            If Not IsNothing(m_SelPart) AndAlso (IsNothing(m_SelMachining) OrElse value.sGUID <> m_SelMachining.sGUID) Then
+               Map.refCurrMachiningPanelVM.SetCurrMachining(New CurrMachining(m_SelPart.nPartId, value.nIndex))
+               'm_CurrMachining.UpdateMachParam()
+            End If
          End If
          m_SelMachining = value
          '' riporto parametri nel pezzo selezionato
@@ -267,13 +273,13 @@ Public Class TopPanelVM
       Dim sName As String = ""
       While GetPrivateProfileString(nIndex, MAT_GUID, "", sGUID, Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini") > 0
          ' leggo nome
-         GetPrivateProfileString(nIndex, MAT_NAME, "", sName, Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini")
+         EgtGetStringUtf8FromIni(nIndex, MAT_NAME, "", sName, Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini")
          MaterialList.Add(New MaterialIndex(nIndex, sGUID, sName))
          nIndex += 1
       End While
       Dim sCurrMaterial As String = ""
       GetMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, "", sCurrMaterial)
-      m_SelMaterial = m_MaterialList.FirstOrDefault(Function(x) x.sName = sCurrMaterial)
+      m_SelMaterial = m_MaterialList.FirstOrDefault(Function(x) x.sGUID = sCurrMaterial)
    End Sub
 
    Friend Function GetSelMaterialData() As Material
@@ -303,7 +309,7 @@ Public Class TopPanelVM
       End While
       Dim sCurrMachining As String = ""
       GetMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, "", sCurrMachining)
-      SelMachining = MachiningList.FirstOrDefault(Function(x) x.sName = sCurrMachining)
+      SelMachining = MachiningList.FirstOrDefault(Function(x) x.sGUID = sCurrMachining)
    End Sub
 
    Friend Function GetSelMachining() As Machining
@@ -525,6 +531,7 @@ Public Class TopPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Machining()
+      If IsNothing(m_SelPart) OrElse IsNothing(CurrMachining) Then Return
       If IsNothing(m_SelMachining) Then
          MessageBox.Show("Select current Db Machining first!", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Return
diff --git a/3dPrintApp/Utility/BTLIniFile.vb b/Icarus/Utility/BTLIniFile.vb
similarity index 100%
rename from 3dPrintApp/Utility/BTLIniFile.vb
rename to Icarus/Utility/BTLIniFile.vb
diff --git a/3dPrintApp/Utility/Converters.vb b/Icarus/Utility/Converters.vb
similarity index 100%
rename from 3dPrintApp/Utility/Converters.vb
rename to Icarus/Utility/Converters.vb
diff --git a/3dPrintApp/Utility/CurrentMachine.vb b/Icarus/Utility/CurrentMachine.vb
similarity index 100%
rename from 3dPrintApp/Utility/CurrentMachine.vb
rename to Icarus/Utility/CurrentMachine.vb
diff --git a/3dPrintApp/Utility/DbControllers.vb b/Icarus/Utility/DbControllers.vb
similarity index 100%
rename from 3dPrintApp/Utility/DbControllers.vb
rename to Icarus/Utility/DbControllers.vb
diff --git a/3dPrintApp/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
similarity index 99%
rename from 3dPrintApp/Utility/Dictionary.xaml
rename to Icarus/Utility/Dictionary.xaml
index b595994..645d81f 100644
--- a/3dPrintApp/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:PrintApp="clr-namespace:_3dPrintApp"
+   xmlns:PrintApp="clr-namespace:Icarus"
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
@@ -38,6 +38,7 @@
    <PrintApp:MachiningDbVM x:Key="MachiningDbVM"/>
    <PrintApp:MaterialDbVM x:Key="MaterialDbVM"/>
    <PrintApp:SliderManagerVM x:Key="SliderManagerVM"/>
+   <PrintApp:RibParamPanelVM x:Key="RibParamPanelVM"/>
    <!--<EgtBEAMWALL:CALCPanelVM x:Key="CALCPanelVM"/>
    <EgtBEAMWALL:PartParametersVM x:Key="PartParametersVM"/>
    <EgtBEAMWALL:LeftPanelVM x:Key="LeftPanelVM"/>
@@ -176,7 +177,7 @@
    </Style>
    <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="80"/>
+      <Setter Property="Width" Value="70"/>
    </Style>
    <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="60"/>
@@ -428,6 +429,11 @@
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="TSFEditor_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBox -->
@@ -462,6 +468,8 @@
 
    <Style x:Key="LeftPanel_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Width" Value="50"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="HorizontalContentAlignment" Value="Right"/>
    </Style>
 
    <Style x:Key="ControllerInputPanel_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
diff --git a/3dPrintApp/Utility/Dictionary.xaml.vb b/Icarus/Utility/Dictionary.xaml.vb
similarity index 100%
rename from 3dPrintApp/Utility/Dictionary.xaml.vb
rename to Icarus/Utility/Dictionary.xaml.vb
diff --git a/3dPrintApp/Utility/DisableModifiedMgr.vb b/Icarus/Utility/DisableModifiedMgr.vb
similarity index 100%
rename from 3dPrintApp/Utility/DisableModifiedMgr.vb
rename to Icarus/Utility/DisableModifiedMgr.vb
diff --git a/3dPrintApp/Utility/LuaExec.vb b/Icarus/Utility/LuaExec.vb
similarity index 97%
rename from 3dPrintApp/Utility/LuaExec.vb
rename to Icarus/Utility/LuaExec.vb
index c1f3910..10ac167 100644
--- a/3dPrintApp/Utility/LuaExec.vb
+++ b/Icarus/Utility/LuaExec.vb
@@ -1,5 +1,4 @@
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Module LuaExec
@@ -47,7 +46,7 @@ Module LuaExec
          If Not bOk Then EgtOutLog("ExecSlice Err=" & nErr.ToString())
       Else
          EgtOutLog("Error executing Slice Exec script " & sExecPath)
-         Return False
+         bOk = False
       End If
       ' Cancello tavola globale
       EgtLuaResetGlobVar("MATERIAL")
diff --git a/3dPrintApp/Utility/MachParamIniFile.vb b/Icarus/Utility/MachParamIniFile.vb
similarity index 100%
rename from 3dPrintApp/Utility/MachParamIniFile.vb
rename to Icarus/Utility/MachParamIniFile.vb
diff --git a/3dPrintApp/Utility/Map.vb b/Icarus/Utility/Map.vb
similarity index 98%
rename from 3dPrintApp/Utility/Map.vb
rename to Icarus/Utility/Map.vb
index 92f9107..639aba5 100644
--- a/3dPrintApp/Utility/Map.vb
+++ b/Icarus/Utility/Map.vb
@@ -54,6 +54,7 @@ Module Map
    Private m_refMachiningDbVM As MachiningDbVM
    Private m_refMaterialDbVM As MaterialDbVM
    Private m_refSliderManagerVM As SliderManagerVM
+   Private m_refRibParamPanelVM As RibParamPanelVM
 
 #Region "Get"
 
@@ -380,6 +381,12 @@ Module Map
       End Get
    End Property
 
+   Public ReadOnly Property refRibParamPanelVM As RibParamPanelVM
+      Get
+         Return m_refRibParamPanelVM
+      End Get
+   End Property
+
 #End Region    ' Get
 
 #Region "Set"
@@ -653,6 +660,11 @@ Module Map
       Return Not IsNothing(m_refSliderManagerVM)
    End Function
 
+   Friend Function SetRefRibParamPanelVM(RibParamPanelVM As RibParamPanelVM) As Boolean
+      m_refRibParamPanelVM = RibParamPanelVM
+      Return Not IsNothing(m_refRibParamPanelVM)
+   End Function
+
 #End Region    ' Set
 
 #Region "Init"
diff --git a/3dPrintApp/Utility/MyMachine.vb b/Icarus/Utility/MyMachine.vb
similarity index 100%
rename from 3dPrintApp/Utility/MyMachine.vb
rename to Icarus/Utility/MyMachine.vb
diff --git a/3dPrintApp/Utility/RawPartConfiguration.vb b/Icarus/Utility/RawPartConfiguration.vb
similarity index 100%
rename from 3dPrintApp/Utility/RawPartConfiguration.vb
rename to Icarus/Utility/RawPartConfiguration.vb
diff --git a/3dPrintApp/Utility/SectionXMaterialToBeAdded.vb b/Icarus/Utility/SectionXMaterialToBeAdded.vb
similarity index 100%
rename from 3dPrintApp/Utility/SectionXMaterialToBeAdded.vb
rename to Icarus/Utility/SectionXMaterialToBeAdded.vb
diff --git a/3dPrintApp/Utility/TextBlockUtils.vb b/Icarus/Utility/TextBlockUtils.vb
similarity index 100%
rename from 3dPrintApp/Utility/TextBlockUtils.vb
rename to Icarus/Utility/TextBlockUtils.vb
diff --git a/3dPrintApp/Utility/TreeViewItemBase.vb b/Icarus/Utility/TreeViewItemBase.vb
similarity index 100%
rename from 3dPrintApp/Utility/TreeViewItemBase.vb
rename to Icarus/Utility/TreeViewItemBase.vb
diff --git a/3dPrintApp/ViewModel/MaterialVM.vb b/Icarus/ViewModel/MaterialVM.vb
similarity index 100%
rename from 3dPrintApp/ViewModel/MaterialVM.vb
rename to Icarus/ViewModel/MaterialVM.vb
diff --git a/3dPrintApp/ViewModel/Print3dLayerVM.vb b/Icarus/ViewModel/Print3dLayerVM.vb
similarity index 100%
rename from 3dPrintApp/ViewModel/Print3dLayerVM.vb
rename to Icarus/ViewModel/Print3dLayerVM.vb
diff --git a/3dPrintApp/ViewModel/Print3dPartVM.vb b/Icarus/ViewModel/Print3dPartVM.vb
similarity index 100%
rename from 3dPrintApp/ViewModel/Print3dPartVM.vb
rename to Icarus/ViewModel/Print3dPartVM.vb
diff --git a/3dPrintApp/ViewPanel/ViewPanelV.xaml b/Icarus/ViewPanel/ViewPanelV.xaml
similarity index 100%
rename from 3dPrintApp/ViewPanel/ViewPanelV.xaml
rename to Icarus/ViewPanel/ViewPanelV.xaml
diff --git a/3dPrintApp/ViewPanel/ViewPanelV.xaml.vb b/Icarus/ViewPanel/ViewPanelV.xaml.vb
similarity index 100%
rename from 3dPrintApp/ViewPanel/ViewPanelV.xaml.vb
rename to Icarus/ViewPanel/ViewPanelV.xaml.vb
diff --git a/3dPrintApp/ViewPanel/ViewPanelVM.vb b/Icarus/ViewPanel/ViewPanelVM.vb
similarity index 100%
rename from 3dPrintApp/ViewPanel/ViewPanelVM.vb
rename to Icarus/ViewPanel/ViewPanelVM.vb
diff --git a/3dPrintApp/packages.config b/Icarus/packages.config
similarity index 100%
rename from 3dPrintApp/packages.config
rename to Icarus/packages.config