diff --git a/kiwano/2d/DebugNode.cpp b/kiwano/2d/DebugNode.cpp
index 7e221142..d3ade3d8 100644
--- a/kiwano/2d/DebugNode.cpp
+++ b/kiwano/2d/DebugNode.cpp
@@ -60,11 +60,12 @@ namespace kiwano
 
 	void DebugNode::OnRender()
 	{
-		Renderer::Instance()->GetSolidColorBrush()->SetColor(DX::ConvertToColorF(background_color_));
+		auto renderer = Renderer::Instance();
 
-		Renderer::Instance()->GetD2DDeviceResources()->GetDeviceContext()->FillRoundedRectangle(
+		renderer->GetSolidColorBrush()->SetColor(DX::ConvertToColorF(background_color_));
+		renderer->GetD2DDeviceResources()->GetDeviceContext()->FillRoundedRectangle(
 			D2D1::RoundedRect(DX::ConvertToRectF(GetBounds()), 5.f, 5.f),
-			Renderer::Instance()->GetSolidColorBrush()
+			renderer->GetSolidColorBrush()
 		);
 	}
 
diff --git a/kiwano/2d/Node.cpp b/kiwano/2d/Node.cpp
index e8c5eee6..6b42f464 100644
--- a/kiwano/2d/Node.cpp
+++ b/kiwano/2d/Node.cpp
@@ -123,10 +123,12 @@ namespace kiwano
 	{
 		if (show_border_)
 		{
-			Rect bounds = GetBounds();
-			Renderer::Instance()->SetTransform(transform_matrix_);
-			Renderer::Instance()->FillRectangle(bounds, Color(Color::Red, .4f));
-			Renderer::Instance()->DrawRectangle(bounds, Color(Color::Red, .8f), 4.f);
+            Rect bounds = GetBounds();
+
+            auto renderer = Renderer::Instance();
+            renderer->SetTransform(transform_matrix_);
+            renderer->FillRectangle(bounds, Color(Color::Red, .4f));
+            renderer->DrawRectangle(bounds, Color(Color::Red, .8f), 4.f);
 		}
 
 		for (auto child = children_.First(); child; child = child->NextItem())
@@ -228,10 +230,12 @@ namespace kiwano
 		else
 		{
 			// matrix multiplication is optimized by expression template
-			transform_matrix_ = Matrix::Scaling(transform_.scale)
-				* Matrix::Skewing(transform_.skew)
-				* Matrix::Rotation(transform_.rotation)
-				* Matrix::Translation(transform_.position);
+            transform_matrix_ = Matrix::SRT(transform_.position, transform_.scale, transform_.rotation);
+
+            if (!transform_.skew.IsOrigin())
+            {
+                transform_matrix_ = Matrix::Skewing(transform_.skew) * transform_matrix_;
+            }
 		}
 
 		transform_matrix_.Translate(Point{ -size_.x * anchor_.x, -size_.y * anchor_.y });
@@ -656,8 +660,9 @@ namespace kiwano
 
 	void VisualNode::PrepareRender()
 	{
-		Renderer::Instance()->SetTransform(transform_matrix_);
-		Renderer::Instance()->SetOpacity(displayed_opacity_);
+        auto renderer = Renderer::Instance();
+        renderer->SetTransform(transform_matrix_);
+        renderer->SetOpacity(displayed_opacity_);
 	}
 
 }
diff --git a/kiwano/2d/Text.cpp b/kiwano/2d/Text.cpp
index f3ef601c..06c9f5ab 100644
--- a/kiwano/2d/Text.cpp
+++ b/kiwano/2d/Text.cpp
@@ -303,7 +303,8 @@ namespace kiwano
 
 		if (text_layout_)
 		{
-			Renderer::Instance()->SetTextStyle(
+            auto renderer = Renderer::Instance();
+            renderer->SetTextStyle(
 				GetDisplayedOpacity(),
 				style_.color,
 				style_.outline,
@@ -311,7 +312,7 @@ namespace kiwano
 				style_.outline_width,
 				style_.outline_stroke
 			);
-			Renderer::Instance()->DrawTextLayout(text_layout_);
+            renderer->DrawTextLayout(text_layout_);
 		}
 	}
 
@@ -327,8 +328,10 @@ namespace kiwano
 		if (text_.empty())
 			return;
 
+        auto renderer = Renderer::Instance();
+
 		ThrowIfFailed(
-			Renderer::Instance()->GetD2DDeviceResources()->CreateTextFormat(
+            renderer->GetD2DDeviceResources()->CreateTextFormat(
 				text_format_,
 				font_,
 				style_
@@ -336,7 +339,7 @@ namespace kiwano
 		);
 
 		ThrowIfFailed(
-			Renderer::Instance()->GetD2DDeviceResources()->CreateTextLayout(
+            renderer->GetD2DDeviceResources()->CreateTextLayout(
 				text_layout_,
 				layout_size_,
 				text_,
diff --git a/kiwano/math/Matrix.hpp b/kiwano/math/Matrix.hpp
index 5c3f7194..37d29e06 100644
--- a/kiwano/math/Matrix.hpp
+++ b/kiwano/math/Matrix.hpp
@@ -236,6 +236,17 @@ namespace kiwano
 				);
 			}
 
+            static inline MatrixT SRT(const vec2_type& trans, const vec2_type& scale, value_type angle)
+            {
+                value_type s = math::Sin(angle);
+                value_type c = math::Cos(angle);
+                return MatrixT(
+                    c * scale.x, s * scale.x,
+                    -s * scale.y, c * scale.y,
+                    trans.x, trans.y
+                );
+            }
+
 			static inline MatrixT Skewing(const vec2_type& angle)
 			{
 				value_type tx = math::Tan(angle.x);