%PDF- %PDF-
Mini Shell

Mini Shell

Direktori : /www/old2/_music/diplomka/
Upload File :
Create Path :
Current File : /www/old2/_music/diplomka/DoorDatapoints_r2.patch

Index: ConfigApp.Data/InternalDataSet.Designer.cs
===================================================================
--- ConfigApp.Data/InternalDataSet.Designer.cs	(revision 3451)
+++ ConfigApp.Data/InternalDataSet.Designer.cs	(working copy)
@@ -14262,6 +14262,8 @@
             
             private global::System.Data.DataColumn columnexpHWDeviceName;
             
+            private global::System.Data.DataColumn columnDatapointNumber;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public VirtualBusDoorDataTable() : 
@@ -14370,6 +14372,14 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn DatapointNumberColumn {
+                get {
+                    return this.columnDatapointNumber;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
             public int Count {
                 get {
@@ -14405,7 +14415,7 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public VirtualBusDoorRow AddVirtualBusDoorRow(VirtualDoorRow parentVirtualDoorRowByVirtualDoor_VirtualBusDoor, bool OpenSignalSounder, int OpenSignalTime, int OpenAlarmTime, LogicalDoorRow parentLogicalDoorRowByLogicalDoor_VirtualBusDoor, string expName, uint expOwner, string expHWDeviceName) {
+            public VirtualBusDoorRow AddVirtualBusDoorRow(VirtualDoorRow parentVirtualDoorRowByVirtualDoor_VirtualBusDoor, bool OpenSignalSounder, int OpenSignalTime, int OpenAlarmTime, LogicalDoorRow parentLogicalDoorRowByLogicalDoor_VirtualBusDoor, string expName, uint expOwner, string expHWDeviceName, int DatapointNumber) {
                 VirtualBusDoorRow rowVirtualBusDoorRow = ((VirtualBusDoorRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -14415,7 +14425,8 @@
                         null,
                         expName,
                         expOwner,
-                        expHWDeviceName};
+                        expHWDeviceName,
+                        DatapointNumber};
                 if ((parentVirtualDoorRowByVirtualDoor_VirtualBusDoor != null)) {
                     columnValuesArray[0] = parentVirtualDoorRowByVirtualDoor_VirtualBusDoor[0];
                 }
@@ -14429,7 +14440,7 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public VirtualBusDoorRow AddVirtualBusDoorRow(VirtualDoorRow parentVirtualDoorRowByVirtualDoor_VirtualBusDoor, bool OpenSignalSounder, int OpenSignalTime, int OpenAlarmTime, LogicalDoorRow parentLogicalDoorRowByLogicalDoor_VirtualBusDoor) {
+            public VirtualBusDoorRow AddVirtualBusDoorRow(VirtualDoorRow parentVirtualDoorRowByVirtualDoor_VirtualBusDoor, bool OpenSignalSounder, int OpenSignalTime, int OpenAlarmTime, LogicalDoorRow parentLogicalDoorRowByLogicalDoor_VirtualBusDoor, int DatapointNumber) {
                 VirtualBusDoorRow rowVirtualBusDoorRow = ((VirtualBusDoorRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -14439,7 +14450,8 @@
                         null,
                         null,
                         null,
-                        null};
+                        null,
+                        DatapointNumber};
                 if ((parentVirtualDoorRowByVirtualDoor_VirtualBusDoor != null)) {
                     columnValuesArray[0] = parentVirtualDoorRowByVirtualDoor_VirtualBusDoor[0];
                 }
@@ -14483,6 +14495,7 @@
                 this.columnexpName = base.Columns["expName"];
                 this.columnexpOwner = base.Columns["expOwner"];
                 this.columnexpHWDeviceName = base.Columns["expHWDeviceName"];
+                this.columnDatapointNumber = base.Columns["DatapointNumber"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -14504,6 +14517,8 @@
                 base.Columns.Add(this.columnexpOwner);
                 this.columnexpHWDeviceName = new global::System.Data.DataColumn("expHWDeviceName", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnexpHWDeviceName);
+                this.columnDatapointNumber = new global::System.Data.DataColumn("DatapointNumber", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDatapointNumber);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnUID}, true));
                 this.columnUID.AllowDBNull = false;
@@ -41037,8 +41052,6 @@
             
             private global::System.Data.DataColumn columnDoorBell;
             
-            private global::System.Data.DataColumn columnDoorDatapointNumber;
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public HWBus2DoorControllerModuleDataTable() {
@@ -41090,14 +41103,6 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public global::System.Data.DataColumn DoorDatapointNumberColumn {
-                get {
-                    return this.columnDoorDatapointNumber;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
             public int Count {
                 get {
@@ -41133,12 +41138,11 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public HWBus2DoorControllerModuleRow AddHWBus2DoorControllerModuleRow(HardwareDeviceRow parentHardwareDeviceRowByHardwareDevice_HWBus2DoorControllerModule, bool DoorBell, int DoorDatapointNumber) {
+            public HWBus2DoorControllerModuleRow AddHWBus2DoorControllerModuleRow(HardwareDeviceRow parentHardwareDeviceRowByHardwareDevice_HWBus2DoorControllerModule, bool DoorBell) {
                 HWBus2DoorControllerModuleRow rowHWBus2DoorControllerModuleRow = ((HWBus2DoorControllerModuleRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
-                        DoorBell,
-                        DoorDatapointNumber};
+                        DoorBell};
                 if ((parentHardwareDeviceRowByHardwareDevice_HWBus2DoorControllerModule != null)) {
                     columnValuesArray[0] = parentHardwareDeviceRowByHardwareDevice_HWBus2DoorControllerModule[0];
                 }
@@ -41173,7 +41177,6 @@
             internal void InitVars() {
                 this.columnUID = base.Columns["UID"];
                 this.columnDoorBell = base.Columns["DoorBell"];
-                this.columnDoorDatapointNumber = base.Columns["DoorDatapointNumber"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -41183,8 +41186,6 @@
                 base.Columns.Add(this.columnUID);
                 this.columnDoorBell = new global::System.Data.DataColumn("DoorBell", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDoorBell);
-                this.columnDoorDatapointNumber = new global::System.Data.DataColumn("DoorDatapointNumber", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnDoorDatapointNumber);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnUID}, true));
                 this.columnUID.AllowDBNull = false;
@@ -41358,8 +41359,6 @@
             
             private global::System.Data.DataColumn columnSettingAlertingPartSet;
             
-            private global::System.Data.DataColumn columnDoorDatapointNumber;
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public HWBus2DoorGuardDataTable() {
@@ -41539,14 +41538,6 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public global::System.Data.DataColumn DoorDatapointNumberColumn {
-                get {
-                    return this.columnDoorDatapointNumber;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
             public int Count {
                 get {
@@ -41600,8 +41591,7 @@
                         int SettingActiveSetup, 
                         int SettingActiveSetupPermanent, 
                         int SettingAcousticsAlarmSignalSound, 
-                        int SettingAlertingPartSet, 
-                        int DoorDatapointNumber) {
+                        int SettingAlertingPartSet) {
                 HWBus2DoorGuardRow rowHWBus2DoorGuardRow = ((HWBus2DoorGuardRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -41621,8 +41611,7 @@
                         SettingActiveSetup,
                         SettingActiveSetupPermanent,
                         SettingAcousticsAlarmSignalSound,
-                        SettingAlertingPartSet,
-                        DoorDatapointNumber};
+                        SettingAlertingPartSet};
                 if ((parentHardwareDeviceRowByHardwareDevice_HWBus2DoorGuard != null)) {
                     columnValuesArray[0] = parentHardwareDeviceRowByHardwareDevice_HWBus2DoorGuard[0];
                 }
@@ -41673,7 +41662,6 @@
                 this.columnSettingActiveSetupPermanent = base.Columns["SettingActiveSetupPermanent"];
                 this.columnSettingAcousticsAlarmSignalSound = base.Columns["SettingAcousticsAlarmSignalSound"];
                 this.columnSettingAlertingPartSet = base.Columns["SettingAlertingPartSet"];
-                this.columnDoorDatapointNumber = base.Columns["DoorDatapointNumber"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -41715,8 +41703,6 @@
                 base.Columns.Add(this.columnSettingAcousticsAlarmSignalSound);
                 this.columnSettingAlertingPartSet = new global::System.Data.DataColumn("SettingAlertingPartSet", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnSettingAlertingPartSet);
-                this.columnDoorDatapointNumber = new global::System.Data.DataColumn("DoorDatapointNumber", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnDoorDatapointNumber);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("HWBus2DoorGuardKey1", new global::System.Data.DataColumn[] {
                                 this.columnUID}, true));
                 this.columnUID.AllowDBNull = false;
@@ -42141,8 +42127,6 @@
             
             private global::System.Data.DataColumn columnDoorBell;
             
-            private global::System.Data.DataColumn columnDoorDatapointNumber;
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public HWBus2Identkey3DataTable() {
@@ -42226,14 +42210,6 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public global::System.Data.DataColumn DoorDatapointNumberColumn {
-                get {
-                    return this.columnDoorDatapointNumber;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
             public int Count {
                 get {
@@ -42269,7 +42245,7 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public HWBus2Identkey3Row AddHWBus2Identkey3Row(HardwareDeviceRow parentHardwareDeviceRowByHardwareDevice_HWBus2IdentKey3, bool SLActive, bool SLEvaluation, bool SLDetection, bool SPE, bool DoorBell, int DoorDatapointNumber) {
+            public HWBus2Identkey3Row AddHWBus2Identkey3Row(HardwareDeviceRow parentHardwareDeviceRowByHardwareDevice_HWBus2IdentKey3, bool SLActive, bool SLEvaluation, bool SLDetection, bool SPE, bool DoorBell) {
                 HWBus2Identkey3Row rowHWBus2Identkey3Row = ((HWBus2Identkey3Row)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -42277,8 +42253,7 @@
                         SLEvaluation,
                         SLDetection,
                         SPE,
-                        DoorBell,
-                        DoorDatapointNumber};
+                        DoorBell};
                 if ((parentHardwareDeviceRowByHardwareDevice_HWBus2IdentKey3 != null)) {
                     columnValuesArray[0] = parentHardwareDeviceRowByHardwareDevice_HWBus2IdentKey3[0];
                 }
@@ -42317,7 +42292,6 @@
                 this.columnSLDetection = base.Columns["SLDetection"];
                 this.columnSPE = base.Columns["SPE"];
                 this.columnDoorBell = base.Columns["DoorBell"];
-                this.columnDoorDatapointNumber = base.Columns["DoorDatapointNumber"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -42335,8 +42309,6 @@
                 base.Columns.Add(this.columnSPE);
                 this.columnDoorBell = new global::System.Data.DataColumn("DoorBell", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDoorBell);
-                this.columnDoorDatapointNumber = new global::System.Data.DataColumn("DoorDatapointNumber", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnDoorDatapointNumber);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("HWBus2IdentKey3Key1", new global::System.Data.DataColumn[] {
                                 this.columnUID}, true));
                 this.columnUID.AllowDBNull = false;
@@ -85140,6 +85112,22 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int DatapointNumber {
+                get {
+                    try {
+                        return ((int)(this[this.tableVirtualBusDoor.DatapointNumberColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'DatapointNumber\' in table \'VirtualBusDoor\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableVirtualBusDoor.DatapointNumberColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public LogicalDoorRow LogicalDoorRow {
                 get {
                     return ((LogicalDoorRow)(this.GetParentRow(this.Table.ParentRelations["LogicalDoor_VirtualBusDoor"])));
@@ -85207,6 +85195,18 @@
             public void SetexpHWDeviceNameNull() {
                 this[this.tableVirtualBusDoor.expHWDeviceNameColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsDatapointNumberNull() {
+                return this.IsNull(this.tableVirtualBusDoor.DatapointNumberColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetDatapointNumberNull() {
+                this[this.tableVirtualBusDoor.DatapointNumberColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -99104,23 +99104,6 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public int DoorDatapointNumber {
-                get {
-                    try {
-                        return ((int)(this[this.tableHWBus2DoorControllerModule.DoorDatapointNumberColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'DoorDatapointNumber\' in table \'HWBus2DoorControllerModule\' " +
-                                "is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableHWBus2DoorControllerModule.DoorDatapointNumberColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public HardwareDeviceRow HardwareDeviceRow {
                 get {
                     return ((HardwareDeviceRow)(this.GetParentRow(this.Table.ParentRelations["HardwareDevice_HWBus2DoorControllerModule"])));
@@ -99141,18 +99124,6 @@
             public void SetDoorBellNull() {
                 this[this.tableHWBus2DoorControllerModule.DoorBellColumn] = global::System.Convert.DBNull;
             }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public bool IsDoorDatapointNumberNull() {
-                return this.IsNull(this.tableHWBus2DoorControllerModule.DoorDatapointNumberColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public void SetDoorDatapointNumberNull() {
-                this[this.tableHWBus2DoorControllerModule.DoorDatapointNumberColumn] = global::System.Convert.DBNull;
-            }
         }
         
         /// <summary>
@@ -99467,22 +99438,6 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public int DoorDatapointNumber {
-                get {
-                    try {
-                        return ((int)(this[this.tableHWBus2DoorGuard.DoorDatapointNumberColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'DoorDatapointNumber\' in table \'HWBus2DoorGuard\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableHWBus2DoorGuard.DoorDatapointNumberColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public HardwareDeviceRow HardwareDeviceRow {
                 get {
                     return ((HardwareDeviceRow)(this.GetParentRow(this.Table.ParentRelations["HardwareDevice_HWBus2DoorGuard"])));
@@ -99695,18 +99650,6 @@
             public void SetSettingAlertingPartSetNull() {
                 this[this.tableHWBus2DoorGuard.SettingAlertingPartSetColumn] = global::System.Convert.DBNull;
             }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public bool IsDoorDatapointNumberNull() {
-                return this.IsNull(this.tableHWBus2DoorGuard.DoorDatapointNumberColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public void SetDoorDatapointNumberNull() {
-                this[this.tableHWBus2DoorGuard.DoorDatapointNumberColumn] = global::System.Convert.DBNull;
-            }
         }
         
         /// <summary>
@@ -99881,22 +99824,6 @@
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public int DoorDatapointNumber {
-                get {
-                    try {
-                        return ((int)(this[this.tableHWBus2Identkey3.DoorDatapointNumberColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'DoorDatapointNumber\' in table \'HWBus2Identkey3\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableHWBus2Identkey3.DoorDatapointNumberColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public HardwareDeviceRow HardwareDeviceRow {
                 get {
                     return ((HardwareDeviceRow)(this.GetParentRow(this.Table.ParentRelations["HardwareDevice_HWBus2IdentKey3"])));
@@ -99965,18 +99892,6 @@
             public void SetDoorBellNull() {
                 this[this.tableHWBus2Identkey3.DoorBellColumn] = global::System.Convert.DBNull;
             }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public bool IsDoorDatapointNumberNull() {
-                return this.IsNull(this.tableHWBus2Identkey3.DoorDatapointNumberColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public void SetDoorDatapointNumberNull() {
-                this[this.tableHWBus2Identkey3.DoorDatapointNumberColumn] = global::System.Convert.DBNull;
-            }
         }
         
         /// <summary>
Index: ConfigApp.Data/InternalDataSet.xsd
===================================================================
--- ConfigApp.Data/InternalDataSet.xsd	(revision 3451)
+++ ConfigApp.Data/InternalDataSet.xsd	(working copy)
@@ -129,6 +129,7 @@
               <xs:element name="expName" msdata:ReadOnly="true" msdata:Expression="Parent(VirtualDoor_VirtualBusDoor).expName" msprop:Generator_ColumnVarNameInTable="columnexpName" msprop:Generator_ColumnPropNameInRow="expName" msprop:Generator_ColumnPropNameInTable="expNameColumn" msprop:Generator_UserColumnName="expName" type="xs:string" minOccurs="0" />
               <xs:element name="expOwner" msdata:ReadOnly="true" msdata:Expression="Parent(VirtualDoor_VirtualBusDoor).expOwner" msprop:Generator_ColumnVarNameInTable="columnexpOwner" msprop:Generator_ColumnPropNameInRow="expOwner" msprop:Generator_ColumnPropNameInTable="expOwnerColumn" msprop:Generator_UserColumnName="expOwner" type="xs:unsignedInt" minOccurs="0" />
               <xs:element name="expHWDeviceName" msdata:ReadOnly="true" msdata:Expression="Parent(LogicalDoor_VirtualBusDoor).expHWDeviceName" msprop:Generator_ColumnVarNameInTable="columnexpHWDeviceName" msprop:Generator_ColumnPropNameInRow="expHWDeviceName" msprop:Generator_ColumnPropNameInTable="expHWDeviceNameColumn" msprop:Generator_UserColumnName="expHWDeviceName" type="xs:string" minOccurs="0" />
+              <xs:element name="DatapointNumber" msprop:Generator_ColumnVarNameInTable="columnDatapointNumber" msprop:Generator_ColumnPropNameInRow="DatapointNumber" msprop:Generator_ColumnPropNameInTable="DatapointNumberColumn" msprop:Generator_UserColumnName="DatapointNumber" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -1015,7 +1016,6 @@
             <xs:sequence>
               <xs:element name="UID" msprop:Generator_ColumnVarNameInTable="columnUID" msprop:Generator_ColumnPropNameInRow="UID" msprop:Generator_ColumnPropNameInTable="UIDColumn" msprop:Generator_UserColumnName="UID" type="xs:unsignedInt" />
               <xs:element name="DoorBell" msprop:Generator_ColumnVarNameInTable="columnDoorBell" msprop:Generator_ColumnPropNameInRow="DoorBell" msprop:Generator_ColumnPropNameInTable="DoorBellColumn" msprop:Generator_UserColumnName="DoorBell" type="xs:boolean" minOccurs="0" />
-              <xs:element name="DoorDatapointNumber" msprop:Generator_ColumnVarNameInTable="columnDoorDatapointNumber" msprop:Generator_ColumnPropNameInRow="DoorDatapointNumber" msprop:Generator_ColumnPropNameInTable="DoorDatapointNumberColumn" msprop:Generator_UserColumnName="DoorDatapointNumber" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -1040,7 +1040,6 @@
               <xs:element name="SettingActiveSetupPermanent" msprop:Generator_ColumnVarNameInTable="columnSettingActiveSetupPermanent" msprop:Generator_ColumnPropNameInRow="SettingActiveSetupPermanent" msprop:Generator_ColumnPropNameInTable="SettingActiveSetupPermanentColumn" msprop:Generator_UserColumnName="SettingActiveSetupPermanent" type="xs:int" minOccurs="0" />
               <xs:element name="SettingAcousticsAlarmSignalSound" msprop:Generator_ColumnVarNameInTable="columnSettingAcousticsAlarmSignalSound" msprop:Generator_ColumnPropNameInRow="SettingAcousticsAlarmSignalSound" msprop:Generator_ColumnPropNameInTable="SettingAcousticsAlarmSignalSoundColumn" msprop:Generator_UserColumnName="SettingAcousticsAlarmSignalSound" type="xs:int" minOccurs="0" />
               <xs:element name="SettingAlertingPartSet" msprop:Generator_ColumnVarNameInTable="columnSettingAlertingPartSet" msprop:Generator_ColumnPropNameInRow="SettingAlertingPartSet" msprop:Generator_ColumnPropNameInTable="SettingAlertingPartSetColumn" msprop:Generator_UserColumnName="SettingAlertingPartSet" type="xs:int" minOccurs="0" />
-              <xs:element name="DoorDatapointNumber" msprop:Generator_ColumnVarNameInTable="columnDoorDatapointNumber" msprop:Generator_ColumnPropNameInRow="DoorDatapointNumber" msprop:Generator_ColumnPropNameInTable="DoorDatapointNumberColumn" msprop:Generator_UserColumnName="DoorDatapointNumber" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -1061,7 +1060,6 @@
               <xs:element name="SLDetection" msdata:Caption="SLActive" msprop:Generator_ColumnVarNameInTable="columnSLDetection" msprop:Generator_ColumnPropNameInRow="SLDetection" msprop:Generator_ColumnPropNameInTable="SLDetectionColumn" msprop:Generator_UserColumnName="SLDetection" type="xs:boolean" minOccurs="0" />
               <xs:element name="SPE" msdata:Caption="SLActive" msprop:Generator_ColumnVarNameInTable="columnSPE" msprop:Generator_ColumnPropNameInRow="SPE" msprop:Generator_ColumnPropNameInTable="SPEColumn" msprop:Generator_UserColumnName="SPE" type="xs:boolean" minOccurs="0" />
               <xs:element name="DoorBell" msprop:Generator_ColumnVarNameInTable="columnDoorBell" msprop:Generator_ColumnPropNameInRow="DoorBell" msprop:Generator_ColumnPropNameInTable="DoorBellColumn" msprop:Generator_UserColumnName="DoorBell" type="xs:boolean" minOccurs="0" />
-              <xs:element name="DoorDatapointNumber" msprop:Generator_ColumnVarNameInTable="columnDoorDatapointNumber" msprop:Generator_ColumnPropNameInRow="DoorDatapointNumber" msprop:Generator_ColumnPropNameInTable="DoorDatapointNumberColumn" msprop:Generator_UserColumnName="DoorDatapointNumber" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
Index: ConfigApp.Data/InternalDataSet.xss
===================================================================
--- ConfigApp.Data/InternalDataSet.xss	(revision 3451)
+++ ConfigApp.Data/InternalDataSet.xss	(working copy)
@@ -4,84 +4,84 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="2277" ViewPortY="753" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="1489" ViewPortY="477" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Panel" ZOrder="274" X="1282" Y="536" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="22" SplitterPosition="121" />
-    <Shape ID="DesignTable:DetectorGroup" ZOrder="57" X="-1008" Y="912" Height="315" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="311" />
-    <Shape ID="DesignTable:VirtualBusPIR" ZOrder="153" X="663" Y="192" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:VirtualInput" ZOrder="229" X="656" Y="506" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:DetectorGroup" ZOrder="58" X="-1008" Y="912" Height="315" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="311" />
+    <Shape ID="DesignTable:VirtualBusPIR" ZOrder="154" X="663" Y="192" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:VirtualInput" ZOrder="230" X="656" Y="506" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:VirtualOutput" ZOrder="423" X="662" Y="1000" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
-    <Shape ID="DesignTable:VirtualUserInterface" ZOrder="241" X="347" Y="2561" Height="68" Width="182" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AccessPoint" ZOrder="45" X="-395" Y="588" Height="486" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="482" />
-    <Shape ID="DesignTable:VirtualBusDoor" ZOrder="258" X="662" Y="1458" Height="163" Width="155" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:Trigger" ZOrder="186" X="1955" Y="2014" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Condition" ZOrder="183" X="1495" Y="2024" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Command" ZOrder="185" X="1603" Y="2170" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Macro" ZOrder="56" X="1274" Y="1869" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
-    <Shape ID="DesignTable:Action" ZOrder="182" X="1355" Y="2194" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:LogicalPIR" ZOrder="225" X="959" Y="177" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:VirtualUserInterface" ZOrder="242" X="347" Y="2561" Height="68" Width="182" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:AccessPoint" ZOrder="47" X="-395" Y="588" Height="486" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="482" />
+    <Shape ID="DesignTable:VirtualBusDoor" ZOrder="4" X="662" Y="1458" Height="200" Width="155" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:Trigger" ZOrder="187" X="1955" Y="2014" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Condition" ZOrder="184" X="1495" Y="2024" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Command" ZOrder="186" X="1603" Y="2170" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Macro" ZOrder="57" X="1274" Y="1869" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
+    <Shape ID="DesignTable:Action" ZOrder="183" X="1355" Y="2194" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:LogicalPIR" ZOrder="226" X="959" Y="177" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:LogicalInput" ZOrder="470" X="956" Y="652" Height="113" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" />
-    <Shape ID="DesignTable:LogicalOutput" ZOrder="198" X="957" Y="999" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:LogicalSounder" ZOrder="227" X="975" Y="381" Height="68" Width="155" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalEmail" ZOrder="223" X="961" Y="-9" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalSMS" ZOrder="197" X="974" Y="1620" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:Partition" ZOrder="58" X="30" Y="-338" Height="714" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="22" SplitterPosition="710" />
-    <Shape ID="DesignTable:Expression" ZOrder="184" X="1715" Y="2012" Height="125" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:LogicalCamera" ZOrder="224" X="963" Y="90" Height="68" Width="151" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalDoor" ZOrder="51" X="971" Y="1485" Height="106" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Port" ZOrder="178" X="1525" Y="1535" Height="277" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
-    <Shape ID="DesignTable:MultiplePersonAccess" ZOrder="246" X="-129" Y="738" Height="87" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:LogicalOutput" ZOrder="199" X="957" Y="999" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:LogicalSounder" ZOrder="228" X="975" Y="381" Height="68" Width="155" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalEmail" ZOrder="224" X="961" Y="-9" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalSMS" ZOrder="198" X="974" Y="1620" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Partition" ZOrder="59" X="30" Y="-338" Height="714" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="22" SplitterPosition="710" />
+    <Shape ID="DesignTable:Expression" ZOrder="185" X="1715" Y="2012" Height="125" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:LogicalCamera" ZOrder="225" X="963" Y="90" Height="68" Width="151" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalDoor" ZOrder="53" X="971" Y="1485" Height="106" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Port" ZOrder="179" X="1525" Y="1535" Height="277" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
+    <Shape ID="DesignTable:MultiplePersonAccess" ZOrder="247" X="-129" Y="738" Height="87" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:FailAttempt" ZOrder="294" X="-120" Y="891" Height="164" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="160" />
-    <Shape ID="DesignTable:Action_Command" ZOrder="181" X="1453" Y="2345" Height="87" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:Object" ZOrder="170" X="1289" Y="772" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:Building" ZOrder="171" X="1287" Y="932" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Floor" ZOrder="172" X="1472" Y="931" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:Room" ZOrder="173" X="1690" Y="929" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:VirtualDevice" ZOrder="4" X="-140" Y="1357" Height="219" Width="151" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
-    <Shape ID="DesignTable:LogicalDevice" ZOrder="3" X="1294" Y="1275" Height="219" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
+    <Shape ID="DesignTable:Action_Command" ZOrder="182" X="1453" Y="2345" Height="87" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Object" ZOrder="171" X="1289" Y="772" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Building" ZOrder="172" X="1287" Y="932" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Floor" ZOrder="173" X="1472" Y="931" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:Room" ZOrder="174" X="1690" Y="929" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:VirtualDevice" ZOrder="8" X="-140" Y="1357" Height="219" Width="151" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
+    <Shape ID="DesignTable:LogicalDevice" ZOrder="7" X="1294" Y="1275" Height="219" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
     <Shape ID="DesignTable:UID" ZOrder="273" X="1276" Y="361" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:HardwareDevice" ZOrder="179" X="1951" Y="1213" Height="409" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="424" />
-    <Shape ID="DesignTable:VirtualHardwiredPIR" ZOrder="108" X="664" Y="710" Height="258" Width="186" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VirtualHardwiredDoor" ZOrder="48" X="664" Y="1172" Height="258" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VirtualSounder" ZOrder="228" X="663" Y="340" Height="106" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualEmail" ZOrder="199" X="664" Y="-25" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualCamera" ZOrder="134" X="665" Y="83" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualSMS" ZOrder="230" X="665" Y="1627" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualReader" ZOrder="187" X="676" Y="2667" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualKeyboard" ZOrder="191" X="674" Y="2412" Height="106" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualKeyboardReader" ZOrder="237" X="675" Y="2541" Height="106" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualKeySwitch" ZOrder="208" X="435" Y="806" Height="106" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualRelay" ZOrder="129" X="430" Y="1415" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:VirtualWindow" ZOrder="207" X="412" Y="621" Height="106" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:HardwareDevice" ZOrder="180" X="1951" Y="1213" Height="409" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="424" />
+    <Shape ID="DesignTable:VirtualHardwiredPIR" ZOrder="109" X="664" Y="710" Height="258" Width="186" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VirtualHardwiredDoor" ZOrder="50" X="664" Y="1172" Height="258" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VirtualSounder" ZOrder="229" X="663" Y="340" Height="106" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualEmail" ZOrder="200" X="664" Y="-25" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualCamera" ZOrder="135" X="665" Y="83" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualSMS" ZOrder="231" X="665" Y="1627" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualReader" ZOrder="188" X="676" Y="2667" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualKeyboard" ZOrder="192" X="674" Y="2412" Height="106" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualKeyboardReader" ZOrder="238" X="675" Y="2541" Height="106" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualKeySwitch" ZOrder="209" X="435" Y="806" Height="106" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualRelay" ZOrder="130" X="430" Y="1415" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:VirtualWindow" ZOrder="208" X="412" Y="621" Height="106" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:LogicalPeripheral" ZOrder="282" X="970" Y="1702" Height="86" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
-    <Shape ID="DesignTable:LogicalSmokeDetector" ZOrder="195" X="976" Y="1800" Height="68" Width="167" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalTemperature" ZOrder="189" X="977" Y="1887" Height="68" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalSmokeDetector" ZOrder="196" X="976" Y="1800" Height="68" Width="167" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalTemperature" ZOrder="190" X="977" Y="1887" Height="68" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:VirtualPeripheral" ZOrder="260" X="366" Y="1604" Height="903" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="918" />
-    <Shape ID="DesignTable:VirtualSmokeDetector" ZOrder="257" X="664" Y="1743" Height="163" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:VirtualTemperature" ZOrder="231" X="669" Y="1926" Height="106" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:LogicalKeyboard" ZOrder="233" X="954" Y="2425" Height="68" Width="162" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalKeyboardReader" ZOrder="235" X="949" Y="2537" Height="68" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalReader" ZOrder="234" X="961" Y="2655" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:CatalogueData" ZOrder="174" X="1526" Y="1279" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:VirtualSmokeDetector" ZOrder="258" X="664" Y="1743" Height="163" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:VirtualTemperature" ZOrder="232" X="669" Y="1926" Height="106" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:LogicalKeyboard" ZOrder="234" X="954" Y="2425" Height="68" Width="162" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalKeyboardReader" ZOrder="236" X="949" Y="2537" Height="68" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalReader" ZOrder="235" X="961" Y="2655" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:CatalogueData" ZOrder="175" X="1526" Y="1279" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:WirelessMaster" ZOrder="414" X="1702" Y="1484" Height="87" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:LogicalInstallService" ZOrder="188" X="974" Y="1983" Height="68" Width="172" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:LogicalInstallService" ZOrder="189" X="974" Y="1983" Height="68" Width="172" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:LogicalSmartUI" ZOrder="347" X="958" Y="3040" Height="68" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalAccessPoint" ZOrder="226" X="952" Y="487" Height="125" Width="176" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:APQuickMacro" ZOrder="247" X="-111" Y="638" Height="87" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:APMacro" ZOrder="245" X="80" Y="630" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:AccessPoint_User" ZOrder="7" X="-428" Y="1603" Height="87" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:ExternalSounderStyle" ZOrder="100" X="-1018" Y="63" Height="239" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:SignalingGroup" ZOrder="123" X="-947" Y="1272" Height="125" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Partition_SignalingGroup" ZOrder="86" X="-794" Y="-249" Height="87" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:SignalingGroup_Sounder" ZOrder="133" X="-715" Y="1250" Height="87" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="74" SplitterPosition="83" />
+    <Shape ID="DesignTable:LogicalAccessPoint" ZOrder="227" X="952" Y="487" Height="125" Width="176" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:APQuickMacro" ZOrder="248" X="-111" Y="638" Height="87" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:APMacro" ZOrder="246" X="80" Y="630" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:AccessPoint_User" ZOrder="11" X="-428" Y="1603" Height="87" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:ExternalSounderStyle" ZOrder="101" X="-1018" Y="63" Height="239" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:SignalingGroup" ZOrder="124" X="-947" Y="1272" Height="125" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Partition_SignalingGroup" ZOrder="87" X="-794" Y="-249" Height="87" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:SignalingGroup_Sounder" ZOrder="134" X="-715" Y="1250" Height="87" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="74" SplitterPosition="83" />
     <Shape ID="DesignTable:SignalingGroup_Flasher" ZOrder="372" X="-711" Y="1150" Height="87" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:APTurnstile" ZOrder="254" X="62" Y="902" Height="144" Width="169" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:HWIBusBusController" ZOrder="54" X="2232" Y="464" Height="106" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:APTurnstile" ZOrder="255" X="62" Y="902" Height="144" Width="169" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:HWIBusBusController" ZOrder="55" X="2232" Y="464" Height="106" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:HWIBusBus2Module" ZOrder="354" X="2236" Y="682" Height="48" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
     <Shape ID="DesignTable:HWSerialBusController" ZOrder="353" X="2230" Y="936" Height="125" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:HWBus216DGDisablingDisplayModule" ZOrder="295" X="2501" Y="73" Height="48" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:HWBus210DGDisablingUnit" ZOrder="361" X="2526" Y="-6" Height="48" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:HWBus2DuoModule" ZOrder="31" X="2526" Y="327" Height="143" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:HWBus2DuoModule" ZOrder="35" X="2526" Y="327" Height="143" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:HWBus2MiniModule" ZOrder="365" X="2553" Y="1763" Height="49" Width="186" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
     <Shape ID="DesignTable:HWBus25InputModule" ZOrder="429" X="2538" Y="975" Height="68" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:HWBus25OutputModule" ZOrder="283" X="2540" Y="1055" Height="68" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -89,90 +89,90 @@
     <Shape ID="DesignTable:HWBus2ViewGuardPIR" ZOrder="298" X="2500" Y="2224" Height="257" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
     <Shape ID="DesignTable:HWBus2SmokeDetector" ZOrder="428" X="2538" Y="892" Height="68" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:HWBus2Identloc" ZOrder="366" X="2560" Y="1676" Height="48" Width="163" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:HWBus2DoorControllerModule" ZOrder="33" X="2531" Y="803" Height="86" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
-    <Shape ID="DesignTable:HWBus2DoorGuard" ZOrder="32" X="2529" Y="477" Height="257" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:HWBus2DoorControllerModule" ZOrder="2" X="2531" Y="803" Height="67" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:HWBus2DoorGuard" ZOrder="1" X="2529" Y="477" Height="256" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
     <Shape ID="DesignTable:HWBus2Identkey2" ZOrder="285" X="2538" Y="1136" Height="67" Width="173" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
-    <Shape ID="DesignTable:HWBus2Identkey3" ZOrder="53" X="2554" Y="1518" Height="162" Width="173" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
+    <Shape ID="DesignTable:HWBus2Identkey3" ZOrder="3" X="2554" Y="1518" Height="143" Width="173" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:HWModulBusReader" ZOrder="466" X="2887" Y="-219" Height="124" Width="187" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
     <Shape ID="DesignTable:HWModulBusKeyboardReader" ZOrder="454" X="2884" Y="-61" Height="124" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
     <Shape ID="DesignTable:HWBus2GraphicsKeypad" ZOrder="363" X="2526" Y="273" Height="48" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:HWBus2WirelessMaster" ZOrder="24" X="2884" Y="295" Height="86" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
-    <Shape ID="DesignTable:HWBus2Wireless4IOModule" ZOrder="27" X="2883" Y="386" Height="124" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
-    <Shape ID="DesignTable:HWBus2WirelessSmokeDetector" ZOrder="26" X="2880" Y="740" Height="124" Width="254" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
-    <Shape ID="DesignTable:HWBus2WirelessViewguard" ZOrder="25" X="2884" Y="68" Height="219" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
-    <Shape ID="DesignTable:HWBus2WirelessPanicButton" ZOrder="22" X="2880" Y="595" Height="112" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="108" />
+    <Shape ID="DesignTable:HWBus2WirelessMaster" ZOrder="28" X="2884" Y="295" Height="86" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
+    <Shape ID="DesignTable:HWBus2Wireless4IOModule" ZOrder="31" X="2883" Y="386" Height="124" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
+    <Shape ID="DesignTable:HWBus2WirelessSmokeDetector" ZOrder="30" X="2880" Y="740" Height="124" Width="254" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
+    <Shape ID="DesignTable:HWBus2WirelessViewguard" ZOrder="29" X="2884" Y="68" Height="219" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
+    <Shape ID="DesignTable:HWBus2WirelessPanicButton" ZOrder="26" X="2880" Y="595" Height="112" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="108" />
     <Shape ID="DesignTable:HWBus2SirenModule" ZOrder="465" X="2546" Y="2042" Height="144" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:HWSerialDS6600" ZOrder="367" X="2904" Y="1395" Height="48" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
     <Shape ID="DesignTable:HWSerialDS7700" ZOrder="369" X="2911" Y="1686" Height="48" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
     <Shape ID="DesignTable:HWBus264DGDisplayTerminal" ZOrder="362" X="2526" Y="184" Height="61" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="57" />
     <Shape ID="DesignTable:HWIBusEAGrundModule" ZOrder="355" X="2234" Y="588" Height="68" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:HWBus2BusController" ZOrder="36" X="2239" Y="774" Height="143" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:HWBus2BusController" ZOrder="38" X="2239" Y="774" Height="143" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:RemoteApplication" ZOrder="275" X="1490" Y="126" Height="220" Width="178" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
     <Shape ID="DesignTable:Storage" ZOrder="276" X="1702" Y="129" Height="163" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:PartitionMember" ZOrder="34" X="-696" Y="761" Height="372" Width="183" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
-    <Shape ID="DesignTable:PMCollection" ZOrder="117" X="-682" Y="567" Height="164" Width="151" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="160" />
+    <Shape ID="DesignTable:PartitionMember" ZOrder="36" X="-696" Y="761" Height="372" Width="183" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
+    <Shape ID="DesignTable:PMCollection" ZOrder="118" X="-682" Y="567" Height="164" Width="151" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="160" />
     <Shape ID="DesignTable:PMCollectionDependency" ZOrder="349" X="-1008" Y="516" Height="106" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:PMCollectionEntryRoute" ZOrder="348" X="-1006" Y="630" Height="49" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
-    <Shape ID="DesignTable:PMCollectionExitRoute" ZOrder="118" X="-1006" Y="726" Height="49" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
-    <Shape ID="DesignTable:PMCollection_PartitionMember" ZOrder="120" X="-1009" Y="790" Height="106" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Trigger_PartitionReadySetState" ZOrder="66" X="2200" Y="2240" Height="87" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:Trigger_PartitionSetState" ZOrder="65" X="2202" Y="2340" Height="68" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:PMCollectionExitRoute" ZOrder="119" X="-1006" Y="726" Height="49" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
+    <Shape ID="DesignTable:PMCollection_PartitionMember" ZOrder="121" X="-1009" Y="790" Height="106" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Trigger_PartitionReadySetState" ZOrder="67" X="2200" Y="2240" Height="87" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Trigger_PartitionSetState" ZOrder="66" X="2202" Y="2340" Height="68" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:Command_PartitionSetState" ZOrder="424" X="1486" Y="2554" Height="68" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:Command_PartitionClearAlarmType" ZOrder="312" X="1487" Y="2463" Height="68" Width="274" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:Command_PartitionMemberOmit" ZOrder="305" X="1487" Y="2647" Height="68" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:Command_OutputPulseOn" ZOrder="281" X="1877" Y="2475" Height="201" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:Command_MacroDelay" ZOrder="415" X="1882" Y="2184" Height="68" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:PartitionFaultType" ZOrder="87" X="-507" Y="-249" Height="87" Width="173" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:VirtualPeripheralPartitionMemberFaultType" ZOrder="128" X="-975" Y="2236" Height="257" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:PartitionFaultType" ZOrder="88" X="-507" Y="-249" Height="87" Width="173" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:VirtualPeripheralPartitionMemberFaultType" ZOrder="129" X="-975" Y="2236" Height="257" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
     <Shape ID="DesignTable:LogicalWirelessPeripheral" ZOrder="335" X="965" Y="2181" Height="68" Width="181" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:LogicalWirelessMaster" ZOrder="192" X="974" Y="2072" Height="68" Width="165" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:HWBus2WirelessPanicButtonController" ZOrder="23" X="2884" Y="534" Height="49" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
-    <Shape ID="DesignTable:UnsetPreventionAlarmType" ZOrder="253" X="-283" Y="-249" Height="87" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:ScheduledItem_APGroup" ZOrder="166" X="-728" Y="1454" Height="182" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:ScheduledItem" ZOrder="127" X="-697" Y="1747" Height="125" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:DatePeriod" ZOrder="16" X="-972" Y="2071" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:TimePeriod" ZOrder="244" X="-2" Y="1957" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:LogicalWirelessMaster" ZOrder="193" X="974" Y="2072" Height="68" Width="165" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:HWBus2WirelessPanicButtonController" ZOrder="27" X="2884" Y="534" Height="49" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
+    <Shape ID="DesignTable:UnsetPreventionAlarmType" ZOrder="254" X="-283" Y="-249" Height="87" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:ScheduledItem_APGroup" ZOrder="167" X="-728" Y="1454" Height="182" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:ScheduledItem" ZOrder="128" X="-697" Y="1747" Height="125" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:DatePeriod" ZOrder="20" X="-972" Y="2071" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TimePeriod" ZOrder="245" X="-2" Y="1957" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:UserGroup_TimeSchedule" ZOrder="374" X="-478" Y="1791" Height="87" Width="175" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:TimeSchedule" ZOrder="9" X="-219" Y="1665" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:User" ZOrder="30" X="-224" Y="2027" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:Holiday" ZOrder="8" X="-18" Y="1724" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TimeSchedule" ZOrder="13" X="-219" Y="1665" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:User" ZOrder="34" X="-224" Y="2027" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:Holiday" ZOrder="12" X="-18" Y="1724" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:User_UserGroup" ZOrder="300" X="-473" Y="1947" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:VirtualFlasher" ZOrder="279" X="448" Y="1059" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:VirtualDSDevice" ZOrder="436" X="666" Y="-138" Height="106" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:LogicalDSAlarmReporting" ZOrder="435" X="930" Y="-120" Height="68" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AlarmDevice" ZOrder="93" X="-1015" Y="-152" Height="182" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:AlarmDevice_FaultPartition" ZOrder="256" X="-795" Y="-148" Height="87" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:Channel" ZOrder="28" X="-698" Y="-55" Height="219" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="196" />
+    <Shape ID="DesignTable:AlarmDevice" ZOrder="94" X="-1015" Y="-152" Height="182" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:AlarmDevice_FaultPartition" ZOrder="257" X="-795" Y="-148" Height="87" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Channel" ZOrder="32" X="-698" Y="-55" Height="219" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="196" />
     <Shape ID="DesignTable:HWSerialDS6700" ZOrder="368" X="2906" Y="1500" Height="48" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
     <Shape ID="DesignTable:HWSerialDS6750" ZOrder="389" X="2916" Y="1603" Height="48" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
     <Shape ID="DesignTable:HWSerialDS7600" ZOrder="370" X="2914" Y="1769" Height="48" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
     <Shape ID="DesignTable:HWSerialDS9500" ZOrder="388" X="2915" Y="1850" Height="48" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:Trigger_Simple" ZOrder="68" X="2200" Y="1996" Height="125" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:Trigger_SingleEvent" ZOrder="67" X="2200" Y="2134" Height="87" Width="181" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:VirtualWirelessMaster" ZOrder="232" X="665" Y="2055" Height="106" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Trigger_Simple" ZOrder="69" X="2200" Y="1996" Height="125" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Trigger_SingleEvent" ZOrder="68" X="2200" Y="2134" Height="87" Width="181" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:VirtualWirelessMaster" ZOrder="233" X="665" Y="2055" Height="106" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:VirtualWirelessPeripheral" ZOrder="259" X="671" Y="2182" Height="125" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:LogicalCarbonMonoxide" ZOrder="438" X="943" Y="-252" Height="68" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:VirtualCarbonMonoxide" ZOrder="437" X="666" Y="-251" Height="106" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:SounderTemplate" ZOrder="124" X="-1002" Y="324" Height="182" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:SounderTemplate" ZOrder="125" X="-1002" Y="324" Height="182" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:HWGPIOInput" ZOrder="359" X="2249" Y="-16" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:HWGPIOOutput" ZOrder="360" X="2241" Y="-143" Height="67" Width="159" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:HWSPIInput" ZOrder="357" X="2248" Y="191" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:HWSPIOutput" ZOrder="358" X="2246" Y="89" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:HWAnalogInput" ZOrder="356" X="2245" Y="278" Height="162" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
-    <Shape ID="DesignTable:UIProxy" ZOrder="43" X="-280" Y="2486" Height="238" Width="181" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
+    <Shape ID="DesignTable:UIProxy" ZOrder="45" X="-280" Y="2486" Height="238" Width="181" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
     <Shape ID="DesignTable:UITouchCenter" ZOrder="280" X="-3" Y="2217" Height="283" Width="155" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="279" />
     <Shape ID="DesignTable:UITouchCenter_Partition" ZOrder="351" X="2" Y="2091" Height="106" Width="181" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:GeneralSettings" ZOrder="278" X="1280" Y="119" Height="238" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
     <Shape ID="DesignTable:PartitionDependency" ZOrder="325" X="280" Y="-342" Height="87" Width="188" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:StoredFaultTypes" ZOrder="248" X="-273" Y="-112" Height="410" Width="172" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
-    <Shape ID="DesignTable:Partition_LocalSounder" ZOrder="98" X="-271" Y="307" Height="87" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:VirtualPIR" ZOrder="204" X="315" Y="202" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:StoredFaultTypes" ZOrder="249" X="-273" Y="-112" Height="410" Width="172" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
+    <Shape ID="DesignTable:Partition_LocalSounder" ZOrder="99" X="-271" Y="307" Height="87" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:VirtualPIR" ZOrder="205" X="315" Y="202" Height="125" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:VirtualDoor" ZOrder="268" X="425" Y="1159" Height="238" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
-    <Shape ID="DesignTable:ScheduledItem_Door" ZOrder="165" X="-728" Y="1645" Height="87" Width="186" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:HWBus2ViewGuardDual" ZOrder="125" X="2502" Y="2528" Height="257" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:ScheduledItem_Door" ZOrder="166" X="-728" Y="1645" Height="87" Width="186" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:HWBus2ViewGuardDual" ZOrder="126" X="2502" Y="2528" Height="257" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
     <Shape ID="DesignTable:ConfigInfo" ZOrder="277" X="1281" Y="-55" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:SoundingFaultTypes" ZOrder="115" X="-508" Y="-109" Height="505" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="501" />
-    <Shape ID="DesignTable:ScheduledItem_AP" ZOrder="10" X="-724" Y="1340" Height="106" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:SoundingFaultTypes" ZOrder="116" X="-508" Y="-109" Height="505" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="501" />
+    <Shape ID="DesignTable:ScheduledItem_AP" ZOrder="14" X="-724" Y="1340" Height="106" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:Signal" ZOrder="313" X="1290" Y="2435" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:VirtualKey" ZOrder="346" X="679" Y="2794" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:LogicalKey" ZOrder="345" X="958" Y="2790" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
@@ -179,43 +179,55 @@
     <Shape ID="DesignTable:VirtualLed" ZOrder="344" X="676" Y="2882" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:LogicalLed" ZOrder="343" X="959" Y="2871" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
     <Shape ID="DesignTable:UIKeypad" ZOrder="296" X="-13" Y="2637" Height="257" Width="188" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:UIKeypadItem" ZOrder="41" X="-286" Y="2761" Height="296" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
+    <Shape ID="DesignTable:UIKeypadItem" ZOrder="43" X="-286" Y="2761" Height="296" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
     <Shape ID="DesignTable:LogicalDisplay" ZOrder="342" X="961" Y="2943" Height="49" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
     <Shape ID="DesignTable:ScheduledItem_UIProxy" ZOrder="373" X="-970" Y="1788" Height="86" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
     <Shape ID="DesignTable:HWBus2KeypadLED" ZOrder="332" X="2538" Y="-352" Height="143" Width="181" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:HWBus2KeypadLCD" ZOrder="331" X="2531" Y="-208" Height="200" Width="182" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="196" />
-    <Shape ID="DesignTable:UserGroup" ZOrder="29" X="-1361" Y="1213" Height="1093" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="1089" />
-    <Shape ID="DesignTable:ScheduledItem_Partition" ZOrder="21" X="-971" Y="1649" Height="86" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
+    <Shape ID="DesignTable:UserGroup" ZOrder="33" X="-1361" Y="1213" Height="1093" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="1089" />
+    <Shape ID="DesignTable:ScheduledItem_Partition" ZOrder="25" X="-971" Y="1649" Height="86" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
     <Shape ID="DesignTable:UserGroup_ScheduledItem" ZOrder="352" X="-978" Y="1895" Height="124" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
     <Shape ID="DesignTable:VirtualWirelessPanicButton" ZOrder="338" X="667" Y="2321" Height="67" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:LogicalWirelessPanicButton" ZOrder="337" X="954" Y="2327" Height="67" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:HWBus2ViewGuardPIRMask" ZOrder="267" X="2806" Y="2222" Height="231" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="227" />
     <Shape ID="DesignTable:HWBus2ViewGuardDualMask" ZOrder="307" X="2806" Y="2526" Height="277" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
-    <Shape ID="DesignTable:Trigger_UIKey" ZOrder="64" X="2203" Y="2419" Height="68" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:Command_Sounder" ZOrder="180" X="1883" Y="2287" Height="87" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:Trigger_Timer" ZOrder="91" X="2204" Y="2500" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Trigger_UIKey" ZOrder="65" X="2203" Y="2419" Height="68" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Command_Sounder" ZOrder="181" X="1883" Y="2287" Height="87" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Trigger_Timer" ZOrder="92" X="2204" Y="2500" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:HWBus2SounderFlasherModule" ZOrder="291" X="2174" Y="1704" Height="258" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:HWBus22RelaisInputModule" ZOrder="290" X="2177" Y="1512" Height="143" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:HWBus2PowerSupplyUnit" ZOrder="287" X="2884" Y="878" Height="143" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
-    <Shape ID="DesignTable:Trigger_Macro" ZOrder="63" X="2205" Y="2699" Height="68" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:Trigger_PartitionMemberOmit" ZOrder="90" X="2205" Y="2615" Height="67" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
-    <Shape ID="DesignTable:LicenseUsage" ZOrder="126" X="-514" Y="2551" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
-    <Shape ID="DesignTable:ContactID" ZOrder="97" X="-703" Y="180" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
-    <Shape ID="DesignTable:ContactIDEvent" ZOrder="96" X="-707" Y="319" Height="143" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
-    <Shape ID="DesignTable:Trigger_Counter" ZOrder="62" X="2206" Y="2781" Height="105" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
-    <Shape ID="DesignTable:Trigger_User" ZOrder="89" X="2207" Y="2895" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
-    <Shape ID="DesignTable:Command_ISOMEvent" ZOrder="88" X="1879" Y="2703" Height="68" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:Trigger_PartitionAlarm" ZOrder="61" X="2207" Y="3017" Height="124" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
-    <Shape ID="DesignTable:DatapointNumbers" ZOrder="2" X="1908" Y="130" Height="143" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
-    <Shape ID="DesignTable:Trigger_SimpleFilter" ZOrder="37" X="1948" Y="1827" Height="181" Width="183" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
-    <Shape ID="DesignTable:ControllerNumbers" ZOrder="35" X="1547" Y="576" Height="67" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
-    <Shape ID="DesignTable:ScheduledItem_Macro" ZOrder="6" X="-978" Y="1531" Height="86" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
-    <Shape ID="DesignTable:HWBus2DoorGuardIOMode" ZOrder="1" X="2885" Y="1035" Height="49" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
+    <Shape ID="DesignTable:Trigger_Macro" ZOrder="64" X="2205" Y="2699" Height="68" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Trigger_PartitionMemberOmit" ZOrder="91" X="2205" Y="2615" Height="67" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:LicenseUsage" ZOrder="127" X="-514" Y="2551" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
+    <Shape ID="DesignTable:ContactID" ZOrder="98" X="-703" Y="180" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
+    <Shape ID="DesignTable:ContactIDEvent" ZOrder="97" X="-707" Y="319" Height="143" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:Trigger_Counter" ZOrder="63" X="2206" Y="2781" Height="105" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
+    <Shape ID="DesignTable:Trigger_User" ZOrder="90" X="2207" Y="2895" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
+    <Shape ID="DesignTable:Command_ISOMEvent" ZOrder="89" X="1879" Y="2703" Height="68" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Trigger_PartitionAlarm" ZOrder="62" X="2207" Y="3017" Height="124" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
+    <Shape ID="DesignTable:DatapointNumbers" ZOrder="6" X="1908" Y="130" Height="143" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:Trigger_SimpleFilter" ZOrder="39" X="1948" Y="1827" Height="181" Width="183" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
+    <Shape ID="DesignTable:ControllerNumbers" ZOrder="37" X="1547" Y="576" Height="67" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:ScheduledItem_Macro" ZOrder="10" X="-978" Y="1531" Height="86" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
+    <Shape ID="DesignTable:HWBus2DoorGuardIOMode" ZOrder="5" X="2885" Y="1035" Height="49" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_SounderTemplate_DetectorGroup" ZOrder="114" LineWidth="11">
+    <Connector ID="DesignRelation:PartitionMember_DetectorGroup" ZOrder="339" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>-696</X>
+          <Y>1000</Y>
+        </Point>
+        <Point>
+          <X>-823</X>
+          <Y>1000</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_SounderTemplate_DetectorGroup" ZOrder="115" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>-1002</X>
           <Y>324</Y>
         </Point>
@@ -233,19 +245,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:PartitionMember_DetectorGroup" ZOrder="339" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualPIR_VirtualBusPIR" ZOrder="152" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-696</X>
-          <Y>1000</Y>
+          <X>465</X>
+          <Y>229</Y>
         </Point>
         <Point>
-          <X>-823</X>
-          <Y>1000</Y>
+          <X>663</X>
+          <Y>229</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalPIR_VirtualBusPIR" ZOrder="152" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalPIR_VirtualBusPIR" ZOrder="153" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>959</X>
@@ -265,19 +277,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualPIR_VirtualBusPIR" ZOrder="151" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualInput" ZOrder="417" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>465</X>
-          <Y>229</Y>
+          <X>11</X>
+          <Y>1375</Y>
         </Point>
         <Point>
-          <X>663</X>
-          <Y>229</Y>
+          <X>252</X>
+          <Y>1375</Y>
         </Point>
+        <Point>
+          <X>252</X>
+          <Y>519</Y>
+        </Point>
+        <Point>
+          <X>656</X>
+          <Y>519</Y>
+        </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualInput" ZOrder="201" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualInput" ZOrder="202" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>956</X>
@@ -297,35 +317,31 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualInput" ZOrder="417" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Signal_VirtualOutput" ZOrder="299" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>11</X>
-          <Y>1375</Y>
+          <X>1290</X>
+          <Y>2435</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>1375</Y>
+          <X>1262</X>
+          <Y>2435</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>519</Y>
+          <X>1262</X>
+          <Y>1462</Y>
         </Point>
         <Point>
-          <X>656</X>
-          <Y>519</Y>
+          <X>1044</X>
+          <Y>1462</Y>
         </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualOutput" ZOrder="149" LineWidth="11">
-      <RoutePoints>
         <Point>
-          <X>957</X>
-          <Y>1050</Y>
+          <X>1044</X>
+          <Y>1162</Y>
         </Point>
         <Point>
           <X>812</X>
-          <Y>1050</Y>
+          <Y>1162</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -349,35 +365,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Signal_VirtualOutput" ZOrder="299" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualOutput" ZOrder="150" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1290</X>
-          <Y>2435</Y>
+          <X>957</X>
+          <Y>1050</Y>
         </Point>
         <Point>
-          <X>1262</X>
-          <Y>2435</Y>
-        </Point>
-        <Point>
-          <X>1262</X>
-          <Y>1462</Y>
-        </Point>
-        <Point>
-          <X>1044</X>
-          <Y>1462</Y>
-        </Point>
-        <Point>
-          <X>1044</X>
-          <Y>1162</Y>
-        </Point>
-        <Point>
           <X>812</X>
-          <Y>1162</Y>
+          <Y>1050</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualUserInterface" ZOrder="141" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualUserInterface" ZOrder="142" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
@@ -397,7 +397,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_LogicalAccessPoint_AccessPoint" ZOrder="44" LineWidth="11">
+    <Connector ID="DesignRelation:FK_LogicalAccessPoint_AccessPoint" ZOrder="46" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>952</X>
@@ -417,9 +417,29 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalDoor_VirtualBusDoor" ZOrder="52" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDoor_VirtualBusDoor" ZOrder="324" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>575</X>
+          <Y>1195</Y>
+        </Point>
+        <Point>
+          <X>621</X>
+          <Y>1195</Y>
+        </Point>
+        <Point>
+          <X>621</X>
+          <Y>1488</Y>
+        </Point>
+        <Point>
+          <X>662</X>
+          <Y>1488</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:LogicalDoor_VirtualBusDoor" ZOrder="54" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>971</X>
           <Y>1525</Y>
         </Point>
@@ -437,43 +457,31 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDoor_VirtualBusDoor" ZOrder="324" LineWidth="11">
+    <Connector ID="DesignRelation:ActionOn_Macro" ZOrder="425" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>575</X>
-          <Y>1195</Y>
+          <X>1355</X>
+          <Y>2212</Y>
         </Point>
         <Point>
-          <X>621</X>
-          <Y>1195</Y>
+          <X>1291</X>
+          <Y>2212</Y>
         </Point>
         <Point>
-          <X>621</X>
-          <Y>1488</Y>
+          <X>1291</X>
+          <Y>2098</Y>
         </Point>
         <Point>
-          <X>662</X>
-          <Y>1488</Y>
+          <X>1459</X>
+          <Y>2098</Y>
         </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:Condition_Macro" ZOrder="431" LineWidth="11">
-      <RoutePoints>
         <Point>
-          <X>1495</X>
-          <Y>2024</Y>
+          <X>1459</X>
+          <Y>1979</Y>
         </Point>
         <Point>
-          <X>1473</X>
-          <Y>2024</Y>
-        </Point>
-        <Point>
-          <X>1473</X>
-          <Y>1883</Y>
-        </Point>
-        <Point>
           <X>1424</X>
-          <Y>1883</Y>
+          <Y>1979</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -505,31 +513,23 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:ActionOn_Macro" ZOrder="425" LineWidth="11">
+    <Connector ID="DesignRelation:Condition_Macro" ZOrder="431" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1355</X>
-          <Y>2212</Y>
+          <X>1495</X>
+          <Y>2024</Y>
         </Point>
         <Point>
-          <X>1291</X>
-          <Y>2212</Y>
+          <X>1473</X>
+          <Y>2024</Y>
         </Point>
         <Point>
-          <X>1291</X>
-          <Y>2098</Y>
+          <X>1473</X>
+          <Y>1883</Y>
         </Point>
         <Point>
-          <X>1459</X>
-          <Y>2098</Y>
-        </Point>
-        <Point>
-          <X>1459</X>
-          <Y>1979</Y>
-        </Point>
-        <Point>
           <X>1424</X>
-          <Y>1979</Y>
+          <Y>1883</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -693,7 +693,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalDevice_LogicalDoor" ZOrder="50" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalDevice_LogicalDoor" ZOrder="52" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1294</X>
@@ -713,7 +713,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_HardwareDevice_Port" ZOrder="177" LineWidth="11">
+    <Connector ID="DesignRelation:FK_HardwareDevice_Port" ZOrder="178" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1951</X>
@@ -773,6 +773,26 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:ActionList_ActionList_Command" ZOrder="329" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>1355</X>
+          <Y>2229</Y>
+        </Point>
+        <Point>
+          <X>1319</X>
+          <Y>2229</Y>
+        </Point>
+        <Point>
+          <X>1319</X>
+          <Y>2402</Y>
+        </Point>
+        <Point>
+          <X>1453</X>
+          <Y>2402</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:Command_ActionList_Command" ZOrder="330" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -801,26 +821,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:ActionList_ActionList_Command" ZOrder="329" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>1355</X>
-          <Y>2229</Y>
-        </Point>
-        <Point>
-          <X>1319</X>
-          <Y>2229</Y>
-        </Point>
-        <Point>
-          <X>1319</X>
-          <Y>2402</Y>
-        </Point>
-        <Point>
-          <X>1453</X>
-          <Y>2402</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:Object_Building" ZOrder="326" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -881,9 +881,29 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalDevice_VirtualDevice" ZOrder="49" LineWidth="11">
+    <Connector ID="DesignRelation:PartitionMember_VirtualDevice" ZOrder="270" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>-513</X>
+          <Y>933</Y>
+        </Point>
+        <Point>
+          <X>-441</X>
+          <Y>933</Y>
+        </Point>
+        <Point>
+          <X>-441</X>
+          <Y>1408</Y>
+        </Point>
+        <Point>
+          <X>-140</X>
+          <Y>1408</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:LogicalDevice_VirtualDevice" ZOrder="51" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>1294</X>
           <Y>1494</Y>
         </Point>
@@ -905,43 +925,43 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:PartitionMember_VirtualDevice" ZOrder="270" LineWidth="11">
+    <Connector ID="DesignRelation:HardwareDevice_LogicalDevice" ZOrder="328" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-513</X>
-          <Y>933</Y>
+          <X>1951</X>
+          <Y>1247</Y>
         </Point>
         <Point>
-          <X>-441</X>
-          <Y>933</Y>
+          <X>1472</X>
+          <Y>1247</Y>
         </Point>
         <Point>
-          <X>-441</X>
-          <Y>1408</Y>
+          <X>1472</X>
+          <Y>1322</Y>
         </Point>
         <Point>
-          <X>-140</X>
-          <Y>1408</Y>
+          <X>1444</X>
+          <Y>1322</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:HardwareDevice_LogicalDevice" ZOrder="328" LineWidth="11">
+    <Connector ID="DesignRelation:CatalogueData_HardwareDevice" ZOrder="327" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1951</X>
-          <Y>1247</Y>
+          <X>1676</X>
+          <Y>1331</Y>
         </Point>
         <Point>
-          <X>1472</X>
-          <Y>1247</Y>
+          <X>1730</X>
+          <Y>1331</Y>
         </Point>
         <Point>
-          <X>1472</X>
-          <Y>1322</Y>
+          <X>1730</X>
+          <Y>1281</Y>
         </Point>
         <Point>
-          <X>1444</X>
-          <Y>1322</Y>
+          <X>1951</X>
+          <Y>1281</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -965,59 +985,59 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:CatalogueData_HardwareDevice" ZOrder="327" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualPIR_VirtualHardwiredPIR" ZOrder="108" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1676</X>
-          <Y>1331</Y>
+          <X>465</X>
+          <Y>240</Y>
         </Point>
         <Point>
-          <X>1730</X>
-          <Y>1331</Y>
+          <X>609</X>
+          <Y>240</Y>
         </Point>
         <Point>
-          <X>1730</X>
-          <Y>1281</Y>
+          <X>609</X>
+          <Y>718</Y>
         </Point>
         <Point>
-          <X>1951</X>
-          <Y>1281</Y>
+          <X>664</X>
+          <Y>718</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWiredPIR" ZOrder="217" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredPIR2" ZOrder="222" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>986</X>
-          <Y>765</Y>
+          <X>998</X>
+          <Y>999</Y>
         </Point>
         <Point>
-          <X>986</X>
-          <Y>820</Y>
+          <X>998</X>
+          <Y>897</Y>
         </Point>
         <Point>
           <X>850</X>
-          <Y>820</Y>
+          <Y>897</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWiredPIR1" ZOrder="218" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredPIR1" ZOrder="221" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1002</X>
-          <Y>765</Y>
+          <X>1009</X>
+          <Y>999</Y>
         </Point>
         <Point>
-          <X>1002</X>
-          <Y>840</Y>
+          <X>1009</X>
+          <Y>878</Y>
         </Point>
         <Point>
           <X>850</X>
-          <Y>840</Y>
+          <Y>878</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWiredPIR2" ZOrder="219" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualWiredPIR2" ZOrder="220" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1015</X>
@@ -1033,127 +1053,103 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredPIR1" ZOrder="220" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualWiredPIR1" ZOrder="219" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1009</X>
-          <Y>999</Y>
+          <X>1002</X>
+          <Y>765</Y>
         </Point>
         <Point>
-          <X>1009</X>
-          <Y>878</Y>
+          <X>1002</X>
+          <Y>840</Y>
         </Point>
         <Point>
           <X>850</X>
-          <Y>878</Y>
+          <Y>840</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredPIR2" ZOrder="221" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualWiredPIR" ZOrder="218" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>998</X>
-          <Y>999</Y>
+          <X>986</X>
+          <Y>765</Y>
         </Point>
         <Point>
-          <X>998</X>
-          <Y>897</Y>
+          <X>986</X>
+          <Y>820</Y>
         </Point>
         <Point>
           <X>850</X>
-          <Y>897</Y>
+          <Y>820</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualPIR_VirtualHardwiredPIR" ZOrder="107" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDoor_VirtualHardwiredDoor" ZOrder="323" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>465</X>
-          <Y>240</Y>
+          <X>575</X>
+          <Y>1181</Y>
         </Point>
         <Point>
-          <X>609</X>
-          <Y>240</Y>
-        </Point>
-        <Point>
-          <X>609</X>
-          <Y>718</Y>
-        </Point>
-        <Point>
           <X>664</X>
-          <Y>718</Y>
+          <Y>1181</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualWiredDoor" ZOrder="308" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualWiredDoor2" ZOrder="217" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>11</X>
-          <Y>1376</Y>
-        </Point>
-        <Point>
-          <X>664</X>
-          <Y>1376</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWiredDoor1" ZOrder="215" LineWidth="11">
-      <RoutePoints>
-        <Point>
           <X>956</X>
-          <Y>741</Y>
+          <Y>749</Y>
         </Point>
         <Point>
-          <X>879</X>
-          <Y>741</Y>
+          <X>887</X>
+          <Y>749</Y>
         </Point>
         <Point>
-          <X>879</X>
-          <Y>1246</Y>
+          <X>887</X>
+          <Y>1263</Y>
         </Point>
         <Point>
           <X>859</X>
-          <Y>1246</Y>
+          <Y>1263</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWiredDoor" ZOrder="214" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor" ZOrder="211" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>956</X>
-          <Y>729</Y>
+          <X>977</X>
+          <Y>1105</Y>
         </Point>
         <Point>
-          <X>871</X>
-          <Y>729</Y>
+          <X>977</X>
+          <Y>1340</Y>
         </Point>
         <Point>
-          <X>871</X>
-          <Y>1228</Y>
-        </Point>
-        <Point>
           <X>859</X>
-          <Y>1228</Y>
+          <Y>1340</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor6" ZOrder="213" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor1" ZOrder="212" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1012</X>
+          <X>989</X>
           <Y>1105</Y>
         </Point>
         <Point>
-          <X>1012</X>
-          <Y>1397</Y>
+          <X>989</X>
+          <Y>1358</Y>
         </Point>
         <Point>
           <X>859</X>
-          <Y>1397</Y>
+          <Y>1358</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor2" ZOrder="212" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor2" ZOrder="213" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1001</X>
@@ -1169,85 +1165,77 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor1" ZOrder="211" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor6" ZOrder="214" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>989</X>
+          <X>1012</X>
           <Y>1105</Y>
         </Point>
         <Point>
-          <X>989</X>
-          <Y>1358</Y>
+          <X>1012</X>
+          <Y>1397</Y>
         </Point>
         <Point>
           <X>859</X>
-          <Y>1358</Y>
+          <Y>1397</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualWiredDoor" ZOrder="210" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualWiredDoor" ZOrder="215" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>977</X>
-          <Y>1105</Y>
+          <X>956</X>
+          <Y>729</Y>
         </Point>
         <Point>
-          <X>977</X>
-          <Y>1340</Y>
+          <X>871</X>
+          <Y>729</Y>
         </Point>
         <Point>
+          <X>871</X>
+          <Y>1228</Y>
+        </Point>
+        <Point>
           <X>859</X>
-          <Y>1340</Y>
+          <Y>1228</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWiredDoor2" ZOrder="216" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualWiredDoor1" ZOrder="216" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>956</X>
-          <Y>749</Y>
+          <Y>741</Y>
         </Point>
         <Point>
-          <X>887</X>
-          <Y>749</Y>
+          <X>879</X>
+          <Y>741</Y>
         </Point>
         <Point>
-          <X>887</X>
-          <Y>1263</Y>
+          <X>879</X>
+          <Y>1246</Y>
         </Point>
         <Point>
           <X>859</X>
-          <Y>1263</Y>
+          <Y>1246</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDoor_VirtualHardwiredDoor" ZOrder="323" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualWiredDoor" ZOrder="308" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>575</X>
-          <Y>1181</Y>
+          <X>11</X>
+          <Y>1376</Y>
         </Point>
         <Point>
           <X>664</X>
-          <Y>1181</Y>
+          <Y>1376</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalSounder_VirtualSounder" ZOrder="200" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualSounder" ZOrder="137" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>975</X>
-          <Y>398</Y>
-        </Point>
-        <Point>
-          <X>816</X>
-          <Y>398</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualSounder" ZOrder="136" LineWidth="11">
-      <RoutePoints>
-        <Point>
           <X>11</X>
           <Y>1391</Y>
         </Point>
@@ -1265,24 +1253,16 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalEmail_VirtualEmail" ZOrder="472" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalSounder_VirtualSounder" ZOrder="201" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>961</X>
-          <Y>-3</Y>
+          <X>975</X>
+          <Y>398</Y>
         </Point>
         <Point>
-          <X>918</X>
-          <Y>-3</Y>
+          <X>816</X>
+          <Y>398</Y>
         </Point>
-        <Point>
-          <X>918</X>
-          <Y>12</Y>
-        </Point>
-        <Point>
-          <X>814</X>
-          <Y>12</Y>
-        </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:VirtualDevice_VirtualEmail" ZOrder="416" LineWidth="11">
@@ -1305,16 +1285,24 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalCamera_VirtualCamera" ZOrder="471" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalEmail_VirtualEmail" ZOrder="472" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>963</X>
-          <Y>124</Y>
+          <X>961</X>
+          <Y>-3</Y>
         </Point>
         <Point>
-          <X>815</X>
-          <Y>124</Y>
+          <X>918</X>
+          <Y>-3</Y>
         </Point>
+        <Point>
+          <X>918</X>
+          <Y>12</Y>
+        </Point>
+        <Point>
+          <X>814</X>
+          <Y>12</Y>
+        </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:VirtualDevice_VirtualCamera" ZOrder="418" LineWidth="11">
@@ -1337,19 +1325,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalSMS_VirtualSMS" ZOrder="196" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalCamera_VirtualCamera" ZOrder="471" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>974</X>
-          <Y>1681</Y>
+          <X>963</X>
+          <Y>124</Y>
         </Point>
         <Point>
           <X>815</X>
-          <Y>1681</Y>
+          <Y>124</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualSMS" ZOrder="146" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualSMS" ZOrder="147" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
@@ -1377,24 +1365,16 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualUserInterface_VirtualReader" ZOrder="240" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalSMS_VirtualSMS" ZOrder="197" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>529</X>
-          <Y>2591</Y>
+          <X>974</X>
+          <Y>1681</Y>
         </Point>
         <Point>
-          <X>631</X>
-          <Y>2591</Y>
+          <X>815</X>
+          <Y>1681</Y>
         </Point>
-        <Point>
-          <X>631</X>
-          <Y>2704</Y>
-        </Point>
-        <Point>
-          <X>676</X>
-          <Y>2704</Y>
-        </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:LogicalReader_VirtualReader" ZOrder="311" LineWidth="11">
@@ -1417,23 +1397,23 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualUserInterface_VirtualKeyboard" ZOrder="238" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualUserInterface_VirtualReader" ZOrder="241" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>529</X>
-          <Y>2575</Y>
+          <Y>2591</Y>
         </Point>
         <Point>
-          <X>627</X>
-          <Y>2575</Y>
+          <X>631</X>
+          <Y>2591</Y>
         </Point>
         <Point>
-          <X>627</X>
-          <Y>2451</Y>
+          <X>631</X>
+          <Y>2704</Y>
         </Point>
         <Point>
-          <X>674</X>
-          <Y>2451</Y>
+          <X>676</X>
+          <Y>2704</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -1449,19 +1429,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualUserInterface_VirtualKeyboardReader" ZOrder="239" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualUserInterface_VirtualKeyboard" ZOrder="239" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>529</X>
-          <Y>2584</Y>
+          <Y>2575</Y>
         </Point>
         <Point>
-          <X>675</X>
-          <Y>2584</Y>
+          <X>627</X>
+          <Y>2575</Y>
         </Point>
+        <Point>
+          <X>627</X>
+          <Y>2451</Y>
+        </Point>
+        <Point>
+          <X>674</X>
+          <Y>2451</Y>
+        </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalKeyboardReader_VirtualKeyboardReader" ZOrder="236" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalKeyboardReader_VirtualKeyboardReader" ZOrder="237" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>949</X>
@@ -1473,27 +1461,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualKeySwitch" ZOrder="421" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualUserInterface_VirtualKeyboardReader" ZOrder="240" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>11</X>
-          <Y>1375</Y>
+          <X>529</X>
+          <Y>2584</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>1375</Y>
+          <X>675</X>
+          <Y>2584</Y>
         </Point>
-        <Point>
-          <X>252</X>
-          <Y>806</Y>
-        </Point>
-        <Point>
-          <X>435</X>
-          <Y>806</Y>
-        </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualKeySwitch" ZOrder="209" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_VirtualKeySwitch" ZOrder="210" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>956</X>
@@ -1513,23 +1493,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualRelay" ZOrder="47" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualKeySwitch" ZOrder="421" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1026</X>
-          <Y>1105</Y>
+          <X>11</X>
+          <Y>1375</Y>
         </Point>
         <Point>
-          <X>1026</X>
-          <Y>1445</Y>
+          <X>252</X>
+          <Y>1375</Y>
         </Point>
         <Point>
-          <X>580</X>
-          <Y>1445</Y>
+          <X>252</X>
+          <Y>806</Y>
         </Point>
+        <Point>
+          <X>435</X>
+          <Y>806</Y>
+        </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualRelay" ZOrder="137" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualRelay" ZOrder="138" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
@@ -1549,28 +1533,20 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWindow" ZOrder="205" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualRelay" ZOrder="49" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>956</X>
-          <Y>678</Y>
+          <X>1026</X>
+          <Y>1105</Y>
         </Point>
         <Point>
-          <X>565</X>
-          <Y>678</Y>
+          <X>1026</X>
+          <Y>1445</Y>
         </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:LogicalInput_VirtualWindow1" ZOrder="206" LineWidth="11">
-      <RoutePoints>
         <Point>
-          <X>956</X>
-          <Y>700</Y>
+          <X>580</X>
+          <Y>1445</Y>
         </Point>
-        <Point>
-          <X>565</X>
-          <Y>700</Y>
-        </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:VirtualDevice_VirtualWindow" ZOrder="420" LineWidth="11">
@@ -1593,6 +1569,30 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:LogicalInput_VirtualWindow1" ZOrder="207" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>956</X>
+          <Y>700</Y>
+        </Point>
+        <Point>
+          <X>565</X>
+          <Y>700</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:LogicalInput_VirtualWindow" ZOrder="206" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>956</X>
+          <Y>678</Y>
+        </Point>
+        <Point>
+          <X>565</X>
+          <Y>678</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:LogicalDevice_LogicalPeripheral" ZOrder="400" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -1653,26 +1653,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualPeripheral" ZOrder="143" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>11</X>
-          <Y>1392</Y>
-        </Point>
-        <Point>
-          <X>252</X>
-          <Y>1392</Y>
-        </Point>
-        <Point>
-          <X>252</X>
-          <Y>1648</Y>
-        </Point>
-        <Point>
-          <X>366</X>
-          <Y>1648</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:LogicalPeripheral_VirtualPeripheral" ZOrder="469" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -1685,27 +1665,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualSmokeDetector" ZOrder="144" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualPeripheral" ZOrder="144" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
-          <Y>1394</Y>
+          <Y>1392</Y>
         </Point>
         <Point>
           <X>252</X>
-          <Y>1394</Y>
+          <Y>1392</Y>
         </Point>
         <Point>
           <X>252</X>
-          <Y>1752</Y>
+          <Y>1648</Y>
         </Point>
         <Point>
-          <X>664</X>
-          <Y>1752</Y>
+          <X>366</X>
+          <Y>1648</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalSmokeDetector_VirtualSmokeDetector" ZOrder="194" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalSmokeDetector_VirtualSmokeDetector" ZOrder="195" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>976</X>
@@ -1725,23 +1705,23 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualTemperature" ZOrder="142" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualSmokeDetector" ZOrder="145" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
-          <Y>1395</Y>
+          <Y>1394</Y>
         </Point>
         <Point>
           <X>252</X>
-          <Y>1395</Y>
+          <Y>1394</Y>
         </Point>
         <Point>
           <X>252</X>
-          <Y>1926</Y>
+          <Y>1752</Y>
         </Point>
         <Point>
-          <X>669</X>
-          <Y>1926</Y>
+          <X>664</X>
+          <Y>1752</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -1765,6 +1745,26 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:VirtualDevice_VirtualTemperature" ZOrder="143" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>11</X>
+          <Y>1395</Y>
+        </Point>
+        <Point>
+          <X>252</X>
+          <Y>1395</Y>
+        </Point>
+        <Point>
+          <X>252</X>
+          <Y>1926</Y>
+        </Point>
+        <Point>
+          <X>669</X>
+          <Y>1926</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:LogicalDevice_LogicalKeyboard" ZOrder="393" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -1825,7 +1825,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_HardwareDevice_WirelessMaster" ZOrder="176" LineWidth="11">
+    <Connector ID="DesignRelation:FK_HardwareDevice_WirelessMaster1" ZOrder="176" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1951</X>
@@ -1832,20 +1832,20 @@
           <Y>1246</Y>
         </Point>
         <Point>
-          <X>1927</X>
+          <X>1917</X>
           <Y>1246</Y>
         </Point>
         <Point>
-          <X>1927</X>
-          <Y>1557</Y>
+          <X>1917</X>
+          <Y>1535</Y>
         </Point>
         <Point>
           <X>1856</X>
-          <Y>1557</Y>
+          <Y>1535</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_HardwareDevice_WirelessMaster1" ZOrder="175" LineWidth="11">
+    <Connector ID="DesignRelation:FK_HardwareDevice_WirelessMaster" ZOrder="177" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1951</X>
@@ -1852,16 +1852,16 @@
           <Y>1246</Y>
         </Point>
         <Point>
-          <X>1917</X>
+          <X>1927</X>
           <Y>1246</Y>
         </Point>
         <Point>
-          <X>1917</X>
-          <Y>1535</Y>
+          <X>1927</X>
+          <Y>1557</Y>
         </Point>
         <Point>
           <X>1856</X>
-          <Y>1535</Y>
+          <Y>1557</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -1973,9 +1973,29 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AccessPoint_AccessPoint_User" ZOrder="162" LineWidth="11">
+    <Connector ID="DesignRelation:FK_User_AccessPoint_User" ZOrder="164" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>-224</X>
+          <Y>2027</Y>
+        </Point>
+        <Point>
+          <X>-244</X>
+          <Y>2027</Y>
+        </Point>
+        <Point>
+          <X>-244</X>
+          <Y>1681</Y>
+        </Point>
+        <Point>
+          <X>-262</X>
+          <Y>1681</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_AccessPoint_AccessPoint_User" ZOrder="163" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>-395</X>
           <Y>845</Y>
         </Point>
@@ -2001,27 +2021,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_User_AccessPoint_User" ZOrder="163" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle2" ZOrder="105" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-224</X>
-          <Y>2027</Y>
+          <X>-810</X>
+          <Y>324</Y>
         </Point>
         <Point>
-          <X>-244</X>
-          <Y>2027</Y>
+          <X>-755</X>
+          <Y>324</Y>
         </Point>
         <Point>
-          <X>-244</X>
-          <Y>1681</Y>
+          <X>-755</X>
+          <Y>206</Y>
         </Point>
         <Point>
-          <X>-262</X>
-          <Y>1681</Y>
+          <X>-777</X>
+          <Y>206</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle1" ZOrder="103" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle3" ZOrder="106" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-810</X>
@@ -2028,20 +2048,20 @@
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-749</X>
+          <X>-760</X>
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-749</X>
-          <Y>177</Y>
+          <X>-760</X>
+          <Y>243</Y>
         </Point>
         <Point>
           <X>-777</X>
-          <Y>177</Y>
+          <Y>243</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle" ZOrder="102" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle4" ZOrder="322" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-810</X>
@@ -2048,20 +2068,20 @@
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-744</X>
+          <X>-765</X>
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-744</X>
-          <Y>140</Y>
+          <X>-765</X>
+          <Y>274</Y>
         </Point>
         <Point>
           <X>-777</X>
-          <Y>140</Y>
+          <Y>274</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Partition_ExternalSounderStyle" ZOrder="101" LineWidth="11">
+    <Connector ID="DesignRelation:Partition_ExternalSounderStyle" ZOrder="102" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -2097,7 +2117,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle4" ZOrder="322" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle" ZOrder="103" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-810</X>
@@ -2104,20 +2124,20 @@
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-765</X>
+          <X>-744</X>
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-765</X>
-          <Y>274</Y>
+          <X>-744</X>
+          <Y>140</Y>
         </Point>
         <Point>
           <X>-777</X>
-          <Y>274</Y>
+          <Y>140</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle3" ZOrder="105" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle1" ZOrder="104" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-810</X>
@@ -2124,40 +2144,40 @@
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-760</X>
+          <X>-749</X>
           <Y>324</Y>
         </Point>
         <Point>
-          <X>-760</X>
-          <Y>243</Y>
+          <X>-749</X>
+          <Y>177</Y>
         </Point>
         <Point>
           <X>-777</X>
-          <Y>243</Y>
+          <Y>177</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SounderTemplate_ExternalSounderStyle2" ZOrder="104" LineWidth="11">
+    <Connector ID="DesignRelation:Partition_Partition_SignalingGroup" ZOrder="252" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-810</X>
-          <Y>324</Y>
+          <X>30</X>
+          <Y>-132</Y>
         </Point>
         <Point>
-          <X>-755</X>
-          <Y>324</Y>
+          <X>-539</X>
+          <Y>-132</Y>
         </Point>
         <Point>
-          <X>-755</X>
-          <Y>206</Y>
+          <X>-539</X>
+          <Y>-196</Y>
         </Point>
         <Point>
-          <X>-777</X>
-          <Y>206</Y>
+          <X>-582</X>
+          <Y>-196</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:SignalingGroup_Partition_SignalingGroup" ZOrder="20" LineWidth="11">
+    <Connector ID="DesignRelation:SignalingGroup_Partition_SignalingGroup" ZOrder="24" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-947</X>
@@ -2177,27 +2197,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Partition_Partition_SignalingGroup" ZOrder="251" LineWidth="11">
+    <Connector ID="DesignRelation:SignalingGroup_SignalingGroup_Siren" ZOrder="122" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>30</X>
-          <Y>-132</Y>
+          <X>-791</X>
+          <Y>1307</Y>
         </Point>
         <Point>
-          <X>-539</X>
-          <Y>-132</Y>
+          <X>-715</X>
+          <Y>1307</Y>
         </Point>
-        <Point>
-          <X>-539</X>
-          <Y>-196</Y>
-        </Point>
-        <Point>
-          <X>-582</X>
-          <Y>-196</Y>
-        </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_SignalingGroup_Sounder" ZOrder="132" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_SignalingGroup_Sounder" ZOrder="133" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>663</X>
@@ -2225,19 +2237,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:SignalingGroup_SignalingGroup_Siren" ZOrder="121" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualFlasher_SignalingGroup_Flasher" ZOrder="320" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-791</X>
-          <Y>1307</Y>
+          <X>448</X>
+          <Y>1066</Y>
         </Point>
         <Point>
-          <X>-715</X>
-          <Y>1307</Y>
+          <X>-476</X>
+          <Y>1066</Y>
         </Point>
+        <Point>
+          <X>-476</X>
+          <Y>1223</Y>
+        </Point>
+        <Point>
+          <X>-509</X>
+          <Y>1223</Y>
+        </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:SignalingGroup_SignalingGroup_Flasher" ZOrder="122" LineWidth="11">
+    <Connector ID="DesignRelation:SignalingGroup_SignalingGroup_Flasher" ZOrder="123" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-791</X>
@@ -2257,48 +2277,36 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualFlasher_SignalingGroup_Flasher" ZOrder="320" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_APTurnstile" ZOrder="204" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>448</X>
-          <Y>1066</Y>
+          <X>975</X>
+          <Y>999</Y>
         </Point>
         <Point>
-          <X>-476</X>
-          <Y>1066</Y>
+          <X>975</X>
+          <Y>983</Y>
         </Point>
         <Point>
-          <X>-476</X>
-          <Y>1223</Y>
+          <X>631</X>
+          <Y>983</Y>
         </Point>
         <Point>
-          <X>-509</X>
-          <Y>1223</Y>
+          <X>631</X>
+          <Y>997</Y>
         </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:LogicalInput_APTurnstile" ZOrder="202" LineWidth="11">
-      <RoutePoints>
         <Point>
-          <X>956</X>
-          <Y>765</Y>
+          <X>296</X>
+          <Y>997</Y>
         </Point>
         <Point>
-          <X>956</X>
+          <X>296</X>
           <Y>975</Y>
         </Point>
         <Point>
-          <X>338</X>
+          <X>231</X>
           <Y>975</Y>
         </Point>
-        <Point>
-          <X>338</X>
-          <Y>1003</Y>
-        </Point>
-        <Point>
-          <X>231</X>
-          <Y>1003</Y>
-        </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:AccessPoint_APTurnstile" ZOrder="293" LineWidth="11">
@@ -2329,35 +2337,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_APTurnstile" ZOrder="203" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalInput_APTurnstile" ZOrder="203" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>975</X>
-          <Y>999</Y>
+          <X>956</X>
+          <Y>765</Y>
         </Point>
         <Point>
-          <X>975</X>
-          <Y>983</Y>
+          <X>956</X>
+          <Y>975</Y>
         </Point>
         <Point>
-          <X>631</X>
-          <Y>983</Y>
+          <X>338</X>
+          <Y>975</Y>
         </Point>
         <Point>
-          <X>631</X>
-          <Y>997</Y>
+          <X>338</X>
+          <Y>1003</Y>
         </Point>
         <Point>
-          <X>296</X>
-          <Y>997</Y>
-        </Point>
-        <Point>
-          <X>296</X>
-          <Y>975</Y>
-        </Point>
-        <Point>
           <X>231</X>
-          <Y>975</Y>
+          <Y>1003</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -2641,7 +2641,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:HardwareDevice_HWBus2DoorGuard" ZOrder="55" LineWidth="11">
+    <Connector ID="DesignRelation:HardwareDevice_HWBus2DoorGuard" ZOrder="56" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2112</X>
@@ -2981,7 +2981,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Partition_PartitionMember" ZOrder="167" LineWidth="11">
+    <Connector ID="DesignRelation:Partition_PartitionMember" ZOrder="168" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -3009,7 +3009,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Partition_PMCollection" ZOrder="116" LineWidth="11">
+    <Connector ID="DesignRelation:Partition_PMCollection" ZOrder="117" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -3037,7 +3037,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:PMCollection_PMCollectionDependecy" ZOrder="111" LineWidth="11">
+    <Connector ID="DesignRelation:PMCollection_PMCollectionDependecy" ZOrder="112" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-682</X>
@@ -3057,7 +3057,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:PMCollection_PMCollectionEntryRoute" ZOrder="113" LineWidth="11">
+    <Connector ID="DesignRelation:PMCollection_PMCollectionEntryRoute" ZOrder="114" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-682</X>
@@ -3077,7 +3077,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:PMCollection_PMCollectionExitRoute" ZOrder="112" LineWidth="11">
+    <Connector ID="DesignRelation:PMCollection_PMCollectionExitRoute" ZOrder="113" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-682</X>
@@ -3097,7 +3097,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Trigger_PartitionTrigger_ReadyState" ZOrder="81" LineWidth="11">
+    <Connector ID="DesignRelation:Trigger_PartitionTrigger_ReadyState" ZOrder="82" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -3117,7 +3117,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Trigger_PartitionTrigger_SetState" ZOrder="80" LineWidth="11">
+    <Connector ID="DesignRelation:Trigger_PartitionTrigger_SetState" ZOrder="81" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -3137,7 +3137,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Command_Command_PartitionSetState" ZOrder="71" LineWidth="11">
+    <Connector ID="DesignRelation:Command_Command_PartitionSetState" ZOrder="72" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1753</X>
@@ -3157,7 +3157,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Command_Command_PartitionClearAlarmType" ZOrder="72" LineWidth="11">
+    <Connector ID="DesignRelation:Command_Command_PartitionClearAlarmType" ZOrder="73" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1753</X>
@@ -3177,7 +3177,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Command_Command_PartitionMemberOmit" ZOrder="70" LineWidth="11">
+    <Connector ID="DesignRelation:Command_Command_PartitionMemberOmit" ZOrder="71" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1753</X>
@@ -3197,7 +3197,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Command_Command_OutputPulseOn" ZOrder="73" LineWidth="11">
+    <Connector ID="DesignRelation:Command_Command_OutputPulseOn" ZOrder="74" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1753</X>
@@ -3217,7 +3217,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Command_Command_MacroDelay" ZOrder="75" LineWidth="11">
+    <Connector ID="DesignRelation:Command_Command_MacroDelay" ZOrder="76" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1753</X>
@@ -3237,7 +3237,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Partition_PartitionFaultType" ZOrder="249" LineWidth="11">
+    <Connector ID="DesignRelation:Partition_PartitionFaultType" ZOrder="250" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -3257,29 +3257,9 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualPeripheral_VirtualPeripheralPartitionMemberFaultType" ZOrder="243" LineWidth="11">
+    <Connector ID="DesignRelation:PartitionMember_VirtualPeripheralPartitionMemberFaultType" ZOrder="23" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>366</X>
-          <Y>1667</Y>
-        </Point>
-        <Point>
-          <X>-49</X>
-          <Y>1667</Y>
-        </Point>
-        <Point>
-          <X>-49</X>
-          <Y>2297</Y>
-        </Point>
-        <Point>
-          <X>-675</X>
-          <Y>2297</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:PartitionMember_VirtualPeripheralPartitionMemberFaultType" ZOrder="19" LineWidth="11">
-      <RoutePoints>
-        <Point>
           <X>-696</X>
           <Y>933</Y>
         </Point>
@@ -3305,6 +3285,26 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:VirtualPeripheral_VirtualPeripheralPartitionMemberFaultType" ZOrder="244" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>366</X>
+          <Y>1667</Y>
+        </Point>
+        <Point>
+          <X>-49</X>
+          <Y>1667</Y>
+        </Point>
+        <Point>
+          <X>-49</X>
+          <Y>2297</Y>
+        </Point>
+        <Point>
+          <X>-675</X>
+          <Y>2297</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:LogicalDevice_LogicalWirelessPeripheral" ZOrder="350" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -3365,7 +3365,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Partition_UnsetPreventionAlarmType" ZOrder="250" LineWidth="11">
+    <Connector ID="DesignRelation:Partition_UnsetPreventionAlarmType" ZOrder="251" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -3385,43 +3385,43 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:AccessPoint_ScheduledItem_AccessPoint" ZOrder="427" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AccessPointGroup_AccessPointGroup_AccessPoint" ZOrder="377" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-378</X>
-          <Y>1074</Y>
+          <X>-697</X>
+          <Y>1747</Y>
         </Point>
         <Point>
-          <X>-378</X>
+          <X>-765</X>
+          <Y>1747</Y>
+        </Point>
+        <Point>
+          <X>-765</X>
           <Y>1461</Y>
         </Point>
         <Point>
-          <X>-519</X>
+          <X>-728</X>
           <Y>1461</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AccessPointGroup_AccessPointGroup_AccessPoint" ZOrder="377" LineWidth="11">
+    <Connector ID="DesignRelation:AccessPoint_ScheduledItem_AccessPoint" ZOrder="427" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-697</X>
-          <Y>1747</Y>
+          <X>-378</X>
+          <Y>1074</Y>
         </Point>
         <Point>
-          <X>-765</X>
-          <Y>1747</Y>
-        </Point>
-        <Point>
-          <X>-765</X>
+          <X>-378</X>
           <Y>1461</Y>
         </Point>
         <Point>
-          <X>-728</X>
+          <X>-519</X>
           <Y>1461</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:UserGroup_DatePeriod" ZOrder="18" LineWidth="11">
+    <Connector ID="DesignRelation:UserGroup_DatePeriod" ZOrder="22" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-1124</X>
@@ -3457,29 +3457,9 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TimeSchedule_UserGroup_TimeSchedule" ZOrder="375" LineWidth="11">
+    <Connector ID="DesignRelation:FK_RTZ_UserGroup_TimeSchedule" ZOrder="21" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-219</X>
-          <Y>1701</Y>
-        </Point>
-        <Point>
-          <X>-277</X>
-          <Y>1701</Y>
-        </Point>
-        <Point>
-          <X>-277</X>
-          <Y>1868</Y>
-        </Point>
-        <Point>
-          <X>-303</X>
-          <Y>1868</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:FK_RTZ_UserGroup_TimeSchedule" ZOrder="17" LineWidth="11">
-      <RoutePoints>
-        <Point>
           <X>-1124</X>
           <Y>2030</Y>
         </Point>
@@ -3497,27 +3477,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:UserGroup_User_UserGroup" ZOrder="14" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TimeSchedule_UserGroup_TimeSchedule" ZOrder="375" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-1124</X>
-          <Y>2041</Y>
+          <X>-219</X>
+          <Y>1701</Y>
         </Point>
         <Point>
-          <X>-499</X>
-          <Y>2041</Y>
+          <X>-277</X>
+          <Y>1701</Y>
         </Point>
         <Point>
-          <X>-499</X>
-          <Y>2025</Y>
+          <X>-277</X>
+          <Y>1868</Y>
         </Point>
         <Point>
-          <X>-473</X>
-          <Y>2025</Y>
+          <X>-303</X>
+          <Y>1868</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:User_User_UserGroup" ZOrder="13" LineWidth="11">
+    <Connector ID="DesignRelation:User_User_UserGroup" ZOrder="17" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-224</X>
@@ -3537,27 +3517,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualFlasher" ZOrder="422" LineWidth="11">
+    <Connector ID="DesignRelation:UserGroup_User_UserGroup" ZOrder="18" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>11</X>
-          <Y>1375</Y>
+          <X>-1124</X>
+          <Y>2041</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>1375</Y>
+          <X>-499</X>
+          <Y>2041</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>1059</Y>
+          <X>-499</X>
+          <Y>2025</Y>
         </Point>
         <Point>
-          <X>448</X>
-          <Y>1059</Y>
+          <X>-473</X>
+          <Y>2025</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalOutput_VirtualFlasher" ZOrder="150" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalOutput_VirtualFlasher" ZOrder="151" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>957</X>
@@ -3581,7 +3561,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualDSDevice" ZOrder="413" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualFlasher" ZOrder="422" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
@@ -3593,11 +3573,11 @@
         </Point>
         <Point>
           <X>252</X>
-          <Y>-134</Y>
+          <Y>1059</Y>
         </Point>
         <Point>
-          <X>666</X>
-          <Y>-134</Y>
+          <X>448</X>
+          <Y>1059</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -3613,6 +3593,26 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:VirtualDevice_VirtualDSDevice" ZOrder="413" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>11</X>
+          <Y>1375</Y>
+        </Point>
+        <Point>
+          <X>252</X>
+          <Y>1375</Y>
+        </Point>
+        <Point>
+          <X>252</X>
+          <Y>-134</Y>
+        </Point>
+        <Point>
+          <X>666</X>
+          <Y>-134</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:LogicalDevice_LogicalDSAlarmReporting" ZOrder="410" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -3633,9 +3633,29 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_VirtualDSDevice_AlarmDevice" ZOrder="85" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Partition_AlarmDevice" ZOrder="85" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>30</X>
+          <Y>-333</Y>
+        </Point>
+        <Point>
+          <X>-1057</X>
+          <Y>-333</Y>
+        </Point>
+        <Point>
+          <X>-1057</X>
+          <Y>-38</Y>
+        </Point>
+        <Point>
+          <X>-1015</X>
+          <Y>-38</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_VirtualDSDevice_AlarmDevice" ZOrder="86" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>666</X>
           <Y>-138</Y>
         </Point>
@@ -3661,27 +3681,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Partition_AlarmDevice" ZOrder="84" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AlarmDevice_AlarmDevice_FaultPartition" ZOrder="110" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>30</X>
-          <Y>-333</Y>
+          <X>-865</X>
+          <Y>-122</Y>
         </Point>
         <Point>
-          <X>-1057</X>
-          <Y>-333</Y>
+          <X>-816</X>
+          <Y>-122</Y>
         </Point>
         <Point>
-          <X>-1057</X>
-          <Y>-38</Y>
+          <X>-816</X>
+          <Y>-95</Y>
         </Point>
         <Point>
-          <X>-1015</X>
-          <Y>-38</Y>
+          <X>-795</X>
+          <Y>-95</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Partition_AlarmDevice_FaultPartition" ZOrder="252" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Partition_AlarmDevice_FaultPartition" ZOrder="253" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -3701,30 +3721,10 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AlarmDevice_AlarmDevice_FaultPartition" ZOrder="109" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AlarmDevice_Channel" ZOrder="100" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-865</X>
-          <Y>-122</Y>
-        </Point>
-        <Point>
-          <X>-816</X>
-          <Y>-122</Y>
-        </Point>
-        <Point>
-          <X>-816</X>
-          <Y>-95</Y>
-        </Point>
-        <Point>
-          <X>-795</X>
-          <Y>-95</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:FK_AlarmDevice_Channel" ZOrder="99" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>-865</X>
           <Y>-115</Y>
         </Point>
         <Point>
@@ -3821,7 +3821,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Trigger_SimpleTrigger" ZOrder="83" LineWidth="11">
+    <Connector ID="DesignRelation:Trigger_SimpleTrigger" ZOrder="84" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -3833,7 +3833,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Trigger_Trigger_SingleEvent" ZOrder="82" LineWidth="11">
+    <Connector ID="DesignRelation:Trigger_Trigger_SingleEvent" ZOrder="83" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -3853,9 +3853,21 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualWirelessMaster" ZOrder="139" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalWirelessMaster_VirtualWirelessMaster" ZOrder="194" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>974</X>
+          <Y>2111</Y>
+        </Point>
+        <Point>
+          <X>859</X>
+          <Y>2111</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:VirtualDevice_VirtualWirelessMaster" ZOrder="140" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>11</X>
           <Y>1395</Y>
         </Point>
@@ -3873,19 +3885,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalWirelessMaster_VirtualWirelessMaster" ZOrder="193" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalWirelessPeripheral_VirtualWirelessPeripheral" ZOrder="340" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>974</X>
-          <Y>2111</Y>
+          <X>965</X>
+          <Y>2212</Y>
         </Point>
         <Point>
-          <X>859</X>
-          <Y>2111</Y>
+          <X>929</X>
+          <Y>2212</Y>
         </Point>
+        <Point>
+          <X>929</X>
+          <Y>2234</Y>
+        </Point>
+        <Point>
+          <X>882</X>
+          <Y>2234</Y>
+        </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualWirelessPeripheral" ZOrder="140" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualWirelessPeripheral" ZOrder="141" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
@@ -3905,26 +3925,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalWirelessPeripheral_VirtualWirelessPeripheral" ZOrder="340" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>965</X>
-          <Y>2212</Y>
-        </Point>
-        <Point>
-          <X>929</X>
-          <Y>2212</Y>
-        </Point>
-        <Point>
-          <X>929</X>
-          <Y>2234</Y>
-        </Point>
-        <Point>
-          <X>882</X>
-          <Y>2234</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:LogicalDevice_LogicalCarbonMonoxide" ZOrder="411" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -3945,6 +3945,18 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:LogicalCarbonMonoxide_VirtualCarbonMonoxide" ZOrder="467" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>943</X>
+          <Y>-234</Y>
+        </Point>
+        <Point>
+          <X>872</X>
+          <Y>-234</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:VirtualDevice_VirtualCarbonMonoxide" ZOrder="412" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -3965,18 +3977,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalCarbonMonoxide_VirtualCarbonMonoxide" ZOrder="467" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>943</X>
-          <Y>-234</Y>
-        </Point>
-        <Point>
-          <X>872</X>
-          <Y>-234</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:FK_HardwareDevice_HWGPIOInput" ZOrder="460" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -4077,7 +4077,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_HardwareDevice_UIProxy" ZOrder="190" LineWidth="11">
+    <Connector ID="DesignRelation:FK_HardwareDevice_UIProxy" ZOrder="191" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1951</X>
@@ -4109,22 +4109,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:UIProxy_UITouchCenter" ZOrder="401" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>-147</X>
-          <Y>2486</Y>
-        </Point>
-        <Point>
-          <X>-147</X>
-          <Y>2369</Y>
-        </Point>
-        <Point>
-          <X>-3</X>
-          <Y>2369</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:LogicalSmartUI_UIProxyTouchCenter" ZOrder="272" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -4145,6 +4129,22 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:UIProxy_UITouchCenter" ZOrder="401" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>-147</X>
+          <Y>2486</Y>
+        </Point>
+        <Point>
+          <X>-147</X>
+          <Y>2369</Y>
+        </Point>
+        <Point>
+          <X>-3</X>
+          <Y>2369</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:FK_UIProxy_UIProxy_Partition" ZOrder="402" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -4165,31 +4165,31 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Partition_PartitionDependency" ZOrder="222" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Partition_PartitionDependency1" ZOrder="256" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>224</X>
-          <Y>-270</Y>
+          <Y>-285</Y>
         </Point>
         <Point>
           <X>280</X>
-          <Y>-270</Y>
+          <Y>-285</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Partition_PartitionDependency1" ZOrder="255" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Partition_PartitionDependency" ZOrder="223" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>224</X>
-          <Y>-285</Y>
+          <Y>-270</Y>
         </Point>
         <Point>
           <X>280</X>
-          <Y>-285</Y>
+          <Y>-270</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Partition_StoredFaultTypes" ZOrder="169" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Partition_StoredFaultTypes" ZOrder="170" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -4209,26 +4209,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualSounder_Partition_LocalSounder" ZOrder="315" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>663</X>
-          <Y>383</Y>
-        </Point>
-        <Point>
-          <X>-40</X>
-          <Y>383</Y>
-        </Point>
-        <Point>
-          <X>-40</X>
-          <Y>375</Y>
-        </Point>
-        <Point>
-          <X>-91</X>
-          <Y>375</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:Partition_Partition_LocalSounder" ZOrder="314" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -4249,27 +4229,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualPIR" ZOrder="106" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualSounder_Partition_LocalSounder" ZOrder="315" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>11</X>
-          <Y>1375</Y>
+          <X>663</X>
+          <Y>383</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>1375</Y>
+          <X>-40</X>
+          <Y>383</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>202</Y>
+          <X>-40</X>
+          <Y>375</Y>
         </Point>
         <Point>
-          <X>315</X>
-          <Y>202</Y>
+          <X>-91</X>
+          <Y>375</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualDevice_VirtualDoor" ZOrder="419" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualPIR" ZOrder="107" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
@@ -4281,11 +4261,11 @@
         </Point>
         <Point>
           <X>252</X>
-          <Y>1159</Y>
+          <Y>202</Y>
         </Point>
         <Point>
-          <X>425</X>
-          <Y>1159</Y>
+          <X>315</X>
+          <Y>202</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -4309,27 +4289,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_Door" ZOrder="164" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualDevice_VirtualDoor" ZOrder="419" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-697</X>
-          <Y>1747</Y>
+          <X>11</X>
+          <Y>1375</Y>
         </Point>
         <Point>
-          <X>-757</X>
-          <Y>1747</Y>
+          <X>252</X>
+          <Y>1375</Y>
         </Point>
         <Point>
-          <X>-757</X>
-          <Y>1697</Y>
+          <X>252</X>
+          <Y>1159</Y>
         </Point>
         <Point>
-          <X>-728</X>
-          <Y>1697</Y>
+          <X>425</X>
+          <Y>1159</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_VirtualDoor_ScheduledItem_Door" ZOrder="135" LineWidth="11">
+    <Connector ID="DesignRelation:FK_VirtualDoor_ScheduledItem_Door" ZOrder="136" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>425</X>
@@ -4357,6 +4337,26 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_Door" ZOrder="165" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>-697</X>
+          <Y>1747</Y>
+        </Point>
+        <Point>
+          <X>-757</X>
+          <Y>1747</Y>
+        </Point>
+        <Point>
+          <X>-757</X>
+          <Y>1697</Y>
+        </Point>
+        <Point>
+          <X>-728</X>
+          <Y>1697</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:HardwareDevice_HWBus2ViewguardDual" ZOrder="264" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -4377,7 +4377,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Partition_SoundingFaultTypes" ZOrder="168" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Partition_SoundingFaultTypes" ZOrder="169" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>30</X>
@@ -4397,9 +4397,29 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_AP" ZOrder="130" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AccessPoint_ScheduledItem_AP" ZOrder="132" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>-395</X>
+          <Y>845</Y>
+        </Point>
+        <Point>
+          <X>-426</X>
+          <Y>845</Y>
+        </Point>
+        <Point>
+          <X>-426</X>
+          <Y>1413</Y>
+        </Point>
+        <Point>
+          <X>-550</X>
+          <Y>1413</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_AP" ZOrder="131" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>-697</X>
           <Y>1747</Y>
         </Point>
@@ -4417,23 +4437,23 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AccessPoint_ScheduledItem_AP" ZOrder="131" LineWidth="11">
+    <Connector ID="DesignRelation:FK_VirtualDevice_VirtualKey" ZOrder="139" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-395</X>
-          <Y>845</Y>
+          <X>11</X>
+          <Y>1397</Y>
         </Point>
         <Point>
-          <X>-426</X>
-          <Y>845</Y>
+          <X>252</X>
+          <Y>1397</Y>
         </Point>
         <Point>
-          <X>-426</X>
-          <Y>1413</Y>
+          <X>252</X>
+          <Y>2811</Y>
         </Point>
         <Point>
-          <X>-550</X>
-          <Y>1413</Y>
+          <X>679</X>
+          <Y>2811</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -4457,26 +4477,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_VirtualDevice_VirtualKey" ZOrder="138" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>11</X>
-          <Y>1397</Y>
-        </Point>
-        <Point>
-          <X>252</X>
-          <Y>1397</Y>
-        </Point>
-        <Point>
-          <X>252</X>
-          <Y>2811</Y>
-        </Point>
-        <Point>
-          <X>679</X>
-          <Y>2811</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:FK_LogicalDevice_LogicalKey" ZOrder="395" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -4497,43 +4497,43 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_VirtualDevice_VirtualLed" ZOrder="145" LineWidth="11">
+    <Connector ID="DesignRelation:FK_LogicalLed_VirtualLed" ZOrder="309" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>11</X>
-          <Y>1397</Y>
+          <X>959</X>
+          <Y>2904</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>1397</Y>
+          <X>904</X>
+          <Y>2904</Y>
         </Point>
         <Point>
-          <X>252</X>
-          <Y>2899</Y>
+          <X>904</X>
+          <Y>2927</Y>
         </Point>
         <Point>
-          <X>676</X>
-          <Y>2899</Y>
+          <X>826</X>
+          <Y>2927</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_LogicalLed_VirtualLed" ZOrder="309" LineWidth="11">
+    <Connector ID="DesignRelation:FK_VirtualDevice_VirtualLed" ZOrder="146" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>959</X>
-          <Y>2904</Y>
+          <X>11</X>
+          <Y>1397</Y>
         </Point>
         <Point>
-          <X>904</X>
-          <Y>2904</Y>
+          <X>252</X>
+          <Y>1397</Y>
         </Point>
         <Point>
-          <X>904</X>
-          <Y>2927</Y>
+          <X>252</X>
+          <Y>2899</Y>
         </Point>
         <Point>
-          <X>826</X>
-          <Y>2927</Y>
+          <X>676</X>
+          <Y>2899</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -4557,51 +4557,59 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:LogicalPeripheral_UIKeypad" ZOrder="154" LineWidth="11">
+    <Connector ID="DesignRelation:FK_LogicalKeyboardReader_UIKeypad" ZOrder="156" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>970</X>
-          <Y>1743</Y>
+          <X>949</X>
+          <Y>2572</Y>
         </Point>
         <Point>
-          <X>913</X>
-          <Y>1743</Y>
+          <X>928</X>
+          <Y>2572</Y>
         </Point>
         <Point>
-          <X>913</X>
-          <Y>2652</Y>
+          <X>928</X>
+          <Y>2660</Y>
         </Point>
         <Point>
-          <X>228</X>
-          <Y>2652</Y>
+          <X>543</X>
+          <Y>2660</Y>
         </Point>
         <Point>
-          <X>228</X>
-          <Y>2711</Y>
+          <X>543</X>
+          <Y>2691</Y>
         </Point>
         <Point>
           <X>175</X>
-          <Y>2711</Y>
+          <Y>2691</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_LogicalDisplay_UIKeypad" ZOrder="158" LineWidth="11">
+    <Connector ID="DesignRelation:FK_UIProxy_Keypad_UIProxy_Keypad" ZOrder="160" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>961</X>
-          <Y>2957</Y>
+          <X>-13</X>
+          <Y>2663</Y>
         </Point>
         <Point>
-          <X>233</X>
-          <Y>2957</Y>
+          <X>-27</X>
+          <Y>2663</Y>
         </Point>
         <Point>
-          <X>233</X>
-          <Y>2727</Y>
+          <X>-27</X>
+          <Y>2626</Y>
         </Point>
         <Point>
+          <X>197</X>
+          <Y>2626</Y>
+        </Point>
+        <Point>
+          <X>197</X>
+          <Y>2747</Y>
+        </Point>
+        <Point>
           <X>175</X>
-          <Y>2727</Y>
+          <Y>2747</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -4625,139 +4633,111 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_UIProxy_Keypad_UIProxy_Keypad" ZOrder="159" LineWidth="11">
+    <Connector ID="DesignRelation:FK_LogicalDisplay_UIKeypad" ZOrder="159" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-13</X>
-          <Y>2663</Y>
+          <X>961</X>
+          <Y>2957</Y>
         </Point>
         <Point>
-          <X>-27</X>
-          <Y>2663</Y>
+          <X>233</X>
+          <Y>2957</Y>
         </Point>
         <Point>
-          <X>-27</X>
-          <Y>2626</Y>
+          <X>233</X>
+          <Y>2727</Y>
         </Point>
         <Point>
-          <X>197</X>
-          <Y>2626</Y>
-        </Point>
-        <Point>
-          <X>197</X>
-          <Y>2747</Y>
-        </Point>
-        <Point>
           <X>175</X>
-          <Y>2747</Y>
+          <Y>2727</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_LogicalKeyboardReader_UIKeypad" ZOrder="155" LineWidth="11">
+    <Connector ID="DesignRelation:LogicalPeripheral_UIKeypad" ZOrder="155" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>949</X>
-          <Y>2572</Y>
+          <X>970</X>
+          <Y>1743</Y>
         </Point>
         <Point>
-          <X>928</X>
-          <Y>2572</Y>
+          <X>913</X>
+          <Y>1743</Y>
         </Point>
         <Point>
-          <X>928</X>
-          <Y>2660</Y>
+          <X>913</X>
+          <Y>2652</Y>
         </Point>
         <Point>
-          <X>543</X>
-          <Y>2660</Y>
+          <X>228</X>
+          <Y>2652</Y>
         </Point>
         <Point>
-          <X>543</X>
-          <Y>2691</Y>
+          <X>228</X>
+          <Y>2711</Y>
         </Point>
         <Point>
           <X>175</X>
-          <Y>2691</Y>
+          <Y>2711</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Signal_UIKeypadItem2" ZOrder="40" LineWidth="11">
+    <Connector ID="DesignRelation:FK_LogicalKey_UIKeypadItem" ZOrder="157" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1290</X>
-          <Y>2468</Y>
+          <X>958</X>
+          <Y>2825</Y>
         </Point>
         <Point>
-          <X>1248</X>
-          <Y>2468</Y>
+          <X>884</X>
+          <Y>2825</Y>
         </Point>
         <Point>
-          <X>1248</X>
-          <Y>3027</Y>
+          <X>884</X>
+          <Y>2973</Y>
         </Point>
         <Point>
-          <X>-96</X>
-          <Y>3027</Y>
+          <X>-22</X>
+          <Y>2973</Y>
         </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:Signal_UIKeypadItem" ZOrder="242" LineWidth="11">
-      <RoutePoints>
         <Point>
-          <X>1290</X>
-          <Y>2447</Y>
+          <X>-22</X>
+          <Y>2853</Y>
         </Point>
         <Point>
-          <X>1228</X>
-          <Y>2447</Y>
-        </Point>
-        <Point>
-          <X>1228</X>
-          <Y>3004</Y>
-        </Point>
-        <Point>
-          <X>-48</X>
-          <Y>3004</Y>
-        </Point>
-        <Point>
-          <X>-48</X>
-          <Y>2990</Y>
-        </Point>
-        <Point>
           <X>-96</X>
-          <Y>2990</Y>
+          <Y>2853</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Signal_UIKeypadItem1" ZOrder="46" LineWidth="11">
+    <Connector ID="DesignRelation:FK_LogicalLed_UIKeypadItem" ZOrder="158" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1290</X>
-          <Y>2458</Y>
+          <X>959</X>
+          <Y>2904</Y>
         </Point>
         <Point>
-          <X>1238</X>
-          <Y>2458</Y>
+          <X>907</X>
+          <Y>2904</Y>
         </Point>
         <Point>
-          <X>1238</X>
-          <Y>3016</Y>
+          <X>907</X>
+          <Y>2988</Y>
         </Point>
         <Point>
-          <X>-58</X>
-          <Y>3016</Y>
+          <X>-39</X>
+          <Y>2988</Y>
         </Point>
         <Point>
-          <X>-58</X>
-          <Y>3006</Y>
+          <X>-39</X>
+          <Y>2874</Y>
         </Point>
         <Point>
           <X>-96</X>
-          <Y>3006</Y>
+          <Y>2874</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:UIKeypad_UIKeypadItem" ZOrder="42" LineWidth="11">
+    <Connector ID="DesignRelation:UIKeypad_UIKeypadItem" ZOrder="44" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-99</X>
@@ -4777,62 +4757,82 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_LogicalLed_UIKeypadItem" ZOrder="157" LineWidth="11">
+    <Connector ID="DesignRelation:Signal_UIKeypadItem1" ZOrder="48" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>959</X>
-          <Y>2904</Y>
+          <X>1290</X>
+          <Y>2458</Y>
         </Point>
         <Point>
-          <X>907</X>
-          <Y>2904</Y>
+          <X>1238</X>
+          <Y>2458</Y>
         </Point>
         <Point>
-          <X>907</X>
-          <Y>2988</Y>
+          <X>1238</X>
+          <Y>3016</Y>
         </Point>
         <Point>
-          <X>-39</X>
-          <Y>2988</Y>
+          <X>-58</X>
+          <Y>3016</Y>
         </Point>
         <Point>
-          <X>-39</X>
-          <Y>2874</Y>
+          <X>-58</X>
+          <Y>3006</Y>
         </Point>
         <Point>
           <X>-96</X>
-          <Y>2874</Y>
+          <Y>3006</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_LogicalKey_UIKeypadItem" ZOrder="156" LineWidth="11">
+    <Connector ID="DesignRelation:Signal_UIKeypadItem" ZOrder="243" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>958</X>
-          <Y>2825</Y>
+          <X>1290</X>
+          <Y>2447</Y>
         </Point>
         <Point>
-          <X>884</X>
-          <Y>2825</Y>
+          <X>1228</X>
+          <Y>2447</Y>
         </Point>
         <Point>
-          <X>884</X>
-          <Y>2973</Y>
+          <X>1228</X>
+          <Y>3004</Y>
         </Point>
         <Point>
-          <X>-22</X>
-          <Y>2973</Y>
+          <X>-48</X>
+          <Y>3004</Y>
         </Point>
         <Point>
-          <X>-22</X>
-          <Y>2853</Y>
+          <X>-48</X>
+          <Y>2990</Y>
         </Point>
         <Point>
           <X>-96</X>
-          <Y>2853</Y>
+          <Y>2990</Y>
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:FK_Signal_UIKeypadItem2" ZOrder="42" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>1290</X>
+          <Y>2468</Y>
+        </Point>
+        <Point>
+          <X>1248</X>
+          <Y>2468</Y>
+        </Point>
+        <Point>
+          <X>1248</X>
+          <Y>3027</Y>
+        </Point>
+        <Point>
+          <X>-96</X>
+          <Y>3027</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
     <Connector ID="DesignRelation:FK_LogicalDevice_LogicalDisplay" ZOrder="333" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -4853,51 +4853,51 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_UIProxy_ScheduledItem_UIProxy" ZOrder="15" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_UIProxy" ZOrder="271" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-280</X>
-          <Y>2526</Y>
+          <X>-697</X>
+          <Y>1781</Y>
         </Point>
         <Point>
-          <X>-509</X>
-          <Y>2526</Y>
-        </Point>
-        <Point>
-          <X>-509</X>
-          <Y>2217</Y>
-        </Point>
-        <Point>
           <X>-997</X>
-          <Y>2217</Y>
+          <Y>1781</Y>
         </Point>
         <Point>
           <X>-997</X>
-          <Y>1864</Y>
+          <Y>1843</Y>
         </Point>
         <Point>
           <X>-970</X>
-          <Y>1864</Y>
+          <Y>1843</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_UIProxy" ZOrder="271" LineWidth="11">
+    <Connector ID="DesignRelation:FK_UIProxy_ScheduledItem_UIProxy" ZOrder="19" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-697</X>
-          <Y>1781</Y>
+          <X>-280</X>
+          <Y>2526</Y>
         </Point>
         <Point>
+          <X>-509</X>
+          <Y>2526</Y>
+        </Point>
+        <Point>
+          <X>-509</X>
+          <Y>2217</Y>
+        </Point>
+        <Point>
           <X>-997</X>
-          <Y>1781</Y>
+          <Y>2217</Y>
         </Point>
         <Point>
           <X>-997</X>
-          <Y>1843</Y>
+          <Y>1864</Y>
         </Point>
         <Point>
           <X>-970</X>
-          <Y>1843</Y>
+          <Y>1864</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -4941,9 +4941,29 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Partition_ScheduledItem_Partition" ZOrder="95" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_Partition" ZOrder="16" LineWidth="11">
       <RoutePoints>
         <Point>
+          <X>-697</X>
+          <Y>1756</Y>
+        </Point>
+        <Point>
+          <X>-1022</X>
+          <Y>1756</Y>
+        </Point>
+        <Point>
+          <X>-1022</X>
+          <Y>1702</Y>
+        </Point>
+        <Point>
+          <X>-971</X>
+          <Y>1702</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Partition_ScheduledItem_Partition" ZOrder="96" LineWidth="11">
+      <RoutePoints>
+        <Point>
           <X>30</X>
           <Y>-81</Y>
         </Point>
@@ -4969,27 +4989,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_Partition" ZOrder="12" LineWidth="11">
+    <Connector ID="DesignRelation:ScheduledItem_UserGroup_ScheduledItem" ZOrder="161" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-697</X>
-          <Y>1756</Y>
+          <Y>1787</Y>
         </Point>
         <Point>
-          <X>-1022</X>
-          <Y>1756</Y>
+          <X>-739</X>
+          <Y>1787</Y>
         </Point>
         <Point>
-          <X>-1022</X>
-          <Y>1702</Y>
+          <X>-739</X>
+          <Y>1971</Y>
         </Point>
         <Point>
-          <X>-971</X>
-          <Y>1702</Y>
+          <X>-758</X>
+          <Y>1971</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:UserGroup_UserGroup_ScheduledItem" ZOrder="161" LineWidth="11">
+    <Connector ID="DesignRelation:UserGroup_UserGroup_ScheduledItem" ZOrder="162" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-1124</X>
@@ -5001,27 +5021,27 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:ScheduledItem_UserGroup_ScheduledItem" ZOrder="160" LineWidth="11">
+    <Connector ID="DesignRelation:FK_LogicalWirelessPanicButton_VirtualWirelessPanicButton" ZOrder="336" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-697</X>
-          <Y>1787</Y>
+          <X>954</X>
+          <Y>2352</Y>
         </Point>
         <Point>
-          <X>-739</X>
-          <Y>1787</Y>
+          <X>932</X>
+          <Y>2352</Y>
         </Point>
         <Point>
-          <X>-739</X>
-          <Y>1971</Y>
+          <X>932</X>
+          <Y>2377</Y>
         </Point>
         <Point>
-          <X>-758</X>
-          <Y>1971</Y>
+          <X>891</X>
+          <Y>2377</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_VirtualDevice_VirtualWirelessPanicButton" ZOrder="147" LineWidth="11">
+    <Connector ID="DesignRelation:FK_VirtualDevice_VirtualWirelessPanicButton" ZOrder="148" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>11</X>
@@ -5041,26 +5061,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_LogicalWirelessPanicButton_VirtualWirelessPanicButton" ZOrder="336" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>954</X>
-          <Y>2352</Y>
-        </Point>
-        <Point>
-          <X>932</X>
-          <Y>2352</Y>
-        </Point>
-        <Point>
-          <X>932</X>
-          <Y>2377</Y>
-        </Point>
-        <Point>
-          <X>891</X>
-          <Y>2377</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:LogicalDevice_LogicalWirelessPanicButton" ZOrder="334" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -5121,7 +5121,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Trigger_Trigger_UIKey" ZOrder="79" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Trigger_Trigger_UIKey" ZOrder="80" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5141,7 +5141,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Command_Command_Sounder" ZOrder="74" LineWidth="11">
+    <Connector ID="DesignRelation:Command_Command_Sounder" ZOrder="75" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1753</X>
@@ -5161,7 +5161,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:Trigger_Trigger_Timer" ZOrder="39" LineWidth="11">
+    <Connector ID="DesignRelation:Trigger_Trigger_Timer" ZOrder="41" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5241,7 +5241,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Trigger_Trigger_Macro" ZOrder="77" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Trigger_Trigger_Macro" ZOrder="78" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5261,7 +5261,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Trigger_Trigger_PartitionMemberOmit" ZOrder="78" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Trigger_Trigger_PartitionMemberOmit" ZOrder="79" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5281,7 +5281,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AlarmDevice_ContactID" ZOrder="94" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AlarmDevice_ContactID" ZOrder="95" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-865</X>
@@ -5309,7 +5309,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_AlarmDevice_ContactIDEvent" ZOrder="92" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AlarmDevice_ContactIDEvent" ZOrder="93" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-865</X>
@@ -5337,7 +5337,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Trigger_Trigger_Counter" ZOrder="76" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Trigger_Trigger_Counter" ZOrder="77" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5357,7 +5357,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Trigger_Trigger_User" ZOrder="60" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Trigger_Trigger_User" ZOrder="61" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5377,7 +5377,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Command_Command_ISOMEvent" ZOrder="69" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Command_Command_ISOMEvent" ZOrder="70" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1753</X>
@@ -5397,7 +5397,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Trigger_Trigger_PartitionAlarm" ZOrder="59" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Trigger_Trigger_PartitionAlarm" ZOrder="60" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5417,7 +5417,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Trigger_Trigger_SimpleFilter" ZOrder="38" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Trigger_Trigger_SimpleFilter" ZOrder="40" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>2105</X>
@@ -5437,47 +5437,47 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_Macro" ZOrder="11" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Macro_ScheduledItem_Macro" ZOrder="9" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>-697</X>
-          <Y>1763</Y>
+          <X>1274</X>
+          <Y>1915</Y>
         </Point>
         <Point>
-          <X>-1030</X>
-          <Y>1763</Y>
+          <X>-748</X>
+          <Y>1915</Y>
         </Point>
         <Point>
-          <X>-1030</X>
-          <Y>1586</Y>
+          <X>-748</X>
+          <Y>1607</Y>
         </Point>
         <Point>
-          <X>-978</X>
-          <Y>1586</Y>
+          <X>-784</X>
+          <Y>1607</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Macro_ScheduledItem_Macro" ZOrder="5" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ScheduledItem_ScheduledItem_Macro" ZOrder="15" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1274</X>
-          <Y>1915</Y>
+          <X>-697</X>
+          <Y>1763</Y>
         </Point>
         <Point>
-          <X>-748</X>
-          <Y>1915</Y>
+          <X>-1030</X>
+          <Y>1763</Y>
         </Point>
         <Point>
-          <X>-748</X>
-          <Y>1607</Y>
+          <X>-1030</X>
+          <Y>1586</Y>
         </Point>
         <Point>
-          <X>-784</X>
-          <Y>1607</Y>
+          <X>-978</X>
+          <Y>1586</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:PartitionMember_PMCollection_PartitionMember" ZOrder="119" LineWidth="11">
+    <Connector ID="DesignRelation:PartitionMember_PMCollection_PartitionMember" ZOrder="120" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-696</X>
@@ -5497,7 +5497,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:PMCollection_PMCollection_PartitionMember" ZOrder="110" LineWidth="11">
+    <Connector ID="DesignRelation:PMCollection_PMCollection_PartitionMember" ZOrder="111" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-682</X>
@@ -5537,7 +5537,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:VirtualPeripheral_VirtualDevice" ZOrder="148" LineWidth="11">
+    <Connector ID="DesignRelation:VirtualPeripheral_VirtualDevice" ZOrder="149" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>366</X>
Index: ConfigApp.Logic/DataLoader.cs
===================================================================
--- ConfigApp.Logic/DataLoader.cs	(revision 3451)
+++ ConfigApp.Logic/DataLoader.cs	(working copy)
@@ -128,7 +128,7 @@
                 InternalDataStore.DataSet.EnforceConstraints = false;
                 InternalDataStore.DataSet.XML = xmlData;
                 InsertRoomUIDs();
-                InitDatapoints();
+                LoadDatapoints();
                 FixSimpleFilterTriggers();
                 FixUserTriggers();
                 CheckUniqueIDsAndDBNulls();
@@ -138,7 +138,7 @@
             }
         }
 
-        private static void InitDatapoints()
+        private static void LoadDatapoints()
         {
             // Init partitions
             var partitions = InternalDataStore.DataSet.DatapointNumbers.Where(p => p.ItemType == "Partition");
@@ -196,45 +196,18 @@
             var doors = InternalDataStore.DataSet.DatapointNumbers.Where(p => p.ItemType == "Door");
             foreach (var door in doors)
             {
-                var od1 = InternalDataStore.DataSet.HWBus2Identkey3.FirstOrDefault(p => p.UID == door.ItemUID);
+                var od1 = InternalDataStore.DataSet.VirtualBusDoor.FirstOrDefault(p => p.UID == door.ItemUID);
                 if (od1 != null)
                 {
-                    od1.DoorDatapointNumber = door.DatapointNumber;
+                    od1.DatapointNumber = door.DatapointNumber;
                 }
-                else
-                {
-                    var od2 = InternalDataStore.DataSet.HWBus2DoorControllerModule.FirstOrDefault(p => p.UID == door.ItemUID);
-                    if (od2 != null)
-                    {
-                        od2.DoorDatapointNumber = door.DatapointNumber;
-                    }
-                    else
-                    {
-                        var od3 = InternalDataStore.DataSet.HWBus2DoorGuard.FirstOrDefault(p => p.UID == door.ItemUID);
-                        if (od3 != null)
-                        {
-                            od3.DoorDatapointNumber = door.DatapointNumber;
-                        }
-                    }
-                }
             }
             // Set datapoint numbers for rows which haven't any
-            var nddoorguards = InternalDataStore.DataSet.HWBus2DoorGuard.Where(p => p.IsDoorDatapointNumberNull());
-            foreach (var row in nddoorguards)
+            var ndoors = InternalDataStore.DataSet.VirtualBusDoor.Where(p => p.IsDatapointNumberNull());
+            foreach (var row in ndoors)
             {
-                row.DoorDatapointNumber = DatapointNumberHelper.GetDoorNumber();
+                row.DatapointNumber = DatapointNumberHelper.GetDoorNumber();
             }
-            var nddoorcontrollers =
-                InternalDataStore.DataSet.HWBus2DoorControllerModule.Where(p => p.IsDoorDatapointNumberNull());
-            foreach (var row in nddoorcontrollers)
-            {
-                row.DoorDatapointNumber = DatapointNumberHelper.GetDoorNumber();
-            }
-            var ndiks3 = InternalDataStore.DataSet.HWBus2Identkey3.Where(p => p.IsDoorDatapointNumberNull());
-            foreach (var row in ndiks3)
-            {
-                row.DoorDatapointNumber = DatapointNumberHelper.GetDoorNumber();
-            }
 
             var rfDevices = InternalDataStore.DataSet.DatapointNumbers.Where(p => p.ItemType == "WirelessDevice");
             foreach (var rfDevice in rfDevices)
Index: ConfigApp.Logic/Datapoints/DatapointNumberHelper.cs
===================================================================
--- ConfigApp.Logic/Datapoints/DatapointNumberHelper.cs	(revision 3451)
+++ ConfigApp.Logic/Datapoints/DatapointNumberHelper.cs	(working copy)
@@ -151,11 +151,7 @@
                 limit = 1;
             }
             bool retVal =
-                (
-                 InternalDataStore.DataSet.HWBus2DoorGuard.Count(p => !p.IsDoorDatapointNumberNull() && p.DoorDatapointNumber == number) +
-                 InternalDataStore.DataSet.HWBus2DoorControllerModule.Count(p => !p.IsDoorDatapointNumberNull() && p.DoorDatapointNumber == number) +
-                 InternalDataStore.DataSet.HWBus2Identkey3.Count(p => !p.IsDoorDatapointNumberNull() && p.DoorDatapointNumber == number)
-                ) <= limit
+                InternalDataStore.DataSet.VirtualBusDoor.Count(p => !p.IsDatapointNumberNull() && p.DatapointNumber == number) <= limit
                 && number >= DoorStart && number <= DoorEnd;
             return retVal;
         }
Index: ConfigApp.Logic/Datapoints/DatapointSaver.cs
===================================================================
--- ConfigApp.Logic/Datapoints/DatapointSaver.cs	(revision 3451)
+++ ConfigApp.Logic/Datapoints/DatapointSaver.cs	(working copy)
@@ -88,47 +88,18 @@
 
         private static void SaveDoors()
         {
-            // Door guard
-            var doorGuards = InternalDataStore.DataSet.HWBus2DoorGuard.Where(p => !p.IsDoorDatapointNumberNull());
-            foreach (var doorGuard in doorGuards)
+            var doors = InternalDataStore.DataSet.VirtualBusDoor.Where(p => !p.IsDatapointNumberNull());
+            foreach (var door in doors)
             {
                 var row = InternalDataStore.DataSet.DatapointNumbers.NewDatapointNumbersRow();
-                row.ItemUID = doorGuard.UID;
-                row.VirtualItemUID = 0;
+                row.ItemUID = door.UID;
+                row.VirtualItemUID = door.UID;
                 row.ItemType = "Door";
-                row.DatapointNumber = doorGuard.DoorDatapointNumber;
-                row.Name = doorGuard.HardwareDeviceRow.Name;
+                row.DatapointNumber = door.DatapointNumber;
+                row.Name = door.expName;
                 row.DatapointType = "300070002";
                 InternalDataStore.DataSet.DatapointNumbers.AddDatapointNumbersRow(row);
             }
-
-            // IdentKey-3
-            var identkeys = InternalDataStore.DataSet.HWBus2Identkey3.Where(p => !p.IsDoorDatapointNumberNull());
-            foreach (var identkey in identkeys)
-            {
-                var row = InternalDataStore.DataSet.DatapointNumbers.NewDatapointNumbersRow();
-                row.ItemUID = identkey.UID;
-                row.VirtualItemUID = 0;
-                row.ItemType = "Door";
-                row.DatapointNumber = identkey.DoorDatapointNumber;
-                row.Name = identkey.HardwareDeviceRow.Name;
-                row.DatapointType = "300070002";
-                InternalDataStore.DataSet.DatapointNumbers.AddDatapointNumbersRow(row);
-            }
-
-            // Door controller module
-            var doorControllerModules = InternalDataStore.DataSet.HWBus2DoorControllerModule.Where(p => !p.IsDoorDatapointNumberNull());
-            foreach (var doorControllerModule in doorControllerModules)
-            {
-                var row = InternalDataStore.DataSet.DatapointNumbers.NewDatapointNumbersRow();
-                row.ItemUID = doorControllerModule.UID;
-                row.VirtualItemUID = 0;
-                row.ItemType = "Door";
-                row.DatapointNumber = doorControllerModule.DoorDatapointNumber;
-                row.Name = doorControllerModule.HardwareDeviceRow.Name;
-                row.DatapointType = "300070002";
-                InternalDataStore.DataSet.DatapointNumbers.AddDatapointNumbersRow(row);
-            }
         }
 
         private static void SaveMacros()
Index: ConfigApp/Views/SystemData/Partitions/DoorListView.cs
===================================================================
--- ConfigApp/Views/SystemData/Partitions/DoorListView.cs	(revision 3451)
+++ ConfigApp/Views/SystemData/Partitions/DoorListView.cs	(working copy)
@@ -1,16 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
 using System.Data;
 using System.Diagnostics;
-using System.Text;
-using System.Windows.Forms;
 using DevExpress.XtraEditors;
 using DevExpress.XtraLayout.Utils;
 using DevExpress.XtraEditors.Controls;
 using Honeywell.MBEMEA.ConfigApp.Data;
 using Honeywell.MBEMEA.ConfigApp.Logic;
+using Honeywell.MBEMEA.ConfigApp.Logic.Datapoints;
 using Honeywell.MBEMEA.ConfigApp.Templates;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraGrid.Menu;
@@ -123,6 +119,20 @@
             {
                 if (CurrentRow != null)
                 {
+                    if (MainBindingSource.Position >= 0 && MainBindingSource.Current != null)
+                    {
+                        MainBindingSource.EndEdit();
+                        var view = MainBindingSource.Current as DataRowView;
+                        if (view != null)
+                        {
+                            var busdoor = view.Row as InternalDataSet.VirtualBusDoorRow;
+                            if (busdoor != null && busdoor.RowState != DataRowState.Unchanged)
+                            {
+                                return true;
+                            }
+                        }
+                    }
+
                     if ((VirtualDoorBindingSource.Position>=0) && (VirtualDoorBindingSource.Current != null))
                     {
                         VirtualDoorBindingSource.EndEdit();
@@ -551,5 +561,34 @@
                 DoorOpenSignalIntSecTimeEdit.EditValue = (object)(MaxVal);
             }
         }
+
+        private void spinEditDatapointNumber_Leave(object sender, EventArgs e)
+        {
+            if (spinEditDatapointNumber.EditValue == null)
+            {
+                return;
+            }
+
+            int val = (int)spinEditDatapointNumber.Value;
+            int val2 = DatapointNumberHelper.GetDoorNumber(val, true);
+            if (val != val2)
+            {
+                spinEditDatapointNumber.Value = val2;
+            }
+        }
+
+        private void MainBindingSource_CurrentChanged(object sender, EventArgs e)
+        {
+            var currView = MainBindingSource.Current as DataRowView;
+            if (currView != null)
+            {
+                var currRow = currView.Row as InternalDataSet.VirtualBusDoorRow;
+                if (currRow != null && currRow.IsDatapointNumberNull())
+                {
+                    currRow.DatapointNumber = DatapointNumberHelper.GetDoorNumber();
+                    currRow.AcceptChanges();
+                }
+            }
+        }
     }
 }
Index: ConfigApp/Views/SystemData/Partitions/DoorListView.Designer.cs
===================================================================
--- ConfigApp/Views/SystemData/Partitions/DoorListView.Designer.cs	(revision 3451)
+++ ConfigApp/Views/SystemData/Partitions/DoorListView.Designer.cs	(working copy)
@@ -39,6 +39,7 @@
             this.VirtualDeviceBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.APPrimaryBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.spinEditDatapointNumber = new DevExpress.XtraEditors.SpinEdit();
             this.checkEditAccessAfterUnset2 = new DevExpress.XtraEditors.CheckEdit();
             this.APSecondaryBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.checkEditAccessAfterUnset1 = new DevExpress.XtraEditors.CheckEdit();
@@ -113,29 +114,6 @@
             this.comboBoxEditEventDocTypeOutside = new DevExpress.XtraEditors.CheckEdit();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
-            this.layoutControlGroupSettings = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.DoorSettingsACInsideLayoutControlGroup = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem50 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.DoorSettingsACOutsideLayoutControlGroup = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem60 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroupGeneral = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -175,6 +153,7 @@
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItemDatapointNumber = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroupFaultTries = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -188,6 +167,29 @@
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlGroupSettings = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.DoorSettingsACInsideLayoutControlGroup = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem50 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.DoorSettingsACOutsideLayoutControlGroup = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem60 = new DevExpress.XtraLayout.LayoutControlItem();
             this.PartitionBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -205,6 +207,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.APPrimaryBindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.spinEditDatapointNumber.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.checkEditAccessAfterUnset2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.APSecondaryBindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.checkEditAccessAfterUnset1.Properties)).BeginInit();
@@ -279,29 +282,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.comboBoxEditEventDocTypeOutside.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupSettings)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACInsideLayoutControlGroup)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem50)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACOutsideLayoutControlGroup)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem60)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupGeneral)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
@@ -341,6 +321,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemDatapointNumber)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupFaultTries)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
@@ -354,6 +335,29 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupSettings)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACInsideLayoutControlGroup)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem50)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACOutsideLayoutControlGroup)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem60)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PartitionBindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit();
@@ -377,6 +381,7 @@
             this.MainBindingSource.DataMember = "VirtualBusDoor";
             this.MainBindingSource.Filter = "";
             this.MainBindingSource.Position = -1;
+            this.MainBindingSource.CurrentChanged += new System.EventHandler(this.MainBindingSource_CurrentChanged);
             // 
             // gridControl1
             // 
@@ -448,6 +453,7 @@
             // layoutControl1
             // 
             this.layoutControl1.AllowCustomizationMenu = false;
+            this.layoutControl1.Controls.Add(this.spinEditDatapointNumber);
             this.layoutControl1.Controls.Add(this.checkEditAccessAfterUnset2);
             this.layoutControl1.Controls.Add(this.checkEditAccessAfterUnset1);
             this.layoutControl1.Controls.Add(this.checkEdit3);
@@ -519,6 +525,31 @@
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(987, 168, 250, 350);
             this.layoutControl1.Root = this.layoutControlGroup1;
             // 
+            // spinEditDatapointNumber
+            // 
+            this.spinEditDatapointNumber.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.MainBindingSource, "DatapointNumber", true));
+            resources.ApplyResources(this.spinEditDatapointNumber, "spinEditDatapointNumber");
+            this.spinEditDatapointNumber.Name = "spinEditDatapointNumber";
+            this.spinEditDatapointNumber.Properties.Appearance.Options.UseTextOptions = true;
+            this.spinEditDatapointNumber.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
+            this.spinEditDatapointNumber.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("spinEditDatapointNumber.Properties.Buttons"))))});
+            this.spinEditDatapointNumber.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+            this.spinEditDatapointNumber.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+            this.spinEditDatapointNumber.Properties.Mask.EditMask = resources.GetString("spinEditDatapointNumber.Properties.Mask.EditMask");
+            this.spinEditDatapointNumber.Properties.MaxValue = new decimal(new int[] {
+            6631,
+            0,
+            0,
+            0});
+            this.spinEditDatapointNumber.Properties.MinValue = new decimal(new int[] {
+            5608,
+            0,
+            0,
+            0});
+            this.spinEditDatapointNumber.StyleController = this.layoutControl1;
+            this.spinEditDatapointNumber.Leave += new System.EventHandler(this.spinEditDatapointNumber_Leave);
+            // 
             // checkEditAccessAfterUnset2
             // 
             this.checkEditAccessAfterUnset2.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.APSecondaryBindingSource, "AccessAfterUnset", true));
@@ -1418,7 +1449,7 @@
             this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup1.Name = "layoutControlGroup1";
             this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup1.Size = new System.Drawing.Size(677, 589);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(677, 613);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // tabbedControlGroup1
@@ -1426,244 +1457,14 @@
             resources.ApplyResources(this.tabbedControlGroup1, "tabbedControlGroup1");
             this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 0);
             this.tabbedControlGroup1.Name = "tabbedControlGroup1";
-            this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroupSettings;
-            this.tabbedControlGroup1.SelectedTabPageIndex = 2;
-            this.tabbedControlGroup1.Size = new System.Drawing.Size(677, 589);
+            this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroupGeneral;
+            this.tabbedControlGroup1.SelectedTabPageIndex = 0;
+            this.tabbedControlGroup1.Size = new System.Drawing.Size(677, 613);
             this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlGroupGeneral,
             this.layoutControlGroupFaultTries,
             this.layoutControlGroupSettings});
             // 
-            // layoutControlGroupSettings
-            // 
-            resources.ApplyResources(this.layoutControlGroupSettings, "layoutControlGroupSettings");
-            this.layoutControlGroupSettings.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.DoorSettingsACInsideLayoutControlGroup,
-            this.DoorSettingsACOutsideLayoutControlGroup});
-            this.layoutControlGroupSettings.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlGroupSettings.Name = "layoutControlGroupSettings";
-            this.layoutControlGroupSettings.Size = new System.Drawing.Size(653, 543);
-            // 
-            // DoorSettingsACInsideLayoutControlGroup
-            // 
-            resources.ApplyResources(this.DoorSettingsACInsideLayoutControlGroup, "DoorSettingsACInsideLayoutControlGroup");
-            this.DoorSettingsACInsideLayoutControlGroup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem13,
-            this.layoutControlItem14,
-            this.layoutControlItem15,
-            this.layoutControlItem16,
-            this.layoutControlItem17,
-            this.layoutControlItem19,
-            this.layoutControlItem18,
-            this.layoutControlItem33,
-            this.layoutControlItem22,
-            this.layoutControlItem50});
-            this.DoorSettingsACInsideLayoutControlGroup.Location = new System.Drawing.Point(0, 0);
-            this.DoorSettingsACInsideLayoutControlGroup.Name = "DoorSettingsACInsideLayoutControlGroup";
-            this.DoorSettingsACInsideLayoutControlGroup.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
-            this.DoorSettingsACInsideLayoutControlGroup.Size = new System.Drawing.Size(326, 543);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.comboBoxModeAccess;
-            resources.ApplyResources(this.layoutControlItem13, "layoutControlItem13");
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 47);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.comboBoxModeAccessNoSchedule;
-            resources.ApplyResources(this.layoutControlItem14, "layoutControlItem14");
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 71);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.comboBoxModeSet;
-            resources.ApplyResources(this.layoutControlItem15, "layoutControlItem15");
-            this.layoutControlItem15.Location = new System.Drawing.Point(0, 95);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.comboBoxModePartSet;
-            resources.ApplyResources(this.layoutControlItem16, "layoutControlItem16");
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 119);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(131, 13);
-            this.layoutControlItem16.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.OnlyInCustomization;
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.comboBoxModeUnset;
-            resources.ApplyResources(this.layoutControlItem17, "layoutControlItem17");
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.comboBoxModeMacro;
-            resources.ApplyResources(this.layoutControlItem19, "layoutControlItem19");
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 191);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.comboBoxModeQuickMacro;
-            resources.ApplyResources(this.layoutControlItem18, "layoutControlItem18");
-            this.layoutControlItem18.Location = new System.Drawing.Point(0, 167);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem33
-            // 
-            this.layoutControlItem33.Control = this.textEditCodeData1;
-            resources.ApplyResources(this.layoutControlItem33, "layoutControlItem33");
-            this.layoutControlItem33.Location = new System.Drawing.Point(0, 215);
-            this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.Size = new System.Drawing.Size(316, 299);
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.AP1DoorReleaseTimeIntSecTimeEdit;
-            resources.ApplyResources(this.layoutControlItem22, "layoutControlItem22");
-            this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.Size = new System.Drawing.Size(316, 24);
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem50
-            // 
-            this.layoutControlItem50.Control = this.checkEditAccessAfterUnset1;
-            resources.ApplyResources(this.layoutControlItem50, "layoutControlItem50");
-            this.layoutControlItem50.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem50.Name = "layoutControlItem50";
-            this.layoutControlItem50.Size = new System.Drawing.Size(316, 23);
-            this.layoutControlItem50.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // DoorSettingsACOutsideLayoutControlGroup
-            // 
-            resources.ApplyResources(this.DoorSettingsACOutsideLayoutControlGroup, "DoorSettingsACOutsideLayoutControlGroup");
-            this.DoorSettingsACOutsideLayoutControlGroup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem5,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem8,
-            this.layoutControlItem9,
-            this.layoutControlItem1,
-            this.layoutControlItem10,
-            this.layoutControlItem34,
-            this.layoutControlItem11,
-            this.layoutControlItem60});
-            this.DoorSettingsACOutsideLayoutControlGroup.Location = new System.Drawing.Point(326, 0);
-            this.DoorSettingsACOutsideLayoutControlGroup.Name = "DoorSettingsACOutsideLayoutControlGroup";
-            this.DoorSettingsACOutsideLayoutControlGroup.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
-            this.DoorSettingsACOutsideLayoutControlGroup.Size = new System.Drawing.Size(327, 543);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.comboBoxModeAccessNoScheduleOutside;
-            resources.ApplyResources(this.layoutControlItem5, "layoutControlItem5");
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 71);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.comboBoxModeSetOutside;
-            resources.ApplyResources(this.layoutControlItem6, "layoutControlItem6");
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 95);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.comboBoxModePartSetOutside;
-            resources.ApplyResources(this.layoutControlItem7, "layoutControlItem7");
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 119);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(131, 13);
-            this.layoutControlItem7.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.OnlyInCustomization;
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.comboBoxModeUnsetOutside;
-            resources.ApplyResources(this.layoutControlItem8, "layoutControlItem8");
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 143);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.comboBoxModeMacroOutside;
-            resources.ApplyResources(this.layoutControlItem9, "layoutControlItem9");
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 191);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.comboBoxModeAccessOutside;
-            resources.ApplyResources(this.layoutControlItem1, "layoutControlItem1");
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 47);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.comboBoxModeQuickMacroOutside;
-            resources.ApplyResources(this.layoutControlItem10, "layoutControlItem10");
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 167);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem34
-            // 
-            this.layoutControlItem34.Control = this.textEditCodeData2;
-            resources.ApplyResources(this.layoutControlItem34, "layoutControlItem34");
-            this.layoutControlItem34.Location = new System.Drawing.Point(0, 215);
-            this.layoutControlItem34.Name = "layoutControlItem34";
-            this.layoutControlItem34.Size = new System.Drawing.Size(317, 299);
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.AP2DoorReleaseTimeIntSecTimeEdit;
-            resources.ApplyResources(this.layoutControlItem11, "layoutControlItem11");
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(317, 24);
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(131, 13);
-            // 
-            // layoutControlItem60
-            // 
-            this.layoutControlItem60.Control = this.checkEditAccessAfterUnset2;
-            resources.ApplyResources(this.layoutControlItem60, "layoutControlItem60");
-            this.layoutControlItem60.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem60.Name = "layoutControlItem60";
-            this.layoutControlItem60.Size = new System.Drawing.Size(317, 23);
-            this.layoutControlItem60.TextSize = new System.Drawing.Size(131, 13);
-            // 
             // layoutControlGroupGeneral
             // 
             resources.ApplyResources(this.layoutControlGroupGeneral, "layoutControlGroupGeneral");
@@ -1677,10 +1478,11 @@
             this.ACOutsideLayoutControlGroup,
             this.layoutControlItem32,
             this.layoutControlItem31,
-            this.layoutControlItem45});
+            this.layoutControlItem45,
+            this.layoutControlItemDatapointNumber});
             this.layoutControlGroupGeneral.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroupGeneral.Name = "layoutControlGroupGeneral";
-            this.layoutControlGroupGeneral.Size = new System.Drawing.Size(653, 543);
+            this.layoutControlGroupGeneral.Size = new System.Drawing.Size(653, 567);
             // 
             // layoutControlItem23
             // 
@@ -1747,7 +1549,7 @@
             this.layoutControlItem43,
             this.layoutControlItem47,
             this.layoutControlItem57});
-            this.ACInsideLayoutControlGroup.Location = new System.Drawing.Point(0, 166);
+            this.ACInsideLayoutControlGroup.Location = new System.Drawing.Point(0, 190);
             this.ACInsideLayoutControlGroup.Name = "ACInsideLayoutControlGroup";
             this.ACInsideLayoutControlGroup.Size = new System.Drawing.Size(326, 377);
             // 
@@ -1896,7 +1698,7 @@
             this.layoutControlItem44,
             this.layoutControlItem48,
             this.layoutControlItem59});
-            this.ACOutsideLayoutControlGroup.Location = new System.Drawing.Point(326, 166);
+            this.ACOutsideLayoutControlGroup.Location = new System.Drawing.Point(326, 190);
             this.ACOutsideLayoutControlGroup.Name = "ACOutsideLayoutControlGroup";
             this.ACOutsideLayoutControlGroup.Size = new System.Drawing.Size(327, 377);
             // 
@@ -2054,6 +1856,15 @@
             this.layoutControlItem45.Size = new System.Drawing.Size(327, 23);
             this.layoutControlItem45.TextSize = new System.Drawing.Size(131, 13);
             // 
+            // layoutControlItemDatapointNumber
+            // 
+            this.layoutControlItemDatapointNumber.Control = this.spinEditDatapointNumber;
+            resources.ApplyResources(this.layoutControlItemDatapointNumber, "layoutControlItemDatapointNumber");
+            this.layoutControlItemDatapointNumber.Location = new System.Drawing.Point(0, 166);
+            this.layoutControlItemDatapointNumber.Name = "layoutControlItemDatapointNumber";
+            this.layoutControlItemDatapointNumber.Size = new System.Drawing.Size(653, 24);
+            this.layoutControlItemDatapointNumber.TextSize = new System.Drawing.Size(131, 13);
+            // 
             // layoutControlGroupFaultTries
             // 
             resources.ApplyResources(this.layoutControlGroupFaultTries, "layoutControlGroupFaultTries");
@@ -2062,7 +1873,7 @@
             this.layoutControlGroup5});
             this.layoutControlGroupFaultTries.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroupFaultTries.Name = "layoutControlGroupFaultTries";
-            this.layoutControlGroupFaultTries.Size = new System.Drawing.Size(653, 543);
+            this.layoutControlGroupFaultTries.Size = new System.Drawing.Size(653, 567);
             // 
             // layoutControlGroup4
             // 
@@ -2075,7 +1886,7 @@
             this.layoutControlItem29});
             this.layoutControlGroup4.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup4.Name = "layoutControlGroup4";
