diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 8a15736..629cf5d 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -50,6 +50,8 @@ Module ConstIni
    Public Const K_HINGEDGE_INI As String = "HingeEdge"
    Public Const K_TOPEDGE_INI As String = "TopEdge"
    Public Const K_BOTTOMEDGE_INI As String = "BottomEdge"
+   Public Const K_BEVELU_INI As String = "BevelUp"
+   Public Const K_BEVELD_INI As String = "BevelDowm"
 
    Public Const S_MACHINING As String = "Machining"
    Public Const K_LOCKEDGEISCHECKED_INI As String = "LockEdgeIsChecked"
diff --git a/DoorParameters/Door.vb b/DoorParameters/Door.vb
index 0b27f6f..52884d9 100644
--- a/DoorParameters/Door.vb
+++ b/DoorParameters/Door.vb
@@ -213,12 +213,15 @@ Public Class Door
 
 #Region "TypeEdge"
 
-   Private m_EdgeTypeList As List(Of String) = New List(Of String)
-   Public ReadOnly Property EdgeTypeList As List(Of String)
+   Friend Shared m_EdgeTypeList As New ObservableCollection(Of String)
+   Public Shared Property EdgeTypeList As ObservableCollection(Of String)
       Get
          ' restituisco il valore della lista che è stato creato all'avvio
-         Return OptionModule.m_EdgeTypeList
+         Return m_EdgeTypeList
       End Get
+      Set(value As ObservableCollection(Of String))
+         m_EdgeTypeList = value
+      End Set
    End Property
 
    Private m_LockEdgeType As String = Nothing
@@ -228,9 +231,6 @@ Public Class Door
       End Get
       Set(value As String)
          m_LockEdgeType = value
-         'If SetChange <> 0 Then
-         '   SetChange += 1
-         'End If
          m_IsModifyDoor = True
          SetTitle()
       End Set
@@ -963,7 +963,7 @@ Public Class Door
    ' carico valori profiles
    Public Function GetProfiles(Index As Integer) As Integer
       ' Creo una stringa per scrivere gli errori
-      Dim ReadingError As String = String.Empty
+      Dim bError As Boolean = False
       ' Lock
       Dim LockEdgeType As String = SearchKeyValue(FileContent(Index), K_LOCKEDGE)
       ' se il valore restituito è nullo o vuoto
@@ -973,9 +973,14 @@ Public Class Door
          ' altrimenti lascia il valore vuoto
          Index += 1
       Else
-         ' carico il valore nella porta corrente
-         m_LockEdgeType = LockEdgeType
-         ' restituisco la riga successiva all'ultimo valore letto
+         ' controllo che il valore sia nella lista
+         If EdgeTypeControl(LockEdgeType) Then
+            ' carico il valore nella porta corrente
+            m_LockEdgeType = LockEdgeType
+            ' restituisco la riga successiva all'ultimo valore letto
+         Else
+            bError = True
+         End If
          Index += 1
       End If
       Dim LockEdgeMachining As String = SearchKeyValue(FileContent(Index), K_MACHINING)
@@ -1001,7 +1006,11 @@ Public Class Door
          If Not SearchKey(FileContent(Index), K_HINGEEDGE) Then Return -1
          Index += 1
       Else
-         m_HingeEdgeType = HingeEdgeType
+         If EdgeTypeControl(HingeEdgeType) Then
+            m_HingeEdgeType = HingeEdgeType
+         Else
+            bError = True
+         End If
          Index += 1
       End If
       Dim HingeEdgeMachining As String = SearchKeyValue(FileContent(Index), K_MACHINING)
@@ -1027,7 +1036,11 @@ Public Class Door
          If Not SearchKey(FileContent(Index), K_TOP) Then Return -1
          Index += 1
       Else
-         m_TopType = TopType
+         If EdgeTypeControl(TopType) Then
+            m_TopType = TopType
+         Else
+            bError = True
+         End If
          Index += 1
       End If
       Dim TopMachining As String = SearchKeyValue(FileContent(Index), K_MACHINING)
