diff --git a/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index ac4fd36..250c4c4 100644
--- a/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -375,8 +375,13 @@
   <SicServos classType="Aitex.Core.RT.Device.Devices.SicServo" assembly="MECF.Framework.RT.EquipmentLibrary">
     <SicServo id="PMServo" module="" display="PMServo" schematicId="PMServo" unit="" aioType="float" aiActualSpeed="AI_ActualSpeed" aiActualCurrent="AI_ActualCurrent" aiAccSpeed="AI_ActualspeedACC" aiDecSpeed="AI_ActualspeedDEC" aoActualSpeedSetPoint="AO_SpindleSpeed" aoAccSpeedSetPoint="AO_SpindleACC" aoDecSpeedSetPoint="AO_SpindleDEC" diServoReady="DI_ServoReady" diServoError="DI_ServoDriverFaultSW" doServoEnable="DO_ServoEnable" doServoInital="DO_ServoInitial" doServoReset="DO_ServoReset" />
   </SicServos>
-  <IoSignalTowers classType="Aitex.Core.RT.Device.Devices.IoSignalTower" assembly="MECF.Framework.RT.EquipmentLibrary">
-    <IoSignalTower id="SignalTower" module="PM1" display="SignalTower" schematicId="PMSignalTower" doGreen="DO_TowerGreen" doYellow="DO_TowerYellow" doRed="DO_TowerRed" doBuzzer="DO_Buzzer" />
+  <IoSignalTowers classType="MECF.Framework.RT.EquipmentLibrary.Devices.IoSignalTower" assembly="MECF.Framework.RT.EquipmentLibrary">
+    <IoSignalTower id="SignalTower" module="PM1" display="SignalTower" schematicId="PMSignalTower"
+                   eventFile="PM1_STEvents.xml"
+                   doGreen="DO_TowerGreen" 
+                   doYellow="DO_TowerYellow" 
+                   doRed="DO_TowerRed" 
+                   doBuzzer="DO_Buzzer" />
   </IoSignalTowers>
   <IoChamberMoveBodys classType="Aitex.Core.RT.Device.Devices.IoChamberMoveBody" assembly="MECF.Framework.RT.EquipmentLibrary">
     <IoChamberMoveBody id="ChamberMoveBody" module="" display="ChamberMoveBody" schematicId="ChamberMoveBody" unit="" aioType="" diUpFaceback="DI_ChamMoveBodyUp" diDownFaceback="DI_ChamMoveBodyDown" diFront=" DI_ChamMoveBodyFront" diEndFaceback="DI_ChamMoveBodyEnd" doUpSetpoint="DO_ChamMoveBodyUp" doDownSetpoint="DO_ChamMoveBodyDown" doUpBrake="DO_ChamMoveBodyUpAirBrake" doForward="DO_ChamMoveBodyForward" doBackward="DO_ChamMoveBodyBackward" doForwardLatch="DO_ChamMoveBodyBrakerForward" doBackwardLatch="DO_ChamMoveBodyBrakerBackward" diForwardLatch="DI_ChamMoveBodyUpLatchFW" diBackwardLatch="DI_ChamMoveBodyEndLatchBW" diRemote="DI_ChamLidPushButtonLocal" diLock="DI_ManualLidUpPB" diUpDownEnable="DI_ChamMoveBodyUpDownEnableFB" doUpDownEnable="DO_ChamMoveBodyUpDownEnable" />
diff --git a/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml b/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
index 132f678..185ddf7 100644
--- a/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
+++ b/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
@@ -374,8 +374,13 @@
   <!--<SicAETemps classType="Aitex.Core.RT.Device.Devices.SicAETemp" assembly="MECF.Framework.RT.EquipmentLibrary">
     <SicAETemp id="PMAETemp" module="" display="PMAETemp" schematicId="PMAETemp" doPyroCommunicationError="DO_PyroCommunicationError" EnableLogMessage="True" />
   </SicAETemps>-->