-            this.layoutControlGroup4.Size = new System.Drawing.Size(326, 543);
+            this.layoutControlGroup4.Size = new System.Drawing.Size(326, 567);
             // 
             // layoutControlItem25
             // 
@@ -2119,7 +1930,7 @@
             resources.ApplyResources(this.layoutControlItem29, "layoutControlItem29");
             this.layoutControlItem29.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.Size = new System.Drawing.Size(302, 404);
+            this.layoutControlItem29.Size = new System.Drawing.Size(302, 428);
             this.layoutControlItem29.TextSize = new System.Drawing.Size(131, 13);
             // 
             // layoutControlGroup5
@@ -2133,7 +1944,7 @@
             this.layoutControlItem21});
             this.layoutControlGroup5.Location = new System.Drawing.Point(326, 0);
             this.layoutControlGroup5.Name = "layoutControlGroup5";
-            this.layoutControlGroup5.Size = new System.Drawing.Size(327, 543);
+            this.layoutControlGroup5.Size = new System.Drawing.Size(327, 567);
             // 
             // layoutControlItem2
             // 
@@ -2177,9 +1988,239 @@
             resources.ApplyResources(this.layoutControlItem21, "layoutControlItem21");
             this.layoutControlItem21.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.Size = new System.Drawing.Size(303, 404);