@@ -1053,7 +1066,11 @@ Public Class Door
          If Not SearchKey(FileContent(Index), K_BOTTOM) Then Return -1
          Index += 1
       Else
-         m_BottomType = BottomType
+         If EdgeTypeControl(BottomType) Then
+            m_BottomType = BottomType
+         Else
+            bError = True
+         End If
          Index += 1
       End If
 
@@ -1080,6 +1097,16 @@ Public Class Door
 
 #End Region    ' Carica il General della porta
 
+   ' controllo che i valori passati come spigoli siano presenti nella lista corrente
+   Public Function EdgeTypeControl(Edge As String) As Boolean
+      If Door.EdgeTypeList.IndexOf(Edge) = -1 Then
+         MessageBox.Show(Edge & " is not a member of the current list of EdgeType. Check Bevel in option page.", "Caution", MessageBoxButton.OK, MessageBoxImage.Asterisk)
+         Return False
+      Else
+         Return True
+      End If
+   End Function
+
    ' ricerco la compo nella lista dei compobtn
    Public Function GetNewCompo(Index As Integer, CompoNameDDF As String, ByRef InvalidValue As String) As Integer
       Dim bDDFName As Boolean = False
diff --git a/DoorParameters/DoorParametersView.xaml b/DoorParameters/DoorParametersView.xaml
index 26f63f6..6f6089c 100644
--- a/DoorParameters/DoorParametersView.xaml
+++ b/DoorParameters/DoorParametersView.xaml
@@ -85,7 +85,6 @@
                       ItemsSource="{Binding CurrDoor.EdgeTypeList}" 
                       SelectedItem="{Binding CurrDoor.LockEdgeType}"
                       Style="{StaticResource DoorParamsCmBx}" Height="Auto"/>
-
             <TextBlock Grid.Column="2" Grid.Row="2" 
                       Text="{Binding HingeedgeMsg}"
                       Style="{StaticResource DoorParamsTxBl}"
diff --git a/DoorParameters/DoorParametersViewModel.vb b/DoorParameters/DoorParametersViewModel.vb
index 5d126c9..b78f7a6 100644
--- a/DoorParameters/DoorParametersViewModel.vb
+++ b/DoorParameters/DoorParametersViewModel.vb
@@ -117,6 +117,8 @@ Public Class DoorParametersViewModel
       End Get
    End Property
 
+
+
    ' definizione comando
    Private m_EnterRefreshCmd As ICommand
 
diff --git a/IniFile.vb b/IniFile.vb
index b767d66..c958ad0 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -105,6 +105,19 @@ Friend Module IniFile
       Return True
    End Function
 
+   Public Function DefaultGetPrivateProfileObservableCollection(ByVal lpAppName As String, ByVal lpKeyName As String, ByVal List As ObservableCollection(Of String)) As Boolean
+      Dim sVal As String = String.Empty
+      DefaultGetPrivateProfileString(lpAppName, lpKeyName, "", sVal)
+      Dim sItems() As String = sVal.Split(",".ToCharArray)
+      ' se la lista ha almeno un elemento
+      If sItems.Count > 0 Then
+         For Index = 0 To sItems.Count() - 1
+            List.Add(Trim(sItems(Index)))
+         Next
+      End If
+      Return True
+   End Function
+
    Public Function DefaultGetPrivateProfilesMachining(ByVal lpAppName As String, ByVal lpKeyName As String, ByRef IpBoolean As Boolean) As Boolean
       Dim sVal As String = String.Empty
       DefaultGetPrivateProfileString(lpAppName, lpKeyName, "", sVal)
@@ -116,6 +129,17 @@ Friend Module IniFile
       Return IpBoolean
    End Function
 