-  <IoSignalTowers classType="Aitex.Core.RT.Device.Devices.IoSignalTower" assembly="MECF.Framework.RT.EquipmentLibrary">
-    <IoSignalTower id="SignalTower" module="PM2" display="SignalTower" schematicId="PMSignalTower" doGreen="DO_TowerGreen" doYellow="DO_TowerYellow" doRed="DO_TowerRed" doBuzzer="DO_Buzzer" />
+  <IoSignalTowers classType="MECF.Framework.RT.EquipmentLibrary.Devices.IoSignalTower" assembly="MECF.Framework.RT.EquipmentLibrary">
+    <IoSignalTower id="SignalTower" module="PM2" display="SignalTower" schematicId="PMSignalTower"
+                   eventFile="PM2_STEvents.xml"
+                   doGreen="DO_TowerGreen" 
+                   doYellow="DO_TowerYellow" 
+                   doRed="DO_TowerRed" 
+                   doBuzzer="DO_Buzzer" />
   </IoSignalTowers>
   <IoChamberMoveBodys classType="Aitex.Core.RT.Device.Devices.IoChamberMoveBody" assembly="MECF.Framework.RT.EquipmentLibrary">
     <IoChamberMoveBody id="ChamberMoveBody" module="" display="ChamberMoveBody" schematicId="ChamberMoveBody" unit="" aioType="" diUpFaceback="DI_ChamMoveBodyUp" diDownFaceback="DI_ChamMoveBodyDown" diFront=" DI_ChamMoveBodyFront" diEndFaceback="DI_ChamMoveBodyEnd" doUpSetpoint="DO_ChamMoveBodyUp" doDownSetpoint="DO_ChamMoveBodyDown" doUpBrake="DO_ChamMoveBodyUpAirBrake" doForward="DO_ChamMoveBodyForward" doBackward="DO_ChamMoveBodyBackward" doForwardLatch="DO_ChamMoveBodyBrakerForward" doBackwardLatch="DO_ChamMoveBodyBrakerBackward" diForwardLatch="DI_ChamMoveBodyUpLatchFW" diBackwardLatch="DI_ChamMoveBodyEndLatchBW" diRemote="DI_ChamLidPushButtonLocal" diLock="DI_ManualLidUpPB" diUpDownEnable="DI_ChamMoveBodyUpDownEnableFB" doUpDownEnable="DO_ChamMoveBodyUpDownEnable" />
diff --git a/SicCommonExt/SicCommonExt.csproj b/SicCommonExt/SicCommonExt.csproj
index b7601ac..df412d3 100644
--- a/SicCommonExt/SicCommonExt.csproj
+++ b/SicCommonExt/SicCommonExt.csproj
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<<<<<<< Updated upstream
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
-=======
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
->>>>>>> Stashed changes
-    <PropertyGroup>
+<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
+	        Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+<PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
         <ProjectGuid>{51E609BF-6312-4BE1-BF53-3BFD94F9A01C}</ProjectGuid>
@@ -37,18 +33,6 @@
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
     <ItemGroup>
-<<<<<<< Updated upstream
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="Class1.cs"/>
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-=======
         <Reference Include="MECF.Framework.Common">
           <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.Common.dll</HintPath>
         </Reference>
@@ -65,8 +49,7 @@
         <Compile Include="WaferDataRecorderEx.cs" />
     </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
->>>>>>> Stashed changes
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">
     </Target>
diff --git a/SicCommonExt/WaferDataRecorderEx.cs b/SicCommonExt/WaferDataRecorderEx.cs
index 0ba911d..c413cea 100644
--- a/SicCommonExt/WaferDataRecorderEx.cs
+++ b/SicCommonExt/WaferDataRecorderEx.cs
@@ -6,11 +6,8 @@ using Aitex.Core.RT.DBCore;
 using Aitex.Core.RT.Log;
 using MECF.Framework.Common.DBCore;
 