+            this.layoutControlItem21.Size = new System.Drawing.Size(303, 428);
             this.layoutControlItem21.TextSize = new System.Drawing.Size(131, 13);
             // 
+            // layoutControlGroupSettings
+            // 
+            resources.ApplyResources(this.layoutControlGroupSettings, "layoutControlGroupSettings");
+            this.layoutControlGroupSettings.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.DoorSettingsACInsideLayoutControlGroup,
+            this.DoorSettingsACOutsideLayoutControlGroup});
+            this.layoutControlGroupSettings.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlGroupSettings.Name = "layoutControlGroupSettings";
+            this.layoutControlGroupSettings.Size = new System.Drawing.Size(653, 567);
+            // 
+            // DoorSettingsACInsideLayoutControlGroup
+            // 
+            resources.ApplyResources(this.DoorSettingsACInsideLayoutControlGroup, "DoorSettingsACInsideLayoutControlGroup");
+            this.DoorSettingsACInsideLayoutControlGroup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem15,
+            this.layoutControlItem16,
+            this.layoutControlItem17,
+            this.layoutControlItem19,
+            this.layoutControlItem18,
+            this.layoutControlItem33,
+            this.layoutControlItem22,
+            this.layoutControlItem50});
+            this.DoorSettingsACInsideLayoutControlGroup.Location = new System.Drawing.Point(0, 0);
+            this.DoorSettingsACInsideLayoutControlGroup.Name = "DoorSettingsACInsideLayoutControlGroup";
+            this.DoorSettingsACInsideLayoutControlGroup.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
+            this.DoorSettingsACInsideLayoutControlGroup.Size = new System.Drawing.Size(326, 567);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.comboBoxModeAccess;
+            resources.ApplyResources(this.layoutControlItem13, "layoutControlItem13");
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 47);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.comboBoxModeAccessNoSchedule;
+            resources.ApplyResources(this.layoutControlItem14, "layoutControlItem14");
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 71);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.comboBoxModeSet;
+            resources.ApplyResources(this.layoutControlItem15, "layoutControlItem15");
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 95);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.comboBoxModePartSet;
+            resources.ApplyResources(this.layoutControlItem16, "layoutControlItem16");
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 119);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(131, 13);
+            this.layoutControlItem16.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.OnlyInCustomization;
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.comboBoxModeUnset;
+            resources.ApplyResources(this.layoutControlItem17, "layoutControlItem17");
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.comboBoxModeMacro;
+            resources.ApplyResources(this.layoutControlItem19, "layoutControlItem19");
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 191);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.comboBoxModeQuickMacro;
+            resources.ApplyResources(this.layoutControlItem18, "layoutControlItem18");
+            this.layoutControlItem18.Location = new System.Drawing.Point(0, 167);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem33
+            // 
+            this.layoutControlItem33.Control = this.textEditCodeData1;
+            resources.ApplyResources(this.layoutControlItem33, "layoutControlItem33");
+            this.layoutControlItem33.Location = new System.Drawing.Point(0, 215);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.Size = new System.Drawing.Size(316, 323);
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.AP1DoorReleaseTimeIntSecTimeEdit;
+            resources.ApplyResources(this.layoutControlItem22, "layoutControlItem22");
+            this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.Size = new System.Drawing.Size(316, 24);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem50
+            // 
+            this.layoutControlItem50.Control = this.checkEditAccessAfterUnset1;
+            resources.ApplyResources(this.layoutControlItem50, "layoutControlItem50");
+            this.layoutControlItem50.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem50.Name = "layoutControlItem50";
+            this.layoutControlItem50.Size = new System.Drawing.Size(316, 23);
+            this.layoutControlItem50.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // DoorSettingsACOutsideLayoutControlGroup
+            // 
+            resources.ApplyResources(this.DoorSettingsACOutsideLayoutControlGroup, "DoorSettingsACOutsideLayoutControlGroup");
+            this.DoorSettingsACOutsideLayoutControlGroup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem9,
+            this.layoutControlItem1,
+            this.layoutControlItem10,
+            this.layoutControlItem34,
+            this.layoutControlItem11,
+            this.layoutControlItem60});
+            this.DoorSettingsACOutsideLayoutControlGroup.Location = new System.Drawing.Point(326, 0);
+            this.DoorSettingsACOutsideLayoutControlGroup.Name = "DoorSettingsACOutsideLayoutControlGroup";
+            this.DoorSettingsACOutsideLayoutControlGroup.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
+            this.DoorSettingsACOutsideLayoutControlGroup.Size = new System.Drawing.Size(327, 567);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.comboBoxModeAccessNoScheduleOutside;
+            resources.ApplyResources(this.layoutControlItem5, "layoutControlItem5");
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 71);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.comboBoxModeSetOutside;
+            resources.ApplyResources(this.layoutControlItem6, "layoutControlItem6");
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 95);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.comboBoxModePartSetOutside;
+            resources.ApplyResources(this.layoutControlItem7, "layoutControlItem7");
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 119);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(131, 13);
+            this.layoutControlItem7.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.OnlyInCustomization;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.comboBoxModeUnsetOutside;
+            resources.ApplyResources(this.layoutControlItem8, "layoutControlItem8");
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 143);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.comboBoxModeMacroOutside;
+            resources.ApplyResources(this.layoutControlItem9, "layoutControlItem9");
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 191);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.comboBoxModeAccessOutside;
+            resources.ApplyResources(this.layoutControlItem1, "layoutControlItem1");
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 47);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.comboBoxModeQuickMacroOutside;
+            resources.ApplyResources(this.layoutControlItem10, "layoutControlItem10");
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 167);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.textEditCodeData2;
+            resources.ApplyResources(this.layoutControlItem34, "layoutControlItem34");
+            this.layoutControlItem34.Location = new System.Drawing.Point(0, 215);
+            this.layoutControlItem34.Name = "layoutControlItem34";
+            this.layoutControlItem34.Size = new System.Drawing.Size(317, 323);
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.AP2DoorReleaseTimeIntSecTimeEdit;
+            resources.ApplyResources(this.layoutControlItem11, "layoutControlItem11");
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.Size = new System.Drawing.Size(317, 24);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(131, 13);
+            // 
+            // layoutControlItem60
+            // 
+            this.layoutControlItem60.Control = this.checkEditAccessAfterUnset2;
+            resources.ApplyResources(this.layoutControlItem60, "layoutControlItem60");
+            this.layoutControlItem60.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem60.Name = "layoutControlItem60";
+            this.layoutControlItem60.Size = new System.Drawing.Size(317, 23);
+            this.layoutControlItem60.TextSize = new System.Drawing.Size(131, 13);
+            // 
             // PartitionBindingSource
             // 
             this.PartitionBindingSource.DataMember = "Partition";