+   Public Function DefaultGetPrivateProfilesBevel(ByVal lpAppName As String, ByVal lpKeyName As String, ByRef IpBoolean As Boolean) As Boolean
+      Dim sVal As String = String.Empty
+      DefaultGetPrivateProfileString(lpAppName, lpKeyName, "", sVal)
+      If String.Equals(Trim(sVal), "1") Then
+         IpBoolean = True
+      Else
+         IpBoolean = False
+      End If
+      Return IpBoolean
+   End Function
+
    Public Function WritePrivateProfileString(IpAppName As String, IpKeyName As String, ByRef IpString As String) As Boolean
       Return EgtUILib.WritePrivateProfileString(IpAppName, IpKeyName, IpString, m_sIniFile)
    End Function
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index d0c9055..6365d7e 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.8.4.2")> 
-<Assembly: AssemblyFileVersion("1.8.4.2")> 
+<Assembly: AssemblyVersion("1.8.4.3")> 
+<Assembly: AssemblyFileVersion("1.8.4.3")> 
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index 5d7f2a6..c254ae0 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -16,6 +16,10 @@ Friend Module OptionModule
    Friend m_SelectedMeasureUnit As String
    Friend m_bIsMmUnit As Boolean
 
+   ' Paramaetri per la scelta del bevel
+   Friend m_bBevelUp As Boolean
+   Friend m_bBevelDown As Boolean
+
    Friend Enum LauncherWindow
       Open_window = 0
       Open_last_project = 1
@@ -27,7 +31,7 @@ Friend Module OptionModule
    Friend m_Thickness As String
    Friend m_SwingTypeList As New List(Of String)
    Friend m_Swing As String
-   Friend m_EdgeTypeList As New List(Of String)
+   'Friend m_EdgeTypeList As New ObservableCollection(Of String)
    Friend m_LockEdgeType As String
    Friend m_HingeEdgeType As String
    Friend m_TopType As String
@@ -93,6 +97,14 @@ Friend Module OptionModule
          IniFile.m_MyProjectDir = sMyProjectDir
       End If
 
+      ' leggo il tipo di Bevel selezionato
+      Dim BevelUp As Boolean
+      DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELU_INI, BevelUp)
+      m_bBevelUp = BevelUp
+      Dim BevelDown As Boolean
+      DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELD_INI, BevelDown)
+      m_bBevelDown = BevelDown
+
       ' Leggo le dimensioni della porta dal file Default.ini
       Dim Width As String = String.Empty
       DefaultGetPrivateProfileString(S_SIZE, K_WIDTH_INI, "", Width)
@@ -111,9 +123,10 @@ Friend Module OptionModule
       DefaultGetPrivateProfileString(S_SIZE, K_SWING_INI, "", Swing)
       m_Swing = Swing
       ' carico il valori associati al tipo di spigolo
-      Dim EdgeTypeList As New List(Of String)
-      DefaultGetPrivateProfileList(S_EDGE, K_EDGETYPE_LIST_INI, EdgeTypeList)
-      m_EdgeTypeList = EdgeTypeList
+      Dim EdgeTypeList As New ObservableCollection(Of String)
+      DefaultGetPrivateProfileObservableCollection(S_EDGE, K_EDGETYPE_LIST_INI, EdgeTypeList)
+      Door.EdgeTypeList = EdgeTypeList
+      SetEdgeTypeList(Door.EdgeTypeList, m_bBevelUp, m_bBevelDown)
       Dim LockEdgeType As String = String.Empty
       DefaultGetPrivateProfileString(S_EDGE, K_LOCKEDGE, "", LockEdgeType)
       m_LockEdgeType = LockEdgeType
@@ -165,7 +178,14 @@ Friend Module OptionModule
 
    End Sub
 
-
+   Friend Sub SetEdgeTypeList(EdgeTypeList As ObservableCollection(Of String), bBevelUp As Boolean, bBevelDown As Boolean)
+      If Not bBevelUp Then
+         EdgeTypeList.Remove("BU")
+      End If
+      If Not bBevelDown Then
+         EdgeTypeList.Remove("BD")
+      End If
+   End Sub
 
 End Module
 
diff --git a/OptionsWindow/OptionsView.xaml b/OptionsWindow/OptionsView.xaml
index 85e2746..7f4cd80 100644
--- a/OptionsWindow/OptionsView.xaml
+++ b/OptionsWindow/OptionsView.xaml
@@ -15,6 +15,7 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
          <RowDefinition Height="4*"/>
@@ -35,7 +36,7 @@
          </UniformGrid>
       </GroupBox>
       <!--Impostazioni generali della porta-->
