diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
index 32b24f372..893bd30ce 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
@@ -4897,7 +4897,7 @@
         </option>
         <option>
           <name>OGLastSavedByProductVersion</name>
-          <state>5.20.0.50986</state>
+          <state>5.30.0.51160</state>
         </option>
         <option>
           <name>GeneralEnableMisra</name>
@@ -5448,7 +5448,7 @@
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\at91sam9xe512\flash.icf</state>
+          <state>$PROJ_DIR$\flash.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
index b09d95a29..4e2b1330f 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
@@ -21,10 +21,6 @@ ByteLimit=50
 Checksum=1592855699
 [InstructionProfiling]
 Enabled=_ 0
-[Log file]
-LoggingEnabled=_ 0
-LogFile=_ ""
-Category=_ 0
 [TermIOLog]
 LoggingEnabled=_ 0
 LogFile=_ ""
@@ -32,6 +28,10 @@ LogFile=_ ""
 Enabled=0
 Source=2
 Graph=0
+[Log file]
+LoggingEnabled=_ 0
+LogFile=_ ""
+Category=_ 0
 [Disassemble mode]
 mode=0
 [Breakpoints]
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
index f197a9d4e..a2485417f 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
+++ b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
@@ -12,7 +12,7 @@
           
           
           
-        <Column0>309</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
+        <Column0>325</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
       </Workspace>
       <Build>
         
@@ -24,7 +24,7 @@
     <Windows>
       
       
-    <Wnd2>
+    <Wnd0>
         <Tabs>
           <Tab>
             <Identity>TabID-26777-6465</Identity>
@@ -32,11 +32,11 @@
             <Factory>Workspace</Factory>
             <Session>
               
-            <NodeDict><ExpandedNode>at91sam9xe-ek</ExpandedNode><ExpandedNode>at91sam9xe-ek/main.c</ExpandedNode><ExpandedNode>at91sam9xe-ek/scheduler_source</ExpandedNode></NodeDict></Session>
+            <NodeDict><ExpandedNode>at91sam9xe-ek</ExpandedNode></NodeDict></Session>
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
         <Tabs>
           <Tab>
             <Identity>TabID-25209-6494</Identity>
@@ -46,20 +46,20 @@
           </Tab>
         <Tab><Identity>TabID-21317-8493</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd3></Windows>
+      <SelectedTab>0</SelectedTab></Wnd1></Windows>
     <Editor>
       
       
       
       
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c</Filename><XPos>0</XPos><YPos>88</YPos><SelStart>3772</SelStart><SelEnd>3772</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c</Filename><XPos>0</XPos><YPos>45</YPos><SelStart>2969</SelStart><SelEnd>2976</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1734</YPos><SelStart>54344</SelStart><SelEnd>54344</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>2396</SelStart><SelEnd>2396</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename><XPos>0</XPos><YPos>98</YPos><SelStart>4027</SelStart><SelEnd>4027</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_lowlevel.c</Filename><XPos>0</XPos><YPos>75</YPos><SelStart>3913</SelStart><SelEnd>3913</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_3.c</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>2980</SelStart><SelEnd>2980</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename><XPos>0</XPos><YPos>204</YPos><SelStart>7829</SelStart><SelEnd>7829</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename><XPos>0</XPos><YPos>5</YPos><SelStart>435</SelStart><SelEnd>435</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c</Filename><XPos>0</XPos><YPos>104</YPos><SelStart>4841</SelStart><SelEnd>4858</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\peripherals\pit\pit.c</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>3157</SelStart><SelEnd>3157</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board.h</Filename><XPos>0</XPos><YPos>186</YPos><SelStart>7460</SelStart><SelEnd>7467</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c</Filename><XPos>0</XPos><YPos>79</YPos><SelStart>3123</SelStart><SelEnd>3132</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\task.h</Filename><XPos>0</XPos><YPos>154</YPos><SelStart>5068</SelStart><SelEnd>5068</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c</Filename><XPos>0</XPos><YPos>112</YPos><SelStart>5137</SelStart><SelEnd>5137</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
     <Positions>
       
       
       
       
       
-    <Top><Row0><Sizes><Toolbar-00abb450><key>iaridepm.enu1</key></Toolbar-00abb450></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>399</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>238690</sizeVertCX><sizeVertCY>604888</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>346</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>348</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>354379</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-00abb4c0><key>iaridepm.enu1</key></Toolbar-00abb4c0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>399</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>238690</sizeVertCX><sizeVertCY>604888</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>346</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>348</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>354379</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Workspace>