@@ -2237,6 +2278,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.APPrimaryBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.spinEditDatapointNumber.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.checkEditAccessAfterUnset2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.APSecondaryBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.checkEditAccessAfterUnset1.Properties)).EndInit();
@@ -2311,29 +2353,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.comboBoxEditEventDocTypeOutside.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupSettings)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACInsideLayoutControlGroup)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem50)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACOutsideLayoutControlGroup)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem60)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupGeneral)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
@@ -2373,6 +2392,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemDatapointNumber)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupFaultTries)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
@@ -2386,6 +2406,29 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupSettings)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACInsideLayoutControlGroup)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem50)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DoorSettingsACOutsideLayoutControlGroup)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem60)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PartitionBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit();
@@ -2560,5 +2603,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem50;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem60;
         private DevExpress.XtraGrid.Columns.GridColumn colexpHWDeviceName;
+        private DevExpress.XtraEditors.SpinEdit spinEditDatapointNumber;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItemDatapointNumber;
     }
 }
Index: ConfigApp/Views/SystemData/Partitions/DoorListView.resx
===================================================================
--- ConfigApp/Views/SystemData/Partitions/DoorListView.resx	(revision 3451)
+++ ConfigApp/Views/SystemData/Partitions/DoorListView.resx	(working copy)
@@ -198,8 +198,39 @@
   <data name="&gt;&gt;SplitContainer.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="spinEditDatapointNumber.EditValue" type="System.Decimal, mscorlib">