-      <GroupBox Header="{Binding General}" Grid.Row="1" Grid.ColumnSpan="3">
+      <GroupBox Header="{Binding General}" Grid.Row="1" Grid.ColumnSpan="4">
          <Grid >
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
@@ -167,6 +168,7 @@
       <!--Seclta della modalità di avvio del programma-->
       <GroupBox Header="{Binding OptionStart}" Grid.Column="2">
          <UniformGrid Rows="2">
+            
             <ComboBox ItemsSource="{Binding OptionLauncher}" SelectedItem="{Binding SelectedOptionLauncher}"
                     VerticalAlignment="Center"
                    Style="{StaticResource DoorParamsCmBx}"
@@ -175,8 +177,36 @@
                TextAlignment="Center" Margin="5,0,5,0"/>
          </UniformGrid>
       </GroupBox>
+
+      <!--Scelta posizionamento macchina-->
+      <GroupBox Header="{Binding BevelMsg}" Grid.Column="3" >      
+            <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="4*"/>
+               <RowDefinition Height="4*"/>
+               <RowDefinition Height="1.5*"/>
+            </Grid.RowDefinitions>
+            <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center"
+                      Name="BevelUp"
+                      Style="{StaticResource DoorParamsChBx}"
+                      IsChecked="{Binding BevelUpIsChecked}"/>
+            <TextBlock Text="{Binding BevelUpMsg}" Grid.Column="1"
+                       VerticalAlignment="Center"/>   
+            <CheckBox Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                      Name="BevelDown"
+                      Style="{StaticResource DoorParamsChBx}"
+                      IsChecked="{Binding BevelDownIsChecked}"/>
+            <TextBlock Text="{Binding BevelDownMsg}" Grid.Column="1" Grid.Row="1"
+                       VerticalAlignment="Center"/>
+         </Grid>
+      </GroupBox>
+
       <!--Seclta della cartella in cui salvare i progetti-->
-      <GroupBox Header="{Binding CurrentDirectiry}"  Grid.Row="2" Grid.ColumnSpan="3" Margin="5,0,5,0">
+      <GroupBox Header="{Binding CurrentDirectiry}"  Grid.Row="2" Grid.ColumnSpan="4" Margin="5,0,5,0">
          <Grid >
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
@@ -195,7 +225,7 @@
          </Grid>
       </GroupBox>
       <!--Bottone di chiusura della pagina-->
-      <Button Content="{Binding MsgClose}" Grid.Row="3" Grid.Column="2" Margin="5"
+      <Button Content="{Binding MsgClose}" Grid.Row="3" Grid.Column="3" Margin="5"
               Command="{Binding CloseOptionsCommand}"/>
       
       <!--<GroupBox Header="{Binding CurrentLanguageMsg}" Margin="0,0,0.4,423.6" Grid.RowSpan="3" >
diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb
index 813dc8f..6c78ad2 100644
--- a/OptionsWindow/OptionsViewModel.vb
+++ b/OptionsWindow/OptionsViewModel.vb
@@ -74,6 +74,37 @@ Public Class OptionsViewModel
       End Set
    End Property
 
+   ' Carico i parametri associati al Bevel Up/Down
+   Public Property BevelUpIsChecked As Boolean
+      Get
+         Return OptionModule.m_bBevelUp
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bBevelUp = value
+         If value Then
+            DefaultWritePrivateProfileString(S_EDGE, K_BEVELU_INI, "1")
+         Else
+            DefaultWritePrivateProfileString(S_EDGE, K_BEVELU_INI, "0")
+         End If
+         RefreshEdgeTypeList()
+      End Set
+   End Property
+
+   Public Property BevelDownIsChecked As Boolean
+      Get
+         Return OptionModule.m_bBevelDown
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bBevelDown = value
+         If value Then
+            DefaultWritePrivateProfileString(S_EDGE, K_BEVELD_INI, "1")            
+         Else
+            DefaultWritePrivateProfileString(S_EDGE, K_BEVELD_INI, "0")
+         End If
+         RefreshEdgeTypeList()
+      End Set
+   End Property
+
    ' Carico i valori di Default della porta
    Public Property WidthValue As String
       Get