-<<<<<<< Updated upstream
-namespace SicRT
-=======
+
 namespace SicCommonExt
->>>>>>> Stashed changes
 {
     public class tray_thickness_data
     {
diff --git a/SicRT/Config/PM1_STEvents.xml b/SicRT/Config/PM1_STEvents.xml
new file mode 100644
index 0000000..90210b8
--- /dev/null
+++ b/SicRT/Config/PM1_STEvents.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<STEvents>
+
+	<STPatterns>
+		<!--注意："JobDone"为系统保留模式，请仅更改"pattern"，其余属性请勿修改 -->
+		<STPattern name="JobDone" pattern="--.........." cycles="-1" priority="-1" part="Buzzer" />
+		<STPattern name="Alarm" pattern="-----.." cycles="-1" priority="0"/>
+		<STPattern name="Warning" pattern="-----......." cycles="-1" priority="5"/>
+		<STPattern name="Blink" pattern="----------.........." cycles="-1" priority="10"/>
+	</STPatterns>
+
+	<STEvents>
+		<STEvent name="PM1.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="PM2.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="TM.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="LoadLock.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="UnLoad.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="EFEM.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="Aligner.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="WaferRobot.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="TrayRobot.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+
+		<STEvent name="PM1.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="PM2.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="TM.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="LoadLock.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="UnLoad.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="EFEM.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="Aligner.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="WaferRobot.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="TrayRobot.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+
+		<STEvent name="PM1.IsProcessing" Red="Off" Yellow="Off" Green="Blinking" Blue="Off" Buzzer="Off" />
+		<STEvent name="PM2.IsProcessing" Red="Off" Yellow="Off" Green="Blinking" Blue="Off" Buzzer="Off" />
+
+		<STEvent name="PM1.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="PM2.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="TM.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="LoadLock.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="UnLoad.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="Aligner.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="WaferRobot.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="TrayRobot.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="System.IsAutoRunning" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+	</STEvents>
+</STEvents>
+
+
+
diff --git a/SicRT/Config/PM2_STEvents.xml b/SicRT/Config/PM2_STEvents.xml
new file mode 100644
index 0000000..90210b8
--- /dev/null
+++ b/SicRT/Config/PM2_STEvents.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<STEvents>
+
+	<STPatterns>
+		<!--注意："JobDone"为系统保留模式，请仅更改"pattern"，其余属性请勿修改 -->
+		<STPattern name="JobDone" pattern="--.........." cycles="-1" priority="-1" part="Buzzer" />
+		<STPattern name="Alarm" pattern="-----.." cycles="-1" priority="0"/>
+		<STPattern name="Warning" pattern="-----......." cycles="-1" priority="5"/>
+		<STPattern name="Blink" pattern="----------.........." cycles="-1" priority="10"/>
+	</STPatterns>
+
+	<STEvents>
+		<STEvent name="PM1.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="PM2.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="TM.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="LoadLock.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="UnLoad.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="EFEM.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="Aligner.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="WaferRobot.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+		<STEvent name="TrayRobot.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
+
+		<STEvent name="PM1.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="PM2.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="TM.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="LoadLock.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="UnLoad.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="EFEM.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="Aligner.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="WaferRobot.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+		<STEvent name="TrayRobot.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
+
+		<STEvent name="PM1.IsProcessing" Red="Off" Yellow="Off" Green="Blinking" Blue="Off" Buzzer="Off" />
+		<STEvent name="PM2.IsProcessing" Red="Off" Yellow="Off" Green="Blinking" Blue="Off" Buzzer="Off" />
+
+		<STEvent name="PM1.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="PM2.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="TM.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="LoadLock.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="UnLoad.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="Aligner.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="WaferRobot.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="TrayRobot.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+		<STEvent name="System.IsAutoRunning" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
+	</STEvents>
+</STEvents>
+
+
+
diff --git a/SicRT/Config/SignalTower.xml b/SicRT/Config/SignalTower.xml
deleted file mode 100644
index c63019d..0000000
--- a/SicRT/Config/SignalTower.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<STEvents>
-	<STEvent name="PM1.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="PM2.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="TM.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="LoadLock.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="UnLoad.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="EFEM.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="Aligner.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="WaferRobot.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	<STEvent name="TrayRobot.IsAlarm" Red="On" Yellow="Off" Green="Off" Blue="Off" Buzzer="On" />
-	
-	<STEvent name="PM1.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="PM2.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="TM.IsWarning" Red="Off" Yellow="On" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="LoadLock.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="UnLoad.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="EFEM.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="Aligner.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="WaferRobot.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
-	<STEvent name="TrayRobot.IsWarning" Red="On" Yellow="Off" Green="On" Blue="Off" Buzzer="Blinking" />
-
-	<STEvent name="PM1.IsProcessing" Red="Off" Yellow="Off" Green="Blinking" Blue="Off" Buzzer="Off" />
-	<STEvent name="PM2.IsProcessing" Red="Off" Yellow="Off" Green="Blinking" Blue="Off" Buzzer="Off" />
-
-	<STEvent name="PM1.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="PM2.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="TM.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="LoadLock.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="UnLoad.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="Aligner.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="WaferRobot.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="TrayRobot.IsBusy" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-	<STEvent name="System.IsAutoRunning" Red="Off" Yellow="Off" Green="On" Blue="Off" Buzzer="Off" />
-</STEvents>
-
-
-
diff --git a/SicRT/SicRT.csproj b/SicRT/SicRT.csproj
index ebf0fec..d893719 100644
--- a/SicRT/SicRT.csproj
+++ b/SicRT/SicRT.csproj
@@ -68,12 +68,9 @@
     <Reference Include="log4net">
       <HintPath>..\ThirdParty\MECF.Framework\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="MECF.Framework.Common">
-      <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="MECF.Framework.Common, Version=1.0.8361.29945, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="MECF.Framework.Common, Version=2.1.2.7, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
+      <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.Common.dll</HintPath>
     </Reference>
     <Reference Include="MECF.Framework.RT.Core">
       <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.RT.Core.dll</HintPath>
@@ -81,6 +78,9 @@
     <Reference Include="MECF.Framework.RT.EquipmentLibrary">
       <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.RT.EquipmentLibrary.dll</HintPath>
     </Reference>
+    <Reference Include="MECF.Framework.UI.Core">
+      <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.UI.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Npgsql">
       <HintPath>..\ThirdParty\MECF.Framework\Npgsql.dll</HintPath>
     </Reference>
@@ -186,7 +186,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
-    <None Include="Config\SignalTower.xml">
+    <None Include="Config\PM1_STEvents.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -229,6 +229,11 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Config\PM2_STEvents.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/SicSimulator/SicSimulator.csproj b/SicSimulator/SicSimulator.csproj
index 4fe8615..5e3d5fd 100644
--- a/SicSimulator/SicSimulator.csproj
+++ b/SicSimulator/SicSimulator.csproj
@@ -49,6 +49,9 @@
     <Reference Include="MECF.Framework.Simulator.Core">
       <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.Simulator.Core.dll</HintPath>
     </Reference>
+    <Reference Include="MECF.Framework.UI.Client">
+      <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.UI.Client.dll</HintPath>
+    </Reference>
     <Reference Include="MECF.Framework.UI.Core">
       <HintPath>..\ThirdParty\MECF.Framework\MECF.Framework.UI.Core.dll</HintPath>
     </Reference>
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll
index e014923..4d42c22 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
index c783508..c0c5785 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
index a618fd5..5ec2993 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
index 58606c2..e74cc00 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
index dfedf24..f2a933c 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ
diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
index 719b890..8eac0cf 100644
Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