diff --git a/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp b/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp
index f78e6839..fe9862c1 100644
--- a/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp
+++ b/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp
@@ -3,13 +3,13 @@
 
 void GuiMain()
 {
-	GuiWindow* window = g::NewWindow();
+	auto window = new GuiWindow(theme::ThemeName::Window);
 	window->SetText(L"Hello, world!");
 	window->SetClientSize(Size(480, 320));
 	window->GetBoundsComposition()->SetPreferredMinSize(Size(480, 320));
 	window->MoveToScreenCenter();
 
-	GuiControl* label = g::NewLabel();
+	auto label = new GuiLabel(theme::ThemeName::Label);
 	label->SetText(L"Welcome to GacUI Library!");
 	{
 		FontProperties font;
diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin
index 4d4db62c..74696328 100644
Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin and b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin differ
diff --git a/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp b/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp
index 649b4be9..54ed2bb0 100644
--- a/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp
+++ b/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp
@@ -17,15 +17,13 @@ using presentation::theme::*;
 
 func CreateMainWindow() : Window*
 {
-	var theme = ITheme::GetCurrentTheme();
-
-	var window = new Window*(theme.CreateWindowStyle());
+	var window = new Window*(ThemeName::Window);
 	window.Text = "Hello, world!";
 	window.ClientSize = {x:480 y:320};
 	window.BoundsComposition.PreferredMinSize = {x:480 y:320};
 	window.MoveToScreenCenter();
 
-	var label = new Label*(theme.CreateLabelStyle());
+	var label = new Label*(ThemeName::Label);
 	label.Text = "Welcom to GacUI Library!";
 	label.Font = {fontFamily:"Segoe UI" size:32};
 	window.AddChild(label);