@@ -121,10 +152,14 @@ Public Class OptionsViewModel
       End Set
    End Property
 
-   Public ReadOnly Property EdgeTypeList As List(Of String)
+   Public Property EdgeTypeList As ObservableCollection(Of String)
       Get
-         Return OptionModule.m_EdgeTypeList
+         Return Door.EdgeTypeList
       End Get
+      Set(value As ObservableCollection(Of String))
+         Door.EdgeTypeList = value
+         NotifyPropertyChanged("EdgeTypeList")
+      End Set
    End Property
 
    Public Property LockEdgeType As String
@@ -182,7 +217,7 @@ Public Class OptionsViewModel
       End Set
    End Property
 
-       Public Property HingeEdgeIsChecked As Boolean
+   Public Property HingeEdgeIsChecked As Boolean
       Get
          Return OptionModule.m_HingeEdgeMachining
       End Get
@@ -302,6 +337,7 @@ Public Class OptionsViewModel
          Return EgtMsg(MSG_OPTIONPAGE + 1)
       End Get
    End Property
+
    Public ReadOnly Property LanguageAdvertMsg As String
       Get
          Return EgtMsg(MSG_OPTIONPAGE + 2)
@@ -310,13 +346,13 @@ Public Class OptionsViewModel
 
    Public ReadOnly Property MeasureUnit As String
       Get
-         Return "Unit measure new door."
+         Return EgtMsg(50211)
       End Get
    End Property
 
    Public ReadOnly Property DirectoryMsg As String
       Get
-         Return "Directory Project"
+         Return EgtMsg(50212)
       End Get
    End Property
 
@@ -328,19 +364,19 @@ Public Class OptionsViewModel
 
    Public ReadOnly Property OptionStart As String
       Get
-         Return "Option Start"
+         Return EgtMsg(50213)
       End Get
    End Property
 
    Public ReadOnly Property CurrentUnitMeasure As String
       Get
-         Return "Unit Measure"
+         Return EgtMsg(50200)
       End Get
    End Property
 
    Public ReadOnly Property CurrentDirectiry As String
       Get
-         Return "Current Directory"
+         Return EgtMsg(50214)
       End Get
    End Property
 
@@ -352,13 +388,13 @@ Public Class OptionsViewModel
 
    Public ReadOnly Property EdgeMsg As String
       Get
-         Return "Edge Type"
+         Return EgtMsg(50215)
       End Get
    End Property
 
    Public ReadOnly Property OverMaterialMsg As String
       Get
-         Return "Over Material"
+         Return EgtMsg(50216)
       End Get
    End Property
 
@@ -431,18 +467,45 @@ Public Class OptionsViewModel
 
    Public ReadOnly Property MsgBrowse As String
       Get
-         Return "Browse"
+         Return EgtMsg(50217)
       End Get
    End Property
 
    Public ReadOnly Property MsgClose As String
       Get
-         Return "Close"
+         Return EgtMsg(50218)
+      End Get
+   End Property
+
+   ' BevelMsg
+   Public ReadOnly Property BevelMsg As String
+      Get
+         Return EgtMsg(50219)
+      End Get
+   End Property
+
+   Public ReadOnly Property BevelUpMsg As String
+      Get
+         Return EgtMsg(50220)
+      End Get
+   End Property
+
+   Public ReadOnly Property BevelDownMsg As String
+      Get
+         Return EgtMsg(50221)
       End Get
    End Property
 
 #End Region
 
+   ' Aggiorno la lista deli bevel 
+   Private Sub RefreshEdgeTypeList()
+      Dim rEdgeTypeList As New ObservableCollection(Of String)
+      DefaultGetPrivateProfileObservableCollection(S_EDGE, K_EDGETYPE_LIST_INI, rEdgeTypeList)
+      SetEdgeTypeList(rEdgeTypeList, OptionModule.m_bBevelUp, OptionModule.m_bBevelDown)
+      EdgeTypeList = rEdgeTypeList
+   End Sub
+
 #Region "COMMANDS"
 
 #Region "CloseOptionsCommand"