+    <value>6631</value>
+  </data>
+  <data name="spinEditDatapointNumber.Location" type="System.Drawing.Point, System.Drawing">
+    <value>148, 202</value>
+  </data>
+  <assembly alias="DevExpress.Utils.v13.1" name="DevExpress.Utils.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="spinEditDatapointNumber.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
+    <value>Combo</value>
+  </data>
+  <data name="spinEditDatapointNumber.Properties.Mask.EditMask" xml:space="preserve">
+    <value>d</value>
+  </data>
+  <data name="spinEditDatapointNumber.Size" type="System.Drawing.Size, System.Drawing">
+    <value>515, 20</value>
+  </data>
+  <data name="spinEditDatapointNumber.TabIndex" type="System.Int32, mscorlib">
+    <value>101</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.Name" xml:space="preserve">
+    <value>spinEditDatapointNumber</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.Parent" xml:space="preserve">
+    <value>layoutControl1</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
   <metadata name="APSecondaryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>204, 56</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="internalDataStore.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
@@ -226,10 +257,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;checkEditAccessAfterUnset2.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <metadata name="APPrimaryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>968, 17</value>
   </metadata>
   <data name="checkEditAccessAfterUnset1.Location" type="System.Drawing.Point, System.Drawing">
     <value>153, 84</value>
