diff --git a/Demo/AVR_ATMega323_IAR/rtosdemo.ewd b/Demo/AVR_ATMega323_IAR/rtosdemo.ewd
index 736675fdb..2e87e9a77 100644
--- a/Demo/AVR_ATMega323_IAR/rtosdemo.ewd
+++ b/Demo/AVR_ATMega323_IAR/rtosdemo.ewd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <project>
-  <fileVersion>1</fileVersion>
+  <fileVersion>2</fileVersion>
   <configuration>
     <name>Debug</name>
     <toolchain>
@@ -404,9 +404,9 @@
     </settings>
     <settings>
       <name>JTAGICEMKIIAVR</name>
-      <archiveVersion>2</archiveVersion>
+      <archiveVersion>3</archiveVersion>
       <data>
-        <version>4</version>
+        <version>5</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -533,10 +533,6 @@
           <name>OJTAGICEMKIIAVRJtagIcedownloadToData</name>
           <state>0</state>
         </option>
-        <option>
-          <name>OJTAGICEMKIIAVRCommunication</name>
-          <state>1</state>
-        </option>
         <option>
           <name>OJTAGICEMKIIAVRJtagSoftwareBreak</name>
           <state>0</state>
@@ -553,6 +549,128 @@
           <name>GetcharBreakpointP7</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OJTAGICEMKIIAVRCommunicationNew</name>
+          <state>2</state>
+        </option>
+        <option>
+          <name>OJTAGICEMKIIAVRCommunicationUsbEditId</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>DRAGONAVR</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ODRAGONAVRDriver</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ODRAGONAVRExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRLogFile</name>
+          <state>cspycomm.log</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceSuppLoad</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceConsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceJtagFreqRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceJtagFreqManually</name>
+          <state>100000</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceJtagFreq</name>
+          <version>0</version>
+          <state>8</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceJtagDeviceBefore</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceJtagDeviceAfter</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceJtagInstrBitsBefore</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceJtagInstrBitsAfter</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIceDaisyChain</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagDebugTimers</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagDebugEeprom</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagDebugReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagDebugFuses</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagIcedownloadToData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRJtagSoftwareBreak</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ExitBreakpointP7</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PutcharBreakpointP7</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GetcharBreakpointP7</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRCommunicationNew</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ODRAGONAVRCommunicationUsbEditId</name>
+          <state></state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -619,19 +737,27 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ewplugin</file>
-        <loadFlag>1</loadFlag>
-      </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\Orti\Orti.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$EW_DIR$\common\plugins\Profiling\Profiling.ewplugin</file>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
       <plugin>
-        <file>$EW_DIR$\common\plugins\Stack\stack.ewplugin</file>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
     </debuggerPlugins>
diff --git a/Demo/AVR_ATMega323_IAR/rtosdemo.ewp b/Demo/AVR_ATMega323_IAR/rtosdemo.ewp
index c1b517e0d..3b2bcc5bd 100644
--- a/Demo/AVR_ATMega323_IAR/rtosdemo.ewp
+++ b/Demo/AVR_ATMega323_IAR/rtosdemo.ewp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <project>
-  <fileVersion>1</fileVersion>
+  <fileVersion>2</fileVersion>
   <configuration>
     <name>Debug</name>
     <toolchain>
@@ -10,9 +10,9 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>3</archiveVersion>
+      <archiveVersion>5</archiveVersion>
       <data>
-        <version>6</version>
+        <version>7</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -127,8 +127,8 @@
         </option>
         <option>
           <name>New Variant Processor</name>
-          <version>15</version>
-          <state>47</state>
+          <version>24</version>
+          <state>56</state>
         </option>
         <option>
           <name>GRuntimeLibSelect</name>
@@ -203,13 +203,17 @@
           <name>LCsHeapConfigText</name>
           <state>1</state>
         </option>
+        <option>
+          <name>GGNoMULInstruction</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>ICCAVR</name>
-      <archiveVersion>3</archiveVersion>
+      <archiveVersion>4</archiveVersion>
       <data>
-        <version>12</version>
+        <version>13</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -461,13 +465,17 @@
           <name>CCRadioModuleTypeSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCCAdditionalCommandLineOptionsSlave</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>AAVR</name>
-      <archiveVersion>3</archiveVersion>
+      <archiveVersion>4</archiveVersion>
       <data>
-        <version>9</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -643,18 +651,6 @@
           <name>AsmOutputFile</name>
           <state>$FILE_BNAME$.r90</state>
         </option>
-        <option>
-          <name>AOverrideModuleTypeDefault</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ARadioModuleType</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ARadioModuleTypeSlave</name>
-          <state>1</state>
-        </option>
       </data>
     </settings>
     <settings>
@@ -700,7 +696,7 @@
         </option>
         <option>
           <name>FormatVariant</name>
-          <version>7</version>
+          <version>8</version>
           <state>2</state>
         </option>
         <option>
@@ -882,7 +878,7 @@
         </option>
         <option>
           <name>ExtraFormatVariant</name>
-          <version>7</version>
+          <version>8</version>
           <state>2</state>
         </option>
         <option>
diff --git a/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt b/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
index f4f1d0f59..4c88cd32b 100644
--- a/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
+++ b/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
@@ -17,7 +17,7 @@
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1153</ColumnWidth1><ColumnWidth2>307</ColumnWidth2><ColumnWidth3>76</ColumnWidth3></Build><Debug-Log/></Static>
     <Windows>
       
-    <Wnd2>
+    <Wnd0>
         <Tabs>
           <Tab>
             <Identity>TabID-12388-19520</Identity>
@@ -29,7 +29,7 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-19172-8303</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-954-28216</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-19172-8303</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-954-28216</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>
     <Editor>
       
       
@@ -42,7 +42,7 @@
       
       
       
-    <Top><Row0><Sizes><Toolbar-0088f608><key>iaridepm.enu1</key></Toolbar-0088f608></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>628</Bottom><Right>384</Right><x>-2</x><y>-2</y><xscreen>194</xscreen><yscreen>163</yscreen><sizeHorzCX>115476</sizeHorzCX><sizeHorzCY>165988</sizeHorzCY><sizeVertCX>229762</sizeVertCX><sizeVertCY>641548</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>310</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>312</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>317719</sizeHorzCY><sizeVertCX>116667</sizeVertCX><sizeVertCY>167006</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-00aa9bc8><key>iaridepm.enu1</key></Toolbar-00aa9bc8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>628</Bottom><Right>384</Right><x>-2</x><y>-2</y><xscreen>194</xscreen><yscreen>163</yscreen><sizeHorzCX>115476</sizeHorzCX><sizeHorzCY>165988</sizeHorzCY><sizeVertCX>229762</sizeVertCX><sizeVertCY>641548</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>310</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>312</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>317719</sizeHorzCY><sizeVertCX>116667</sizeVertCX><sizeVertCY>167006</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Workspace>