diff --git a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj
index 4123419a..54161793 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj
+++ b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj
@@ -163,7 +163,7 @@
     <ClInclude Include="UI\Source\DocumentEditorToolstrip.h" />
   </ItemGroup>
   <ItemGroup>
-    <Xml Include="UI\Resource.xml" />
+    <Xml Include="UI\ResourceBase.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters
index 8fd1078c..771ba95b 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters
+++ b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters
@@ -49,7 +49,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Xml Include="UI\Resource.xml">
+    <Xml Include="UI\ResourceBase.xml">
       <Filter>Resource Files</Filter>
     </Xml>
   </ItemGroup>
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/Resource.xml b/Tutorial/GacUI_Controls/DocumentEditor/UI/Resource.xml
deleted file mode 100644
index 67abc539..00000000
--- a/Tutorial/GacUI_Controls/DocumentEditor/UI/Resource.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<Resource>
-  <Folder name="GacGenConfig">
-    <Xml name="Metadata">
-      <ResourceMetadata Name="EditorBase" Version="1.0"/>
-    </Xml>
-    <Folder name="Cpp">
-      <Text name="SourceFolder">Source</Text>
-      <Text name="Resource">..\..\UIRes\DocumentEditor.bin</Text>
-      <Text name="NormalInclude">GacUI.h</Text>
-      <Text name="ReflectionInclude">GacUIReflection.h</Text>
-      <Text name="Name">Demo</Text>
-    </Folder>
-  </Folder>
-  
-  <Instance name="MainWindowResource">
-    <Instance ref.CodeBehind="false" ref.Class="demo::MainWindow" xmlns:demo="demo::*">
-      <Window ref.Name="self" Text="DocumentEditor" ClientSize="x:320 y:240">
-        <att.BoundsComposition-set PreferredMinSize="x:320 y:240"/>
-        <Table AlignmentToParent="left:0 top:0 right:0 bottom:0" CellPadding="20">
-          <att.Rows>
-            <_>composeType:Percentage percentage:1.0</_>
-            <_>composeType:Percentage percentage:1.0</_>
-          </att.Rows>
-          <att.Columns>
-            <_>composeType:Percentage percentage:1.0</_>
-          </att.Columns>
-
-          <Cell Site="row:0 column:0">
-            <Button Text="Open document editor with toolstrip">
-              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
-              <ev.Clicked-eval>
-                <![CDATA[
-                  {
-                    var window = new DocumentEditorToolstripWindow*();
-                    window.ForceCalculateSizeImmediately();
-                    window.MoveToScreenCenter();
-                    window.ShowModalAndDelete(self, func():void{});
-                  }
-                ]]>
-              </ev.Clicked-eval>
-            </Button>
-          </Cell>
-
-          <Cell Site="row:1 column:0">
-            <Button Text="Open document editor with ribbon">
-              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
-              <ev.Clicked-eval>
-                <![CDATA[
-                  {
-                    var window = new DocumentEditorRibbonWindow*();
-                    window.ForceCalculateSizeImmediately();
-                    window.MoveToScreenCenter();
-                    window.ShowModalAndDelete(self, func():void{});
-                  }
-                ]]>
-              </ev.Clicked-eval>
-            </Button>
-          </Cell>
-        </Table>
-      </Window>
-    </Instance>
-  </Instance>
-
-  <Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
-  <Folder name="DocumentComponents" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentComponents.xml</Folder>
-  <Folder name="DocumentEditorBase" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml</Folder>
-  <Folder name="DocumentEditorRibbon" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml</Folder>
-  <Folder name="DocumentEditorToolstrip" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorToolstrip.xml</Folder>
-
-  <Instance name="DocumentEditorRibbonWindowResource">
-    <Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorRibbonWindow" xmlns:demo="demo::*">
-      <Window Text-bind="editor.Text" ClientSize="x:800 y:600">
-        <demo:DocumentEditorRibbon ref.Name="editor">
-          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
-        </demo:DocumentEditorRibbon>
-      </Window>
-    </Instance>
-  </Instance>
-
-  <Instance name="DocumentEditorToolstripWindowResource">
-    <Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorToolstripWindow" xmlns:demo="demo::*">
-      <Window Text-bind="editor.Text" ClientSize="x:800 y:600">
-        <demo:DocumentEditorToolstrip ref.Name="editor">
-          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
-        </demo:DocumentEditorToolstrip>
-      </Window>
-    </Instance>
-  </Instance>
-</Resource>
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/ResourceBase.xml b/Tutorial/GacUI_Controls/DocumentEditor/UI/ResourceBase.xml
new file mode 100644
index 00000000..2979bd8b
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditor/UI/ResourceBase.xml
@@ -0,0 +1,38 @@
+<Resource>
+  <Folder name="GacGenConfig">
+    <Xml name="Metadata">
+      <ResourceMetadata Name="EditorBase" Version="1.0"/>
+    </Xml>
+    <Folder name="Cpp">
+      <Text name="SourceFolder">Source</Text>
+      <Text name="Resource">..\..\UIRes\DocumentEditor.bin</Text>
+      <Text name="NormalInclude">GacUI.h</Text>
+      <Text name="ReflectionInclude">GacUIReflection.h</Text>
+      <Text name="Name">EditorBase</Text>
+    </Folder>
+  </Folder>
+
+  <Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
+  <Folder name="DocumentComponents" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentComponents.xml</Folder>
+  <Folder name="DocumentEditorBase" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml</Folder>
+
+  <Instance name="DocumentEditorRibbonWindowResource">
+    <Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorRibbonWindow" xmlns:demo="demo::*">
+      <Window Text-bind="editor.Text" ClientSize="x:800 y:600">
+        <demo:DocumentEditorRibbon ref.Name="editor">
+          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+        </demo:DocumentEditorRibbon>
+      </Window>
+    </Instance>
+  </Instance>
+
+  <Instance name="DocumentEditorToolstripWindowResource">
+    <Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorToolstripWindow" xmlns:demo="demo::*">
+      <Window Text-bind="editor.Text" ClientSize="x:800 y:600">
+        <demo:DocumentEditorToolstrip ref.Name="editor">
+          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+        </demo:DocumentEditorToolstrip>
+      </Window>
+    </Instance>
+  </Instance>
+</Resource>
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj
index c8602076..931c72fb 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj
@@ -154,6 +154,9 @@
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="UI\ResourceRibbon.xml" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj.filters b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj.filters
index 948faede..b44384e6 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj.filters
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj.filters
@@ -19,4 +19,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="UI\ResourceRibbon.xml">
+      <Filter>Resource Files</Filter>
+    </Xml>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/Main.cpp b/Tutorial/GacUI_Controls/DocumentEditorRibbon/Main.cpp
index 59775d6d..2b5bfb88 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorRibbon/Main.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/Main.cpp
@@ -10,6 +10,7 @@ void GuiMain()
 {
 	{
 		FileStream fileStream(L"../UIRes/DocumentEditor.bin", FileStream::ReadOnly);
+		FileStream fileStream(L"../UIRes/DocumentEditorRibbon.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream);
 		GetResourceManager()->SetResource(resource);
 	}
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/ResourceRibbon.xml b/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/ResourceRibbon.xml
new file mode 100644
index 00000000..8dabbabb
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/ResourceRibbon.xml
@@ -0,0 +1,30 @@
+<Resource>
+  <Folder name="GacGenConfig">
+    <Xml name="Metadata">
+      <ResourceMetadata Name="EditorRibbon" Version="1.0"/>
+      <Dependencies>
+        <Resource Name="EditorBase"/>
+      </Dependencies>
+    </Xml>
+    <Folder name="Cpp">
+      <Text name="SourceFolder">Source</Text>
+      <Text name="Resource">..\..\UIRes\DocumentEditorRibbon.bin</Text>
+      <Text name="NormalInclude">GacUI.h</Text>
+      <Text name="ReflectionInclude">GacUIReflection.h</Text>
+      <Text name="Name">EditorRibbon</Text>
+    </Folder>
+  </Folder>
+
+  <Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
+  <Folder name="DocumentEditorRibbon" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml</Folder>
+
+  <Instance name="MainWindowResource">
+    <Instance ref.CodeBehind="false" ref.Class="demo::MainWindow" xmlns:demo="demo::*">
+      <Window Text-bind="editor.Text" ClientSize="x:800 y:600">
+        <demo:DocumentEditorRibbon ref.Name="editor">
+          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+        </demo:DocumentEditorRibbon>
+      </Window>
+    </Instance>
+  </Instance>
+</Resource>
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj
index 0ac19eb5..838da8f7 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj
@@ -154,6 +154,9 @@
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="UI\ResourceToolstrip.xml" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj.filters b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj.filters
index 948faede..e3f251fc 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj.filters
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj.filters
@@ -19,4 +19,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="UI\ResourceToolstrip.xml">
+      <Filter>Resource Files</Filter>
+    </Xml>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/Main.cpp b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/Main.cpp
index f3272cbb..cba54aba 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/Main.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/Main.cpp
@@ -10,6 +10,7 @@ void GuiMain()
 {
 	{
 		FileStream fileStream(L"../UIRes/DocumentEditor.bin", FileStream::ReadOnly);
+		FileStream fileStream(L"../UIRes/DocumentEditorToolstrip.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream);
 		GetResourceManager()->SetResource(resource);
 	}
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/ResourceToolstrip.xml b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/ResourceToolstrip.xml
new file mode 100644
index 00000000..639f382f
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/ResourceToolstrip.xml
@@ -0,0 +1,30 @@
+<Resource>
+  <Folder name="GacGenConfig">
+    <Xml name="Metadata">
+      <ResourceMetadata Name="EditorToolstrip" Version="1.0"/>
+      <Dependencies>
+        <Resource Name="EditorBase"/>
+      </Dependencies>
+    </Xml>
+    <Folder name="Cpp">
+      <Text name="SourceFolder">Source</Text>
+      <Text name="Resource">..\..\UIRes\DocumentEditorToolstrip.bin</Text>
+      <Text name="NormalInclude">GacUI.h</Text>
+      <Text name="ReflectionInclude">GacUIReflection.h</Text>
+      <Text name="Name">EditorToolstrip</Text>
+    </Folder>
+  </Folder>
+
+  <Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
+  <Folder name="DocumentEditorToolstrip" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorToolstrip.xml</Folder>
+
+  <Instance name="MainWindowResource">
+    <Instance ref.CodeBehind="false" ref.Class="demo::MainWindow" xmlns:demo="demo::*">
+      <Window Text-bind="editor.Text" ClientSize="x:800 y:600">
+        <demo:DocumentEditorToolstrip ref.Name="editor">
+          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+        </demo:DocumentEditorToolstrip>
+      </Window>
+    </Instance>
+  </Instance>
+</Resource>
\ No newline at end of file