@@ -253,10 +284,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;checkEditAccessAfterUnset1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <metadata name="VirtualDoorBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>588, 95</value>
+    <value>17, 95</value>
   </metadata>
   <data name="checkEdit3.Location" type="System.Drawing.Point, System.Drawing">
     <value>474, 107</value>
@@ -280,7 +311,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;checkEdit3.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="AP2DoorReleaseTimeIntSecTimeEdit.EditValue" type="System.TimeSpan, mscorlib">
     <value>00:00:00</value>
@@ -313,7 +344,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;AP2DoorReleaseTimeIntSecTimeEdit.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="AP1DoorReleaseTimeIntSecTimeEdit.EditValue" type="System.TimeSpan, mscorlib">
     <value>00:00:00</value>
@@ -346,10 +377,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;AP1DoorReleaseTimeIntSecTimeEdit.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <metadata name="APFaultSecondaryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>619, 56</value>
+    <value>432, 56</value>
   </metadata>
   <data name="AP2BlockingTimeIntSecTimeEdit.EditValue" type="System.TimeSpan, mscorlib">
     <value>00:00:00</value>
@@ -382,10 +413,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;AP2BlockingTimeIntSecTimeEdit.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <metadata name="APFaultPrimaryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>406, 56</value>
+    <value>219, 56</value>
   </metadata>
   <data name="AP1BlockingTimeIntSecTimeEdit.EditValue" type="System.TimeSpan, mscorlib">
     <value>00:00:00</value>
@@ -418,7 +449,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;AP1BlockingTimeIntSecTimeEdit.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="DoorOpenSignalIntSecTimeEdit.EditValue" type="System.TimeSpan, mscorlib">
     <value>00:00:00</value>
@@ -451,7 +482,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;DoorOpenSignalIntSecTimeEdit.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="DoorOpenTimeIntSecTimeEdit.EditValue" type="System.TimeSpan, mscorlib">
     <value>00:00:00</value>
@@ -484,7 +515,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;DoorOpenTimeIntSecTimeEdit.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <data name="textEditCodeData2.Location" type="System.Drawing.Point, System.Drawing">
     <value>479, 275</value>
@@ -515,7 +546,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;textEditCodeData2.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="textEditCodeData1.Location" type="System.Drawing.Point, System.Drawing">
     <value>153, 275</value>
@@ -545,16 +576,16 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;textEditCodeData1.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <metadata name="PMSecondaryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>207, 95</value>
+    <value>851, 56</value>
   </metadata>
   <data name="checkEditAlertingType2.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
   <data name="checkEditAlertingType2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 401</value>
+    <value>486, 425</value>
   </data>
   <data name="checkEditAlertingType2.Properties.Caption" xml:space="preserve">
     <value />
@@ -575,16 +606,16 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;checkEditAlertingType2.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <metadata name="PMPrimaryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
+    <value>661, 56</value>
   </metadata>
   <data name="checkEditAlertingType.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
   <data name="checkEditAlertingType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 401</value>
+    <value>160, 425</value>
   </data>
   <data name="checkEditAlertingType.Properties.Caption" xml:space="preserve">
     <value />
@@ -605,7 +636,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;checkEditAlertingType.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>17</value>
   </data>
   <data name="imageComboBoxEdit5.EditValue" xml:space="preserve">
     <value>otNone</value>
@@ -614,9 +645,8 @@
     <value>False</value>
   </data>
   <data name="imageComboBoxEdit5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 281</value>
+    <value>486, 305</value>
   </data>
-  <assembly alias="DevExpress.Utils.v13.1" name="DevExpress.Utils.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="imageComboBoxEdit5.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
   </data>
@@ -672,7 +702,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEdit5.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>18</value>
   </data>
   <data name="comboBoxOmitType.EditValue" xml:space="preserve">
     <value>otNone</value>
@@ -681,7 +711,7 @@
     <value>False</value>
   </data>
   <data name="comboBoxOmitType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 281</value>
+    <value>160, 305</value>
   </data>
   <data name="comboBoxOmitType.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -738,10 +768,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxOmitType.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>19</value>
   </data>
   <data name="buttonEditPartitionOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 257</value>
+    <value>486, 281</value>
   </data>
   <data name="buttonEditPartitionOutside.Size" type="System.Drawing.Size, System.Drawing">
     <value>165, 20</value>
@@ -759,10 +789,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;buttonEditPartitionOutside.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>20</value>
   </data>
   <data name="buttonEditPartitionInside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 257</value>
+    <value>160, 281</value>
   </data>
   <data name="buttonEditPartitionInside.Size" type="System.Drawing.Size, System.Drawing">
     <value>164, 20</value>
@@ -780,7 +810,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;buttonEditPartitionInside.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>21</value>
   </data>
   <data name="BoltReadySetTypeOutsideImageComboBoxEdit.EditValue" xml:space="preserve">
     <value>rstNone</value>
@@ -789,7 +819,7 @@
     <value>False</value>
   </data>
   <data name="BoltReadySetTypeOutsideImageComboBoxEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 329</value>
+    <value>486, 353</value>
   </data>
   <data name="BoltReadySetTypeOutsideImageComboBoxEdit.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -855,7 +885,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;BoltReadySetTypeOutsideImageComboBoxEdit.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>22</value>
   </data>
   <data name="BoltReadySetTypeInsideImageComboBoxEdit.EditValue" xml:space="preserve">
     <value>rstNone</value>
@@ -864,7 +894,7 @@
     <value>False</value>
   </data>
   <data name="BoltReadySetTypeInsideImageComboBoxEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 329</value>
+    <value>160, 353</value>
   </data>
   <data name="BoltReadySetTypeInsideImageComboBoxEdit.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -930,7 +960,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;BoltReadySetTypeInsideImageComboBoxEdit.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>23</value>
   </data>
   <data name="LockingErrorImgComboBoxControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>474, 130</value>
@@ -981,7 +1011,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;LockingErrorImgComboBoxControl.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>24</value>
   </data>
   <data name="imageComboBoxEdit4.EditValue" xml:space="preserve">
     <value>astNone</value>
@@ -990,7 +1020,7 @@
     <value>False</value>
   </data>
   <data name="imageComboBoxEdit4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 472</value>
+    <value>486, 496</value>
   </data>
   <data name="imageComboBoxEdit4.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1065,13 +1095,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEdit4.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>25</value>
   </data>
   <data name="imageComboBoxEdit3.EditValue" xml:space="preserve">
     <value>astNone</value>
   </data>
   <data name="imageComboBoxEdit3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 353</value>
+    <value>486, 377</value>
   </data>
   <data name="imageComboBoxEdit3.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1128,7 +1158,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEdit3.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>26</value>
   </data>
   <data name="imageComboBoxEdit2.EditValue" xml:space="preserve">
     <value>astNone</value>
@@ -1137,7 +1167,7 @@
     <value>False</value>
   </data>
   <data name="imageComboBoxEdit2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 472</value>
+    <value>160, 496</value>
   </data>
   <data name="imageComboBoxEdit2.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1212,13 +1242,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEdit2.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>27</value>
   </data>
   <data name="imageComboBoxEdit1.EditValue" xml:space="preserve">
     <value>astNone</value>
   </data>
   <data name="imageComboBoxEdit1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 353</value>
+    <value>160, 377</value>
   </data>
   <data name="imageComboBoxEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1275,7 +1305,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEdit1.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>28</value>
   </data>
   <data name="checkEdit2.Location" type="System.Drawing.Point, System.Drawing">
     <value>474, 84</value>
@@ -1284,7 +1314,7 @@
     <value />
   </data>
   <data name="checkEdit2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 19</value>
+    <value>19, 19</value>
   </data>
   <data name="checkEdit2.TabIndex" type="System.Int32, mscorlib">
     <value>58</value>
@@ -1299,10 +1329,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;checkEdit2.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>29</value>
   </data>
   <data name="AccesspointInsideTextEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 233</value>
+    <value>160, 257</value>
   </data>
   <data name="AccesspointInsideTextEdit.Size" type="System.Drawing.Size, System.Drawing">
     <value>164, 20</value>
@@ -1320,10 +1350,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;AccesspointInsideTextEdit.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>30</value>
   </data>
   <data name="AccesspointOutsideTextEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 233</value>
+    <value>486, 257</value>
   </data>
   <data name="AccesspointOutsideTextEdit.Size" type="System.Drawing.Size, System.Drawing">
     <value>165, 20</value>
@@ -1341,7 +1371,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;AccesspointOutsideTextEdit.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>31</value>
   </data>
   <data name="spinEditAlarmRepeatCountOutside.EditValue" type="System.Decimal, mscorlib">
     <value>0</value>
@@ -1350,7 +1380,7 @@
     <value>False</value>
   </data>
   <data name="spinEditAlarmRepeatCountOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 520</value>
+    <value>486, 544</value>
   </data>
   <data name="spinEditAlarmRepeatCountOutside.Size" type="System.Drawing.Size, System.Drawing">
     <value>165, 20</value>
@@ -1368,7 +1398,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;spinEditAlarmRepeatCountOutside.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>32</value>
   </data>
   <data name="spinEditAlarmRepeatCount.EditValue" type="System.Decimal, mscorlib">
     <value>0</value>
@@ -1377,7 +1407,7 @@
     <value>False</value>
   </data>
   <data name="spinEditAlarmRepeatCount.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 520</value>
+    <value>160, 544</value>
   </data>
   <data name="spinEditAlarmRepeatCount.Size" type="System.Drawing.Size, System.Drawing">
     <value>164, 20</value>
@@ -1395,13 +1425,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;spinEditAlarmRepeatCount.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>33</value>
   </data>
   <data name="comboBoxFaultDeleteTypeOutside.EditValue" xml:space="preserve">
     <value>mdtNormal</value>
   </data>
   <data name="comboBoxFaultDeleteTypeOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 496</value>
+    <value>486, 520</value>
   </data>
   <data name="comboBoxFaultDeleteTypeOutside.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1449,13 +1479,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxFaultDeleteTypeOutside.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>34</value>
   </data>
   <data name="comboBoxFaultDeleteType.EditValue" xml:space="preserve">
     <value>mdtNormal</value>
   </data>
   <data name="comboBoxFaultDeleteType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 496</value>
+    <value>160, 520</value>
   </data>
   <data name="comboBoxFaultDeleteType.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1503,7 +1533,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxFaultDeleteType.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>35</value>
   </data>
   <data name="comboBoxFaultSetTypeOutside.EditValue" xml:space="preserve">
     <value>rstNone</value>
@@ -1512,7 +1542,7 @@
     <value>False</value>
   </data>
   <data name="comboBoxFaultSetTypeOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 448</value>
+    <value>486, 472</value>
   </data>
   <data name="comboBoxFaultSetTypeOutside.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1578,7 +1608,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxFaultSetTypeOutside.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>36</value>
   </data>
   <data name="comboBoxFaultSetType.EditValue" xml:space="preserve">
     <value>rstNone</value>
@@ -1587,7 +1617,7 @@
     <value>False</value>
   </data>
   <data name="comboBoxFaultSetType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 448</value>
+    <value>160, 472</value>
   </data>
   <data name="comboBoxFaultSetType.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1653,7 +1683,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxFaultSetType.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>37</value>
   </data>
   <data name="comboBoxAlarmDeleteTypeOutside.EditValue" xml:space="preserve">
     <value>mdtNormal</value>
@@ -1662,7 +1692,7 @@
     <value>False</value>
   </data>
   <data name="comboBoxAlarmDeleteTypeOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 424</value>
+    <value>486, 448</value>
   </data>
   <data name="comboBoxAlarmDeleteTypeOutside.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1710,7 +1740,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxAlarmDeleteTypeOutside.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>38</value>
   </data>
   <data name="comboBoxAlarmDeleteType.EditValue" xml:space="preserve">
     <value>mdtNormal</value>
@@ -1719,7 +1749,7 @@
     <value>False</value>
   </data>
   <data name="comboBoxAlarmDeleteType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 424</value>
+    <value>160, 448</value>
   </data>
   <data name="comboBoxAlarmDeleteType.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1767,7 +1797,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxAlarmDeleteType.ZOrder" xml:space="preserve">
-    <value>38</value>
+    <value>39</value>
   </data>
   <data name="comboBoxAlertingTypeOutside.EditValue" xml:space="preserve">
     <value>atNone</value>
@@ -1776,7 +1806,7 @@
     <value>False</value>
   </data>
   <data name="comboBoxAlertingTypeOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 377</value>
+    <value>486, 401</value>
   </data>
   <data name="comboBoxAlertingTypeOutside.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1860,7 +1890,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxAlertingTypeOutside.ZOrder" xml:space="preserve">
-    <value>39</value>
+    <value>40</value>
   </data>
   <data name="comboBoxAlertingType.EditValue" xml:space="preserve">
     <value>atNone</value>
@@ -1869,7 +1899,7 @@
     <value>False</value>
   </data>
   <data name="comboBoxAlertingType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 377</value>
+    <value>160, 401</value>
   </data>
   <data name="comboBoxAlertingType.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -1953,13 +1983,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxAlertingType.ZOrder" xml:space="preserve">
-    <value>40</value>
+    <value>41</value>
   </data>
   <data name="comboBoxSetTypeOutside.EditValue" xml:space="preserve">
     <value>rstNone</value>
   </data>
   <data name="comboBoxSetTypeOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 305</value>
+    <value>486, 329</value>
   </data>
   <data name="comboBoxSetTypeOutside.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -2025,13 +2055,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxSetTypeOutside.ZOrder" xml:space="preserve">
-    <value>41</value>
+    <value>42</value>
   </data>
   <data name="comboBoxSetType.EditValue" xml:space="preserve">
     <value>rstNone</value>
   </data>
   <data name="comboBoxSetType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 305</value>
+    <value>160, 329</value>
   </data>
   <data name="comboBoxSetType.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -2097,7 +2127,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxSetType.ZOrder" xml:space="preserve">
-    <value>42</value>
+    <value>43</value>
   </data>
   <data name="checkEdit1.Location" type="System.Drawing.Point, System.Drawing">
     <value>148, 84</value>
@@ -2106,7 +2136,7 @@
     <value />
   </data>
   <data name="checkEdit1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 19</value>
+    <value>19, 19</value>
   </data>
   <data name="checkEdit1.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -2121,7 +2151,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;checkEdit1.ZOrder" xml:space="preserve">
-    <value>43</value>
+    <value>44</value>
   </data>
   <data name="buttonEditHWDevice.Location" type="System.Drawing.Point, System.Drawing">
     <value>148, 60</value>
@@ -2142,7 +2172,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;buttonEditHWDevice.ZOrder" xml:space="preserve">
-    <value>44</value>
+    <value>45</value>
   </data>
   <metadata name="VirtualDeviceBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>766, 17</value>
@@ -2166,7 +2196,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;textEdit1.ZOrder" xml:space="preserve">
-    <value>45</value>
+    <value>46</value>
   </data>
   <data name="comboBoxDeactivateMacrosOutside.EditValue" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2211,7 +2241,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxDeactivateMacrosOutside.ZOrder" xml:space="preserve">
-    <value>46</value>
+    <value>47</value>
   </data>
   <data name="comboBoxDeactivateAccessOutside.EditValue" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2256,7 +2286,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxDeactivateAccessOutside.ZOrder" xml:space="preserve">
-    <value>47</value>
+    <value>48</value>
   </data>
   <data name="comboBoxAlarmOutside.EditValue" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2301,7 +2331,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxAlarmOutside.ZOrder" xml:space="preserve">
-    <value>48</value>
+    <value>49</value>
   </data>
   <data name="spinEditLimitOutside.EditValue" type="System.Decimal, mscorlib">
     <value>0</value>
@@ -2328,7 +2358,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;spinEditLimitOutside.ZOrder" xml:space="preserve">
-    <value>49</value>
+    <value>50</value>
   </data>
   <data name="comboBoxModeAccessOutside.Location" type="System.Drawing.Point, System.Drawing">
     <value>479, 107</value>
@@ -2361,7 +2391,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeAccessOutside.ZOrder" xml:space="preserve">
-    <value>50</value>
+    <value>51</value>
   </data>
   <data name="comboBoxModeQuickMacroOutside.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2397,7 +2427,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeQuickMacroOutside.ZOrder" xml:space="preserve">
-    <value>51</value>
+    <value>52</value>
   </data>
   <data name="comboBoxModeMacroOutside.Location" type="System.Drawing.Point, System.Drawing">
     <value>479, 251</value>
@@ -2430,7 +2460,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeMacroOutside.ZOrder" xml:space="preserve">
-    <value>52</value>
+    <value>53</value>
   </data>
   <data name="comboBoxModeUnsetOutside.Location" type="System.Drawing.Point, System.Drawing">
     <value>479, 203</value>
@@ -2463,7 +2493,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeUnsetOutside.ZOrder" xml:space="preserve">
-    <value>53</value>
+    <value>54</value>
   </data>
   <data name="comboBoxModePartSetOutside.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2499,7 +2529,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModePartSetOutside.ZOrder" xml:space="preserve">
-    <value>54</value>
+    <value>55</value>
   </data>
   <data name="comboBoxModeSetOutside.Location" type="System.Drawing.Point, System.Drawing">
     <value>479, 155</value>
@@ -2532,7 +2562,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeSetOutside.ZOrder" xml:space="preserve">
-    <value>55</value>
+    <value>56</value>
   </data>
   <data name="comboBoxModeAccessNoScheduleOutside.Location" type="System.Drawing.Point, System.Drawing">
     <value>479, 131</value>
@@ -2565,7 +2595,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeAccessNoScheduleOutside.ZOrder" xml:space="preserve">
-    <value>56</value>
+    <value>57</value>
   </data>
   <data name="comboBoxDeactivateMacros.EditValue" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2610,7 +2640,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxDeactivateMacros.ZOrder" xml:space="preserve">
-    <value>57</value>
+    <value>58</value>
   </data>
   <data name="comboBoxDeactivateAccess.EditValue" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2655,7 +2685,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxDeactivateAccess.ZOrder" xml:space="preserve">
-    <value>58</value>
+    <value>59</value>
   </data>
   <data name="comboBoxAlarm.EditValue" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2700,7 +2730,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxAlarm.ZOrder" xml:space="preserve">
-    <value>59</value>
+    <value>60</value>
   </data>
   <data name="spinEditLimit.EditValue" type="System.Decimal, mscorlib">
     <value>0</value>
@@ -2727,7 +2757,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;spinEditLimit.ZOrder" xml:space="preserve">
-    <value>60</value>
+    <value>61</value>
   </data>
   <data name="comboBoxModeMacro.Location" type="System.Drawing.Point, System.Drawing">
     <value>153, 251</value>
@@ -2760,7 +2790,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeMacro.ZOrder" xml:space="preserve">
-    <value>61</value>
+    <value>62</value>
   </data>
   <data name="comboBoxModeQuickMacro.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2796,7 +2826,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeQuickMacro.ZOrder" xml:space="preserve">
-    <value>62</value>
+    <value>63</value>
   </data>
   <data name="comboBoxModeUnset.Location" type="System.Drawing.Point, System.Drawing">
     <value>153, 203</value>
@@ -2829,7 +2859,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeUnset.ZOrder" xml:space="preserve">
-    <value>63</value>
+    <value>64</value>
   </data>
   <data name="comboBoxModePartSet.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2865,7 +2895,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModePartSet.ZOrder" xml:space="preserve">
-    <value>64</value>
+    <value>65</value>
   </data>
   <data name="comboBoxModeSet.Location" type="System.Drawing.Point, System.Drawing">
     <value>153, 155</value>
@@ -2898,7 +2928,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeSet.ZOrder" xml:space="preserve">
-    <value>65</value>
+    <value>66</value>
   </data>
   <data name="comboBoxModeAccessNoSchedule.Location" type="System.Drawing.Point, System.Drawing">
     <value>153, 131</value>
@@ -2931,7 +2961,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeAccessNoSchedule.ZOrder" xml:space="preserve">
-    <value>66</value>
+    <value>67</value>
   </data>
   <data name="comboBoxModeAccess.EditValue" xml:space="preserve">
     <value>omInvalid</value>
@@ -3075,13 +3105,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxModeAccess.ZOrder" xml:space="preserve">
-    <value>67</value>
+    <value>68</value>
   </data>
   <data name="comboBoxEditEventDocType.EditValue" xml:space="preserve">
     <value>edtNone</value>
   </data>
   <data name="comboBoxEditEventDocType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 544</value>
+    <value>160, 568</value>
   </data>
   <data name="comboBoxEditEventDocType.Properties.Caption" xml:space="preserve">
     <value />
@@ -3102,13 +3132,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxEditEventDocType.ZOrder" xml:space="preserve">
-    <value>68</value>
+    <value>69</value>
   </data>
   <data name="comboBoxEditEventDocTypeOutside.EditValue" xml:space="preserve">
     <value>edtNone</value>
   </data>
   <data name="comboBoxEditEventDocTypeOutside.Location" type="System.Drawing.Point, System.Drawing">
-    <value>486, 544</value>
+    <value>486, 568</value>
   </data>
   <data name="comboBoxEditEventDocTypeOutside.Properties.Caption" xml:space="preserve">
     <value />
@@ -3129,7 +3159,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxEditEventDocTypeOutside.ZOrder" xml:space="preserve">
-    <value>69</value>
+    <value>70</value>
   </data>
   <data name="layoutControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -3143,144 +3173,6 @@
   <data name="tabbedControlGroup1.CustomizationFormText" xml:space="preserve">
     <value>tabbedControlGroup1</value>
   </data>
-  <data name="layoutControlGroupSettings.CustomizationFormText" xml:space="preserve">
-    <value>AccessPoint</value>
-  </data>
-  <data name="DoorSettingsACInsideLayoutControlGroup.CustomizationFormText" xml:space="preserve">
-    <value>layoutControlGroup2</value>
-  </data>
-  <data name="layoutControlItem13.CustomizationFormText" xml:space="preserve">
-    <value>ModeAccess</value>
-  </data>
-  <data name="layoutControlItem13.Text" xml:space="preserve">
-    <value>ModeAccess</value>
-  </data>
-  <data name="layoutControlItem14.CustomizationFormText" xml:space="preserve">
-    <value>ModeAccessNoSchedule</value>
-  </data>
-  <data name="layoutControlItem14.Text" xml:space="preserve">
-    <value>ModeAccessNoSchedule</value>
-  </data>
-  <data name="layoutControlItem15.CustomizationFormText" xml:space="preserve">
-    <value>ModeSet</value>
-  </data>
-  <data name="layoutControlItem15.Text" xml:space="preserve">
-    <value>ModeSet</value>
-  </data>
-  <data name="layoutControlItem16.CustomizationFormText" xml:space="preserve">
-    <value>ModePartSet</value>
-  </data>
-  <data name="layoutControlItem16.Text" xml:space="preserve">
-    <value>ModePartSet</value>
-  </data>
-  <data name="layoutControlItem17.CustomizationFormText" xml:space="preserve">
-    <value>ModeUnset</value>
-  </data>
-  <data name="layoutControlItem17.Text" xml:space="preserve">
-    <value>ModeUnset</value>
-  </data>
-  <data name="layoutControlItem19.CustomizationFormText" xml:space="preserve">
-    <value>ModeMacro</value>
-  </data>
-  <data name="layoutControlItem19.Text" xml:space="preserve">
-    <value>ModeMacro</value>
-  </data>
-  <data name="layoutControlItem18.CustomizationFormText" xml:space="preserve">
-    <value>ModeQuickMacro</value>
-  </data>
-  <data name="layoutControlItem18.Text" xml:space="preserve">
-    <value>ModeQuickMacro</value>
-  </data>
-  <data name="layoutControlItem33.CustomizationFormText" xml:space="preserve">
-    <value>Code Data</value>
-  </data>
-  <data name="layoutControlItem33.Text" xml:space="preserve">
-    <value>Code Data</value>
-  </data>
-  <data name="layoutControlItem22.CustomizationFormText" xml:space="preserve">
-    <value>Door Release Time [m:ss]</value>
-  </data>
-  <data name="layoutControlItem22.Text" xml:space="preserve">
-    <value>Door Release Time [m:ss]</value>
-  </data>
-  <data name="layoutControlItem50.CustomizationFormText" xml:space="preserve">
-    <value>Access After Unset</value>
-  </data>
-  <data name="layoutControlItem50.Text" xml:space="preserve">
-    <value>Access After Unset</value>
-  </data>
-  <data name="DoorSettingsACInsideLayoutControlGroup.Text" xml:space="preserve">
-    <value>AccessPoint 1</value>
-  </data>
-  <data name="DoorSettingsACOutsideLayoutControlGroup.CustomizationFormText" xml:space="preserve">
-    <value>layoutControlGroup3</value>
-  </data>
-  <data name="layoutControlItem5.CustomizationFormText" xml:space="preserve">
-    <value>layoutControlItem5</value>
-  </data>
-  <data name="layoutControlItem5.Text" xml:space="preserve">
-    <value>ModeAccessNoSchedule</value>
-  </data>
-  <data name="layoutControlItem6.CustomizationFormText" xml:space="preserve">
-    <value>layoutControlItem6</value>
-  </data>
-  <data name="layoutControlItem6.Text" xml:space="preserve">
-    <value>ModeSet</value>
-  </data>
-  <data name="layoutControlItem7.CustomizationFormText" xml:space="preserve">
-    <value>layoutControlItem7</value>
-  </data>
-  <data name="layoutControlItem7.Text" xml:space="preserve">
-    <value>ModePartSet</value>
-  </data>
-  <data name="layoutControlItem8.CustomizationFormText" xml:space="preserve">
-    <value>layoutControlItem8</value>
-  </data>
-  <data name="layoutControlItem8.Text" xml:space="preserve">
-    <value>ModeUnset</value>
-  </data>
-  <data name="layoutControlItem9.CustomizationFormText" xml:space="preserve">
-    <value>ModeMacro</value>
-  </data>
-  <data name="layoutControlItem9.Text" xml:space="preserve">
-    <value>ModeMacro</value>
-  </data>
-  <data name="layoutControlItem1.CustomizationFormText" xml:space="preserve">
-    <value>Mode Access</value>
-  </data>
-  <data name="layoutControlItem1.Text" xml:space="preserve">
-    <value>Mode Access</value>
-  </data>
-  <data name="layoutControlItem10.CustomizationFormText" xml:space="preserve">
-    <value>ModeQuickMacro</value>
-  </data>
-  <data name="layoutControlItem10.Text" xml:space="preserve">
-    <value>ModeQuickMacro</value>
-  </data>
-  <data name="layoutControlItem34.CustomizationFormText" xml:space="preserve">
-    <value>Code Data</value>
-  </data>
-  <data name="layoutControlItem34.Text" xml:space="preserve">
-    <value>Code Data</value>
-  </data>
-  <data name="layoutControlItem11.CustomizationFormText" xml:space="preserve">
-    <value>Door Release Time [m:ss]</value>
-  </data>
-  <data name="layoutControlItem11.Text" xml:space="preserve">
-    <value>Door Release Time [m:ss]</value>
-  </data>
-  <data name="layoutControlItem60.CustomizationFormText" xml:space="preserve">
-    <value>Access After Unset</value>
-  </data>
-  <data name="layoutControlItem60.Text" xml:space="preserve">
-    <value>Access After Unset</value>
-  </data>
-  <data name="DoorSettingsACOutsideLayoutControlGroup.Text" xml:space="preserve">
-    <value>AccessPoint 2</value>
-  </data>
-  <data name="layoutControlGroupSettings.Text" xml:space="preserve">
-    <value>Door Settings</value>
-  </data>
   <data name="layoutControlGroupGeneral.CustomizationFormText" xml:space="preserve">
     <value>General</value>
   </data>
@@ -3512,6 +3404,12 @@
   <data name="layoutControlItem45.Text" xml:space="preserve">
     <value>Tamper Sounder</value>
   </data>
+  <data name="layoutControlItemDatapointNumber.CustomizationFormText" xml:space="preserve">
+    <value>Datapoint Number</value>
+  </data>
+  <data name="layoutControlItemDatapointNumber.Text" xml:space="preserve">
+    <value>Datapoint Number</value>
+  </data>
   <data name="layoutControlGroupGeneral.Text" xml:space="preserve">
     <value>General</value>
   </data>
@@ -3593,6 +3491,144 @@
   <data name="layoutControlGroupFaultTries.Text" xml:space="preserve">
     <value>Misattempt</value>
   </data>
+  <data name="layoutControlGroupSettings.CustomizationFormText" xml:space="preserve">
+    <value>AccessPoint</value>
+  </data>
+  <data name="DoorSettingsACInsideLayoutControlGroup.CustomizationFormText" xml:space="preserve">
+    <value>layoutControlGroup2</value>
+  </data>
+  <data name="layoutControlItem13.CustomizationFormText" xml:space="preserve">
+    <value>ModeAccess</value>
+  </data>
+  <data name="layoutControlItem13.Text" xml:space="preserve">
+    <value>ModeAccess</value>
+  </data>
+  <data name="layoutControlItem14.CustomizationFormText" xml:space="preserve">
+    <value>ModeAccessNoSchedule</value>
+  </data>
+  <data name="layoutControlItem14.Text" xml:space="preserve">
+    <value>ModeAccessNoSchedule</value>
+  </data>
+  <data name="layoutControlItem15.CustomizationFormText" xml:space="preserve">
+    <value>ModeSet</value>
+  </data>
+  <data name="layoutControlItem15.Text" xml:space="preserve">
+    <value>ModeSet</value>
+  </data>
+  <data name="layoutControlItem16.CustomizationFormText" xml:space="preserve">
+    <value>ModePartSet</value>
+  </data>
+  <data name="layoutControlItem16.Text" xml:space="preserve">
+    <value>ModePartSet</value>
+  </data>
+  <data name="layoutControlItem17.CustomizationFormText" xml:space="preserve">
+    <value>ModeUnset</value>
+  </data>
+  <data name="layoutControlItem17.Text" xml:space="preserve">
+    <value>ModeUnset</value>
+  </data>
+  <data name="layoutControlItem19.CustomizationFormText" xml:space="preserve">
+    <value>ModeMacro</value>
+  </data>
+  <data name="layoutControlItem19.Text" xml:space="preserve">
+    <value>ModeMacro</value>
+  </data>
+  <data name="layoutControlItem18.CustomizationFormText" xml:space="preserve">
+    <value>ModeQuickMacro</value>
+  </data>
+  <data name="layoutControlItem18.Text" xml:space="preserve">
+    <value>ModeQuickMacro</value>
+  </data>
+  <data name="layoutControlItem33.CustomizationFormText" xml:space="preserve">
+    <value>Code Data</value>
+  </data>
+  <data name="layoutControlItem33.Text" xml:space="preserve">
+    <value>Code Data</value>
+  </data>
+  <data name="layoutControlItem22.CustomizationFormText" xml:space="preserve">
+    <value>Door Release Time [m:ss]</value>
+  </data>
+  <data name="layoutControlItem22.Text" xml:space="preserve">
+    <value>Door Release Time [m:ss]</value>
+  </data>
+  <data name="layoutControlItem50.CustomizationFormText" xml:space="preserve">
+    <value>Access After Unset</value>
+  </data>
+  <data name="layoutControlItem50.Text" xml:space="preserve">
+    <value>Access After Unset</value>
+  </data>
+  <data name="DoorSettingsACInsideLayoutControlGroup.Text" xml:space="preserve">
+    <value>AccessPoint 1</value>
+  </data>
+  <data name="DoorSettingsACOutsideLayoutControlGroup.CustomizationFormText" xml:space="preserve">
+    <value>layoutControlGroup3</value>
+  </data>
+  <data name="layoutControlItem5.CustomizationFormText" xml:space="preserve">
+    <value>layoutControlItem5</value>
+  </data>
+  <data name="layoutControlItem5.Text" xml:space="preserve">
+    <value>ModeAccessNoSchedule</value>
+  </data>
+  <data name="layoutControlItem6.CustomizationFormText" xml:space="preserve">
+    <value>layoutControlItem6</value>
+  </data>
+  <data name="layoutControlItem6.Text" xml:space="preserve">
+    <value>ModeSet</value>
+  </data>
+  <data name="layoutControlItem7.CustomizationFormText" xml:space="preserve">
+    <value>layoutControlItem7</value>
+  </data>
+  <data name="layoutControlItem7.Text" xml:space="preserve">
+    <value>ModePartSet</value>
+  </data>
+  <data name="layoutControlItem8.CustomizationFormText" xml:space="preserve">
+    <value>layoutControlItem8</value>
+  </data>
+  <data name="layoutControlItem8.Text" xml:space="preserve">
+    <value>ModeUnset</value>
+  </data>
+  <data name="layoutControlItem9.CustomizationFormText" xml:space="preserve">
+    <value>ModeMacro</value>
+  </data>
+  <data name="layoutControlItem9.Text" xml:space="preserve">
+    <value>ModeMacro</value>
+  </data>
+  <data name="layoutControlItem1.CustomizationFormText" xml:space="preserve">
+    <value>Mode Access</value>
+  </data>
+  <data name="layoutControlItem1.Text" xml:space="preserve">
+    <value>Mode Access</value>
+  </data>
+  <data name="layoutControlItem10.CustomizationFormText" xml:space="preserve">
+    <value>ModeQuickMacro</value>
+  </data>
+  <data name="layoutControlItem10.Text" xml:space="preserve">
+    <value>ModeQuickMacro</value>
+  </data>
+  <data name="layoutControlItem34.CustomizationFormText" xml:space="preserve">
+    <value>Code Data</value>
+  </data>
+  <data name="layoutControlItem34.Text" xml:space="preserve">
+    <value>Code Data</value>
+  </data>
+  <data name="layoutControlItem11.CustomizationFormText" xml:space="preserve">
+    <value>Door Release Time [m:ss]</value>
+  </data>
+  <data name="layoutControlItem11.Text" xml:space="preserve">
+    <value>Door Release Time [m:ss]</value>
+  </data>
+  <data name="layoutControlItem60.CustomizationFormText" xml:space="preserve">
+    <value>Access After Unset</value>
+  </data>
+  <data name="layoutControlItem60.Text" xml:space="preserve">
+    <value>Access After Unset</value>
+  </data>
+  <data name="DoorSettingsACOutsideLayoutControlGroup.Text" xml:space="preserve">
+    <value>AccessPoint 2</value>
+  </data>
+  <data name="layoutControlGroupSettings.Text" xml:space="preserve">
+    <value>Door Settings</value>
+  </data>
   <data name="tabbedControlGroup1.Text" xml:space="preserve">
     <value>tabbedControlGroup1</value>
   </data>
@@ -3690,7 +3726,7 @@
     <value>622, 17</value>
   </metadata>
   <metadata name="PartitionBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>412, 95</value>
+    <value>1056, 56</value>
   </metadata>
   <data name="layoutControlItem12.CustomizationFormText" xml:space="preserve">
     <value>Deactivate Macros</value>
@@ -3842,144 +3878,6 @@
   <data name="&gt;&gt;tabbedControlGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.TabbedControlGroup, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;layoutControlGroupSettings.Name" xml:space="preserve">
-    <value>layoutControlGroupSettings</value>
-  </data>
-  <data name="&gt;&gt;layoutControlGroupSettings.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;DoorSettingsACInsideLayoutControlGroup.Name" xml:space="preserve">
-    <value>DoorSettingsACInsideLayoutControlGroup</value>
-  </data>
-  <data name="&gt;&gt;DoorSettingsACInsideLayoutControlGroup.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem13.Name" xml:space="preserve">
-    <value>layoutControlItem13</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem13.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem14.Name" xml:space="preserve">
-    <value>layoutControlItem14</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem14.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem15.Name" xml:space="preserve">
-    <value>layoutControlItem15</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem15.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem16.Name" xml:space="preserve">
-    <value>layoutControlItem16</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem16.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem17.Name" xml:space="preserve">
-    <value>layoutControlItem17</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem17.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem19.Name" xml:space="preserve">
-    <value>layoutControlItem19</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem19.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem18.Name" xml:space="preserve">
-    <value>layoutControlItem18</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem18.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem33.Name" xml:space="preserve">
-    <value>layoutControlItem33</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem33.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem22.Name" xml:space="preserve">
-    <value>layoutControlItem22</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem22.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem50.Name" xml:space="preserve">
-    <value>layoutControlItem50</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem50.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;DoorSettingsACOutsideLayoutControlGroup.Name" xml:space="preserve">
-    <value>DoorSettingsACOutsideLayoutControlGroup</value>
-  </data>
-  <data name="&gt;&gt;DoorSettingsACOutsideLayoutControlGroup.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem5.Name" xml:space="preserve">
-    <value>layoutControlItem5</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem5.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem6.Name" xml:space="preserve">
-    <value>layoutControlItem6</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem6.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem7.Name" xml:space="preserve">
-    <value>layoutControlItem7</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem7.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem8.Name" xml:space="preserve">
-    <value>layoutControlItem8</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem8.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem9.Name" xml:space="preserve">
-    <value>layoutControlItem9</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem9.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem1.Name" xml:space="preserve">
-    <value>layoutControlItem1</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem10.Name" xml:space="preserve">
-    <value>layoutControlItem10</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem10.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem34.Name" xml:space="preserve">
-    <value>layoutControlItem34</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem34.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem11.Name" xml:space="preserve">
-    <value>layoutControlItem11</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem11.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem60.Name" xml:space="preserve">
-    <value>layoutControlItem60</value>
-  </data>
-  <data name="&gt;&gt;layoutControlItem60.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;layoutControlGroupGeneral.Name" xml:space="preserve">
     <value>layoutControlGroupGeneral</value>
   </data>
@@ -4214,6 +4112,12 @@
   <data name="&gt;&gt;layoutControlItem45.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;layoutControlItemDatapointNumber.Name" xml:space="preserve">
+    <value>layoutControlItemDatapointNumber</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItemDatapointNumber.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;layoutControlGroupFaultTries.Name" xml:space="preserve">
     <value>layoutControlGroupFaultTries</value>
   </data>
@@ -4292,6 +4196,144 @@
   <data name="&gt;&gt;layoutControlItem21.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;layoutControlGroupSettings.Name" xml:space="preserve">
+    <value>layoutControlGroupSettings</value>
+  </data>
+  <data name="&gt;&gt;layoutControlGroupSettings.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;DoorSettingsACInsideLayoutControlGroup.Name" xml:space="preserve">
+    <value>DoorSettingsACInsideLayoutControlGroup</value>
+  </data>
+  <data name="&gt;&gt;DoorSettingsACInsideLayoutControlGroup.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem13.Name" xml:space="preserve">
+    <value>layoutControlItem13</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem13.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem14.Name" xml:space="preserve">
+    <value>layoutControlItem14</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem14.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem15.Name" xml:space="preserve">
+    <value>layoutControlItem15</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem15.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem16.Name" xml:space="preserve">
+    <value>layoutControlItem16</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem16.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem17.Name" xml:space="preserve">
+    <value>layoutControlItem17</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem17.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem19.Name" xml:space="preserve">
+    <value>layoutControlItem19</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem19.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem18.Name" xml:space="preserve">
+    <value>layoutControlItem18</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem18.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem33.Name" xml:space="preserve">
+    <value>layoutControlItem33</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem33.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem22.Name" xml:space="preserve">
+    <value>layoutControlItem22</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem22.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem50.Name" xml:space="preserve">
+    <value>layoutControlItem50</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem50.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;DoorSettingsACOutsideLayoutControlGroup.Name" xml:space="preserve">
+    <value>DoorSettingsACOutsideLayoutControlGroup</value>
+  </data>
+  <data name="&gt;&gt;DoorSettingsACOutsideLayoutControlGroup.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem5.Name" xml:space="preserve">
+    <value>layoutControlItem5</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem5.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem6.Name" xml:space="preserve">
+    <value>layoutControlItem6</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem6.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem7.Name" xml:space="preserve">
+    <value>layoutControlItem7</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem7.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem8.Name" xml:space="preserve">
+    <value>layoutControlItem8</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem8.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem9.Name" xml:space="preserve">
+    <value>layoutControlItem9</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem9.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem1.Name" xml:space="preserve">
+    <value>layoutControlItem1</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem10.Name" xml:space="preserve">
+    <value>layoutControlItem10</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem10.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem34.Name" xml:space="preserve">
+    <value>layoutControlItem34</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem34.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem11.Name" xml:space="preserve">
+    <value>layoutControlItem11</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem11.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem60.Name" xml:space="preserve">
+    <value>layoutControlItem60</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem60.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;PartitionBindingSource.Name" xml:space="preserve">
     <value>PartitionBindingSource</value>
   </data>

Zerion Mini Shell 1.0