From f79fbe9b0bb1c58488cfe3b137ae480916471808 Mon Sep 17 00:00:00 2001
From: Stephen Peters <stpete@microsoft.com>
Date: Tue, 8 Jun 2021 10:33:14 -0700
Subject: [PATCH 1/3] Update Animated Visuals

---
 .../AnimatedBackVisualSource.cpp              | 249 +++--
 .../AnimatedBackVisualSource.h                |   5 +-
 .../AnimatedBackVisualSource.idl              |   4 +-
 .../AnimatedChevronDownSmallVisualSource.cpp  | 123 +--
 .../AnimatedChevronDownSmallVisualSource.h    |   6 +-
 .../AnimatedChevronDownSmallVisualSource.idl  |   4 +-
 ...matedChevronRightDownSmallVisualSource.cpp | 751 ++++++--------
 ...nimatedChevronRightDownSmallVisualSource.h | 153 +--
 ...matedChevronRightDownSmallVisualSource.idl |   4 +-
 ...AnimatedChevronUpDownSmallVisualSource.cpp | 554 +++++------
 .../AnimatedChevronUpDownSmallVisualSource.h  | 164 ++--
 ...AnimatedChevronUpDownSmallVisualSource.idl |   4 +-
 .../AnimatedFindVisualSource.cpp              | 396 ++++----
 .../AnimatedFindVisualSource.h                |   4 +-
 .../AnimatedFindVisualSource.idl              |   4 +-
 ...atedGlobalNavigationButtonVisualSource.cpp | 916 ++++++++----------
 ...imatedGlobalNavigationButtonVisualSource.h |   5 +-
 ...atedGlobalNavigationButtonVisualSource.idl |   4 +-
 .../AnimatedSettingsVisualSource.cpp          | 151 ++-
 .../AnimatedSettingsVisualSource.h            |   4 +-
 .../AnimatedSettingsVisualSource.idl          |   4 +-
 21 files changed, 1650 insertions(+), 1859 deletions(-)

diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.cpp
index de9e2d2caa..a2fd77e66e 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.cpp
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.cpp
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedBackVisualSource.json
 //       
 //       Input file:
-//           AnimatedBackVisualSource.json (27247 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedBackVisualSource.json (21751 bytes created 9:25-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -21,11 +21,11 @@
 // ____________________________________
 // |       Object stats       | Count |
 // |__________________________|_______|
-// | All CompositionObjects   |   223 |
+// | All CompositionObjects   |   195 |
 // |--------------------------+-------|
-// | Expression animators     |    33 |
-// | KeyFrame animators       |    30 |
-// | Reference parameters     |    35 |
+// | Expression animators     |    27 |
+// | KeyFrame animators       |    24 |
+// | Reference parameters     |    29 |
 // | Expression operations    |     4 |
 // |--------------------------+-------|
 // | Animated brushes         |     1 |
@@ -122,8 +122,6 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     CubicBezierEasingFunction _cubicBezierEasingFunction_2{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_3{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_4{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_5{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_6{ nullptr };
     ExpressionAnimation _rootProgress{ nullptr };
     InsetClip _insetClip_0{ nullptr };
     StepEasingFunction _holdThenStepEasingFunction{ nullptr };
@@ -189,6 +187,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 03 - Back - 06 - PressedToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_0()
     {
+        // Frame 60.
         const auto result = CreateBooleanKeyFrameAnimation(0.75F, true);
         return result;
     }
@@ -196,7 +195,9 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 03 - Back - 05 - PressedToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_1()
     {
+        // Frame 40.
         const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, false);
         return result;
     }
@@ -204,7 +205,9 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 03 - Back - 04 - PointerOverToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_2()
     {
+        // Frame 30.
         const auto result = CreateBooleanKeyFrameAnimation(0.375F, true);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, false);
         return result;
     }
@@ -212,7 +215,9 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 03 - Back - 03 - PointerOverToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_3()
     {
+        // Frame 20.
         const auto result = CreateBooleanKeyFrameAnimation(0.25F, true);
+        // Frame 30.
         result.InsertKeyFrame(0.375F, false);
         return result;
     }
@@ -220,7 +225,9 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 03 - Back - 02 - NormalToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_4()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, true);
+        // Frame 20.
         result.InsertKeyFrame(0.25F, false);
         return result;
     }
@@ -228,6 +235,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 03 - Back - 01 - NormalToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_5()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, false);
         return result;
     }
@@ -300,7 +308,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     CompositionColorBrush ThemeColor_Foreground()
     {
         const auto result = _themeColor_Foreground = _c.CreateColorBrush();
-        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W*1,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
+        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
         return result;
     }
 
@@ -360,7 +368,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         shapes.Append(SpriteShape_12());
         // Transforms: Stem 2
         shapes.Append(SpriteShape_13());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_7(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_6(), _rootProgress);
         return result;
     }
 
@@ -400,7 +408,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.CenterPoint({ 7.5F, -0.00300000003F });
         result.Offset({ 9.375F, -0.00400000019F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p622_to_1p86(), RootProgress());
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p622_to_2p25_0(), RootProgress());
         StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p25_to_2p25_0(), _rootProgress);
         return result;
     }
@@ -438,7 +446,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.CenterPoint({ 7.5F, -0.00300000003F });
         result.Offset({ 9.375F, -0.00400000019F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p622_to_2p25(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p622_to_2p25_1(), _rootProgress);
         StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p25_to_2p25_1(), _rootProgress);
         return result;
     }
@@ -476,7 +484,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.CenterPoint({ 7.5F, -0.00300000003F });
         result.Offset({ 9.375F, -0.00400000019F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p86_to_1p622(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p25_to_1p622_0(), _rootProgress);
         StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p25_to_2p25_2(), _rootProgress);
         return result;
     }
@@ -508,12 +516,8 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Path 1
     CompositionSpriteShape SpriteShape_10()
     {
-        // Offset:<24, 24>
-        const auto result = CreateSpriteShape(_pathGeometry_1, { 1.0F, 0.0F, 0.0F, 1.0F, 24.0F, 24.0F }, _themeColor_Foreground);
-        result.CenterPoint({ 7.5F, -0.00300000003F });
-        result.Offset({ 9.375F, -0.00400000019F });
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p86_to_2p25(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p25_to_2p25_3(), _rootProgress);
+        // Offset:<24, 23.99975>, Scale:<2.25, 2.25>
+        const auto result = CreateSpriteShape(_pathGeometry_1, { 2.25F, 0.0F, 0.0F, 2.25F, 24.0F, 23.9997501F }, _themeColor_Foreground);
         return result;
     }
 
@@ -522,10 +526,8 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Path 1
     CompositionSpriteShape SpriteShape_11()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_2);
-        result.Scale({ 2.25F, 2.25F });
-        result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_6(), _rootProgress);
+        // Offset:<24, 24>, Scale:<2.25, 2.25>
+        const auto result = CreateSpriteShape(_pathGeometry_2, { 2.25F, 0.0F, 0.0F, 2.25F, 24.0F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -550,8 +552,8 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.CenterPoint({ 7.5F, -0.00300000003F });
         result.Offset({ 9.375F, -0.00400000019F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p25_to_1p622(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p25_to_2p25_4(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p25_to_1p622_1(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p25_to_2p25_3(), _rootProgress);
         return result;
     }
 
@@ -563,7 +565,7 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         const auto result = _c.CreateSpriteShape(_pathGeometry_2);
         result.Scale({ 2.25F, 2.25F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_8(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_7(), _rootProgress);
         return result;
     }
 
@@ -582,12 +584,8 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Path 1
     CompositionSpriteShape SpriteShape_16()
     {
-        // Offset:<24, 24>
-        const auto result = CreateSpriteShape(_pathGeometry_1, { 1.0F, 0.0F, 0.0F, 1.0F, 24.0F, 24.0F }, _themeColor_Foreground);
-        result.CenterPoint({ 7.5F, -0.00300000003F });
-        result.Offset({ 9.375F, -0.00400000019F });
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p25_to_1p86(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p25_to_2p25_5(), _rootProgress);
+        // Offset:<24, 23.99975>, Scale:<2.25, 2.25>
+        const auto result = CreateSpriteShape(_pathGeometry_1, { 2.25F, 0.0F, 0.0F, 2.25F, 24.0F, 23.9997501F }, _themeColor_Foreground);
         return result;
     }
 
@@ -596,10 +594,8 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Path 1
     CompositionSpriteShape SpriteShape_17()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_2);
-        result.Scale({ 2.25F, 2.25F });
-        result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_9(), _rootProgress);
+        // Offset:<24, 24>, Scale:<2.25, 2.25>
+        const auto result = CreateSpriteShape(_pathGeometry_2, { 2.25F, 0.0F, 0.0F, 2.25F, 24.0F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -743,16 +739,6 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         return _cubicBezierEasingFunction_4 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.0F }, { 0.0F, 1.0F });
     }
 
-    CubicBezierEasingFunction CubicBezierEasingFunction_5()
-    {
-        return _cubicBezierEasingFunction_5 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.449999988F, 1.0F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_6()
-    {
-        return _cubicBezierEasingFunction_6 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.0F }, { 0.449999988F, 1.0F });
-    }
-
     ExpressionAnimation RootProgress()
     {
         const auto result = _rootProgress = _c.CreateExpressionAnimation(L"_.Progress");
@@ -766,42 +752,21 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
         return result;
     }
 
-    // - - - PreComp layer: Controls - 03 - Back - 04 - PointerOverToPressed 
-    // - - Transforms for Controls - 03 - Back - 04 - PointerOverToPressed  Scale(1,1,0)
-    // - Layer: Round Cap 2
-    // Transforms: Stem 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p86_to_1p622()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.86041999F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, 1.86041999F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.487500012F, 1.62211001F, CubicBezierEasingFunction_3());
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 03 - Back - 03 - PointerOverToNormal
-    // - Transforms for Controls - 03 - Back - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Round Cap 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p86_to_2p25()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.86041999F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, 1.86041999F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, 2.25F, CubicBezierEasingFunction_5());
-        return result;
-    }
-
     // - - - PreComp layer: Controls - 03 - Back - 06 - PressedToPointerOver
     // - - Transforms for Controls - 03 - Back - 06 - PressedToPointerOver Scale(1,1,0)
     // - Layer: Round Cap 2
     // Transforms: Stem 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p622_to_1p86()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p622_to_2p25_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.62211001F, StepThenHoldEasingFunction());
+        // Frame 60.
         result.InsertKeyFrame(0.75F, 1.62211001F, HoldThenStepEasingFunction());
+        // Frame 70.
         result.InsertKeyFrame(0.875F, 2.26947999F, CubicBezierEasingFunction_0());
-        result.InsertKeyFrame(0.987500012F, 1.86041999F, CubicBezierEasingFunction_1());
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, 2.25F, CubicBezierEasingFunction_1());
         return result;
     }
 
@@ -810,23 +775,32 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // - Layer: Round Cap 2
     // Transforms: Stem 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p622_to_2p25()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p622_to_2p25_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.62211001F, _stepThenHoldEasingFunction);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, 1.62211001F, _holdThenStepEasingFunction);
+        // Frame 50.
         result.InsertKeyFrame(0.625F, 2.26947999F, _cubicBezierEasingFunction_0);
+        // Frame 59.
         result.InsertKeyFrame(0.737500012F, 2.25F, _cubicBezierEasingFunction_1);
         return result;
     }
 
-    // - - PreComp layer: Controls - 03 - Back - 01 - NormalToPointerOver
-    // - Transforms for Controls - 03 - Back - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Round Cap 2
+    // - - - PreComp layer: Controls - 03 - Back - 04 - PointerOverToPressed 
+    // - - Transforms for Controls - 03 - Back - 04 - PointerOverToPressed  Scale(1,1,0)
+    // - Layer: Round Cap 2
+    // Transforms: Stem 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p25_to_1p86()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p25_to_1p622_0()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, 1.86041999F, _cubicBezierEasingFunction_5);
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, 2.25F, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.487500012F, 1.62211001F, CubicBezierEasingFunction_3());
         return result;
     }
 
@@ -835,10 +809,13 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // - Layer: Round Cap 2
     // Transforms: Stem 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p25_to_1p622()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p25_to_1p622_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _stepThenHoldEasingFunction);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, 2.25F, _holdThenStepEasingFunction);
+        // Frame 19.
         result.InsertKeyFrame(0.237499997F, 1.62211001F, _cubicBezierEasingFunction_3);
         return result;
     }
@@ -850,9 +827,13 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Scale
     ScalarKeyFrameAnimation ScaleYScalarAnimation_2p25_to_2p25_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _stepThenHoldEasingFunction);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, 2.25F, _holdThenStepEasingFunction);
+        // Frame 70.
         result.InsertKeyFrame(0.875F, 2.25F, _cubicBezierEasingFunction_0);
+        // Frame 79.
         result.InsertKeyFrame(0.987500012F, 2.25F, _cubicBezierEasingFunction_1);
         return result;
     }
@@ -864,9 +845,13 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Scale
     ScalarKeyFrameAnimation ScaleYScalarAnimation_2p25_to_2p25_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _stepThenHoldEasingFunction);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, 2.25F, _holdThenStepEasingFunction);
+        // Frame 50.
         result.InsertKeyFrame(0.625F, 2.25F, _cubicBezierEasingFunction_0);
+        // Frame 59.
         result.InsertKeyFrame(0.737500012F, 2.25F, _cubicBezierEasingFunction_1);
         return result;
     }
@@ -878,60 +863,47 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Scale
     ScalarKeyFrameAnimation ScaleYScalarAnimation_2p25_to_2p25_2()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _stepThenHoldEasingFunction);
+        // Frame 30.
         result.InsertKeyFrame(0.375F, 2.25F, _holdThenStepEasingFunction);
+        // Frame 39.
         result.InsertKeyFrame(0.487500012F, 2.25F, CubicBezierEasingFunction_4());
         return result;
     }
 
-    // - - PreComp layer: Controls - 03 - Back - 03 - PointerOverToNormal
-    // - Transforms for Controls - 03 - Back - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Round Cap 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p25_to_2p25_3()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, 2.25F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, 2.25F, CubicBezierEasingFunction_6());
-        return result;
-    }
-
     // - - - PreComp layer: Controls - 03 - Back - 02 - NormalToPressed
     // - - Transforms for Controls - 03 - Back - 02 - NormalToPressed Scale(1,1,0)
     // - Layer: Round Cap 2
     // Transforms: Stem 2
     // Scale
-    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p25_to_2p25_4()
+    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p25_to_2p25_3()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _stepThenHoldEasingFunction);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, 2.25F, _holdThenStepEasingFunction);
+        // Frame 19.
         result.InsertKeyFrame(0.237499997F, 2.25F, _cubicBezierEasingFunction_4);
         return result;
     }
 
-    // - - PreComp layer: Controls - 03 - Back - 01 - NormalToPointerOver
-    // - Transforms for Controls - 03 - Back - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Round Cap 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p25_to_2p25_5()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.25F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, 2.25F, _cubicBezierEasingFunction_6);
-        return result;
-    }
-
     ScalarKeyFrameAnimation t0ScalarAnimation_0_to_1()
     {
+        // Frame 70.
         const auto result = CreateScalarKeyFrameAnimation(0.87500006F, 0.0F, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
+        // Frame 79.
         result.InsertKeyFrame(0.987499952F, 1.0F, _cubicBezierEasingFunction_1);
         return result;
     }
 
     ScalarKeyFrameAnimation t1ScalarAnimation_0_to_1()
     {
+        // Frame 50.
         const auto result = CreateScalarKeyFrameAnimation(0.62500006F, 0.0F, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
+        // Frame 59.
         result.InsertKeyFrame(0.737499952F, 1.0F, _cubicBezierEasingFunction_1);
         return result;
     }
@@ -1044,11 +1016,16 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_0()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.9379997F, 24.0F }, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, { 24.9379997F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 70.
         result.InsertKeyFrame(0.875F, { 20.25F, 24.0F }, _cubicBezierEasingFunction_0);
-        result.InsertExpressionKeyFrame(0.987499952F, L"(Pow(1-_.t0,3)*Vector2(20.25,24))+(3*Square(1-_.t0)*_.t0*Vector2(20.094,24))+(3*(1-_.t0)*Square(_.t0)*Vector2(23.375,24))+(Pow(_.t0,3)*Vector2(24,24))", _stepThenHoldEasingFunction);
+        // Frame 79.
+        result.InsertExpressionKeyFrame(0.987499952F, L"Pow(1-_.t0,3)*Vector2(20.25,24)+(3*Square(1-_.t0)*_.t0*Vector2(20.094,24))+(3*(1-_.t0)*Square(_.t0)*Vector2(23.375,24))+(Pow(_.t0,3)*Vector2(24,24))", _stepThenHoldEasingFunction);
+        // Frame 79.
         result.InsertKeyFrame(0.987500012F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
         return result;
     }
@@ -1059,10 +1036,14 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_1()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 33.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, { 33.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 70.
         result.InsertKeyFrame(0.875F, { 19.9839993F, 24.0F }, CubicBezierEasingFunction_2());
-        result.InsertKeyFrame(0.987500012F, { 28.9839993F, 24.0F }, _cubicBezierEasingFunction_1);
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -1072,11 +1053,16 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_2()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.9379997F, 24.0F }, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, { 24.9379997F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 50.
         result.InsertKeyFrame(0.625F, { 20.25F, 24.0F }, _cubicBezierEasingFunction_0);
-        result.InsertExpressionKeyFrame(0.737499952F, L"(Pow(1-_.t1,3)*Vector2(20.25,24))+(3*Square(1-_.t1)*_.t1*Vector2(20.094,24))+(3*(1-_.t1)*Square(_.t1)*Vector2(23.375,24))+(Pow(_.t1,3)*Vector2(24,24))", _stepThenHoldEasingFunction);
+        // Frame 59.
+        result.InsertExpressionKeyFrame(0.737499952F, L"Pow(1-_.t1,3)*Vector2(20.25,24)+(3*Square(1-_.t1)*_.t1*Vector2(20.094,24))+(3*(1-_.t1)*Square(_.t1)*Vector2(23.375,24))+(Pow(_.t1,3)*Vector2(24,24))", _stepThenHoldEasingFunction);
+        // Frame 59.
         result.InsertKeyFrame(0.737500012F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
         return result;
     }
@@ -1087,9 +1073,13 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_3()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 33.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, { 33.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 50.
         result.InsertKeyFrame(0.625F, { 19.9839993F, 24.0F }, _cubicBezierEasingFunction_2);
+        // Frame 59.
         result.InsertKeyFrame(0.737500012F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_1);
         return result;
     }
@@ -1100,8 +1090,11 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_4()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 30.
         result.InsertKeyFrame(0.375F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 39.
         result.InsertKeyFrame(0.487500012F, { 24.9379997F, 24.0F }, _cubicBezierEasingFunction_3);
         return result;
     }
@@ -1112,32 +1105,26 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_5()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 28.9839993F, 24.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, { 28.9839993F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 39.
         result.InsertKeyFrame(0.487500012F, { 33.0F, 24.0F }, _cubicBezierEasingFunction_3);
         return result;
     }
 
-    // - - PreComp layer: Controls - 03 - Back - 03 - PointerOverToNormal
-    // - Transforms for Controls - 03 - Back - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Round Cap 2
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_6()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 28.9839993F, 24.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, { 28.9839993F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
     // - - PreComp layer: Controls - 03 - Back - 02 - NormalToPressed
     // - Transforms for Controls - 03 - Back - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Round Cap 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_7()
+    Vector2KeyFrameAnimation OffsetVector2Animation_6()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 19.
         result.InsertKeyFrame(0.237499997F, { 24.9379997F, 24.0F }, _cubicBezierEasingFunction_3);
         return result;
     }
@@ -1146,25 +1133,17 @@ class AnimatedBackVisualSource_AnimatedVisual : public winrt::implements<Animate
     // - Transforms for Controls - 03 - Back - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Round Cap 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_8()
+    Vector2KeyFrameAnimation OffsetVector2Animation_7()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 19.
         result.InsertKeyFrame(0.237499997F, { 33.0F, 24.0F }, _cubicBezierEasingFunction_3);
         return result;
     }
 
-    // - - PreComp layer: Controls - 03 - Back - 01 - NormalToPointerOver
-    // - Transforms for Controls - 03 - Back - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Round Cap 2
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_9()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, { 28.9839993F, 24.0F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
     static IGeometrySource2D CanvasGeometryToIGeometrySource2D(winrt::com_ptr<CanvasGeometry> geo)
     {
         return geo.as<IGeometrySource2D>();
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.h
index cad3cffe9b..e2c16d5453 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.h
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.h
@@ -4,13 +4,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedBackVisualSource.json
 //       
 //       Input file:
-//           AnimatedBackVisualSource.json (27247 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedBackVisualSource.json (21751 bytes created 9:25-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -47,6 +47,7 @@
 // |________________|____________|_______|_________________|
 // | Foreground     | Foreground | Color | #FF000000 Black |
 // ---------------------------------------------------------
+
 class AnimatedBackVisualSource
     : public winrt::implementation::AnimatedBackVisualSourceT<AnimatedBackVisualSource>
 {
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.idl
index 5350c609fc..a66060e201 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.idl
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedBackVisualSource.idl
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedBackVisualSource.json
 //       
 //       Input file:
-//           AnimatedBackVisualSource.json (27247 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedBackVisualSource.json (21751 bytes created 9:25-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp
index e69ee9eea5..7a906dff67 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.cpp
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronDownSmallVisualSource.json (9548 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronDownSmallVisualSource.json (9531 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -21,11 +21,11 @@
 // ____________________________________
 // |       Object stats       | Count |
 // |__________________________|_______|
-// | All CompositionObjects   |   109 |
+// | All CompositionObjects   |    99 |
 // |--------------------------+-------|
-// | Expression animators     |    13 |
-// | KeyFrame animators       |    12 |
-// | Reference parameters     |    13 |
+// | Expression animators     |    11 |
+// | KeyFrame animators       |    10 |
+// | Reference parameters     |    11 |
 // | Expression operations    |     4 |
 // |--------------------------+-------|
 // | Animated brushes         |     1 |
@@ -164,9 +164,18 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
         return result;
     }
 
+    CompositionSpriteShape CreateSpriteShape(CompositionGeometry geometry, winrt::float3x2 transformMatrix, CompositionBrush fillBrush)
+    {
+        const auto result = _c.CreateSpriteShape(geometry);
+        result.TransformMatrix(transformMatrix);
+        result.FillBrush(fillBrush);
+        return result;
+    }
+
     // PreComp layer: Controls - 06 - Dropdown - 06 - PressedToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_0()
     {
+        // Frame 60.
         const auto result = CreateBooleanKeyFrameAnimation(0.75F, true);
         return result;
     }
@@ -174,7 +183,9 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // PreComp layer: Controls - 06 - Dropdown - 05 - PressedToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_1()
     {
+        // Frame 40.
         const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, false);
         return result;
     }
@@ -182,7 +193,9 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // PreComp layer: Controls - 06 - Dropdown - 04 - PointerOverToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_2()
     {
+        // Frame 30.
         const auto result = CreateBooleanKeyFrameAnimation(0.375F, true);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, false);
         return result;
     }
@@ -190,7 +203,9 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // PreComp layer: Controls - 06 - Dropdown - 03 - PointerOverToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_3()
     {
+        // Frame 20.
         const auto result = CreateBooleanKeyFrameAnimation(0.25F, true);
+        // Frame 30.
         result.InsertKeyFrame(0.375F, false);
         return result;
     }
@@ -198,7 +213,9 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // PreComp layer: Controls - 06 - Dropdown - 02 - NormalToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_4()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, true);
+        // Frame 20.
         result.InsertKeyFrame(0.25F, false);
         return result;
     }
@@ -206,6 +223,7 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_5()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, false);
         return result;
     }
@@ -237,7 +255,7 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     CompositionColorBrush ThemeColor_Foreground()
     {
         const auto result = _themeColor_Foreground = _c.CreateColorBrush();
-        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W*1,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
+        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
         return result;
     }
 
@@ -287,10 +305,8 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // Path 1
     CompositionSpriteShape SpriteShape_3()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.Scale({ 4.0F, 4.0F });
-        result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_3(), _rootProgress);
+        // Offset:<24, 24>, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 4.0F, 0.0F, 0.0F, 4.0F, 24.0F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -302,7 +318,7 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
         const auto result = _c.CreateSpriteShape(_pathGeometry);
         result.Scale({ 4.0F, 4.0F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_4(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_3(), _rootProgress);
         return result;
     }
 
@@ -311,10 +327,8 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // Path 1
     CompositionSpriteShape SpriteShape_5()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.Scale({ 4.0F, 4.0F });
-        result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_5(), _rootProgress);
+        // Offset:<24, 24>, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 4.0F, 0.0F, 0.0F, 4.0F, 24.0F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -431,17 +445,17 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
 
     CubicBezierEasingFunction CubicBezierEasingFunction_0()
     {
-        return _cubicBezierEasingFunction_0 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.75F, 1.0F });
+        return _cubicBezierEasingFunction_0 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.0F, 1.0F });
     }
 
     CubicBezierEasingFunction CubicBezierEasingFunction_1()
     {
-        return _cubicBezierEasingFunction_1 = _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F });
+        return _cubicBezierEasingFunction_1 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.75F, 1.0F });
     }
 
     CubicBezierEasingFunction CubicBezierEasingFunction_2()
     {
-        return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.0F, 1.0F });
+        return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F });
     }
 
     ExpressionAnimation RootProgress()
@@ -496,7 +510,7 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Group 1
+        // Scale:4,4, Offset:<24, 24>
         result.Shapes().Append(SpriteShape_3());
         return result;
     }
@@ -518,7 +532,7 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Group 1
+        // Scale:4,4, Offset:<24, 24>
         result.Shapes().Append(SpriteShape_5());
         return result;
     }
@@ -543,10 +557,16 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_0()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 32.0F }, StepThenHoldEasingFunction());
-        result.InsertKeyFrame(0.75F, { 24.0F, 32.0F }, HoldThenStepEasingFunction());
-        result.InsertKeyFrame(0.8125F, { 24.0F, 34.0F }, CubicBezierEasingFunction_0());
-        result.InsertKeyFrame(0.987500012F, { 24.0F, 28.0F }, CubicBezierEasingFunction_1());
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, StepThenHoldEasingFunction());
+        // Frame 50.
+        result.InsertKeyFrame(0.625F, { 24.0F, 24.0F }, HoldThenStepEasingFunction());
+        // Frame 60.
+        result.InsertKeyFrame(0.75F, { 24.0F, 22.0F }, CubicBezierEasingFunction_0());
+        // Frame 70.
+        result.InsertKeyFrame(0.875F, { 24.0F, 31.5F }, CubicBezierEasingFunction_1());
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, { 24.0F, 24.0F }, CubicBezierEasingFunction_2());
         return result;
     }
 
@@ -556,10 +576,16 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_1()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 32.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.5F, { 24.0F, 32.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.5625F, { 24.0F, 34.0F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.737500012F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_1);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.5F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0);
+        // Frame 50.
+        result.InsertKeyFrame(0.625F, { 24.0F, 31.5F }, _cubicBezierEasingFunction_1);
+        // Frame 59.
+        result.InsertKeyFrame(0.737500012F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -569,21 +595,12 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_2()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 28.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, { 24.0F, 28.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.487500012F, { 24.0F, 32.0F }, CubicBezierEasingFunction_2());
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 06 - Dropdown - 03 - PointerOverToNormal
-    // - Transforms for Controls - 06 - Dropdown - 03 - PointerOverToNormal Scale(1,1,0)
-    // ShapeGroup: Group 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_3()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 28.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, { 24.0F, 28.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.487500012F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -591,22 +608,14 @@ class AnimatedChevronDownSmallVisualSource_AnimatedVisual : public winrt::implem
     // - Transforms for Controls - 06 - Dropdown - 02 - NormalToPressed Scale(1,1,0)
     // ShapeGroup: Group 1
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_4()
+    Vector2KeyFrameAnimation OffsetVector2Animation_3()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.237499997F, { 24.0F, 32.0F }, _cubicBezierEasingFunction_2);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 06 - Dropdown - 01 - NormalToPointerOver
-    // - Transforms for Controls - 06 - Dropdown - 01 - NormalToPointerOver Scale(1,1,0)
-    // ShapeGroup: Group 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_5()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, { 24.0F, 28.0F }, _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.449999988F, 1.0F }));
+        // Frame 19.
+        result.InsertKeyFrame(0.237499997F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h
index 1023166616..34eb50940c 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.h
@@ -4,13 +4,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronDownSmallVisualSource.json (9548 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronDownSmallVisualSource.json (9531 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -48,7 +48,7 @@
 // | Foreground     | Foreground | Color |   #FF060808   |
 // -------------------------------------------------------
 class AnimatedChevronDownSmallVisualSource
-    : public  winrt::implementation::AnimatedChevronDownSmallVisualSourceT<AnimatedChevronDownSmallVisualSource>
+    : public winrt::implementation::AnimatedChevronDownSmallVisualSourceT<AnimatedChevronDownSmallVisualSource>
 {
     winrt::Windows::UI::Composition::CompositionPropertySet _themeProperties{ nullptr };
     winrt::Windows::UI::Color _themeForeground{ 0xFF, 0x06, 0x08, 0x08 };
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl
index 63fc5ff68e..1561bbea4c 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronDownSmallVisualSource.idl
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronDownSmallVisualSource.json (9548 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronDownSmallVisualSource.json (9531 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.cpp
index ef59a88304..587b2f68b5 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.cpp
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.cpp
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronRightDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronRightDownSmallVisualSource.json (34813 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronRightDownSmallVisualSource.json (27906 bytes created 12:28-08:00 Feb 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -21,11 +21,11 @@
 // ____________________________________
 // |       Object stats       | Count |
 // |__________________________|_______|
-// | All CompositionObjects   |   337 |
+// | All CompositionObjects   |   279 |
 // |--------------------------+-------|
-// | Expression animators     |    43 |
-// | KeyFrame animators       |    42 |
-// | Reference parameters     |    43 |
+// | Expression animators     |    32 |
+// | KeyFrame animators       |    31 |
+// | Reference parameters     |    32 |
 // | Expression operations    |     4 |
 // |--------------------------+-------|
 // | Animated brushes         |     1 |
@@ -36,7 +36,7 @@
 // | ContainerVisuals         |    19 |
 // | ShapeVisuals             |    18 |
 // |--------------------------+-------|
-// | ContainerShapes          |    16 |
+// | ContainerShapes          |    12 |
 // | CompositionSpriteShapes  |    18 |
 // |--------------------------+-------|
 // | Brushes                  |     1 |
@@ -100,7 +100,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
         IClosable>
 {
     winrt::com_ptr<ID2D1Factory> _d2dFactory{ nullptr };
-    static constexpr int64_t c_durationTicks{ 40000000L };
+    static constexpr int64_t c_durationTicks{ 36666666L };
     Compositor const _c{ nullptr };
     ExpressionAnimation const _reusableExpressionAnimation{ nullptr };
     CompositionPropertySet const _themeProperties{ nullptr };
@@ -110,9 +110,6 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     CubicBezierEasingFunction _cubicBezierEasingFunction_0{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_1{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_2{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_3{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_4{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_5{ nullptr };
     ExpressionAnimation _rootProgress{ nullptr };
     InsetClip _insetClip_0{ nullptr };
     StepEasingFunction _holdThenStepEasingFunction{ nullptr };
@@ -178,142 +175,176 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // PreComp layer: Controls - 08 - TreeViewExpand - 18 - PressedOffToNormalOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_00()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.916666687F, true);
+        // Frame 200.
+        const auto result = CreateBooleanKeyFrameAnimation(0.909090936F, true);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 17 - PressedOffToPointerOverOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_01()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.833333313F, true);
-        result.InsertKeyFrame(0.916666687F, false);
+        // Frame 180.
+        const auto result = CreateBooleanKeyFrameAnimation(0.818181813F, true);
+        // Frame 200.
+        result.InsertKeyFrame(0.909090936F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 16 - PressedOffToPressedOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_02()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.791666687F, true);
-        result.InsertKeyFrame(0.833333313F, false);
+        // Frame 170.
+        const auto result = CreateBooleanKeyFrameAnimation(0.772727251F, true);
+        // Frame 180.
+        result.InsertKeyFrame(0.818181813F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_03()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.708333313F, true);
-        result.InsertKeyFrame(0.791666687F, false);
+        // Frame 160.
+        const auto result = CreateBooleanKeyFrameAnimation(0.727272749F, true);
+        // Frame 170.
+        result.InsertKeyFrame(0.772727251F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_04()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.625F, true);
-        result.InsertKeyFrame(0.708333313F, false);
+        // Frame 150.
+        const auto result = CreateBooleanKeyFrameAnimation(0.681818187F, true);
+        // Frame 160.
+        result.InsertKeyFrame(0.727272749F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 13 - PressedOnToPressedOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_05()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.583333313F, true);
-        result.InsertKeyFrame(0.625F, false);
+        // Frame 140.
+        const auto result = CreateBooleanKeyFrameAnimation(0.636363626F, true);
+        // Frame 150.
+        result.InsertKeyFrame(0.681818187F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 12 - PointerOverOffToPressedOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_06()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.541666687F, true);
-        result.InsertKeyFrame(0.583333313F, false);
+        // Frame 130.
+        const auto result = CreateBooleanKeyFrameAnimation(0.590909064F, true);
+        // Frame 140.
+        result.InsertKeyFrame(0.636363626F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_07()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
-        result.InsertKeyFrame(0.541666687F, false);
+        // Frame 120.
+        const auto result = CreateBooleanKeyFrameAnimation(0.545454562F, true);
+        // Frame 130.
+        result.InsertKeyFrame(0.590909064F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 10 - PointerOverOffToPointerOverOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_08()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.458333343F, true);
-        result.InsertKeyFrame(0.5F, false);
+        // Frame 110.
+        const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
+        // Frame 120.
+        result.InsertKeyFrame(0.545454562F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 09 - PointerOverOnToPressedOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_09()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.416666657F, true);
-        result.InsertKeyFrame(0.458333343F, false);
+        // Frame 100.
+        const auto result = CreateBooleanKeyFrameAnimation(0.454545468F, true);
+        // Frame 110.
+        result.InsertKeyFrame(0.5F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_10()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.375F, true);
-        result.InsertKeyFrame(0.416666657F, false);
+        // Frame 90.
+        const auto result = CreateBooleanKeyFrameAnimation(0.409090906F, true);
+        // Frame 100.
+        result.InsertKeyFrame(0.454545468F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 07 - PointerOverOnToPointerOverOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_11()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.333333343F, true);
-        result.InsertKeyFrame(0.375F, false);
+        // Frame 80.
+        const auto result = CreateBooleanKeyFrameAnimation(0.363636374F, true);
+        // Frame 90.
+        result.InsertKeyFrame(0.409090906F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_12()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.291666657F, true);
-        result.InsertKeyFrame(0.333333343F, false);
+        // Frame 70.
+        const auto result = CreateBooleanKeyFrameAnimation(0.318181813F, true);
+        // Frame 80.
+        result.InsertKeyFrame(0.363636374F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_13()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.25F, true);
-        result.InsertKeyFrame(0.291666657F, false);
+        // Frame 60.
+        const auto result = CreateBooleanKeyFrameAnimation(0.272727281F, true);
+        // Frame 70.
+        result.InsertKeyFrame(0.318181813F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_14()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.166666672F, true);
-        result.InsertKeyFrame(0.25F, false);
+        // Frame 30.
+        const auto result = CreateBooleanKeyFrameAnimation(0.13636364F, true);
+        // Frame 60.
+        result.InsertKeyFrame(0.272727281F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_15()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.125F, true);
-        result.InsertKeyFrame(0.166666672F, false);
+        // Frame 20.
+        const auto result = CreateBooleanKeyFrameAnimation(0.0909090936F, true);
+        // Frame 30.
+        result.InsertKeyFrame(0.13636364F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_16()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.0833333358F, true);
-        result.InsertKeyFrame(0.125F, false);
+        // Frame 10.
+        const auto result = CreateBooleanKeyFrameAnimation(0.0454545468F, true);
+        // Frame 20.
+        result.InsertKeyFrame(0.0909090936F, false);
         return result;
     }
 
     // PreComp layer: Controls - 08 - TreeViewExpand - 01 - NormalOnToNormalOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_17()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.0833333358F, false);
+        // Frame 10.
+        const auto result = CreateBooleanKeyFrameAnimation(0.0454545468F, false);
         return result;
     }
 
@@ -344,7 +375,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     CompositionColorBrush ThemeColor_Foreground()
     {
         const auto result = _themeColor_Foreground = _c.CreateColorBrush();
-        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W*1,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
+        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
         return result;
     }
 
@@ -354,11 +385,11 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     CompositionContainerShape ContainerShape_00()
     {
         const auto result = _c.CreateContainerShape();
+        result.RotationAngleInDegrees(90.0F);
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_00());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_0(), RootProgress());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_00(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_0(), RootProgress());
         return result;
     }
 
@@ -368,11 +399,11 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     CompositionContainerShape ContainerShape_01()
     {
         const auto result = _c.CreateContainerShape();
+        result.RotationAngleInDegrees(90.0F);
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_01());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_0(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_01(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_1(), _rootProgress);
         return result;
     }
 
@@ -382,79 +413,39 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     CompositionContainerShape ContainerShape_02()
     {
         const auto result = _c.CreateContainerShape();
-        result.Offset({ 24.1709995F, 23.9230003F });
+        result.Offset({ 24.0F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_02());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_1(), _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
-    // Transforms for Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
-    // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_03()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.Scale({ 4.0F, 4.0F });
-        // ShapeGroup: Group 1 RotationDegrees:270
-        result.Shapes().Append(SpriteShape_03());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_1(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_02(), _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
-    // Transforms for Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
-    // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_04()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.Scale({ 4.0F, 4.0F });
-        // ShapeGroup: Group 1 RotationDegrees:270
-        result.Shapes().Append(SpriteShape_04());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_2(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_03(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_0(), _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 08 - TreeViewExpand - 13 - PressedOnToPressedOff
     // Transforms for Controls - 08 - TreeViewExpand - 13 - PressedOnToPressedOff
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_05()
+    CompositionContainerShape ContainerShape_03()
     {
         const auto result = _c.CreateContainerShape();
-        result.Offset({ 24.1709995F, 23.9230003F });
+        result.Offset({ 24.0F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_05());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_3(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_0(), _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 08 - TreeViewExpand - 12 - PointerOverOffToPressedOff
     // Transforms for Controls - 08 - TreeViewExpand - 12 - PointerOverOffToPressedOff
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_06()
+    CompositionContainerShape ContainerShape_04()
     {
         const auto result = _c.CreateContainerShape();
+        result.Offset({ 24.1709995F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_06());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_04(), _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
-    // Transforms for Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
-    // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_07()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.Scale({ 4.0F, 4.0F });
-        // ShapeGroup: Group 1 RotationDegrees:270
-        result.Shapes().Append(SpriteShape_07());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_05(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_1(), _rootProgress);
         return result;
     }
 
@@ -462,42 +453,28 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // PointerOverOffToPointerOverOn
     // Transforms for Controls - 08 - TreeViewExpand - 10 - PointerOverOffToPointerOverOn
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_08()
+    CompositionContainerShape ContainerShape_05()
     {
         const auto result = _c.CreateContainerShape();
+        result.Offset({ 24.0F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_08());
         StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_2(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_06(), _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 08 - TreeViewExpand - 09 - PointerOverOnToPressedOn
     // Transforms for Controls - 08 - TreeViewExpand - 09 - PointerOverOnToPressedOn
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_09()
+    CompositionContainerShape ContainerShape_06()
     {
         const auto result = _c.CreateContainerShape();
-        result.RotationAngleInDegrees(90.0F);
+        result.Offset({ 24.1709995F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_09());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_07(), _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
-    // Transforms for Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
-    // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_10()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.RotationAngleInDegrees(90.0F);
-        result.Scale({ 4.0F, 4.0F });
-        // ShapeGroup: Group 1 RotationDegrees:270
-        result.Shapes().Append(SpriteShape_10());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_08(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_1(), _rootProgress);
         return result;
     }
 
@@ -505,69 +482,70 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // PointerOverOnToPointerOverOff
     // Transforms for Controls - 08 - TreeViewExpand - 07 - PointerOverOnToPointerOverOff
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_11()
+    CompositionContainerShape ContainerShape_07()
     {
         const auto result = _c.CreateContainerShape();
+        result.Offset({ 24.0F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_11());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_4(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_09(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_2(), _rootProgress);
         return result;
     }
 
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
-    // Transforms for Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
+    // Transforms for Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_12()
+    CompositionContainerShape ContainerShape_08()
     {
         const auto result = _c.CreateContainerShape();
+        result.Offset({ 24.1709995F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
-        result.Shapes().Append(SpriteShape_13());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_10(), _rootProgress);
+        result.Shapes().Append(SpriteShape_12());
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_3(), _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
     // Transforms for Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_13()
+    CompositionContainerShape ContainerShape_09()
     {
         const auto result = _c.CreateContainerShape();
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_14());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_3(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_11(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_90_4(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_2(), _rootProgress);
         return result;
     }
 
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
-    // Transforms for Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
+    // Transforms for Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_14()
+    CompositionContainerShape ContainerShape_10()
     {
         const auto result = _c.CreateContainerShape();
-        result.RotationAngleInDegrees(90.0F);
+        result.Offset({ 24.1709995F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
-        result.Shapes().Append(SpriteShape_16());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_12(), _rootProgress);
+        result.Shapes().Append(SpriteShape_15());
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_3(), _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 08 - TreeViewExpand - 01 - NormalOnToNormalOff
     // Transforms for Controls - 08 - TreeViewExpand - 01 - NormalOnToNormalOff
     // Scale(1,1,0)
-    CompositionContainerShape ContainerShape_15()
+    CompositionContainerShape ContainerShape_11()
     {
         const auto result = _c.CreateContainerShape();
+        result.Offset({ 24.0F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         // ShapeGroup: Group 1 RotationDegrees:270
         result.Shapes().Append(SpriteShape_17());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_5(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_13(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_90_to_0_4(), _rootProgress);
         return result;
     }
 
@@ -609,25 +587,25 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
+    // Transforms for Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_03()
     {
-        // Rotation:-90 degrees
-        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
+        // Offset:<24, 24>, Rotation:-90 degrees, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -4.0F, 4.0F, 0.0F, 24.0F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
+    // Transforms for Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_04()
     {
-        // Rotation:-90 degrees
-        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
+        // Offset:<24, 24>, Rotation:-90 degrees, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -4.0F, 4.0F, 0.0F, 24.0F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -653,14 +631,14 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
+    // Transforms for Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_07()
     {
-        // Rotation:-90 degrees
-        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
+        // Offset:<24.171, 24>, Rotation:-90 degrees, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -4.0F, 4.0F, 0.0F, 24.1709995F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -687,14 +665,14 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
+    // Transforms for Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_10()
     {
-        // Rotation:-90 degrees
-        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
+        // Offset:<24.171, 24>, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 4.0F, 0.0F, 0.0F, 4.0F, 24.1709995F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -710,25 +688,25 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
         return result;
     }
 
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
-    // Transforms for Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
+    // - Transforms for Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_12()
     {
-        // Offset:<24.171, 23.923>, Rotation:-90 degrees, Scale:<4, 4>
-        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -4.0F, 4.0F, 0.0F, 24.1709995F, 23.9230003F }, _themeColor_Foreground);
+        // Rotation:-90 degrees
+        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
+    // Transforms for Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_13()
     {
-        // Rotation:-90 degrees
-        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
+        // Offset:<24.171, 24>, Rotation:-90 degrees, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -4.0F, 4.0F, 0.0F, 24.1709995F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -743,25 +721,25 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
         return result;
     }
 
-    // - PreComp layer: Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
-    // Transforms for Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
+    // - Transforms for Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_15()
     {
-        // Offset:<24.171, 23.923>, Scale:<4, 4>
-        const auto result = CreateSpriteShape(_pathGeometry, { 4.0F, 0.0F, 0.0F, 4.0F, 24.1709995F, 23.9230003F }, _themeColor_Foreground);
+        // Rotation:-90 degrees
+        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
+    // - PreComp layer: Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
+    // Transforms for Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
     // Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_16()
     {
-        // Rotation:-90 degrees
-        const auto result = CreateSpriteShape(_pathGeometry, { 0.0F, -1.0F, 1.0F, 0.0F, 0.0F, 0.0F }, _themeColor_Foreground);
+        // Offset:<24.171, 24>, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 4.0F, 0.0F, 0.0F, 4.0F, 24.1709995F, 24.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1111,32 +1089,17 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
 
     CubicBezierEasingFunction CubicBezierEasingFunction_0()
     {
-        return _cubicBezierEasingFunction_0 = _c.CreateCubicBezierEasingFunction({ 0.25F, 0.0F }, { 0.0F, 1.0F });
+        return _cubicBezierEasingFunction_0 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.75F, 1.0F });
     }
 
     CubicBezierEasingFunction CubicBezierEasingFunction_1()
     {
-        return _cubicBezierEasingFunction_1 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.150000006F, 1.0F });
+        return _cubicBezierEasingFunction_1 = _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F });
     }
 
     CubicBezierEasingFunction CubicBezierEasingFunction_2()
     {
-        return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.0F, 1.0F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_3()
-    {
-        return _cubicBezierEasingFunction_3 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.75F, 1.0F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_4()
-    {
-        return _cubicBezierEasingFunction_4 = _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_5()
-    {
-        return _cubicBezierEasingFunction_5 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.0F, 1.0F });
+        return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.0F, 1.0F });
     }
 
     ExpressionAnimation RootProgress()
@@ -1152,27 +1115,33 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 17 - PressedOffToPointerOverOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 17 - PressedOffToPointerOverOn
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 13 - PressedOnToPressedOff
+    // - Transforms for Controls - 08 - TreeViewExpand - 13 - PressedOnToPressedOff
     // Scale(1,1,0)
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_90_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.833333313F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.875F, 90.0F, CubicBezierEasingFunction_2());
+        // Frame 140.
+        result.InsertKeyFrame(0.636363626F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 149.
+        result.InsertKeyFrame(0.677272737F, 90.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 16 - PressedOffToPressedOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 16 - PressedOffToPressedOn
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 12 - PointerOverOffToPressedOff
+    // - Transforms for Controls - 08 - TreeViewExpand - 12 - PointerOverOffToPressedOff
     // Scale(1,1,0)
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_90_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.791666687F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.829166651F, 90.0F, CubicBezierEasingFunction_5());
+        // Frame 130.
+        result.InsertKeyFrame(0.590909064F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 139.
+        result.InsertKeyFrame(0.631818175F, 90.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1183,82 +1152,103 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_90_2()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.458333343F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.495833337F, 90.0F, _cubicBezierEasingFunction_5);
+        // Frame 110.
+        result.InsertKeyFrame(0.5F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 119.
+        result.InsertKeyFrame(0.540909111F, 90.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
+    // - Transforms for Controls - 08 - TreeViewExpand - 06 - NormalOffToPressedOff
     // Scale(1,1,0)
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_90_3()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.166666672F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.208333328F, 90.0F, _cubicBezierEasingFunction_2);
+        // Frame 70.
+        result.InsertKeyFrame(0.318181813F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 79.
+        result.InsertKeyFrame(0.359090894F, 90.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 18 - PressedOffToNormalOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 18 - PressedOffToNormalOn
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
+    // - Transforms for Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
     // Scale(1,1,0)
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_0()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_90_4()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 90.0F, StepThenHoldEasingFunction());
-        result.InsertKeyFrame(0.958333313F, 90.0F, HoldThenStepEasingFunction());
-        result.InsertKeyFrame(0.995833337F, 0.0F, CubicBezierEasingFunction_0());
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.13636364F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.181818187F, 90.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 16 - PressedOffToPressedOn
+    // - Transforms for Controls - 08 - TreeViewExpand - 16 - PressedOffToPressedOn
     // Scale(1,1,0)
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_1()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 90.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.75F, 90.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.787500024F, 0.0F, _cubicBezierEasingFunction_0);
+        // Frame 170.
+        result.InsertKeyFrame(0.772727251F, 90.0F, _holdThenStepEasingFunction);
+        // Frame 179.
+        result.InsertKeyFrame(0.813636363F, 0.0F, CubicBezierEasingFunction_2());
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 09 - PointerOverOnToPressedOn
+    // - Transforms for Controls - 08 - TreeViewExpand - 09 - PointerOverOnToPressedOn
     // Scale(1,1,0)
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_2()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 90.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.666666687F, 90.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.704166651F, 0.0F, _cubicBezierEasingFunction_0);
+        // Frame 100.
+        result.InsertKeyFrame(0.454545468F, 90.0F, _holdThenStepEasingFunction);
+        // Frame 109.
+        result.InsertKeyFrame(0.49545455F, 0.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 13 - PressedOnToPressedOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 13 - PressedOnToPressedOff
-    // Scale(1,1,0)
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 07 -
+    // PointerOverOnToPointerOverOff
+    // - Transforms for Controls - 08 - TreeViewExpand - 07 -
+    // PointerOverOnToPointerOverOff Scale(1,1,0)
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_3()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_2()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 90.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.583333313F, 90.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.620833337F, 0.0F, _cubicBezierEasingFunction_5);
+        // Frame 80.
+        result.InsertKeyFrame(0.363636374F, 90.0F, _holdThenStepEasingFunction);
+        // Frame 89.
+        result.InsertKeyFrame(0.404545456F, 0.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 07 -
-    // PointerOverOnToPointerOverOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 07 -
-    // PointerOverOnToPointerOverOff Scale(1,1,0)
+    // - - PreComp layer: Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
+    // - Transforms for Controls - 08 - TreeViewExpand - 03 - NormalOnToPressedOn
+    // Scale(1,1,0)
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_4()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_3()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 90.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.333333343F, 90.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.370833337F, 0.0F, _cubicBezierEasingFunction_5);
+        // Frame 20.
+        result.InsertKeyFrame(0.0909090936F, 90.0F, _holdThenStepEasingFunction);
+        // Frame 29.
+        result.InsertKeyFrame(0.131818175F, 0.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1266,11 +1256,12 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // - Transforms for Controls - 08 - TreeViewExpand - 01 - NormalOnToNormalOff
     // Scale(1,1,0)
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_5()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_90_to_0_4()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 90.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.0416666679F, 90.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.0791666657F, 0.0F, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 90.0F, _holdThenStepEasingFunction);
+        // Frame 9.
+        result.InsertKeyFrame(0.0409090891F, 0.0F, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1310,7 +1301,8 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_03());
+        // Scale:4,4, Offset:<24, 24>
+        result.Shapes().Append(SpriteShape_03());
         return result;
     }
 
@@ -1320,7 +1312,8 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_04());
+        // Scale:4,4, Offset:<24, 24>
+        result.Shapes().Append(SpriteShape_04());
         return result;
     }
 
@@ -1330,7 +1323,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_05());
+        result.Shapes().Append(ContainerShape_03());
         return result;
     }
 
@@ -1340,7 +1333,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_06());
+        result.Shapes().Append(ContainerShape_04());
         return result;
     }
 
@@ -1350,7 +1343,8 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_07());
+        // Scale:4,4, Offset:<24.171, 24>
+        result.Shapes().Append(SpriteShape_07());
         return result;
     }
 
@@ -1360,7 +1354,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_08());
+        result.Shapes().Append(ContainerShape_05());
         return result;
     }
 
@@ -1370,7 +1364,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_09());
+        result.Shapes().Append(ContainerShape_06());
         return result;
     }
 
@@ -1380,7 +1374,8 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_10());
+        // Scale:4,4, RotationDegrees:90, Offset:<24.171, 24>
+        result.Shapes().Append(SpriteShape_10());
         return result;
     }
 
@@ -1390,7 +1385,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_11());
+        result.Shapes().Append(ContainerShape_07());
         return result;
     }
 
@@ -1400,8 +1395,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // Scale:4,4, Offset:<24.171, 23.923>
-        result.Shapes().Append(SpriteShape_12());
+        result.Shapes().Append(ContainerShape_08());
         return result;
     }
 
@@ -1411,7 +1405,8 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_12());
+        // Scale:4,4, Offset:<24.171, 24>
+        result.Shapes().Append(SpriteShape_13());
         return result;
     }
 
@@ -1421,7 +1416,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_13());
+        result.Shapes().Append(ContainerShape_09());
         return result;
     }
 
@@ -1431,8 +1426,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // Scale:4,4, RotationDegrees:90, Offset:<24.171, 23.923>
-        result.Shapes().Append(SpriteShape_15());
+        result.Shapes().Append(ContainerShape_10());
         return result;
     }
 
@@ -1442,7 +1436,8 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_14());
+        // Scale:4,4, RotationDegrees:90, Offset:<24.171, 24>
+        result.Shapes().Append(SpriteShape_16());
         return result;
     }
 
@@ -1452,7 +1447,7 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        result.Shapes().Append(ContainerShape_15());
+        result.Shapes().Append(ContainerShape_11());
         return result;
     }
 
@@ -1474,12 +1469,16 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // - Transforms for Controls - 08 - TreeViewExpand - 18 - PressedOffToNormalOn
     // Scale(1,1,0)
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_00()
+    Vector2KeyFrameAnimation OffsetVector2Animation_0()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.916666687F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.958333313F, { 24.1709995F, 36.4230003F }, CubicBezierEasingFunction_1());
-        result.InsertKeyFrame(0.995833337F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, StepThenHoldEasingFunction());
+        // Frame 200.
+        result.InsertKeyFrame(0.909090936F, { 24.0F, 24.0F }, HoldThenStepEasingFunction());
+        // Frame 205.
+        result.InsertKeyFrame(0.931818187F, { 24.0F, 30.0F }, CubicBezierEasingFunction_0());
+        // Frame 219.
+        result.InsertKeyFrame(0.99545455F, { 24.0F, 24.0F }, CubicBezierEasingFunction_1());
         return result;
     }
 
@@ -1487,124 +1486,16 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // - Transforms for Controls - 08 - TreeViewExpand - 17 - PressedOffToPointerOverOn
     // Scale(1,1,0)
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_01()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.833333313F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.875F, { 24.1709995F, 32.6730003F }, CubicBezierEasingFunction_3());
-        result.InsertKeyFrame(0.912500024F, { 24.1709995F, 31.4230003F }, CubicBezierEasingFunction_4());
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 15 - PressedOnToNormalOff
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_02()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.708333313F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.75F, { 24.1709995F, 36.4230003F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.787500024F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_0);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 14 - PressedOnToPointerOverOff
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_03()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.625F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.666666687F, { 24.1709995F, 36.4230003F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.704166651F, { 34.1710014F, 23.9230003F }, _cubicBezierEasingFunction_0);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 12 - PointerOverOffToPressedOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 12 - PointerOverOffToPressedOff
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_04()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 34.1710014F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.541666687F, { 34.1710014F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.579166651F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 11 - PointerOverOffToNormalOff
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_05()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 34.1710014F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.5F, { 34.1710014F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.537500024F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 10 -
-    // PointerOverOffToPointerOverOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 10 -
-    // PointerOverOffToPointerOverOn Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_06()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 34.1710014F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.458333343F, { 34.1710014F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.495833337F, { 24.1709995F, 31.4230003F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 09 - PointerOverOnToPressedOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 09 - PointerOverOnToPressedOn
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_07()
+    Vector2KeyFrameAnimation OffsetVector2Animation_1()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 31.4230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.416666657F, { 24.1709995F, 31.4230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.454166681F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 08 - PointerOverOnToNormalOn
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_08()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 31.4230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, { 24.1709995F, 31.4230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.412499994F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 07 -
-    // PointerOverOnToPointerOverOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 07 -
-    // PointerOverOnToPointerOverOff Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_09()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 31.4230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.333333343F, { 24.1709995F, 31.4230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.370833337F, { 34.1710014F, 23.9230003F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 05 -NormalOffToPointerOverOff
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_10()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.287499994F, { 34.1710014F, 23.9230003F }, _cubicBezierEasingFunction_5);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 180.
+        result.InsertKeyFrame(0.818181813F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 185.
+        result.InsertKeyFrame(0.840909064F, { 24.0F, 30.0F }, _cubicBezierEasingFunction_0);
+        // Frame 199.
+        result.InsertKeyFrame(0.904545426F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -1612,36 +1503,16 @@ class AnimatedChevronRightDownSmallVisualSource_AnimatedVisual : public winrt::i
     // - Transforms for Controls - 08 - TreeViewExpand - 04 - NormalOffToNormalOn
     // Scale(1,1,0)
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_11()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.166666672F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.208333328F, { 24.1709995F, 32.6730003F }, _cubicBezierEasingFunction_3);
-        result.InsertKeyFrame(0.245833337F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_4);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
-    // - Transforms for Controls - 08 - TreeViewExpand - 02 - NormalOnToPointerOverOn
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_12()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.0833333358F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.12083333F, { 24.1709995F, 31.4230003F }, _cubicBezierEasingFunction_5);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 08 - TreeViewExpand - 01 - NormalOnToNormalOff
-    // - Transforms for Controls - 08 - TreeViewExpand - 01 - NormalOnToNormalOff
-    // Scale(1,1,0)
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_13()
+    Vector2KeyFrameAnimation OffsetVector2Animation_2()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.1709995F, 23.9230003F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.0416666679F, { 24.1709995F, 36.4230003F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.0791666657F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.181818187F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 45.
+        result.InsertKeyFrame(0.204545453F, { 24.0F, 30.0F }, _cubicBezierEasingFunction_0);
+        // Frame 59.
+        result.InsertKeyFrame(0.268181831F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -1747,7 +1618,7 @@ winrt::Microsoft::UI::Xaml::Controls::IAnimatedVisual AnimatedChevronRightDownSm
 
 double AnimatedChevronRightDownSmallVisualSource::FrameCount()
 {
-    return 240.0;
+    return 220.0;
 }
 
 double AnimatedChevronRightDownSmallVisualSource::Framerate()
@@ -1757,12 +1628,12 @@ double AnimatedChevronRightDownSmallVisualSource::Framerate()
 
 TimeSpan AnimatedChevronRightDownSmallVisualSource::Duration()
 {
-    return TimeSpan{ 40000000L };
+    return TimeSpan{ 36666666L };
 }
 
 double AnimatedChevronRightDownSmallVisualSource::FrameToProgress(double frameNumber)
 {
-    return frameNumber / 240.0;
+    return frameNumber / 220.0;
 }
 
 winrt::Windows::Foundation::Collections::IMapView<hstring, double> AnimatedChevronRightDownSmallVisualSource::Markers()
@@ -1771,41 +1642,41 @@ winrt::Windows::Foundation::Collections::IMapView<hstring, double> AnimatedChevr
         std::map<winrt::hstring, double>
         {
             { L"NormalOnToNormalOff_Start", 0.0 },
-            { L"NormalOnToNormalOff_End", 0.079375 },
-            { L"NormalOnToPointerOverOn_Start", 0.0835416666666667 },
-            { L"NormalOnToPointerOverOn_End", 0.121041666666667 },
-            { L"NormalOnToPressedOn_Start", 0.125208333333333 },
-            { L"NormalOnToPressedOn_End", 0.162708333333333 },
-            { L"NormalOffToNormalOn_Start", 0.166875 },
-            { L"NormalOffToNormalOn_End", 0.246041666666667 },
-            { L"NormalOffToPointerOverOff_Start", 0.250208333333333 },
-            { L"NormalOffToPointerOverOff_End", 0.287708333333333 },
-            { L"NormalOffToPressedOff_Start", 0.291875 },
-            { L"NormalOffToPressedOff_End", 0.329375 },
-            { L"PointerOverOnToPointerOverOff_Start", 0.333541666666667 },
-            { L"PointerOverOnToPointerOverOff_End", 0.371041666666667 },
-            { L"PointerOverOnToNormalOn_Start", 0.375208333333333 },
-            { L"PointerOverOnToNormalOn_End", 0.412708333333333 },
-            { L"PointerOverOnToPressedOn_Start", 0.416875 },
-            { L"PointerOverOnToPressedOn_End", 0.454375 },
-            { L"PointerOverOffToPointerOverOn_Start", 0.458541666666667 },
-            { L"PointerOverOffToPointerOverOn_End", 0.496041666666667 },
-            { L"PointerOverOffToNormalOff_Start", 0.500208333333333 },
-            { L"PointerOverOffToNormalOff_End", 0.537708333333333 },
-            { L"PointerOverOffToPressedOff_Start", 0.541875 },
-            { L"PointerOverOffToPressedOff_End", 0.579375 },
-            { L"PressedOnToPressedOff_Start", 0.583541666666667 },
-            { L"PressedOnToPressedOff_End", 0.621041666666667 },
-            { L"PressedOnToPointerOverOff_Start", 0.625208333333333 },
-            { L"PressedOnToPointerOverOff_End", 0.704375 },
-            { L"PressedOnToNormalOff_Start", 0.708541666666667 },
-            { L"PressedOnToNormalOff_End", 0.787708333333333 },
-            { L"PressedOffToPressedOn_Start", 0.791875 },
-            { L"PressedOffToPressedOn_End", 0.829375 },
-            { L"PressedOffToPointerOverOn_Start", 0.833541666666667 },
-            { L"PressedOffToPointerOverOn_End", 0.912708333333333 },
-            { L"PressedOffToNormalOn_Start", 0.916875 },
-            { L"PressedOffToNormalOn_End", 0.996041666666667 },
+            { L"NormalOnToNormalOff_End", 0.0411363636363636 },
+            { L"NormalOnToPointerOverOn_Start", 0.0456818181818182 },
+            { L"NormalOnToPointerOverOn_End", 0.0865909090909091 },
+            { L"NormalOnToPressedOn_Start", 0.0911363636363636 },
+            { L"NormalOnToPressedOn_End", 0.132045454545455 },
+            { L"NormalOffToNormalOn_Start", 0.136590909090909 },
+            { L"NormalOffToNormalOn_End", 0.268409090909091 },
+            { L"NormalOffToPointerOverOff_Start", 0.272954545454545 },
+            { L"NormalOffToPointerOverOff_End", 0.313863636363636 },
+            { L"NormalOffToPressedOff_Start", 0.318409090909091 },
+            { L"NormalOffToPressedOff_End", 0.359318181818182 },
+            { L"PointerOverOnToPointerOverOff_Start", 0.363863636363636 },
+            { L"PointerOverOnToPointerOverOff_End", 0.404772727272727 },
+            { L"PointerOverOnToNormalOn_Start", 0.409318181818182 },
+            { L"PointerOverOnToNormalOn_End", 0.450227272727273 },
+            { L"PointerOverOnToPressedOn_Start", 0.454772727272727 },
+            { L"PointerOverOnToPressedOn_End", 0.495681818181818 },
+            { L"PointerOverOffToPointerOverOn_Start", 0.500227272727273 },
+            { L"PointerOverOffToPointerOverOn_End", 0.541136363636364 },
+            { L"PointerOverOffToNormalOff_Start", 0.545681818181818 },
+            { L"PointerOverOffToNormalOff_End", 0.586590909090909 },
+            { L"PointerOverOffToPressedOff_Start", 0.591136363636364 },
+            { L"PointerOverOffToPressedOff_End", 0.632045454545455 },
+            { L"PressedOnToPressedOff_Start", 0.636590909090909 },
+            { L"PressedOnToPressedOff_End", 0.6775 },
+            { L"PressedOnToPointerOverOff_Start", 0.682045454545455 },
+            { L"PressedOnToPointerOverOff_End", 0.722954545454546 },
+            { L"PressedOnToNormalOff_Start", 0.7275 },
+            { L"PressedOnToNormalOff_End", 0.768409090909091 },
+            { L"PressedOffToPressedOn_Start", 0.772954545454546 },
+            { L"PressedOffToPressedOn_End", 0.813863636363636 },
+            { L"PressedOffToPointerOverOn_Start", 0.818409090909091 },
+            { L"PressedOffToPointerOverOn_End", 0.904772727272727 },
+            { L"PressedOffToNormalOn_Start", 0.909318181818182 },
+            { L"PressedOffToNormalOn_End", 0.995681818181818 },
         }
     ).GetView();
 }
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.h
index e50eb6404d..d4d94b3bd6 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.h
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.h
@@ -4,13 +4,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronRightDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronRightDownSmallVisualSource.json (34813 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronRightDownSmallVisualSource.json (27906 bytes created 12:28-08:00 Feb 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -22,49 +22,50 @@
 #include "common.h"
 #include "AnimatedVisuals\AnimatedChevronRightDownSmallVisualSource.g.h"
 
+
 // Name:        Controls_08_SideChevron_TreeViewExpand
 // Frame rate:  60 fps
-// Frame count: 240
-// Duration:    4000.0 mS
+// Frame count: 220
+// Duration:    3666.7 mS
 // ________________________________________________________________________________________________________________
 // |               Marker                |               Constant                | Frame |   mS   |   Progress    |
 // |_____________________________________|_______________________________________|_______|________|_______________|
 // | NormalOnToNormalOff_Start           | M_NormalOnToNormalOff_Start           |     0 |    0.0 | 0.0F          |
-// | NormalOnToNormalOff_End             | M_NormalOnToNormalOff_End             |    19 |  316.7 | 0.0793749988F |
-// | NormalOnToPointerOverOn_Start       | M_NormalOnToPointerOverOn_Start       |    20 |  333.3 | 0.083541669F  |
-// | NormalOnToPointerOverOn_End         | M_NormalOnToPointerOverOn_End         |    29 |  483.3 | 0.121041663F  |
-// | NormalOnToPressedOn_Start           | M_NormalOnToPressedOn_Start           |    30 |  500.0 | 0.125208333F  |
-// | NormalOnToPressedOn_End             | M_NormalOnToPressedOn_End             |    39 |  650.0 | 0.162708327F  |
-// | NormalOffToNormalOn_Start           | M_NormalOffToNormalOn_Start           |    40 |  666.7 | 0.166875005F  |
-// | NormalOffToNormalOn_End             | M_NormalOffToNormalOn_End             |    59 |  983.3 | 0.24604167F   |
-// | NormalOffToPointerOverOff_Start     | M_NormalOffToPointerOverOff_Start     |    60 | 1000.0 | 0.250208348F  |
-// | NormalOffToPointerOverOff_End       | M_NormalOffToPointerOverOff_End       |    69 | 1150.0 | 0.287708342F  |
-// | NormalOffToPressedOff_Start         | M_NormalOffToPressedOff_Start         |    70 | 1166.7 | 0.291875005F  |
-// | NormalOffToPressedOff_End           | M_NormalOffToPressedOff_End           |    79 | 1316.7 | 0.329374999F  |
-// | PointerOverOnToPointerOverOff_Start | M_PointerOverOnToPointerOverOff_Start |    80 | 1333.3 | 0.333541662F  |
-// | PointerOverOnToPointerOverOff_End   | M_PointerOverOnToPointerOverOff_End   |    89 | 1483.3 | 0.371041656F  |
-// | PointerOverOnToNormalOn_Start       | M_PointerOverOnToNormalOn_Start       |    90 | 1500.0 | 0.375208348F  |
-// | PointerOverOnToNormalOn_End         | M_PointerOverOnToNormalOn_End         |    99 | 1650.0 | 0.412708342F  |
-// | PointerOverOnToPressedOn_Start      | M_PointerOverOnToPressedOn_Start      |   100 | 1666.7 | 0.416875005F  |
-// | PointerOverOnToPressedOn_End        | M_PointerOverOnToPressedOn_End        |   109 | 1816.7 | 0.454374999F  |
-// | PointerOverOffToPointerOverOn_Start | M_PointerOverOffToPointerOverOn_Start |   110 | 1833.3 | 0.458541662F  |
-// | PointerOverOffToPointerOverOn_End   | M_PointerOverOffToPointerOverOn_End   |   119 | 1983.3 | 0.496041656F  |
-// | PointerOverOffToNormalOff_Start     | M_PointerOverOffToNormalOff_Start     |   120 | 2000.0 | 0.500208318F  |
-// | PointerOverOffToNormalOff_End       | M_PointerOverOffToNormalOff_End       |   129 | 2150.0 | 0.537708342F  |
-// | PointerOverOffToPressedOff_Start    | M_PointerOverOffToPressedOff_Start    |   130 | 2166.7 | 0.541875005F  |
-// | PointerOverOffToPressedOff_End      | M_PointerOverOffToPressedOff_End      |   139 | 2316.7 | 0.579375029F  |
-// | PressedOnToPressedOff_Start         | M_PressedOnToPressedOff_Start         |   140 | 2333.3 | 0.583541691F  |
-// | PressedOnToPressedOff_End           | M_PressedOnToPressedOff_End           |   149 | 2483.3 | 0.621041656F  |
-// | PressedOnToPointerOverOff_Start     | M_PressedOnToPointerOverOff_Start     |   150 | 2500.0 | 0.625208318F  |
-// | PressedOnToPointerOverOff_End       | M_PressedOnToPointerOverOff_End       |   169 | 2816.7 | 0.704375029F  |
-// | PressedOnToNormalOff_Start          | M_PressedOnToNormalOff_Start          |   170 | 2833.3 | 0.708541691F  |
-// | PressedOnToNormalOff_End            | M_PressedOnToNormalOff_End            |   189 | 3150.0 | 0.787708342F  |
-// | PressedOffToPressedOn_Start         | M_PressedOffToPressedOn_Start         |   190 | 3166.7 | 0.791875005F  |
-// | PressedOffToPressedOn_End           | M_PressedOffToPressedOn_End           |   199 | 3316.7 | 0.829375029F  |
-// | PressedOffToPointerOverOn_Start     | M_PressedOffToPointerOverOn_Start     |   200 | 3333.3 | 0.833541691F  |
-// | PressedOffToPointerOverOn_End       | M_PressedOffToPointerOverOn_End       |   219 | 3650.0 | 0.912708342F  |
-// | PressedOffToNormalOn_Start          | M_PressedOffToNormalOn_Start          |   220 | 3666.7 | 0.916875005F  |
-// | PressedOffToNormalOn_End            | M_PressedOffToNormalOn_End            |   239 | 3983.3 | 0.996041656F  |
+// | NormalOnToNormalOff_End             | M_NormalOnToNormalOff_End             |     9 |  150.0 | 0.0411363654F |
+// | NormalOnToPointerOverOn_Start       | M_NormalOnToPointerOverOn_Start       |    10 |  166.7 | 0.0456818193F |
+// | NormalOnToPointerOverOn_End         | M_NormalOnToPointerOverOn_End         |    19 |  316.7 | 0.0865909085F |
+// | NormalOnToPressedOn_Start           | M_NormalOnToPressedOn_Start           |    20 |  333.3 | 0.0911363661F |
+// | NormalOnToPressedOn_End             | M_NormalOnToPressedOn_End             |    29 |  483.3 | 0.132045448F  |
+// | NormalOffToNormalOn_Start           | M_NormalOffToNormalOn_Start           |    30 |  500.0 | 0.136590913F  |
+// | NormalOffToNormalOn_End             | M_NormalOffToNormalOn_End             |    59 |  983.3 | 0.268409103F  |
+// | NormalOffToPointerOverOff_Start     | M_NormalOffToPointerOverOff_Start     |    60 | 1000.0 | 0.272954553F  |
+// | NormalOffToPointerOverOff_End       | M_NormalOffToPointerOverOff_End       |    69 | 1150.0 | 0.313863635F  |
+// | NormalOffToPressedOff_Start         | M_NormalOffToPressedOff_Start         |    70 | 1166.7 | 0.318409085F  |
+// | NormalOffToPressedOff_End           | M_NormalOffToPressedOff_End           |    79 | 1316.7 | 0.359318167F  |
+// | PointerOverOnToPointerOverOff_Start | M_PointerOverOnToPointerOverOff_Start |    80 | 1333.3 | 0.363863647F  |
+// | PointerOverOnToPointerOverOff_End   | M_PointerOverOnToPointerOverOff_End   |    89 | 1483.3 | 0.404772729F  |
+// | PointerOverOnToNormalOn_Start       | M_PointerOverOnToNormalOn_Start       |    90 | 1500.0 | 0.409318179F  |
+// | PointerOverOnToNormalOn_End         | M_PointerOverOnToNormalOn_End         |    99 | 1650.0 | 0.450227261F  |
+// | PointerOverOnToPressedOn_Start      | M_PointerOverOnToPressedOn_Start      |   100 | 1666.7 | 0.454772741F  |
+// | PointerOverOnToPressedOn_End        | M_PointerOverOnToPressedOn_End        |   109 | 1816.7 | 0.495681822F  |
+// | PointerOverOffToPointerOverOn_Start | M_PointerOverOffToPointerOverOn_Start |   110 | 1833.3 | 0.500227273F  |
+// | PointerOverOffToPointerOverOn_End   | M_PointerOverOffToPointerOverOn_End   |   119 | 1983.3 | 0.541136384F  |
+// | PointerOverOffToNormalOff_Start     | M_PointerOverOffToNormalOff_Start     |   120 | 2000.0 | 0.545681834F  |
+// | PointerOverOffToNormalOff_End       | M_PointerOverOffToNormalOff_End       |   129 | 2150.0 | 0.586590886F  |
+// | PointerOverOffToPressedOff_Start    | M_PointerOverOffToPressedOff_Start    |   130 | 2166.7 | 0.591136336F  |
+// | PointerOverOffToPressedOff_End      | M_PointerOverOffToPressedOff_End      |   139 | 2316.7 | 0.632045448F  |
+// | PressedOnToPressedOff_Start         | M_PressedOnToPressedOff_Start         |   140 | 2333.3 | 0.636590898F  |
+// | PressedOnToPressedOff_End           | M_PressedOnToPressedOff_End           |   149 | 2483.3 | 0.67750001F   |
+// | PressedOnToPointerOverOff_Start     | M_PressedOnToPointerOverOff_Start     |   150 | 2500.0 | 0.68204546F   |
+// | PressedOnToPointerOverOff_End       | M_PressedOnToPointerOverOff_End       |   159 | 2650.0 | 0.722954571F  |
+// | PressedOnToNormalOff_Start          | M_PressedOnToNormalOff_Start          |   160 | 2666.7 | 0.727500021F  |
+// | PressedOnToNormalOff_End            | M_PressedOnToNormalOff_End            |   169 | 2816.7 | 0.768409073F  |
+// | PressedOffToPressedOn_Start         | M_PressedOffToPressedOn_Start         |   170 | 2833.3 | 0.772954524F  |
+// | PressedOffToPressedOn_End           | M_PressedOffToPressedOn_End           |   179 | 2983.3 | 0.813863635F  |
+// | PressedOffToPointerOverOn_Start     | M_PressedOffToPointerOverOn_Start     |   180 | 3000.0 | 0.818409085F  |
+// | PressedOffToPointerOverOn_End       | M_PressedOffToPointerOverOn_End       |   199 | 3316.7 | 0.904772699F  |
+// | PressedOffToNormalOn_Start          | M_PressedOffToNormalOn_Start          |   200 | 3333.3 | 0.909318209F  |
+// | PressedOffToNormalOn_End            | M_PressedOffToNormalOn_End            |   219 | 3650.0 | 0.995681822F  |
 // ----------------------------------------------------------------------------------------------------------------
 // _______________________________________________________
 // | Theme property |  Accessor  | Type  | Default value |
@@ -80,116 +81,116 @@ class AnimatedChevronRightDownSmallVisualSource
 
     static winrt::Windows::Foundation::Numerics::float4 ColorAsVector4(winrt::Windows::UI::Color color);
 public:
-    // Animation duration: 4.000 seconds.
-    static constexpr int64_t c_durationTicks{ 40000000L };
+    // Animation duration: 3.667 seconds.
+    static constexpr int64_t c_durationTicks{ 36666666L };
 
     // Marker: NormalOnToNormalOff_Start.
     static constexpr float M_NormalOnToNormalOff_Start{ 0.0F };
 
     // Marker: NormalOnToNormalOff_End.
-    static constexpr float M_NormalOnToNormalOff_End{ 0.0793749988F };
+    static constexpr float M_NormalOnToNormalOff_End{ 0.0411363654F };
 
     // Marker: NormalOnToPointerOverOn_Start.
-    static constexpr float M_NormalOnToPointerOverOn_Start{ 0.083541669F };
+    static constexpr float M_NormalOnToPointerOverOn_Start{ 0.0456818193F };
 
     // Marker: NormalOnToPointerOverOn_End.
-    static constexpr float M_NormalOnToPointerOverOn_End{ 0.121041663F };
+    static constexpr float M_NormalOnToPointerOverOn_End{ 0.0865909085F };
 
     // Marker: NormalOnToPressedOn_Start.
-    static constexpr float M_NormalOnToPressedOn_Start{ 0.125208333F };
+    static constexpr float M_NormalOnToPressedOn_Start{ 0.0911363661F };
 
     // Marker: NormalOnToPressedOn_End.
-    static constexpr float M_NormalOnToPressedOn_End{ 0.162708327F };
+    static constexpr float M_NormalOnToPressedOn_End{ 0.132045448F };
 
     // Marker: NormalOffToNormalOn_Start.
-    static constexpr float M_NormalOffToNormalOn_Start{ 0.166875005F };
+    static constexpr float M_NormalOffToNormalOn_Start{ 0.136590913F };
 
     // Marker: NormalOffToNormalOn_End.
-    static constexpr float M_NormalOffToNormalOn_End{ 0.24604167F };
+    static constexpr float M_NormalOffToNormalOn_End{ 0.268409103F };
 
     // Marker: NormalOffToPointerOverOff_Start.
-    static constexpr float M_NormalOffToPointerOverOff_Start{ 0.250208348F };
+    static constexpr float M_NormalOffToPointerOverOff_Start{ 0.272954553F };
 
     // Marker: NormalOffToPointerOverOff_End.
-    static constexpr float M_NormalOffToPointerOverOff_End{ 0.287708342F };
+    static constexpr float M_NormalOffToPointerOverOff_End{ 0.313863635F };
 
     // Marker: NormalOffToPressedOff_Start.
-    static constexpr float M_NormalOffToPressedOff_Start{ 0.291875005F };
+    static constexpr float M_NormalOffToPressedOff_Start{ 0.318409085F };
 
     // Marker: NormalOffToPressedOff_End.
-    static constexpr float M_NormalOffToPressedOff_End{ 0.329374999F };
+    static constexpr float M_NormalOffToPressedOff_End{ 0.359318167F };
 
     // Marker: PointerOverOnToPointerOverOff_Start.
-    static constexpr float M_PointerOverOnToPointerOverOff_Start{ 0.333541662F };
+    static constexpr float M_PointerOverOnToPointerOverOff_Start{ 0.363863647F };
 
     // Marker: PointerOverOnToPointerOverOff_End.
-    static constexpr float M_PointerOverOnToPointerOverOff_End{ 0.371041656F };
+    static constexpr float M_PointerOverOnToPointerOverOff_End{ 0.404772729F };
 
     // Marker: PointerOverOnToNormalOn_Start.
-    static constexpr float M_PointerOverOnToNormalOn_Start{ 0.375208348F };
+    static constexpr float M_PointerOverOnToNormalOn_Start{ 0.409318179F };
 
     // Marker: PointerOverOnToNormalOn_End.
-    static constexpr float M_PointerOverOnToNormalOn_End{ 0.412708342F };
+    static constexpr float M_PointerOverOnToNormalOn_End{ 0.450227261F };
 
     // Marker: PointerOverOnToPressedOn_Start.
-    static constexpr float M_PointerOverOnToPressedOn_Start{ 0.416875005F };
+    static constexpr float M_PointerOverOnToPressedOn_Start{ 0.454772741F };
 
     // Marker: PointerOverOnToPressedOn_End.
-    static constexpr float M_PointerOverOnToPressedOn_End{ 0.454374999F };
+    static constexpr float M_PointerOverOnToPressedOn_End{ 0.495681822F };
 
     // Marker: PointerOverOffToPointerOverOn_Start.
-    static constexpr float M_PointerOverOffToPointerOverOn_Start{ 0.458541662F };
+    static constexpr float M_PointerOverOffToPointerOverOn_Start{ 0.500227273F };
 
     // Marker: PointerOverOffToPointerOverOn_End.
-    static constexpr float M_PointerOverOffToPointerOverOn_End{ 0.496041656F };
+    static constexpr float M_PointerOverOffToPointerOverOn_End{ 0.541136384F };
 
     // Marker: PointerOverOffToNormalOff_Start.
-    static constexpr float M_PointerOverOffToNormalOff_Start{ 0.500208318F };
+    static constexpr float M_PointerOverOffToNormalOff_Start{ 0.545681834F };
 
     // Marker: PointerOverOffToNormalOff_End.
-    static constexpr float M_PointerOverOffToNormalOff_End{ 0.537708342F };
+    static constexpr float M_PointerOverOffToNormalOff_End{ 0.586590886F };
 
     // Marker: PointerOverOffToPressedOff_Start.
-    static constexpr float M_PointerOverOffToPressedOff_Start{ 0.541875005F };
+    static constexpr float M_PointerOverOffToPressedOff_Start{ 0.591136336F };
 
     // Marker: PointerOverOffToPressedOff_End.
-    static constexpr float M_PointerOverOffToPressedOff_End{ 0.579375029F };
+    static constexpr float M_PointerOverOffToPressedOff_End{ 0.632045448F };
 
     // Marker: PressedOnToPressedOff_Start.
-    static constexpr float M_PressedOnToPressedOff_Start{ 0.583541691F };
+    static constexpr float M_PressedOnToPressedOff_Start{ 0.636590898F };
 
     // Marker: PressedOnToPressedOff_End.
-    static constexpr float M_PressedOnToPressedOff_End{ 0.621041656F };
+    static constexpr float M_PressedOnToPressedOff_End{ 0.67750001F };
 
     // Marker: PressedOnToPointerOverOff_Start.
-    static constexpr float M_PressedOnToPointerOverOff_Start{ 0.625208318F };
+    static constexpr float M_PressedOnToPointerOverOff_Start{ 0.68204546F };
 
     // Marker: PressedOnToPointerOverOff_End.
-    static constexpr float M_PressedOnToPointerOverOff_End{ 0.704375029F };
+    static constexpr float M_PressedOnToPointerOverOff_End{ 0.722954571F };
 
     // Marker: PressedOnToNormalOff_Start.
-    static constexpr float M_PressedOnToNormalOff_Start{ 0.708541691F };
+    static constexpr float M_PressedOnToNormalOff_Start{ 0.727500021F };
 
     // Marker: PressedOnToNormalOff_End.
-    static constexpr float M_PressedOnToNormalOff_End{ 0.787708342F };
+    static constexpr float M_PressedOnToNormalOff_End{ 0.768409073F };
 
     // Marker: PressedOffToPressedOn_Start.
-    static constexpr float M_PressedOffToPressedOn_Start{ 0.791875005F };
+    static constexpr float M_PressedOffToPressedOn_Start{ 0.772954524F };
 
     // Marker: PressedOffToPressedOn_End.
-    static constexpr float M_PressedOffToPressedOn_End{ 0.829375029F };
+    static constexpr float M_PressedOffToPressedOn_End{ 0.813863635F };
 
     // Marker: PressedOffToPointerOverOn_Start.
-    static constexpr float M_PressedOffToPointerOverOn_Start{ 0.833541691F };
+    static constexpr float M_PressedOffToPointerOverOn_Start{ 0.818409085F };
 
     // Marker: PressedOffToPointerOverOn_End.
-    static constexpr float M_PressedOffToPointerOverOn_End{ 0.912708342F };
+    static constexpr float M_PressedOffToPointerOverOn_End{ 0.904772699F };
 
     // Marker: PressedOffToNormalOn_Start.
-    static constexpr float M_PressedOffToNormalOn_Start{ 0.916875005F };
+    static constexpr float M_PressedOffToNormalOn_Start{ 0.909318209F };
 
     // Marker: PressedOffToNormalOn_End.
-    static constexpr float M_PressedOffToNormalOn_End{ 0.996041656F };
+    static constexpr float M_PressedOffToNormalOn_End{ 0.995681822F };
 
     // Theme property: Foreground.
     static inline const winrt::Windows::UI::Color c_themeForeground{ 0xFF, 0x06, 0x08, 0x08 };
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.idl
index 95efccd3bb..be10ed7b74 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.idl
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronRightDownSmallVisualSource.idl
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronRightDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronRightDownSmallVisualSource.json (34813 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronRightDownSmallVisualSource.json (27906 bytes created 12:28-08:00 Feb 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.cpp
index 510db72403..49d269f7d5 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.cpp
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.cpp
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronUpDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronUpDownSmallVisualSource.json (25255 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronUpDownSmallVisualSource.json (24992 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -21,11 +21,11 @@
 // ____________________________________
 // |       Object stats       | Count |
 // |__________________________|_______|
-// | All CompositionObjects   |   325 |
+// | All CompositionObjects   |   293 |
 // |--------------------------+-------|
-// | Expression animators     |    51 |
-// | KeyFrame animators       |    48 |
-// | Reference parameters     |    53 |
+// | Expression animators     |    41 |
+// | KeyFrame animators       |    40 |
+// | Reference parameters     |    41 |
 // | Expression operations    |     4 |
 // |--------------------------+-------|
 // | Animated brushes         |     1 |
@@ -108,7 +108,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         IClosable>
 {
     winrt::com_ptr<ID2D1Factory> _d2dFactory{ nullptr };
-    static constexpr int64_t c_durationTicks{ 40000000L };
+    static constexpr int64_t c_durationTicks{ 43333333L };
     Compositor const _c{ nullptr };
     ExpressionAnimation const _reusableExpressionAnimation{ nullptr };
     CompositionPropertySet const _themeProperties{ nullptr };
@@ -118,6 +118,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     CubicBezierEasingFunction _cubicBezierEasingFunction_0{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_1{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_2{ nullptr };
+    CubicBezierEasingFunction _cubicBezierEasingFunction_3{ nullptr };
     ExpressionAnimation _rootProgress{ nullptr };
     InsetClip _insetClip_0{ nullptr };
     StepEasingFunction _holdThenStepEasingFunction{ nullptr };
@@ -172,145 +173,186 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         return result;
     }
 
+    CompositionSpriteShape CreateSpriteShape(CompositionGeometry geometry, winrt::float3x2 transformMatrix)
+    {
+        const auto result = _c.CreateSpriteShape(geometry);
+        result.TransformMatrix(transformMatrix);
+        return result;
+    }
+
     // PreComp layer: Controls - 07 - Dropdown Rotate - 18 - PressedOffToNormalOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_00()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.916666687F, true);
+        // Frame 240.
+        const auto result = CreateBooleanKeyFrameAnimation(0.923076928F, true);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 17 - PressedOffToPointerOverOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_01()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.833333313F, true);
-        result.InsertKeyFrame(0.916666687F, false);
+        // Frame 220.
+        const auto result = CreateBooleanKeyFrameAnimation(0.846153855F, true);
+        // Frame 240.
+        result.InsertKeyFrame(0.923076928F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 16 - PressedOffToPressedOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_02()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.791666687F, true);
-        result.InsertKeyFrame(0.833333313F, false);
+        // Frame 210.
+        const auto result = CreateBooleanKeyFrameAnimation(0.807692289F, true);
+        // Frame 220.
+        result.InsertKeyFrame(0.846153855F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 15 - PressedOnToNormalOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_03()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.708333313F, true);
-        result.InsertKeyFrame(0.791666687F, false);
+        // Frame 190.
+        const auto result = CreateBooleanKeyFrameAnimation(0.730769217F, true);
+        // Frame 210.
+        result.InsertKeyFrame(0.807692289F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 14 - PressedOnToPointerOverOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_04()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.625F, true);
-        result.InsertKeyFrame(0.708333313F, false);
+        // Frame 170.
+        const auto result = CreateBooleanKeyFrameAnimation(0.653846145F, true);
+        // Frame 190.
+        result.InsertKeyFrame(0.730769217F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 13 - PressedOnToPressedOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_05()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.583333313F, true);
-        result.InsertKeyFrame(0.625F, false);
+        // Frame 160.
+        const auto result = CreateBooleanKeyFrameAnimation(0.615384638F, true);
+        // Frame 170.
+        result.InsertKeyFrame(0.653846145F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 12 - PointerOverOffToPressedOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_06()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.541666687F, true);
-        result.InsertKeyFrame(0.583333313F, false);
+        // Frame 150.
+        const auto result = CreateBooleanKeyFrameAnimation(0.576923072F, true);
+        // Frame 160.
+        result.InsertKeyFrame(0.615384638F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 11 - PointerOverOffToNormalOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_07()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
-        result.InsertKeyFrame(0.541666687F, false);
+        // Frame 140.
+        const auto result = CreateBooleanKeyFrameAnimation(0.538461566F, true);
+        // Frame 150.
+        result.InsertKeyFrame(0.576923072F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 10 - PointerOverOffToPointerOverOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_08()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.458333343F, true);
-        result.InsertKeyFrame(0.5F, false);
+        // Frame 130.
+        const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
+        // Frame 140.
+        result.InsertKeyFrame(0.538461566F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 09 - PointerOverOnToPressedOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_09()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.416666657F, true);
-        result.InsertKeyFrame(0.458333343F, false);
+        // Frame 120.
+        const auto result = CreateBooleanKeyFrameAnimation(0.461538464F, true);
+        // Frame 130.
+        result.InsertKeyFrame(0.5F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 08 - PointerOverOnToNormalOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_10()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.375F, true);
-        result.InsertKeyFrame(0.416666657F, false);
+        // Frame 110.
+        const auto result = CreateBooleanKeyFrameAnimation(0.423076928F, true);
+        // Frame 120.
+        result.InsertKeyFrame(0.461538464F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 07 - PointerOverOnToPointerOverOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_11()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.333333343F, true);
-        result.InsertKeyFrame(0.375F, false);
+        // Frame 100.
+        const auto result = CreateBooleanKeyFrameAnimation(0.384615391F, true);
+        // Frame 110.
+        result.InsertKeyFrame(0.423076928F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 06 - NormalOffToPressedOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_12()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.291666657F, true);
-        result.InsertKeyFrame(0.333333343F, false);
+        // Frame 90.
+        const auto result = CreateBooleanKeyFrameAnimation(0.346153855F, true);
+        // Frame 100.
+        result.InsertKeyFrame(0.384615391F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 05 -NormalOffToPointerOverOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_13()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.25F, true);
-        result.InsertKeyFrame(0.291666657F, false);
+        // Frame 80.
+        const auto result = CreateBooleanKeyFrameAnimation(0.307692319F, true);
+        // Frame 90.
+        result.InsertKeyFrame(0.346153855F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 04 - NormalOffToNormalOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_14()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.166666672F, true);
-        result.InsertKeyFrame(0.25F, false);
+        // Frame 50.
+        const auto result = CreateBooleanKeyFrameAnimation(0.192307696F, true);
+        // Frame 80.
+        result.InsertKeyFrame(0.307692319F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 03 - NormalOnToPressedOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_15()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.125F, true);
-        result.InsertKeyFrame(0.166666672F, false);
+        // Frame 40.
+        const auto result = CreateBooleanKeyFrameAnimation(0.15384616F, true);
+        // Frame 50.
+        result.InsertKeyFrame(0.192307696F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 02 - NormalOnToPointerOverOn
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_16()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.0833333358F, true);
-        result.InsertKeyFrame(0.125F, false);
+        // Frame 30.
+        const auto result = CreateBooleanKeyFrameAnimation(0.115384616F, true);
+        // Frame 40.
+        result.InsertKeyFrame(0.15384616F, false);
         return result;
     }
 
     // PreComp layer: Controls - 07 - Dropdown Rotate - 01 - NormalOnToNormalOff
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_17()
     {
-        const auto result = CreateBooleanKeyFrameAnimation(0.0833333358F, false);
+        // Frame 30.
+        const auto result = CreateBooleanKeyFrameAnimation(0.115384616F, false);
         return result;
     }
 
@@ -333,7 +375,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     CompositionColorBrush ThemeColor_Foreground()
     {
         const auto result = _themeColor_Foreground = _c.CreateColorBrush();
-        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W*1,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
+        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
         return result;
     }
 
@@ -480,15 +522,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Path 1
     CompositionSpriteShape SpriteShape_07()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.Scale({ 4.0F, 4.0F });
+        // Offset:<24, 24>, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 4.0F, 0.0F, 0.0F, 4.0F, 24.0F, 24.0F });
         result.StrokeBrush(_themeColor_Foreground);
         result.StrokeDashCap(CompositionStrokeCap::Round);
         result.StrokeStartCap(CompositionStrokeCap::Round);
         result.StrokeEndCap(CompositionStrokeCap::Round);
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_07(), _rootProgress);
         return result;
     }
 
@@ -500,6 +541,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     CompositionSpriteShape SpriteShape_08()
     {
         const auto result = _c.CreateSpriteShape(_pathGeometry);
+        result.Offset({ 24.0F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         result.StrokeBrush(_themeColor_Foreground);
         result.StrokeDashCap(CompositionStrokeCap::Round);
@@ -508,7 +550,6 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
         StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_180_3(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_08(), _rootProgress);
         return result;
     }
 
@@ -527,7 +568,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         result.StrokeEndCap(CompositionStrokeCap::Round);
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_09(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_07(), _rootProgress);
         return result;
     }
 
@@ -537,16 +578,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Path 1
     CompositionSpriteShape SpriteShape_10()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.RotationAngleInDegrees(180.0F);
-        result.Scale({ 4.0F, 4.0F });
+        // Offset:<24, 24>, Rotation:-180 degrees, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { -4.0F, 0.0F, -0.0F, -4.0F, 24.0F, 24.0F });
         result.StrokeBrush(_themeColor_Foreground);
         result.StrokeDashCap(CompositionStrokeCap::Round);
         result.StrokeStartCap(CompositionStrokeCap::Round);
         result.StrokeEndCap(CompositionStrokeCap::Round);
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_10(), _rootProgress);
         return result;
     }
 
@@ -558,6 +597,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     CompositionSpriteShape SpriteShape_11()
     {
         const auto result = _c.CreateSpriteShape(_pathGeometry);
+        result.Offset({ 24.0F, 24.0F });
         result.Scale({ 4.0F, 4.0F });
         result.StrokeBrush(_themeColor_Foreground);
         result.StrokeDashCap(CompositionStrokeCap::Round);
@@ -566,7 +606,6 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
         StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_180_to_0_3(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_11(), _rootProgress);
         return result;
     }
 
@@ -584,7 +623,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         result.StrokeEndCap(CompositionStrokeCap::Round);
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_12(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_08(), _rootProgress);
         return result;
     }
 
@@ -594,15 +633,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Path 1
     CompositionSpriteShape SpriteShape_13()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.Scale({ 4.0F, 4.0F });
+        // Offset:<24, 24>, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { 4.0F, 0.0F, 0.0F, 4.0F, 24.0F, 24.0F });
         result.StrokeBrush(_themeColor_Foreground);
         result.StrokeDashCap(CompositionStrokeCap::Round);
         result.StrokeStartCap(CompositionStrokeCap::Round);
         result.StrokeEndCap(CompositionStrokeCap::Round);
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_13(), _rootProgress);
         return result;
     }
 
@@ -621,7 +659,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
         StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_180_4(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_14(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_09(), _rootProgress);
         return result;
     }
 
@@ -640,7 +678,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         result.StrokeEndCap(CompositionStrokeCap::Round);
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_15(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_10(), _rootProgress);
         return result;
     }
 
@@ -650,16 +688,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Path 1
     CompositionSpriteShape SpriteShape_16()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.RotationAngleInDegrees(180.0F);
-        result.Scale({ 4.0F, 4.0F });
+        // Offset:<24, 24>, Rotation:-180 degrees, Scale:<4, 4>
+        const auto result = CreateSpriteShape(_pathGeometry, { -4.0F, 0.0F, -0.0F, -4.0F, 24.0F, 24.0F });
         result.StrokeBrush(_themeColor_Foreground);
         result.StrokeDashCap(CompositionStrokeCap::Round);
         result.StrokeStartCap(CompositionStrokeCap::Round);
         result.StrokeEndCap(CompositionStrokeCap::Round);
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_16(), _rootProgress);
         return result;
     }
 
@@ -678,7 +714,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         result.StrokeLineJoin(CompositionStrokeLineJoin::Round);
         result.StrokeMiterLimit(2.0F);
         StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_180_to_0_4(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_17(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_11(), _rootProgress);
         return result;
     }
 
@@ -975,8 +1011,6 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         const auto result = _root = _c.CreateContainerVisual();
         const auto propertySet = result.Properties();
         propertySet.InsertScalar(L"Progress", 0.0F);
-        propertySet.InsertScalar(L"t0", 0.0F);
-        propertySet.InsertScalar(L"t1", 0.0F);
         const auto children = result.Children();
         // PreComp layer: Controls - 07 - Dropdown Rotate - 18 - PressedOffToNormalOn
         children.InsertAtTop(ContainerVisual_00());
@@ -1014,8 +1048,6 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         children.InsertAtTop(ContainerVisual_16());
         // PreComp layer: Controls - 07 - Dropdown Rotate - 01 - NormalOnToNormalOff
         children.InsertAtTop(ContainerVisual_17());
-        StartProgressBoundAnimation(propertySet, L"t0", t0ScalarAnimation_0_to_1(), _rootProgress);
-        StartProgressBoundAnimation(propertySet, L"t1", t1ScalarAnimation_0_to_1(), _rootProgress);
         return result;
     }
 
@@ -1034,6 +1066,11 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
         return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F });
     }
 
+    CubicBezierEasingFunction CubicBezierEasingFunction_3()
+    {
+        return _cubicBezierEasingFunction_3 = _c.CreateCubicBezierEasingFunction({ 0.850000024F, 0.0F }, { 0.75F, 1.0F });
+    }
+
     ExpressionAnimation RootProgress()
     {
         const auto result = _rootProgress = _c.CreateExpressionAnimation(L"_.Progress");
@@ -1054,9 +1091,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_180_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, StepThenHoldEasingFunction());
-        result.InsertKeyFrame(0.9375F, 0.0F, HoldThenStepEasingFunction());
-        result.InsertKeyFrame(0.995833337F, 180.0F, CubicBezierEasingFunction_0());
+        // Frame 245.
+        result.InsertKeyFrame(0.942307711F, 0.0F, HoldThenStepEasingFunction());
+        // Frame 255.
+        result.InsertKeyFrame(0.980769217F, 180.0F, CubicBezierEasingFunction_0());
         return result;
     }
 
@@ -1067,9 +1107,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_180_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.854166687F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.912500024F, 180.0F, _cubicBezierEasingFunction_0);
+        // Frame 225.
+        result.InsertKeyFrame(0.865384638F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 235.
+        result.InsertKeyFrame(0.903846145F, 180.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1080,9 +1123,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_180_2()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.791666687F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.829166651F, 180.0F, _cubicBezierEasingFunction_0);
+        // Frame 210.
+        result.InsertKeyFrame(0.807692289F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 219.
+        result.InsertKeyFrame(0.842307687F, 180.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1094,9 +1140,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_180_3()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.458333343F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.495833337F, 180.0F, _cubicBezierEasingFunction_0);
+        // Frame 130.
+        result.InsertKeyFrame(0.5F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 139.
+        result.InsertKeyFrame(0.534615397F, 180.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1107,9 +1156,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_180_4()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.1875F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.245833337F, 180.0F, _cubicBezierEasingFunction_0);
+        // Frame 65.
+        result.InsertKeyFrame(0.25F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 75.
+        result.InsertKeyFrame(0.288461536F, 180.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1120,9 +1172,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_180_to_0_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 180.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.729166687F, 180.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.787500024F, 0.0F, _cubicBezierEasingFunction_0);
+        // Frame 195.
+        result.InsertKeyFrame(0.75F, 180.0F, _holdThenStepEasingFunction);
+        // Frame 205.
+        result.InsertKeyFrame(0.788461566F, 0.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1133,9 +1188,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_180_to_0_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 180.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.645833313F, 180.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.704166651F, 0.0F, _cubicBezierEasingFunction_0);
+        // Frame 175.
+        result.InsertKeyFrame(0.673076928F, 180.0F, _holdThenStepEasingFunction);
+        // Frame 185.
+        result.InsertKeyFrame(0.711538434F, 0.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1146,9 +1204,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_180_to_0_2()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 180.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.583333313F, 180.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.620833337F, 0.0F, _cubicBezierEasingFunction_0);
+        // Frame 160.
+        result.InsertKeyFrame(0.615384638F, 180.0F, _holdThenStepEasingFunction);
+        // Frame 169.
+        result.InsertKeyFrame(0.649999976F, 0.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1160,9 +1221,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_180_to_0_3()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 180.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.333333343F, 180.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.370833337F, 0.0F, _cubicBezierEasingFunction_0);
+        // Frame 100.
+        result.InsertKeyFrame(0.384615391F, 180.0F, _holdThenStepEasingFunction);
+        // Frame 109.
+        result.InsertKeyFrame(0.419230759F, 0.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1173,25 +1237,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Rotation
     ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_180_to_0_4()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 180.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.020833334F, 180.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.0791666657F, 0.0F, _cubicBezierEasingFunction_0);
-        return result;
-    }
-
-    ScalarKeyFrameAnimation t0ScalarAnimation_0_to_1()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.50000006F, 0.0F, _stepThenHoldEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.537499964F, 1.0F, _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.652999997F, 1.0F }));
-        return result;
-    }
-
-    ScalarKeyFrameAnimation t1ScalarAnimation_0_to_1()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.416666687F, 0.0F, _stepThenHoldEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.454166651F, 1.0F, _cubicBezierEasingFunction_0);
+        // Frame 15.
+        result.InsertKeyFrame(0.057692308F, 180.0F, _holdThenStepEasingFunction);
+        // Frame 25.
+        result.InsertKeyFrame(0.0961538479F, 0.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1278,7 +1329,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Shape 1
+        // Scale:4,4, Offset:<24, 24>
         result.Shapes().Append(SpriteShape_07());
         return result;
     }
@@ -1311,7 +1362,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Shape 1
+        // Scale:4,4, RotationDegrees:180, Offset:<24, 24>
         result.Shapes().Append(SpriteShape_10());
         return result;
     }
@@ -1344,7 +1395,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Shape 1
+        // Scale:4,4, Offset:<24, 24>
         result.Shapes().Append(SpriteShape_13());
         return result;
     }
@@ -1377,7 +1428,7 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Shape 1
+        // Scale:4,4, RotationDegrees:180, Offset:<24, 24>
         result.Shapes().Append(SpriteShape_16());
         return result;
     }
@@ -1414,10 +1465,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_00()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 32.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.916666687F, { 24.0F, 32.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.9375F, { 24.0F, 34.0F }, CubicBezierEasingFunction_1());
-        result.InsertKeyFrame(0.995833337F, { 24.0F, 24.0F }, CubicBezierEasingFunction_2());
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 22.0F }, _stepThenHoldEasingFunction);
+        // Frame 240.
+        result.InsertKeyFrame(0.923076928F, { 24.0F, 22.0F }, _holdThenStepEasingFunction);
+        // Frame 245.
+        result.InsertKeyFrame(0.942307711F, { 24.0F, 30.0F }, CubicBezierEasingFunction_1());
+        // Frame 259.
+        result.InsertKeyFrame(0.996153831F, { 24.0F, 24.0F }, CubicBezierEasingFunction_2());
         return result;
     }
 
@@ -1428,10 +1483,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_01()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 32.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.833333313F, { 24.0F, 32.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.854166687F, { 24.0F, 34.0F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.912500024F, { 24.0F, 20.0F }, _cubicBezierEasingFunction_2);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 22.0F }, _stepThenHoldEasingFunction);
+        // Frame 220.
+        result.InsertKeyFrame(0.846153855F, { 24.0F, 22.0F }, _holdThenStepEasingFunction);
+        // Frame 225.
+        result.InsertKeyFrame(0.865384638F, { 24.0F, 30.0F }, _cubicBezierEasingFunction_1);
+        // Frame 239.
+        result.InsertKeyFrame(0.919230759F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1442,9 +1501,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_02()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 32.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.791666687F, { 24.0F, 32.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.829166651F, { 24.0F, 16.0F }, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 22.0F }, _stepThenHoldEasingFunction);
+        // Frame 210.
+        result.InsertKeyFrame(0.807692289F, { 24.0F, 22.0F }, _holdThenStepEasingFunction);
+        // Frame 219.
+        result.InsertKeyFrame(0.842307687F, { 24.0F, 26.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1455,10 +1517,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_03()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 16.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.708333313F, { 24.0F, 16.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.729166687F, { 24.0F, 14.0F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.787500024F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 26.0F }, _stepThenHoldEasingFunction);
+        // Frame 190.
+        result.InsertKeyFrame(0.730769217F, { 24.0F, 26.0F }, _holdThenStepEasingFunction);
+        // Frame 195.
+        result.InsertKeyFrame(0.75F, { 24.0F, 18.0F }, CubicBezierEasingFunction_3());
+        // Frame 209.
+        result.InsertKeyFrame(0.80384618F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1469,10 +1535,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_04()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 16.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.625F, { 24.0F, 16.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.645833313F, { 24.0F, 14.0F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.704166651F, { 24.0F, 28.0F }, _cubicBezierEasingFunction_2);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 26.0F }, _stepThenHoldEasingFunction);
+        // Frame 170.
+        result.InsertKeyFrame(0.653846145F, { 24.0F, 26.0F }, _holdThenStepEasingFunction);
+        // Frame 175.
+        result.InsertKeyFrame(0.673076928F, { 24.0F, 18.0F }, _cubicBezierEasingFunction_3);
+        // Frame 189.
+        result.InsertKeyFrame(0.726923048F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1483,9 +1553,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_05()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 16.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.583333313F, { 24.0F, 16.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.620833337F, { 24.0F, 32.0F }, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 26.0F }, _stepThenHoldEasingFunction);
+        // Frame 160.
+        result.InsertKeyFrame(0.615384638F, { 24.0F, 26.0F }, _holdThenStepEasingFunction);
+        // Frame 169.
+        result.InsertKeyFrame(0.649999976F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1497,38 +1570,12 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_06()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 28.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.541666687F, { 24.0F, 28.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.579166651F, { 24.0F, 32.0F }, _cubicBezierEasingFunction_0);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 07 - Dropdown Rotate - 11 - PointerOverOffToNormalOff
-    // - Transforms for Controls - 07 - Dropdown Rotate - 11 - PointerOverOffToNormalOff
-    // Scale(1,1,0)
-    // ShapeGroup: Shape 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_07()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 28.0F }, _stepThenHoldEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.5F, { 24.0F, 28.0F }, _holdThenStepEasingFunction);
-        result.InsertExpressionKeyFrame(0.537499964F, L"(Pow(1-_.t0,3)*Vector2(24,28))+(3*Square(1-_.t0)*_.t0*Vector2(24.028,27.324))+(3*(1-_.t0)*Square(_.t0)*Vector2(24,24.004))+(Pow(_.t0,3)*Vector2(24,24))", _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.537500024F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 07 - Dropdown Rotate - 10 -
-    // PointerOverOffToPointerOverOn
-    // - Transforms for Controls - 07 - Dropdown Rotate - 10 -
-    // PointerOverOffToPointerOverOn Scale(1,1,0)
-    // ShapeGroup: Shape 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_08()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 28.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.458333343F, { 24.0F, 28.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.495833337F, { 24.0F, 20.0F }, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 150.
+        result.InsertKeyFrame(0.576923072F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 159.
+        result.InsertKeyFrame(0.61153847F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1537,40 +1584,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Scale(1,1,0)
     // ShapeGroup: Shape 1
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_09()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 20.0F }, _stepThenHoldEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.416666657F, { 24.0F, 20.0F }, _holdThenStepEasingFunction);
-        result.InsertExpressionKeyFrame(0.454166651F, L"(Pow(1-_.t1,3)*Vector2(24,20))+(3*Square(1-_.t1)*_.t1*Vector2(24,19.333))+(3*(1-_.t1)*Square(_.t1)*Vector2(24,14.333))+(Pow(_.t1,3)*Vector2(24,16))", _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.454166681F, { 24.0F, 16.0F }, _stepThenHoldEasingFunction);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 07 - Dropdown Rotate - 08 - PointerOverOnToNormalOn
-    // - Transforms for Controls - 07 - Dropdown Rotate - 08 - PointerOverOnToNormalOn
-    // Scale(1,1,0)
-    // ShapeGroup: Shape 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_10()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 20.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, { 24.0F, 20.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.412499994F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_0);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 07 - Dropdown Rotate - 07 -
-    // PointerOverOnToPointerOverOff
-    // - Transforms for Controls - 07 - Dropdown Rotate - 07 -
-    // PointerOverOnToPointerOverOff Scale(1,1,0)
-    // ShapeGroup: Shape 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_11()
+    Vector2KeyFrameAnimation OffsetVector2Animation_07()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 20.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.333333343F, { 24.0F, 20.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.370833337F, { 24.0F, 28.0F }, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
+        // Frame 120.
+        result.InsertKeyFrame(0.461538464F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 129.
+        result.InsertKeyFrame(0.496153831F, { 24.0F, 26.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1579,24 +1600,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Scale(1,1,0)
     // ShapeGroup: Shape 1
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_12()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.291666657F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.329166681F, { 24.0F, 32.0F }, _cubicBezierEasingFunction_0);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 07 - Dropdown Rotate - 05 -NormalOffToPointerOverOff
-    // - Transforms for Controls - 07 - Dropdown Rotate - 05 -NormalOffToPointerOverOff
-    // Scale(1,1,0)
-    // ShapeGroup: Shape 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_13()
+    Vector2KeyFrameAnimation OffsetVector2Animation_08()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.287499994F, { 24.0F, 28.0F }, _cubicBezierEasingFunction_0);
+        // Frame 90.
+        result.InsertKeyFrame(0.346153855F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 99.
+        result.InsertKeyFrame(0.380769223F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1605,12 +1616,18 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Scale(1,1,0)
     // ShapeGroup: Shape 1
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_14()
+    Vector2KeyFrameAnimation OffsetVector2Animation_09()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.166666672F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.1875F, { 24.0F, 34.0F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.245833337F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2);
+        // Frame 50.
+        result.InsertKeyFrame(0.192307696F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 60.
+        result.InsertKeyFrame(0.230769232F, { 24.0F, 22.0F }, _cubicBezierEasingFunction_0);
+        // Frame 65.
+        result.InsertKeyFrame(0.25F, { 24.0F, 30.0F }, _cubicBezierEasingFunction_1);
+        // Frame 79.
+        result.InsertKeyFrame(0.303846151F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1619,24 +1636,14 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Scale(1,1,0)
     // ShapeGroup: Shape 1
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_15()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.125F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.162499994F, { 24.0F, 16.0F }, _cubicBezierEasingFunction_0);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 07 - Dropdown Rotate - 02 - NormalOnToPointerOverOn
-    // - Transforms for Controls - 07 - Dropdown Rotate - 02 - NormalOnToPointerOverOn
-    // Scale(1,1,0)
-    // ShapeGroup: Shape 1
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_16()
+    Vector2KeyFrameAnimation OffsetVector2Animation_10()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.0833333358F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.12083333F, { 24.0F, 20.0F }, _cubicBezierEasingFunction_0);
+        // Frame 40.
+        result.InsertKeyFrame(0.15384616F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
+        // Frame 49.
+        result.InsertKeyFrame(0.188461542F, { 24.0F, 26.0F }, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -1645,11 +1652,16 @@ class AnimatedChevronUpDownSmallVisualSource_AnimatedVisual : public winrt::impl
     // Scale(1,1,0)
     // ShapeGroup: Shape 1
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_17()
+    Vector2KeyFrameAnimation OffsetVector2Animation_11()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 24.0F, 24.0F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.020833334F, { 24.0F, 14.0F }, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(0.0791666657F, { 24.0F, 24.0F }, _cubicBezierEasingFunction_2);
+        // Frame 10.
+        result.InsertKeyFrame(0.0384615399F, { 24.0F, 26.0F }, _cubicBezierEasingFunction_0);
+        // Frame 15.
+        result.InsertKeyFrame(0.057692308F, { 24.0F, 18.0F }, _cubicBezierEasingFunction_3);
+        // Frame 29.
+        result.InsertKeyFrame(0.111538462F, { 24.1709995F, 23.9230003F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1755,7 +1767,7 @@ winrt::Microsoft::UI::Xaml::Controls::IAnimatedVisual AnimatedChevronUpDownSmall
 
 double AnimatedChevronUpDownSmallVisualSource::FrameCount()
 {
-    return 240.0;
+    return 260.0;
 }
 
 double AnimatedChevronUpDownSmallVisualSource::Framerate()
@@ -1765,12 +1777,12 @@ double AnimatedChevronUpDownSmallVisualSource::Framerate()
 
 TimeSpan AnimatedChevronUpDownSmallVisualSource::Duration()
 {
-    return TimeSpan{ 40000000L };
+    return TimeSpan{ 43333333L };
 }
 
 double AnimatedChevronUpDownSmallVisualSource::FrameToProgress(double frameNumber)
 {
-    return frameNumber / 240.0;
+    return frameNumber / 260.0;
 }
 
 winrt::Windows::Foundation::Collections::IMapView<hstring, double> AnimatedChevronUpDownSmallVisualSource::Markers()
@@ -1779,41 +1791,41 @@ winrt::Windows::Foundation::Collections::IMapView<hstring, double> AnimatedChevr
         std::map<winrt::hstring, double>
         {
             { L"NormalOnToNormalOff_Start", 0.0 },
-            { L"NormalOnToNormalOff_End", 0.079375 },
-            { L"NormalOnToPointerOverOn_Start", 0.0835416666666667 },
-            { L"NormalOnToPointerOverOn_End", 0.121041666666667 },
-            { L"NormalOnToPressedOn_Start", 0.125208333333333 },
-            { L"NormalOnToPressedOn_End", 0.162708333333333 },
-            { L"NormalOffToNormalOn_Start", 0.166875 },
-            { L"NormalOffToNormalOn_End", 0.246041666666667 },
-            { L"NormalOffToPointerOverOff_Start", 0.250208333333333 },
-            { L"NormalOffToPointerOverOff_End", 0.287708333333333 },
-            { L"NormalOffToPressedOff_Start", 0.291875 },
-            { L"NormalOffToPressedOff_End", 0.329375 },
-            { L"PointerOverOnToPointerOverOff_Start", 0.333541666666667 },
-            { L"PointerOverOnToPointerOverOff_End", 0.371041666666667 },
-            { L"PointerOverOnToNormalOn_Start", 0.375208333333333 },
-            { L"PointerOverOnToNormalOn_End", 0.412708333333333 },
-            { L"PointerOverOnToPressedOn_Start", 0.416875 },
-            { L"PointerOverOnToPressedOn_End", 0.454375 },
-            { L"PointerOverOffToPointerOverOn_Start", 0.458541666666667 },
-            { L"PointerOverOffToPointerOverOn_End", 0.496041666666667 },
-            { L"PointerOverOffToNormalOff_Start", 0.500208333333333 },
-            { L"PointerOverOffToNormalOff_End", 0.537708333333333 },
-            { L"PointerOverOffToPressedOff_Start", 0.541875 },
-            { L"PointerOverOffToPressedOff_End", 0.579375 },
-            { L"PressedOnToPressedOff_Start", 0.583541666666667 },
-            { L"PressedOnToPressedOff_End", 0.621041666666667 },
-            { L"PressedOnToPointerOverOff_Start", 0.625208333333333 },
-            { L"PressedOnToPointerOverOff_End", 0.704375 },
-            { L"PressedOnToNormalOff_Start", 0.708541666666667 },
-            { L"PressedOnToNormalOff_End", 0.787708333333333 },
-            { L"PressedOffToPressedOn_Start", 0.791875 },
-            { L"PressedOffToPressedOn_End", 0.829375 },
-            { L"PressedOffToPointerOverOn_Start", 0.833541666666667 },
-            { L"PressedOffToPointerOverOn_End", 0.912708333333333 },
-            { L"PressedOffToNormalOn_Start", 0.916875 },
-            { L"PressedOffToNormalOn_End", 0.996041666666667 },
+            { L"NormalOnToNormalOff_End", 0.111730769230769 },
+            { L"NormalOnToPointerOverOn_Start", 0.115576923076923 },
+            { L"NormalOnToPointerOverOn_End", 0.150192307692308 },
+            { L"NormalOnToPressedOn_Start", 0.154038461538462 },
+            { L"NormalOnToPressedOn_End", 0.188653846153846 },
+            { L"NormalOffToNormalOn_Start", 0.1925 },
+            { L"NormalOffToNormalOn_End", 0.304038461538462 },
+            { L"NormalOffToPointerOverOff_Start", 0.307884615384615 },
+            { L"NormalOffToPointerOverOff_End", 0.3425 },
+            { L"NormalOffToPressedOff_Start", 0.346346153846154 },
+            { L"NormalOffToPressedOff_End", 0.380961538461538 },
+            { L"PointerOverOnToPointerOverOff_Start", 0.384807692307692 },
+            { L"PointerOverOnToPointerOverOff_End", 0.419423076923077 },
+            { L"PointerOverOnToNormalOn_Start", 0.423269230769231 },
+            { L"PointerOverOnToNormalOn_End", 0.457884615384615 },
+            { L"PointerOverOnToPressedOn_Start", 0.461730769230769 },
+            { L"PointerOverOnToPressedOn_End", 0.496346153846154 },
+            { L"PointerOverOffToPointerOverOn_Start", 0.500192307692308 },
+            { L"PointerOverOffToPointerOverOn_End", 0.534807692307692 },
+            { L"PointerOverOffToNormalOff_Start", 0.538653846153846 },
+            { L"PointerOverOffToNormalOff_End", 0.573269230769231 },
+            { L"PointerOverOffToPressedOff_Start", 0.577115384615385 },
+            { L"PointerOverOffToPressedOff_End", 0.611730769230769 },
+            { L"PressedOnToPressedOff_Start", 0.615576923076923 },
+            { L"PressedOnToPressedOff_End", 0.650192307692308 },
+            { L"PressedOnToPointerOverOff_Start", 0.654038461538462 },
+            { L"PressedOnToPointerOverOff_End", 0.727115384615385 },
+            { L"PressedOnToNormalOff_Start", 0.730961538461539 },
+            { L"PressedOnToNormalOff_End", 0.804038461538462 },
+            { L"PressedOffToPressedOn_Start", 0.807884615384615 },
+            { L"PressedOffToPressedOn_End", 0.8425 },
+            { L"PressedOffToPointerOverOn_Start", 0.846346153846154 },
+            { L"PressedOffToPointerOverOn_End", 0.919423076923077 },
+            { L"PressedOffToNormalOn_Start", 0.923269230769231 },
+            { L"PressedOffToNormalOn_End", 0.996346153846154 },
         }
     ).GetView();
 }
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.h
index a27b73b417..1a6a86eb41 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.h
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.h
@@ -4,13 +4,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronUpDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronUpDownSmallVisualSource.json (25255 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronUpDownSmallVisualSource.json (24992 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -24,55 +24,55 @@
 
 // Name:        Controls_07_DownChevron_Expand+NavView
 // Frame rate:  60 fps
-// Frame count: 240
-// Duration:    4000.0 mS
-// ________________________________________________________________________________________________________________
-// |               Marker                |               Constant                | Frame |   mS   |   Progress    |
-// |_____________________________________|_______________________________________|_______|________|_______________|
-// | NormalOnToNormalOff_Start           | M_NormalOnToNormalOff_Start           |     0 |    0.0 | 0.0F          |
-// | NormalOnToNormalOff_End             | M_NormalOnToNormalOff_End             |    19 |  316.7 | 0.0793749988F |
-// | NormalOnToPointerOverOn_Start       | M_NormalOnToPointerOverOn_Start       |    20 |  333.3 | 0.083541669F  |
-// | NormalOnToPointerOverOn_End         | M_NormalOnToPointerOverOn_End         |    29 |  483.3 | 0.121041663F  |
-// | NormalOnToPressedOn_Start           | M_NormalOnToPressedOn_Start           |    30 |  500.0 | 0.125208333F  |
-// | NormalOnToPressedOn_End             | M_NormalOnToPressedOn_End             |    39 |  650.0 | 0.162708327F  |
-// | NormalOffToNormalOn_Start           | M_NormalOffToNormalOn_Start           |    40 |  666.7 | 0.166875005F  |
-// | NormalOffToNormalOn_End             | M_NormalOffToNormalOn_End             |    59 |  983.3 | 0.24604167F   |
-// | NormalOffToPointerOverOff_Start     | M_NormalOffToPointerOverOff_Start     |    60 | 1000.0 | 0.250208348F  |
-// | NormalOffToPointerOverOff_End       | M_NormalOffToPointerOverOff_End       |    69 | 1150.0 | 0.287708342F  |
-// | NormalOffToPressedOff_Start         | M_NormalOffToPressedOff_Start         |    70 | 1166.7 | 0.291875005F  |
-// | NormalOffToPressedOff_End           | M_NormalOffToPressedOff_End           |    79 | 1316.7 | 0.329374999F  |
-// | PointerOverOnToPointerOverOff_Start | M_PointerOverOnToPointerOverOff_Start |    80 | 1333.3 | 0.333541662F  |
-// | PointerOverOnToPointerOverOff_End   | M_PointerOverOnToPointerOverOff_End   |    89 | 1483.3 | 0.371041656F  |
-// | PointerOverOnToNormalOn_Start       | M_PointerOverOnToNormalOn_Start       |    90 | 1500.0 | 0.375208348F  |
-// | PointerOverOnToNormalOn_End         | M_PointerOverOnToNormalOn_End         |    99 | 1650.0 | 0.412708342F  |
-// | PointerOverOnToPressedOn_Start      | M_PointerOverOnToPressedOn_Start      |   100 | 1666.7 | 0.416875005F  |
-// | PointerOverOnToPressedOn_End        | M_PointerOverOnToPressedOn_End        |   109 | 1816.7 | 0.454374999F  |
-// | PointerOverOffToPointerOverOn_Start | M_PointerOverOffToPointerOverOn_Start |   110 | 1833.3 | 0.458541662F  |
-// | PointerOverOffToPointerOverOn_End   | M_PointerOverOffToPointerOverOn_End   |   119 | 1983.3 | 0.496041656F  |
-// | PointerOverOffToNormalOff_Start     | M_PointerOverOffToNormalOff_Start     |   120 | 2000.0 | 0.500208318F  |
-// | PointerOverOffToNormalOff_End       | M_PointerOverOffToNormalOff_End       |   129 | 2150.0 | 0.537708342F  |
-// | PointerOverOffToPressedOff_Start    | M_PointerOverOffToPressedOff_Start    |   130 | 2166.7 | 0.541875005F  |
-// | PointerOverOffToPressedOff_End      | M_PointerOverOffToPressedOff_End      |   139 | 2316.7 | 0.579375029F  |
-// | PressedOnToPressedOff_Start         | M_PressedOnToPressedOff_Start         |   140 | 2333.3 | 0.583541691F  |
-// | PressedOnToPressedOff_End           | M_PressedOnToPressedOff_End           |   149 | 2483.3 | 0.621041656F  |
-// | PressedOnToPointerOverOff_Start     | M_PressedOnToPointerOverOff_Start     |   150 | 2500.0 | 0.625208318F  |
-// | PressedOnToPointerOverOff_End       | M_PressedOnToPointerOverOff_End       |   169 | 2816.7 | 0.704375029F  |
-// | PressedOnToNormalOff_Start          | M_PressedOnToNormalOff_Start          |   170 | 2833.3 | 0.708541691F  |
-// | PressedOnToNormalOff_End            | M_PressedOnToNormalOff_End            |   189 | 3150.0 | 0.787708342F  |
-// | PressedOffToPressedOn_Start         | M_PressedOffToPressedOn_Start         |   190 | 3166.7 | 0.791875005F  |
-// | PressedOffToPressedOn_End           | M_PressedOffToPressedOn_End           |   199 | 3316.7 | 0.829375029F  |
-// | PressedOffToPointerOverOn_Start     | M_PressedOffToPointerOverOn_Start     |   200 | 3333.3 | 0.833541691F  |
-// | PressedOffToPointerOverOn_End       | M_PressedOffToPointerOverOn_End       |   219 | 3650.0 | 0.912708342F  |
-// | PressedOffToNormalOn_Start          | M_PressedOffToNormalOn_Start          |   220 | 3666.7 | 0.916875005F  |
-// | PressedOffToNormalOn_End            | M_PressedOffToNormalOn_End            |   239 | 3983.3 | 0.996041656F  |
-// ----------------------------------------------------------------------------------------------------------------
+// Frame count: 260
+// Duration:    4333.3 mS
+// _______________________________________________________________________________________________________________
+// |               Marker                |               Constant                | Frame |   mS   |   Progress   |
+// |_____________________________________|_______________________________________|_______|________|______________|
+// | NormalOnToNormalOff_Start           | M_NormalOnToNormalOff_Start           |     0 |    0.0 | 0.0F         |
+// | NormalOnToNormalOff_End             | M_NormalOnToNormalOff_End             |    29 |  483.3 | 0.111730769F |
+// | NormalOnToPointerOverOn_Start       | M_NormalOnToPointerOverOn_Start       |    30 |  500.0 | 0.115576923F |
+// | NormalOnToPointerOverOn_End         | M_NormalOnToPointerOverOn_End         |    39 |  650.0 | 0.150192305F |
+// | NormalOnToPressedOn_Start           | M_NormalOnToPressedOn_Start           |    40 |  666.7 | 0.154038459F |
+// | NormalOnToPressedOn_End             | M_NormalOnToPressedOn_End             |    49 |  816.7 | 0.188653842F |
+// | NormalOffToNormalOn_Start           | M_NormalOffToNormalOn_Start           |    50 |  833.3 | 0.192499995F |
+// | NormalOffToNormalOn_End             | M_NormalOffToNormalOn_End             |    79 | 1316.7 | 0.304038465F |
+// | NormalOffToPointerOverOff_Start     | M_NormalOffToPointerOverOff_Start     |    80 | 1333.3 | 0.307884604F |
+// | NormalOffToPointerOverOff_End       | M_NormalOffToPointerOverOff_End       |    89 | 1483.3 | 0.342500001F |
+// | NormalOffToPressedOff_Start         | M_NormalOffToPressedOff_Start         |    90 | 1500.0 | 0.34634614F  |
+// | NormalOffToPressedOff_End           | M_NormalOffToPressedOff_End           |    99 | 1650.0 | 0.380961537F |
+// | PointerOverOnToPointerOverOff_Start | M_PointerOverOnToPointerOverOff_Start |   100 | 1666.7 | 0.384807706F |
+// | PointerOverOnToPointerOverOff_End   | M_PointerOverOnToPointerOverOff_End   |   109 | 1816.7 | 0.419423074F |
+// | PointerOverOnToNormalOn_Start       | M_PointerOverOnToNormalOn_Start       |   110 | 1833.3 | 0.423269242F |
+// | PointerOverOnToNormalOn_End         | M_PointerOverOnToNormalOn_End         |   119 | 1983.3 | 0.45788461F  |
+// | PointerOverOnToPressedOn_Start      | M_PointerOverOnToPressedOn_Start      |   120 | 2000.0 | 0.461730778F |
+// | PointerOverOnToPressedOn_End        | M_PointerOverOnToPressedOn_End        |   129 | 2150.0 | 0.496346146F |
+// | PointerOverOffToPointerOverOn_Start | M_PointerOverOffToPointerOverOn_Start |   130 | 2166.7 | 0.500192285F |
+// | PointerOverOffToPointerOverOn_End   | M_PointerOverOffToPointerOverOn_End   |   139 | 2316.7 | 0.534807682F |
+// | PointerOverOffToNormalOff_Start     | M_PointerOverOffToNormalOff_Start     |   140 | 2333.3 | 0.538653851F |
+// | PointerOverOffToNormalOff_End       | M_PointerOverOffToNormalOff_End       |   149 | 2483.3 | 0.573269248F |
+// | PointerOverOffToPressedOff_Start    | M_PointerOverOffToPressedOff_Start    |   150 | 2500.0 | 0.577115357F |
+// | PointerOverOffToPressedOff_End      | M_PointerOverOffToPressedOff_End      |   159 | 2650.0 | 0.611730754F |
+// | PressedOnToPressedOff_Start         | M_PressedOnToPressedOff_Start         |   160 | 2666.7 | 0.615576923F |
+// | PressedOnToPressedOff_End           | M_PressedOnToPressedOff_End           |   169 | 2816.7 | 0.65019232F  |
+// | PressedOnToPointerOverOff_Start     | M_PressedOnToPointerOverOff_Start     |   170 | 2833.3 | 0.654038489F |
+// | PressedOnToPointerOverOff_End       | M_PressedOnToPointerOverOff_End       |   189 | 3150.0 | 0.727115393F |
+// | PressedOnToNormalOff_Start          | M_PressedOnToNormalOff_Start          |   190 | 3166.7 | 0.730961561F |
+// | PressedOnToNormalOff_End            | M_PressedOnToNormalOff_End            |   209 | 3483.3 | 0.804038465F |
+// | PressedOffToPressedOn_Start         | M_PressedOffToPressedOn_Start         |   210 | 3500.0 | 0.807884634F |
+// | PressedOffToPressedOn_End           | M_PressedOffToPressedOn_End           |   219 | 3650.0 | 0.842499971F |
+// | PressedOffToPointerOverOn_Start     | M_PressedOffToPointerOverOn_Start     |   220 | 3666.7 | 0.84634614F  |
+// | PressedOffToPointerOverOn_End       | M_PressedOffToPointerOverOn_End       |   239 | 3983.3 | 0.919423103F |
+// | PressedOffToNormalOn_Start          | M_PressedOffToNormalOn_Start          |   240 | 4000.0 | 0.923269212F |
+// | PressedOffToNormalOn_End            | M_PressedOffToNormalOn_End            |   259 | 4316.7 | 0.996346176F |
+// ---------------------------------------------------------------------------------------------------------------
 // _________________________________________________________
 // | Theme property |  Accessor  | Type  |  Default value  |
 // |________________|____________|_______|_________________|
 // | Foreground     | Foreground | Color | #FF000000 Black |
 // ---------------------------------------------------------
 class AnimatedChevronUpDownSmallVisualSource
-    : public  winrt::implementation::AnimatedChevronUpDownSmallVisualSourceT<AnimatedChevronUpDownSmallVisualSource>
+    : public winrt::implementation::AnimatedChevronUpDownSmallVisualSourceT<AnimatedChevronUpDownSmallVisualSource>
 {
     winrt::Windows::UI::Composition::CompositionPropertySet _themeProperties{ nullptr };
     winrt::Windows::UI::Color _themeForeground{ 0xFF, 0x00, 0x00, 0x00 };
@@ -80,116 +80,116 @@ class AnimatedChevronUpDownSmallVisualSource
 
     static winrt::Windows::Foundation::Numerics::float4 ColorAsVector4(winrt::Windows::UI::Color color);
 public:
-    // Animation duration: 4.000 seconds.
-    static constexpr int64_t c_durationTicks{ 40000000L };
+    // Animation duration: 4.333 seconds.
+    static constexpr int64_t c_durationTicks{ 43333333L };
 
     // Marker: NormalOnToNormalOff_Start.
     static constexpr float M_NormalOnToNormalOff_Start{ 0.0F };
 
     // Marker: NormalOnToNormalOff_End.
-    static constexpr float M_NormalOnToNormalOff_End{ 0.0793749988F };
+    static constexpr float M_NormalOnToNormalOff_End{ 0.111730769F };
 
     // Marker: NormalOnToPointerOverOn_Start.
-    static constexpr float M_NormalOnToPointerOverOn_Start{ 0.083541669F };
+    static constexpr float M_NormalOnToPointerOverOn_Start{ 0.115576923F };
 
     // Marker: NormalOnToPointerOverOn_End.
-    static constexpr float M_NormalOnToPointerOverOn_End{ 0.121041663F };
+    static constexpr float M_NormalOnToPointerOverOn_End{ 0.150192305F };
 
     // Marker: NormalOnToPressedOn_Start.
-    static constexpr float M_NormalOnToPressedOn_Start{ 0.125208333F };
+    static constexpr float M_NormalOnToPressedOn_Start{ 0.154038459F };
 
     // Marker: NormalOnToPressedOn_End.
-    static constexpr float M_NormalOnToPressedOn_End{ 0.162708327F };
+    static constexpr float M_NormalOnToPressedOn_End{ 0.188653842F };
 
     // Marker: NormalOffToNormalOn_Start.
-    static constexpr float M_NormalOffToNormalOn_Start{ 0.166875005F };
+    static constexpr float M_NormalOffToNormalOn_Start{ 0.192499995F };
 
     // Marker: NormalOffToNormalOn_End.
-    static constexpr float M_NormalOffToNormalOn_End{ 0.24604167F };
+    static constexpr float M_NormalOffToNormalOn_End{ 0.304038465F };
 
     // Marker: NormalOffToPointerOverOff_Start.
-    static constexpr float M_NormalOffToPointerOverOff_Start{ 0.250208348F };
+    static constexpr float M_NormalOffToPointerOverOff_Start{ 0.307884604F };
 
     // Marker: NormalOffToPointerOverOff_End.
-    static constexpr float M_NormalOffToPointerOverOff_End{ 0.287708342F };
+    static constexpr float M_NormalOffToPointerOverOff_End{ 0.342500001F };
 
     // Marker: NormalOffToPressedOff_Start.
-    static constexpr float M_NormalOffToPressedOff_Start{ 0.291875005F };
+    static constexpr float M_NormalOffToPressedOff_Start{ 0.34634614F };
 
     // Marker: NormalOffToPressedOff_End.
-    static constexpr float M_NormalOffToPressedOff_End{ 0.329374999F };
+    static constexpr float M_NormalOffToPressedOff_End{ 0.380961537F };
 
     // Marker: PointerOverOnToPointerOverOff_Start.
-    static constexpr float M_PointerOverOnToPointerOverOff_Start{ 0.333541662F };
+    static constexpr float M_PointerOverOnToPointerOverOff_Start{ 0.384807706F };
 
     // Marker: PointerOverOnToPointerOverOff_End.
-    static constexpr float M_PointerOverOnToPointerOverOff_End{ 0.371041656F };
+    static constexpr float M_PointerOverOnToPointerOverOff_End{ 0.419423074F };
 
     // Marker: PointerOverOnToNormalOn_Start.
-    static constexpr float M_PointerOverOnToNormalOn_Start{ 0.375208348F };
+    static constexpr float M_PointerOverOnToNormalOn_Start{ 0.423269242F };
 
     // Marker: PointerOverOnToNormalOn_End.
-    static constexpr float M_PointerOverOnToNormalOn_End{ 0.412708342F };
+    static constexpr float M_PointerOverOnToNormalOn_End{ 0.45788461F };
 
     // Marker: PointerOverOnToPressedOn_Start.
-    static constexpr float M_PointerOverOnToPressedOn_Start{ 0.416875005F };
+    static constexpr float M_PointerOverOnToPressedOn_Start{ 0.461730778F };
 
     // Marker: PointerOverOnToPressedOn_End.
-    static constexpr float M_PointerOverOnToPressedOn_End{ 0.454374999F };
+    static constexpr float M_PointerOverOnToPressedOn_End{ 0.496346146F };
 
     // Marker: PointerOverOffToPointerOverOn_Start.
-    static constexpr float M_PointerOverOffToPointerOverOn_Start{ 0.458541662F };
+    static constexpr float M_PointerOverOffToPointerOverOn_Start{ 0.500192285F };
 
     // Marker: PointerOverOffToPointerOverOn_End.
-    static constexpr float M_PointerOverOffToPointerOverOn_End{ 0.496041656F };
+    static constexpr float M_PointerOverOffToPointerOverOn_End{ 0.534807682F };
 
     // Marker: PointerOverOffToNormalOff_Start.
-    static constexpr float M_PointerOverOffToNormalOff_Start{ 0.500208318F };
+    static constexpr float M_PointerOverOffToNormalOff_Start{ 0.538653851F };
 
     // Marker: PointerOverOffToNormalOff_End.
-    static constexpr float M_PointerOverOffToNormalOff_End{ 0.537708342F };
+    static constexpr float M_PointerOverOffToNormalOff_End{ 0.573269248F };
 
     // Marker: PointerOverOffToPressedOff_Start.
-    static constexpr float M_PointerOverOffToPressedOff_Start{ 0.541875005F };
+    static constexpr float M_PointerOverOffToPressedOff_Start{ 0.577115357F };
 
     // Marker: PointerOverOffToPressedOff_End.
-    static constexpr float M_PointerOverOffToPressedOff_End{ 0.579375029F };
+    static constexpr float M_PointerOverOffToPressedOff_End{ 0.611730754F };
 
     // Marker: PressedOnToPressedOff_Start.
-    static constexpr float M_PressedOnToPressedOff_Start{ 0.583541691F };
+    static constexpr float M_PressedOnToPressedOff_Start{ 0.615576923F };
 
     // Marker: PressedOnToPressedOff_End.
-    static constexpr float M_PressedOnToPressedOff_End{ 0.621041656F };
+    static constexpr float M_PressedOnToPressedOff_End{ 0.65019232F };
 
     // Marker: PressedOnToPointerOverOff_Start.
-    static constexpr float M_PressedOnToPointerOverOff_Start{ 0.625208318F };
+    static constexpr float M_PressedOnToPointerOverOff_Start{ 0.654038489F };
 
     // Marker: PressedOnToPointerOverOff_End.
-    static constexpr float M_PressedOnToPointerOverOff_End{ 0.704375029F };
+    static constexpr float M_PressedOnToPointerOverOff_End{ 0.727115393F };
 
     // Marker: PressedOnToNormalOff_Start.
-    static constexpr float M_PressedOnToNormalOff_Start{ 0.708541691F };
+    static constexpr float M_PressedOnToNormalOff_Start{ 0.730961561F };
 
     // Marker: PressedOnToNormalOff_End.
-    static constexpr float M_PressedOnToNormalOff_End{ 0.787708342F };
+    static constexpr float M_PressedOnToNormalOff_End{ 0.804038465F };
 
     // Marker: PressedOffToPressedOn_Start.
-    static constexpr float M_PressedOffToPressedOn_Start{ 0.791875005F };
+    static constexpr float M_PressedOffToPressedOn_Start{ 0.807884634F };
 
     // Marker: PressedOffToPressedOn_End.
-    static constexpr float M_PressedOffToPressedOn_End{ 0.829375029F };
+    static constexpr float M_PressedOffToPressedOn_End{ 0.842499971F };
 
     // Marker: PressedOffToPointerOverOn_Start.
-    static constexpr float M_PressedOffToPointerOverOn_Start{ 0.833541691F };
+    static constexpr float M_PressedOffToPointerOverOn_Start{ 0.84634614F };
 
     // Marker: PressedOffToPointerOverOn_End.
-    static constexpr float M_PressedOffToPointerOverOn_End{ 0.912708342F };
+    static constexpr float M_PressedOffToPointerOverOn_End{ 0.919423103F };
 
     // Marker: PressedOffToNormalOn_Start.
-    static constexpr float M_PressedOffToNormalOn_Start{ 0.916875005F };
+    static constexpr float M_PressedOffToNormalOn_Start{ 0.923269212F };
 
     // Marker: PressedOffToNormalOn_End.
-    static constexpr float M_PressedOffToNormalOn_End{ 0.996041656F };
+    static constexpr float M_PressedOffToNormalOn_End{ 0.996346176F };
 
     // Theme property: Foreground.
     static inline const winrt::Windows::UI::Color c_themeForeground{ 0xFF, 0x00, 0x00, 0x00 };
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.idl
index 4763c0c074..25c1cd94ae 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.idl
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedChevronUpDownSmallVisualSource.idl
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedChevronUpDownSmallVisualSource.json
 //       
 //       Input file:
-//           AnimatedChevronUpDownSmallVisualSource.json (25255 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedChevronUpDownSmallVisualSource.json (24992 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.cpp
index 3fc49de6c5..320792653f 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.cpp
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.cpp
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedFindVisualSource.json
 //       
 //       Input file:
-//           AnimatedFindVisualSource.json (17499 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedFindVisualSource.json (14456 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -21,11 +21,11 @@
 // ____________________________________
 // |       Object stats       | Count |
 // |__________________________|_______|
-// | All CompositionObjects   |   199 |
+// | All CompositionObjects   |   187 |
 // |--------------------------+-------|
-// | Expression animators     |    40 |
-// | KeyFrame animators       |    30 |
-// | Reference parameters     |    44 |
+// | Expression animators     |    34 |
+// | KeyFrame animators       |    26 |
+// | Reference parameters     |    36 |
 // | Expression operations    |     8 |
 // |--------------------------+-------|
 // | Animated brushes         |     2 |
@@ -36,7 +36,7 @@
 // | ContainerVisuals         |     7 |
 // | ShapeVisuals             |     6 |
 // |--------------------------+-------|
-// | ContainerShapes          |     6 |
+// | ContainerShapes          |     4 |
 // | CompositionSpriteShapes  |    12 |
 // |--------------------------+-------|
 // | Brushes                  |     2 |
@@ -121,14 +121,14 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     CubicBezierEasingFunction _cubicBezierEasingFunction_1{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_2{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_3{ nullptr };
+    CubicBezierEasingFunction _cubicBezierEasingFunction_4{ nullptr };
+    CubicBezierEasingFunction _cubicBezierEasingFunction_5{ nullptr };
     ExpressionAnimation _rootProgress{ nullptr };
     InsetClip _insetClip_0{ nullptr };
-    ScalarKeyFrameAnimation _scalarAnimation_1_to_1p2{ nullptr };
-    ScalarKeyFrameAnimation _scalarAnimation_1_to_1p3{ nullptr };
-    ScalarKeyFrameAnimation _scalarAnimation_1p2_to_1{ nullptr };
-    ScalarKeyFrameAnimation _scalarAnimation_1p2_to_1p3{ nullptr };
-    ScalarKeyFrameAnimation _scalarAnimation_1p3_to_1{ nullptr };
-    ScalarKeyFrameAnimation _scalarAnimation_1p3_to_1p2{ nullptr };
+    ScalarKeyFrameAnimation _scalarAnimation_0p8_to_1_0{ nullptr };
+    ScalarKeyFrameAnimation _scalarAnimation_0p8_to_1_1{ nullptr };
+    ScalarKeyFrameAnimation _scalarAnimation_1_to_0p8_0{ nullptr };
+    ScalarKeyFrameAnimation _scalarAnimation_1_to_0p8_1{ nullptr };
     StepEasingFunction _holdThenStepEasingFunction{ nullptr };
     StepEasingFunction _stepThenHoldEasingFunction{ nullptr };
 
@@ -188,9 +188,18 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         return result;
     }
 
+    CompositionSpriteShape CreateSpriteShape(CompositionGeometry geometry, winrt::float3x2 transformMatrix, CompositionBrush fillBrush)
+    {
+        const auto result = _c.CreateSpriteShape(geometry);
+        result.TransformMatrix(transformMatrix);
+        result.FillBrush(fillBrush);
+        return result;
+    }
+
     // PreComp layer: Controls - 05 - Search - 06 - PressedToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_0()
     {
+        // Frame 60.
         const auto result = CreateBooleanKeyFrameAnimation(0.75F, true);
         return result;
     }
@@ -198,7 +207,9 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 05 - Search - 05 - PressedToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_1()
     {
+        // Frame 40.
         const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, false);
         return result;
     }
@@ -206,7 +217,9 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 05 - Search - 04 - PointerOverToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_2()
     {
+        // Frame 30.
         const auto result = CreateBooleanKeyFrameAnimation(0.375F, true);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, false);
         return result;
     }
@@ -214,7 +227,9 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 05 - Search - 03 - PointerOverToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_3()
     {
+        // Frame 20.
         const auto result = CreateBooleanKeyFrameAnimation(0.25F, true);
+        // Frame 30.
         result.InsertKeyFrame(0.375F, false);
         return result;
     }
@@ -222,7 +237,9 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 05 - Search - 02 - NormalToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_4()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, true);
+        // Frame 20.
         result.InsertKeyFrame(0.25F, false);
         return result;
     }
@@ -230,6 +247,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // PreComp layer: Controls - 05 - Search - 01 - NormalToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_5()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, false);
         return result;
     }
@@ -259,7 +277,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     CompositionColorBrush ThemeColor_Foreground_0()
     {
         const auto result = _themeColor_Foreground_0 = _c.CreateColorBrush();
-        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W*1,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
+        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
         return result;
     }
 
@@ -281,8 +299,8 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.Offset({ 24.0F, 24.0F });
         // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
         result.Shapes().Append(SpriteShape_01());
-        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1p3_to_1p2(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1p3_to_1p2, _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_0p8_to_1_0(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_0p8_to_1_0, _rootProgress);
         return result;
     }
 
@@ -296,8 +314,8 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.Offset({ 24.0F, 24.0F });
         // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
         result.Shapes().Append(SpriteShape_03());
-        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1p3_to_1(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1p3_to_1, _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_0p8_to_1_1(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_0p8_to_1_1, _rootProgress);
         return result;
     }
 
@@ -311,53 +329,23 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.Offset({ 24.0F, 24.0F });
         // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
         result.Shapes().Append(SpriteShape_05());
-        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1p2_to_1p3(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1p2_to_1p3, _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 05 - Search - 03 - PointerOverToNormal
-    // Transforms for Controls - 05 - Search - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Layer 4
-    CompositionContainerShape ContainerShape_3()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ 3.81299996F, -3.93799996F });
-        result.Offset({ 24.0F, 24.0F });
-        // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
-        result.Shapes().Append(SpriteShape_07());
-        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1p2_to_1(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1p2_to_1, _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1_to_0p8_0(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1_to_0p8_0, _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 05 - Search - 02 - NormalToPressed
     // Transforms for Controls - 05 - Search - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Layer 4
-    CompositionContainerShape ContainerShape_4()
+    CompositionContainerShape ContainerShape_3()
     {
         const auto result = _c.CreateContainerShape();
         result.CenterPoint({ 3.81299996F, -3.93799996F });
         result.Offset({ 24.0F, 24.0F });
         // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
         result.Shapes().Append(SpriteShape_09());
-        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1_to_1p3(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1_to_1p3, _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 05 - Search - 01 - NormalToPointerOver
-    // Transforms for Controls - 05 - Search - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Layer 4
-    CompositionContainerShape ContainerShape_5()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ 3.81299996F, -3.93799996F });
-        result.Offset({ 24.0F, 24.0F });
-        // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
-        result.Shapes().Append(SpriteShape_11());
-        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1_to_1p2(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1_to_1p2, _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScalarAnimation_1_to_0p8_1(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.Y", _scalarAnimation_1_to_0p8_1, _rootProgress);
         return result;
     }
 
@@ -396,7 +384,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         // Offset:<3.812, -3.938>, Scale:<0.92286, 0.92286>
         const auto result = CreateSpriteShape(Ellipse_14p188(), { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 3.81200004F, -3.93799996F });
         result.StrokeBrush(ThemeColor_Foreground_1());
-        result.StrokeThickness(2.0F);
+        StartProgressBoundAnimation(result, L"StrokeThickness", StrokeThicknessScalarAnimation_3_to_2p5_0(), _rootProgress);
         return result;
     }
 
@@ -422,7 +410,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         // Offset:<3.812, -3.938>, Scale:<0.92286, 0.92286>
         const auto result = CreateSpriteShape(_ellipse_14p188, { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 3.81200004F, -3.93799996F });
         result.StrokeBrush(_themeColor_Foreground_1);
-        result.StrokeThickness(2.0F);
+        StartProgressBoundAnimation(result, L"StrokeThickness", StrokeThicknessScalarAnimation_3_to_2p5_1(), _rootProgress);
         return result;
     }
 
@@ -448,7 +436,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         // Offset:<3.812, -3.938>, Scale:<0.92286, 0.92286>
         const auto result = CreateSpriteShape(_ellipse_14p188, { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 3.81200004F, -3.93799996F });
         result.StrokeBrush(_themeColor_Foreground_1);
-        result.StrokeThickness(2.0F);
+        StartProgressBoundAnimation(result, L"StrokeThickness", StrokeThicknessScalarAnimation_2p5_to_3_0(), _rootProgress);
         return result;
     }
 
@@ -457,24 +445,20 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Path 2
     CompositionSpriteShape SpriteShape_06()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.CenterPoint({ 13.566F, 278.109985F });
-        result.Scale({ 3.0F, 3.0F });
-        result.FillBrush(_themeColor_Foreground_0);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_3(), _rootProgress);
+        // Offset:<-21.485, -805.54297>, Scale:<3, 3>
+        const auto result = CreateSpriteShape(_pathGeometry, { 3.0F, 0.0F, 0.0F, 3.0F, -21.4850006F, -805.542969F }, _themeColor_Foreground_0);
         return result;
     }
 
-    // - - PreComp layer: Controls - 05 - Search - 03 - PointerOverToNormal
-    // - Transforms for Controls - 05 - Search - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Layer 4
+    // - PreComp layer: Controls - 05 - Search - 03 - PointerOverToNormal
+    // Transforms for Controls - 05 - Search - 03 - PointerOverToNormal Scale(1,1,0)
     // Ellipse Path 1
     CompositionSpriteShape SpriteShape_07()
     {
-        // Offset:<3.812, -3.938>, Scale:<0.92286, 0.92286>
-        const auto result = CreateSpriteShape(_ellipse_14p188, { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 3.81200004F, -3.93799996F });
+        // Offset:<27.812, 20.062>, Scale:<0.92286, 0.92286>
+        const auto result = CreateSpriteShape(_ellipse_14p188, { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 27.8120003F, 20.0620003F });
         result.StrokeBrush(_themeColor_Foreground_1);
-        result.StrokeThickness(2.0F);
+        result.StrokeThickness(2.5F);
         return result;
     }
 
@@ -487,7 +471,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         result.CenterPoint({ 13.566F, 278.109985F });
         result.Scale({ 3.0F, 3.0F });
         result.FillBrush(_themeColor_Foreground_0);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_4(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_3(), _rootProgress);
         return result;
     }
 
@@ -500,7 +484,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         // Offset:<3.812, -3.938>, Scale:<0.92286, 0.92286>
         const auto result = CreateSpriteShape(_ellipse_14p188, { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 3.81200004F, -3.93799996F });
         result.StrokeBrush(_themeColor_Foreground_1);
-        result.StrokeThickness(2.0F);
+        StartProgressBoundAnimation(result, L"StrokeThickness", StrokeThicknessScalarAnimation_2p5_to_3_1(), _rootProgress);
         return result;
     }
 
@@ -509,24 +493,20 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Path 2
     CompositionSpriteShape SpriteShape_10()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.CenterPoint({ 13.566F, 278.109985F });
-        result.Scale({ 3.0F, 3.0F });
-        result.FillBrush(_themeColor_Foreground_0);
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_5(), _rootProgress);
+        // Offset:<-21.485, -805.54297>, Scale:<3, 3>
+        const auto result = CreateSpriteShape(_pathGeometry, { 3.0F, 0.0F, 0.0F, 3.0F, -21.4850006F, -805.542969F }, _themeColor_Foreground_0);
         return result;
     }
 
-    // - - PreComp layer: Controls - 05 - Search - 01 - NormalToPointerOver
-    // - Transforms for Controls - 05 - Search - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Layer 4
+    // - PreComp layer: Controls - 05 - Search - 01 - NormalToPointerOver
+    // Transforms for Controls - 05 - Search - 01 - NormalToPointerOver Scale(1,1,0)
     // Ellipse Path 1
     CompositionSpriteShape SpriteShape_11()
     {
-        // Offset:<3.812, -3.938>, Scale:<0.92286, 0.92286>
-        const auto result = CreateSpriteShape(_ellipse_14p188, { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 3.81200004F, -3.93799996F });
+        // Offset:<27.812, 20.062>, Scale:<0.92286, 0.92286>
+        const auto result = CreateSpriteShape(_ellipse_14p188, { 0.922860026F, 0.0F, 0.0F, 0.922860026F, 27.8120003F, 20.0620003F });
         result.StrokeBrush(_themeColor_Foreground_1);
-        result.StrokeThickness(2.0F);
+        result.StrokeThickness(2.5F);
         return result;
     }
 
@@ -629,8 +609,6 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         propertySet.InsertScalar(L"t1", 0.0F);
         propertySet.InsertScalar(L"t2", 0.0F);
         propertySet.InsertScalar(L"t3", 0.0F);
-        propertySet.InsertScalar(L"t4", 0.0F);
-        propertySet.InsertScalar(L"t5", 0.0F);
         const auto children = result.Children();
         // PreComp layer: Controls - 05 - Search - 06 - PressedToPointerOver
         children.InsertAtTop(ContainerVisual_0());
@@ -648,8 +626,6 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         StartProgressBoundAnimation(propertySet, L"t1", t1ScalarAnimation_0_to_1(), _rootProgress);
         StartProgressBoundAnimation(propertySet, L"t2", t2ScalarAnimation_0_to_1(), _rootProgress);
         StartProgressBoundAnimation(propertySet, L"t3", t3ScalarAnimation_0_to_1(), _rootProgress);
-        StartProgressBoundAnimation(propertySet, L"t4", t4ScalarAnimation_0_to_1(), _rootProgress);
-        StartProgressBoundAnimation(propertySet, L"t5", t5ScalarAnimation_0_to_1(), _rootProgress);
         return result;
     }
 
@@ -665,7 +641,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
 
     CubicBezierEasingFunction CubicBezierEasingFunction_2()
     {
-        return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.449999988F, 1.0F });
+        return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.449999988F, 0.0F }, { 0.75F, 1.0F });
     }
 
     CubicBezierEasingFunction CubicBezierEasingFunction_3()
@@ -673,6 +649,16 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         return _cubicBezierEasingFunction_3 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.0F, 1.0F });
     }
 
+    CubicBezierEasingFunction CubicBezierEasingFunction_4()
+    {
+        return _cubicBezierEasingFunction_4 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.449999988F, 1.0F });
+    }
+
+    CubicBezierEasingFunction CubicBezierEasingFunction_5()
+    {
+        return _cubicBezierEasingFunction_5 = _c.CreateCubicBezierEasingFunction({ 0.75F, 0.0F }, { 0.75F, 1.0F });
+    }
+
     ExpressionAnimation RootProgress()
     {
         const auto result = _rootProgress = _c.CreateExpressionAnimation(L"_.Progress");
@@ -687,109 +673,170 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     }
 
     // Scale
-    ScalarKeyFrameAnimation ScalarAnimation_1_to_1p2()
+    ScalarKeyFrameAnimation ScalarAnimation_0p8_to_1_0()
     {
-        const auto result = _scalarAnimation_1_to_1p2 = CreateScalarKeyFrameAnimation(0.0F, 1.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, 1.20000005F, _cubicBezierEasingFunction_3);
+        // Frame 0.
+        const auto result = _scalarAnimation_0p8_to_1_0 = CreateScalarKeyFrameAnimation(0.0F, 0.800000012F, _stepThenHoldEasingFunction);
+        // Frame 60.
+        result.InsertKeyFrame(0.75F, 0.800000012F, _holdThenStepEasingFunction);
+        // Frame 65.
+        result.InsertKeyFrame(0.8125F, 1.20000005F, CubicBezierEasingFunction_2());
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, 1.0F, _cubicBezierEasingFunction_1);
         return result;
     }
 
     // Scale
-    ScalarKeyFrameAnimation ScalarAnimation_1_to_1p3()
-    {
-        const auto result = _scalarAnimation_1_to_1p3 = CreateScalarKeyFrameAnimation(0.0F, 1.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.125F, 1.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.237499997F, 1.29999995F, _cubicBezierEasingFunction_3);
+    ScalarKeyFrameAnimation ScalarAnimation_0p8_to_1_1()
+    {
+        // Frame 0.
+        const auto result = _scalarAnimation_0p8_to_1_1 = CreateScalarKeyFrameAnimation(0.0F, 0.800000012F, _stepThenHoldEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.5F, 0.800000012F, _holdThenStepEasingFunction);
+        // Frame 45.
+        result.InsertKeyFrame(0.5625F, 1.20000005F, _cubicBezierEasingFunction_2);
+        // Frame 59.
+        result.InsertKeyFrame(0.737500012F, 1.0F, _cubicBezierEasingFunction_1);
         return result;
     }
 
     // Scale
-    ScalarKeyFrameAnimation ScalarAnimation_1p2_to_1()
+    ScalarKeyFrameAnimation ScalarAnimation_1_to_0p8_0()
     {
-        const auto result = _scalarAnimation_1p2_to_1 = CreateScalarKeyFrameAnimation(0.0F, 1.20000005F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, 1.20000005F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, 1.0F, CubicBezierEasingFunction_3());
+        // Frame 0.
+        const auto result = _scalarAnimation_1_to_0p8_0 = CreateScalarKeyFrameAnimation(0.0F, 1.0F, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, 1.0F, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.487500012F, 0.800000012F, CubicBezierEasingFunction_4());
         return result;
     }
 
     // Scale
-    ScalarKeyFrameAnimation ScalarAnimation_1p2_to_1p3()
+    ScalarKeyFrameAnimation ScalarAnimation_1_to_0p8_1()
     {
-        const auto result = _scalarAnimation_1p2_to_1p3 = CreateScalarKeyFrameAnimation(0.0F, 1.20000005F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, 1.20000005F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.487500012F, 1.29999995F, CubicBezierEasingFunction_2());
+        // Frame 0.
+        const auto result = _scalarAnimation_1_to_0p8_1 = CreateScalarKeyFrameAnimation(0.0F, 1.0F, _stepThenHoldEasingFunction);
+        // Frame 10.
+        result.InsertKeyFrame(0.125F, 1.0F, _holdThenStepEasingFunction);
+        // Frame 19.
+        result.InsertKeyFrame(0.237499997F, 0.800000012F, _cubicBezierEasingFunction_4);
         return result;
     }
 
-    // Scale
-    ScalarKeyFrameAnimation ScalarAnimation_1p3_to_1()
+    // - - - PreComp layer: Controls - 05 - Search - 04 - PointerOverToPressed
+    // - - Transforms for Controls - 05 - Search - 04 - PointerOverToPressed Scale(1,1,0)
+    // - Layer: Layer 4
+    // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
+    // StrokeThickness
+    ScalarKeyFrameAnimation StrokeThicknessScalarAnimation_2p5_to_3_0()
     {
-        const auto result = _scalarAnimation_1p3_to_1 = CreateScalarKeyFrameAnimation(0.0F, 1.29999995F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.5F, 1.29999995F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.5625F, 0.899999976F, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.737500012F, 1.0F, _cubicBezierEasingFunction_1);
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.5F, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, 2.5F, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.487500012F, 3.0F, CubicBezierEasingFunction_3());
         return result;
     }
 
-    // Scale
-    ScalarKeyFrameAnimation ScalarAnimation_1p3_to_1p2()
+    // - - - PreComp layer: Controls - 05 - Search - 02 - NormalToPressed
+    // - - Transforms for Controls - 05 - Search - 02 - NormalToPressed Scale(1,1,0)
+    // - Layer: Layer 4
+    // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
+    // StrokeThickness
+    ScalarKeyFrameAnimation StrokeThicknessScalarAnimation_2p5_to_3_1()
     {
-        const auto result = _scalarAnimation_1p3_to_1p2 = CreateScalarKeyFrameAnimation(0.0F, 1.29999995F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.75F, 1.29999995F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.8125F, 0.899999976F, CubicBezierEasingFunction_0());
-        result.InsertKeyFrame(0.987500012F, 1.20000005F, CubicBezierEasingFunction_1());
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.5F, _stepThenHoldEasingFunction);
+        // Frame 10.
+        result.InsertKeyFrame(0.125F, 2.5F, _holdThenStepEasingFunction);
+        // Frame 19.
+        result.InsertKeyFrame(0.237499997F, 3.0F, _cubicBezierEasingFunction_3);
+        return result;
+    }
+
+    // - - - PreComp layer: Controls - 05 - Search - 06 - PressedToPointerOver
+    // - - Transforms for Controls - 05 - Search - 06 - PressedToPointerOver Scale(1,1,0)
+    // - Layer: Layer 4
+    // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
+    // StrokeThickness
+    ScalarKeyFrameAnimation StrokeThicknessScalarAnimation_3_to_2p5_0()
+    {
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 3.0F, _stepThenHoldEasingFunction);
+        // Frame 60.
+        result.InsertKeyFrame(0.75F, 3.0F, _holdThenStepEasingFunction);
+        // Frame 65.
+        result.InsertKeyFrame(0.8125F, 2.20000005F, CubicBezierEasingFunction_0());
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, 2.5F, CubicBezierEasingFunction_1());
+        return result;
+    }
+
+    // - - - PreComp layer: Controls - 05 - Search - 05 - PressedToNormal
+    // - - Transforms for Controls - 05 - Search - 05 - PressedToNormal Scale(1,1,0)
+    // - Layer: Layer 4
+    // ShapeGroup: Ellipse 1 Scale:0.92286,0.92286, Offset:<3.812, -3.938>
+    // StrokeThickness
+    ScalarKeyFrameAnimation StrokeThicknessScalarAnimation_3_to_2p5_1()
+    {
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 3.0F, _stepThenHoldEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.5F, 3.0F, _holdThenStepEasingFunction);
+        // Frame 45.
+        result.InsertKeyFrame(0.5625F, 2.20000005F, _cubicBezierEasingFunction_0);
+        // Frame 59.
+        result.InsertKeyFrame(0.737500012F, 2.5F, _cubicBezierEasingFunction_1);
         return result;
     }
 
     ScalarKeyFrameAnimation t0ScalarAnimation_0_to_1()
     {
+        // Frame 60.
         const auto result = CreateScalarKeyFrameAnimation(0.75000006F, 0.0F, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.81249994F, 1.0F, _cubicBezierEasingFunction_0);
+        // Frame 65.
+        result.InsertKeyFrame(0.81249994F, 1.0F, CubicBezierEasingFunction_5());
+        // Frame 65.
         result.InsertKeyFrame(0.8125F, 0.0F, _stepThenHoldEasingFunction);
+        // Frame 79.
         result.InsertKeyFrame(0.987499952F, 1.0F, _cubicBezierEasingFunction_1);
         return result;
     }
 
     ScalarKeyFrameAnimation t1ScalarAnimation_0_to_1()
     {
+        // Frame 40.
         const auto result = CreateScalarKeyFrameAnimation(0.50000006F, 0.0F, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.56249994F, 1.0F, _cubicBezierEasingFunction_0);
+        // Frame 45.
+        result.InsertKeyFrame(0.56249994F, 1.0F, _cubicBezierEasingFunction_5);
+        // Frame 45.
         result.InsertKeyFrame(0.5625F, 0.0F, _stepThenHoldEasingFunction);
+        // Frame 59.
         result.InsertKeyFrame(0.737499952F, 1.0F, _cubicBezierEasingFunction_1);
         return result;
     }
 
     ScalarKeyFrameAnimation t2ScalarAnimation_0_to_1()
     {
+        // Frame 30.
         const auto result = CreateScalarKeyFrameAnimation(0.37500003F, 0.0F, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.487499982F, 1.0F, _cubicBezierEasingFunction_2);
+        // Frame 39.
+        result.InsertKeyFrame(0.487499982F, 1.0F, _cubicBezierEasingFunction_4);
         return result;
     }
 
     ScalarKeyFrameAnimation t3ScalarAnimation_0_to_1()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.25000003F, 0.0F, _stepThenHoldEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.362499982F, 1.0F, _cubicBezierEasingFunction_3);
-        return result;
-    }
-
-    ScalarKeyFrameAnimation t4ScalarAnimation_0_to_1()
-    {
+        // Frame 10.
         const auto result = CreateScalarKeyFrameAnimation(0.125000015F, 0.0F, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.237499982F, 1.0F, _cubicBezierEasingFunction_3);
-        return result;
-    }
-
-    ScalarKeyFrameAnimation t5ScalarAnimation_0_to_1()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.11249999F, 1.0F, _cubicBezierEasingFunction_3);
+        // Frame 19.
+        result.InsertKeyFrame(0.237499982F, 1.0F, _cubicBezierEasingFunction_4);
         return result;
     }
 
@@ -845,7 +892,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         // Layer: Layer 4
         shapes.Append(SpriteShape_06());
         // Layer: Layer 4
-        shapes.Append(ContainerShape_3());
+        shapes.Append(SpriteShape_07());
         return result;
     }
 
@@ -859,7 +906,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         // Layer: Layer 4
         shapes.Append(SpriteShape_08());
         // Layer: Layer 4
-        shapes.Append(ContainerShape_4());
+        shapes.Append(ContainerShape_3());
         return result;
     }
 
@@ -873,7 +920,7 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
         // Layer: Layer 4
         shapes.Append(SpriteShape_10());
         // Layer: Layer 4
-        shapes.Append(ContainerShape_5());
+        shapes.Append(SpriteShape_11());
         return result;
     }
 
@@ -897,12 +944,17 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_0()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 2.58400011F, -246.261002F }, StepThenHoldEasingFunction());
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 7.39699984F, -251.072998F }, StepThenHoldEasingFunction());
         result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.75F, { 2.58400011F, -246.261002F }, HoldThenStepEasingFunction());
-        result.InsertExpressionKeyFrame(0.81249994F, L"(Pow(1-_.t0,3)*Vector2(2.584,-246.261))+(3*Square(1-_.t0)*_.t0*Vector2(3.24,-246.917))+(3*(1-_.t0)*Square(_.t0)*Vector2(6.522,-250.198))+(Pow(_.t0,3)*Vector2(6.522,-250.198))", _stepThenHoldEasingFunction);
-        result.InsertExpressionKeyFrame(0.987499952F, L"(Pow(1-_.t0,3)*Vector2(6.522,-250.198))+(3*Square(1-_.t0)*_.t0*Vector2(6.522,-250.198))+(3*(1-_.t0)*Square(_.t0)*Vector2(4.1,-247.776))+(Pow(_.t0,3)*Vector2(3.616,-247.292))", _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.987500012F, { 3.61599994F, -247.292007F }, _stepThenHoldEasingFunction);
+        // Frame 60.
+        result.InsertKeyFrame(0.75F, { 7.39699984F, -251.072998F }, HoldThenStepEasingFunction());
+        // Frame 65.
+        result.InsertExpressionKeyFrame(0.81249994F, L"Pow(1-_.t0,3)*Vector2(7.397,-251.073)+(3*Square(1-_.t0)*_.t0*Vector2(6.767,-250.443))+(3*(1-_.t0)*Square(_.t0)*Vector2(3.616,-247.292))+(Pow(_.t0,3)*Vector2(3.616,-247.292))", _stepThenHoldEasingFunction);
+        // Frame 79.
+        result.InsertExpressionKeyFrame(0.987499952F, L"Pow(1-_.t0,3)*Vector2(3.616,-247.292)+(3*Square(1-_.t0)*_.t0*Vector2(3.616,-247.292))+(3*(1-_.t0)*Square(_.t0)*Vector2(5.308,-248.984))+(Pow(_.t0,3)*Vector2(5.647,-249.323))", _stepThenHoldEasingFunction);
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, { 5.64699984F, -249.322998F }, _stepThenHoldEasingFunction);
         return result;
     }
 
@@ -912,11 +964,16 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_1()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 2.58400011F, -246.261002F }, _stepThenHoldEasingFunction);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 7.39699984F, -251.072998F }, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.5F, { 2.58400011F, -246.261002F }, _holdThenStepEasingFunction);
-        result.InsertExpressionKeyFrame(0.56249994F, L"(Pow(1-_.t1,3)*Vector2(2.584,-246.261))+(3*Square(1-_.t1)*_.t1*Vector2(3.24,-246.917))+(3*(1-_.t1)*Square(_.t1)*Vector2(6.522,-250.198))+(Pow(_.t1,3)*Vector2(6.522,-250.198))", _stepThenHoldEasingFunction);
-        result.InsertExpressionKeyFrame(0.737499952F, L"(Pow(1-_.t1,3)*Vector2(6.522,-250.198))+(3*Square(1-_.t1)*_.t1*Vector2(6.522,-250.198))+(3*(1-_.t1)*Square(_.t1)*Vector2(5.793,-249.469))+(Pow(_.t1,3)*Vector2(5.647,-249.323))", _stepThenHoldEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.5F, { 7.39699984F, -251.072998F }, _holdThenStepEasingFunction);
+        // Frame 45.
+        result.InsertExpressionKeyFrame(0.56249994F, L"Pow(1-_.t1,3)*Vector2(7.397,-251.073)+(3*Square(1-_.t1)*_.t1*Vector2(6.767,-250.443))+(3*(1-_.t1)*Square(_.t1)*Vector2(3.616,-247.292))+(Pow(_.t1,3)*Vector2(3.616,-247.292))", _stepThenHoldEasingFunction);
+        // Frame 59.
+        result.InsertExpressionKeyFrame(0.737499952F, L"Pow(1-_.t1,3)*Vector2(3.616,-247.292)+(3*Square(1-_.t1)*_.t1*Vector2(3.616,-247.292))+(3*(1-_.t1)*Square(_.t1)*Vector2(5.308,-248.984))+(Pow(_.t1,3)*Vector2(5.647,-249.323))", _stepThenHoldEasingFunction);
+        // Frame 59.
         result.InsertKeyFrame(0.737500012F, { 5.64699984F, -249.322998F }, _stepThenHoldEasingFunction);
         return result;
     }
@@ -927,25 +984,15 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // Offset
     Vector2KeyFrameAnimation OffsetVector2Animation_2()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 3.55299997F, -247.229004F }, _stepThenHoldEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.375F, { 3.55299997F, -247.229004F }, _holdThenStepEasingFunction);
-        result.InsertExpressionKeyFrame(0.487499982F, L"(Pow(1-_.t2,3)*Vector2(3.553,-247.229))+(3*Square(1-_.t2)*_.t2*Vector2(3.392,-247.068))+(3*(1-_.t2)*Square(_.t2)*Vector2(2.745,-246.422))+(Pow(_.t2,3)*Vector2(2.584,-246.261))", _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.487500012F, { 2.58400011F, -246.261002F }, _stepThenHoldEasingFunction);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 05 - Search - 03 - PointerOverToNormal
-    // - Transforms for Controls - 05 - Search - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Layer 4
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_3()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 3.61599994F, -247.292007F }, _stepThenHoldEasingFunction);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 5.64699984F, -249.322998F }, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
-        result.InsertKeyFrame(0.25F, { 3.61599994F, -247.292007F }, _holdThenStepEasingFunction);
-        result.InsertExpressionKeyFrame(0.362499982F, L"(Pow(1-_.t3,3)*Vector2(3.616,-247.292))+(3*Square(1-_.t3)*_.t3*Vector2(3.955,-247.631))+(3*(1-_.t3)*Square(_.t3)*Vector2(5.308,-248.984))+(Pow(_.t3,3)*Vector2(5.647,-249.323))", _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.362500012F, { 5.64699984F, -249.322998F }, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, { 5.64699984F, -249.322998F }, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertExpressionKeyFrame(0.487499982F, L"Pow(1-_.t2,3)*Vector2(5.647,-249.323)+(3*Square(1-_.t2)*_.t2*Vector2(5.939,-249.615))+(3*(1-_.t2)*Square(_.t2)*Vector2(7.105,-250.781))+(Pow(_.t2,3)*Vector2(7.397,-251.073))", _stepThenHoldEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.487500012F, { 7.39699984F, -251.072998F }, _stepThenHoldEasingFunction);
         return result;
     }
 
@@ -953,26 +1000,17 @@ class AnimatedFindVisualSource_AnimatedVisual : public winrt::implements<Animate
     // - Transforms for Controls - 05 - Search - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Layer 4
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_4()
+    Vector2KeyFrameAnimation OffsetVector2Animation_3()
     {
+        // Frame 0.
         const auto result = CreateVector2KeyFrameAnimation(0.0F, { 5.64699984F, -249.322998F }, _stepThenHoldEasingFunction);
         result.SetReferenceParameter(L"_", _root);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, { 5.64699984F, -249.322998F }, _holdThenStepEasingFunction);
-        result.InsertExpressionKeyFrame(0.237499982F, L"(Pow(1-_.t4,3)*Vector2(5.647,-249.323))+(3*Square(1-_.t4)*_.t4*Vector2(5.137,-248.813))+(3*(1-_.t4)*Square(_.t4)*Vector2(3.094,-246.771))+(Pow(_.t4,3)*Vector2(2.584,-246.261))", _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.237499997F, { 2.58400011F, -246.261002F }, _stepThenHoldEasingFunction);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 05 - Search - 01 - NormalToPointerOver
-    // - Transforms for Controls - 05 - Search - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Layer 4
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_5()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 5.64699984F, -249.322998F }, _holdThenStepEasingFunction);
-        result.SetReferenceParameter(L"_", _root);
-        result.InsertExpressionKeyFrame(0.11249999F, L"(Pow(1-_.t5,3)*Vector2(5.647,-249.323))+(3*Square(1-_.t5)*_.t5*Vector2(5.308,-248.984))+(3*(1-_.t5)*Square(_.t5)*Vector2(3.955,-247.631))+(Pow(_.t5,3)*Vector2(3.616,-247.292))", _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.112499997F, { 3.61599994F, -247.292007F }, _stepThenHoldEasingFunction);
+        // Frame 19.
+        result.InsertExpressionKeyFrame(0.237499982F, L"Pow(1-_.t3,3)*Vector2(5.647,-249.323)+(3*Square(1-_.t3)*_.t3*Vector2(5.939,-249.615))+(3*(1-_.t3)*Square(_.t3)*Vector2(7.105,-250.781))+(Pow(_.t3,3)*Vector2(7.397,-251.073))", _stepThenHoldEasingFunction);
+        // Frame 19.
+        result.InsertKeyFrame(0.237499997F, { 7.39699984F, -251.072998F }, _stepThenHoldEasingFunction);
         return result;
     }
 
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.h
index ce53bf52bf..99b460b7ba 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.h
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.h
@@ -4,13 +4,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedFindVisualSource.json
 //       
 //       Input file:
-//           AnimatedFindVisualSource.json (17499 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedFindVisualSource.json (14456 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.idl
index 6698ff5f68..fb3fe64c89 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.idl
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedFindVisualSource.idl
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedFindVisualSource.json
 //       
 //       Input file:
-//           AnimatedFindVisualSource.json (17499 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedFindVisualSource.json (14456 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.cpp
index 4209922752..5d47fd4169 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.cpp
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.cpp
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedGlobalNavigationButtonVisualSource.json
 //       
 //       Input file:
-//           AnimatedGlobalNavigationButtonVisualSource.json (52226 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedGlobalNavigationButtonVisualSource.json (37639 bytes created 9:25-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -21,11 +21,11 @@
 // ____________________________________
 // |       Object stats       | Count |
 // |__________________________|_______|
-// | All CompositionObjects   |   337 |
+// | All CompositionObjects   |   291 |
 // |--------------------------+-------|
-// | Expression animators     |    31 |
-// | KeyFrame animators       |    30 |
-// | Reference parameters     |    31 |
+// | Expression animators     |    23 |
+// | KeyFrame animators       |    22 |
+// | Reference parameters     |    23 |
 // | Expression operations    |     4 |
 // |--------------------------+-------|
 // | Animated brushes         |     1 |
@@ -36,7 +36,7 @@
 // | ContainerVisuals         |     7 |
 // | ShapeVisuals             |     6 |
 // |--------------------------+-------|
-// | ContainerShapes          |    18 |
+// | ContainerShapes          |    12 |
 // | CompositionSpriteShapes  |    54 |
 // |--------------------------+-------|
 // | Brushes                  |     1 |
@@ -113,24 +113,23 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     ExpressionAnimation const _reusableExpressionAnimation{ nullptr };
     CompositionPropertySet const _themeProperties{ nullptr };
     CompositionColorBrush _themeColor_Foreground{ nullptr };
-    CompositionPathGeometry _pathGeometry_0{ nullptr };
-    CompositionPathGeometry _pathGeometry_1{ nullptr };
-    CompositionPathGeometry _pathGeometry_2{ nullptr };
-    CompositionPathGeometry _pathGeometry_3{ nullptr };
-    CompositionPathGeometry _pathGeometry_4{ nullptr };
-    CompositionPathGeometry _pathGeometry_5{ nullptr };
-    CompositionPathGeometry _pathGeometry_6{ nullptr };
-    CompositionPathGeometry _pathGeometry_7{ nullptr };
-    CompositionPathGeometry _pathGeometry_8{ nullptr };
+    CompositionPathGeometry _pathGeometry_00{ nullptr };
+    CompositionPathGeometry _pathGeometry_01{ nullptr };
+    CompositionPathGeometry _pathGeometry_02{ nullptr };
+    CompositionPathGeometry _pathGeometry_03{ nullptr };
+    CompositionPathGeometry _pathGeometry_04{ nullptr };
+    CompositionPathGeometry _pathGeometry_05{ nullptr };
+    CompositionPathGeometry _pathGeometry_06{ nullptr };
+    CompositionPathGeometry _pathGeometry_07{ nullptr };
+    CompositionPathGeometry _pathGeometry_08{ nullptr };
+    CompositionPathGeometry _pathGeometry_09{ nullptr };
+    CompositionPathGeometry _pathGeometry_10{ nullptr };
+    CompositionPathGeometry _pathGeometry_11{ nullptr };
     ContainerVisual _root{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_0{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_1{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_2{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_3{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_4{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_5{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_6{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_7{ nullptr };
     ExpressionAnimation _rootProgress{ nullptr };
     InsetClip _insetClip_0{ nullptr };
     StepEasingFunction _holdThenStepEasingFunction{ nullptr };
@@ -196,6 +195,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // PreComp layer: Controls - 02 - Hamburger - 06 - PressedToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_0()
     {
+        // Frame 60.
         const auto result = CreateBooleanKeyFrameAnimation(0.75F, true);
         return result;
     }
@@ -203,7 +203,9 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // PreComp layer: Controls - 02 - Hamburger - 05 - PressedToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_1()
     {
+        // Frame 40.
         const auto result = CreateBooleanKeyFrameAnimation(0.5F, true);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, false);
         return result;
     }
@@ -211,7 +213,9 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // PreComp layer: Controls - 02 - Hamburger - 04 - PointerOverToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_2()
     {
+        // Frame 30.
         const auto result = CreateBooleanKeyFrameAnimation(0.375F, true);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, false);
         return result;
     }
@@ -219,7 +223,9 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_3()
     {
+        // Frame 20.
         const auto result = CreateBooleanKeyFrameAnimation(0.25F, true);
+        // Frame 30.
         result.InsertKeyFrame(0.375F, false);
         return result;
     }
@@ -227,7 +233,9 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // PreComp layer: Controls - 02 - Hamburger - 02 - NormalToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_4()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, true);
+        // Frame 20.
         result.InsertKeyFrame(0.25F, false);
         return result;
     }
@@ -235,11 +243,12 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_5()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.125F, false);
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_0()
+    winrt::com_ptr<CanvasGeometry> Geometry_00()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
@@ -258,7 +267,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_1()
+    winrt::com_ptr<CanvasGeometry> Geometry_01()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
@@ -277,7 +286,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_2()
+    winrt::com_ptr<CanvasGeometry> Geometry_02()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
@@ -296,7 +305,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_3()
+    winrt::com_ptr<CanvasGeometry> Geometry_03()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
@@ -315,7 +324,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_4()
+    winrt::com_ptr<CanvasGeometry> Geometry_04()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
@@ -334,7 +343,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_5()
+    winrt::com_ptr<CanvasGeometry> Geometry_05()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
@@ -353,54 +362,108 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_6()
+    winrt::com_ptr<CanvasGeometry> Geometry_06()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
         winrt::com_ptr<ID2D1GeometrySink> sink{ nullptr };
         winrt::check_hresult(path->Open(sink.put()));
         sink->SetFillMode(D2D1_FILL_MODE_WINDING);
-        sink->BeginFigure({ -7.59299994F, 0.5F }, D2D1_FIGURE_BEGIN_FILLED);
-        sink->AddLine({ 7.6880002F, 0.5F });
-        sink->AddLine({ 7.6880002F, -0.5F });
-        sink->AddLine({ -7.59299994F, -0.5F });
-        sink->AddLine({ -7.59299994F, 0.5F });
+        sink->BeginFigure({ -7.60599995F, 0.5F }, D2D1_FIGURE_BEGIN_FILLED);
+        sink->AddLine({ 7.70100021F, 0.5F });
+        sink->AddLine({ 7.70100021F, -0.5F });
+        sink->AddLine({ -7.60599995F, -0.5F });
+        sink->AddLine({ -7.60599995F, 0.5F });
         sink->EndFigure(D2D1_FIGURE_END_CLOSED);
         winrt::check_hresult(sink->Close());
         auto result = winrt::make_self<CanvasGeometry>(path);
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_7()
+    winrt::com_ptr<CanvasGeometry> Geometry_07()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
         winrt::com_ptr<ID2D1GeometrySink> sink{ nullptr };
         winrt::check_hresult(path->Open(sink.put()));
         sink->SetFillMode(D2D1_FILL_MODE_WINDING);
-        sink->BeginFigure({ 7.6880002F, -0.486999989F }, D2D1_FIGURE_BEGIN_FILLED);
-        sink->AddLine({ -7.59299994F, -0.486999989F });
-        sink->AddLine({ -7.59299994F, 0.513000011F });
-        sink->AddLine({ 7.6880002F, 0.513000011F });
-        sink->AddLine({ 7.6880002F, -0.486999989F });
+        sink->BeginFigure({ 7.70100021F, -0.486999989F }, D2D1_FIGURE_BEGIN_FILLED);
+        sink->AddLine({ -7.60599995F, -0.486999989F });
+        sink->AddLine({ -7.60599995F, 0.513000011F });
+        sink->AddLine({ 7.70100021F, 0.513000011F });
+        sink->AddLine({ 7.70100021F, -0.486999989F });
         sink->EndFigure(D2D1_FIGURE_END_CLOSED);
         winrt::check_hresult(sink->Close());
         auto result = winrt::make_self<CanvasGeometry>(path);
         return result;
     }
 
-    winrt::com_ptr<CanvasGeometry> Geometry_8()
+    winrt::com_ptr<CanvasGeometry> Geometry_08()
     {
         winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
         winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
         winrt::com_ptr<ID2D1GeometrySink> sink{ nullptr };
         winrt::check_hresult(path->Open(sink.put()));
         sink->SetFillMode(D2D1_FILL_MODE_WINDING);
-        sink->BeginFigure({ 7.6880002F, -0.5F }, D2D1_FIGURE_BEGIN_FILLED);
-        sink->AddLine({ -7.59200001F, -0.5F });
-        sink->AddLine({ -7.59200001F, 0.5F });
-        sink->AddLine({ 7.6880002F, 0.5F });
-        sink->AddLine({ 7.6880002F, -0.5F });
+        sink->BeginFigure({ 7.70100021F, -0.5F }, D2D1_FIGURE_BEGIN_FILLED);
+        sink->AddLine({ -7.60500002F, -0.5F });
+        sink->AddLine({ -7.60500002F, 0.5F });
+        sink->AddLine({ 7.70100021F, 0.5F });
+        sink->AddLine({ 7.70100021F, -0.5F });
+        sink->EndFigure(D2D1_FIGURE_END_CLOSED);
+        winrt::check_hresult(sink->Close());
+        auto result = winrt::make_self<CanvasGeometry>(path);
+        return result;
+    }
+
+    winrt::com_ptr<CanvasGeometry> Geometry_09()
+    {
+        winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
+        winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
+        winrt::com_ptr<ID2D1GeometrySink> sink{ nullptr };
+        winrt::check_hresult(path->Open(sink.put()));
+        sink->SetFillMode(D2D1_FILL_MODE_WINDING);
+        sink->BeginFigure({ -7.5999999F, 0.5F }, D2D1_FIGURE_BEGIN_FILLED);
+        sink->AddLine({ 7.6960001F, 0.5F });
+        sink->AddLine({ 7.6960001F, -0.5F });
+        sink->AddLine({ -7.5999999F, -0.5F });
+        sink->AddLine({ -7.5999999F, 0.5F });
+        sink->EndFigure(D2D1_FIGURE_END_CLOSED);
+        winrt::check_hresult(sink->Close());
+        auto result = winrt::make_self<CanvasGeometry>(path);
+        return result;
+    }
+
+    winrt::com_ptr<CanvasGeometry> Geometry_10()
+    {
+        winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
+        winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
+        winrt::com_ptr<ID2D1GeometrySink> sink{ nullptr };
+        winrt::check_hresult(path->Open(sink.put()));
+        sink->SetFillMode(D2D1_FILL_MODE_WINDING);
+        sink->BeginFigure({ 7.6960001F, -0.486999989F }, D2D1_FIGURE_BEGIN_FILLED);
+        sink->AddLine({ -7.5999999F, -0.486999989F });
+        sink->AddLine({ -7.5999999F, 0.513000011F });
+        sink->AddLine({ 7.6960001F, 0.513000011F });
+        sink->AddLine({ 7.6960001F, -0.486999989F });
+        sink->EndFigure(D2D1_FIGURE_END_CLOSED);
+        winrt::check_hresult(sink->Close());
+        auto result = winrt::make_self<CanvasGeometry>(path);
+        return result;
+    }
+
+    winrt::com_ptr<CanvasGeometry> Geometry_11()
+    {
+        winrt::com_ptr<ID2D1PathGeometry> path{ nullptr };
+        winrt::check_hresult(_d2dFactory->CreatePathGeometry(path.put()));
+        winrt::com_ptr<ID2D1GeometrySink> sink{ nullptr };
+        winrt::check_hresult(path->Open(sink.put()));
+        sink->SetFillMode(D2D1_FILL_MODE_WINDING);
+        sink->BeginFigure({ 7.6960001F, -0.5F }, D2D1_FIGURE_BEGIN_FILLED);
+        sink->AddLine({ -7.59899998F, -0.5F });
+        sink->AddLine({ -7.59899998F, 0.5F });
+        sink->AddLine({ 7.6960001F, 0.5F });
+        sink->AddLine({ 7.6960001F, -0.5F });
         sink->EndFigure(D2D1_FIGURE_END_CLOSED);
         winrt::check_hresult(sink->Close());
         auto result = winrt::make_self<CanvasGeometry>(path);
@@ -411,7 +474,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionColorBrush ThemeColor_Foreground()
     {
         const auto result = _themeColor_Foreground = _c.CreateColorBrush();
-        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W*1,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
+        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
         return result;
     }
 
@@ -430,7 +493,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_01());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_02());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_00(), RootProgress());
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_0(), RootProgress());
         return result;
     }
 
@@ -449,7 +512,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_04());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_05());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_01(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_1(), _rootProgress);
         return result;
     }
 
@@ -460,7 +523,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     {
         const auto result = _c.CreateContainerShape();
         result.CenterPoint({ 0.0480000004F, -5.0F });
-        result.Offset({ 23.9559994F, 28.9139996F });
+        result.Offset({ 23.9559994F, 29.0F });
         const auto shapes = result.Shapes();
         // ShapeGroup: Group 3 Offset:<0, -10>
         shapes.Append(SpriteShape_06());
@@ -468,7 +531,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_07());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_08());
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p433_to_1p963(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p433_to_2p749_0(), _rootProgress);
         StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p75_to_2p75_0(), _rootProgress);
         return result;
     }
@@ -488,7 +551,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_10());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_11());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_02(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_2(), _rootProgress);
         return result;
     }
 
@@ -507,7 +570,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_13());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_14());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_03(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_3(), _rootProgress);
         return result;
     }
 
@@ -518,7 +581,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     {
         const auto result = _c.CreateContainerShape();
         result.CenterPoint({ 0.0480000004F, -5.0F });
-        result.Offset({ 23.9559994F, 28.9139996F });
+        result.Offset({ 23.9559994F, 29.0F });
         const auto shapes = result.Shapes();
         // ShapeGroup: Group 3 Offset:<0, -10>
         shapes.Append(SpriteShape_15());
@@ -526,7 +589,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_16());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_17());
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p433_to_2p749(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p433_to_2p749_1(), _rootProgress);
         StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p75_to_2p75_1(), _rootProgress);
         return result;
     }
@@ -546,7 +609,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_19());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_20());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_04(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_4(), _rootProgress);
         return result;
     }
 
@@ -565,7 +628,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_22());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_23());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_05(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_5(), _rootProgress);
         return result;
     }
 
@@ -576,7 +639,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     {
         const auto result = _c.CreateContainerShape();
         result.CenterPoint({ 0.0480000004F, -5.0F });
-        result.Offset({ 23.9559994F, 28.9139996F });
+        result.Offset({ 23.9559994F, 29.0F });
         const auto shapes = result.Shapes();
         // ShapeGroup: Group 3 Offset:<0, -10>
         shapes.Append(SpriteShape_24());
@@ -584,73 +647,15 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_25());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_26());
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p963_to_1p433(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p749_to_1p433_0(), _rootProgress);
         StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p75_to_2p75_2(), _rootProgress);
         return result;
     }
 
-    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_09()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ 7.5F, -5.0F });
-        result.Scale({ 2.75F, 2.75F });
-        const auto shapes = result.Shapes();
-        // ShapeGroup: Group 3 Offset:<0, -10>
-        shapes.Append(SpriteShape_27());
-        // ShapeGroup: Group 2 Offset:<0, -4.85>
-        shapes.Append(SpriteShape_28());
-        // ShapeGroup: Group 1
-        shapes.Append(SpriteShape_29());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_06(), _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_10()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ -7.5F, -5.0F });
-        result.Scale({ 2.75F, 2.75F });
-        const auto shapes = result.Shapes();
-        // ShapeGroup: Group 3 Offset:<0, -10>
-        shapes.Append(SpriteShape_30());
-        // ShapeGroup: Group 2 Offset:<0, -4.85>
-        shapes.Append(SpriteShape_31());
-        // ShapeGroup: Group 1
-        shapes.Append(SpriteShape_32());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_07(), _rootProgress);
-        return result;
-    }
-
-    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_11()
-    {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ 0.0480000004F, -5.0F });
-        result.Offset({ 23.9559994F, 28.9139996F });
-        const auto shapes = result.Shapes();
-        // ShapeGroup: Group 3 Offset:<0, -10>
-        shapes.Append(SpriteShape_33());
-        // ShapeGroup: Group 2 Offset:<0, -4.85>
-        shapes.Append(SpriteShape_34());
-        // ShapeGroup: Group 1
-        shapes.Append(SpriteShape_35());
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_1p963_to_1p963(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p75_to_2p75_3(), _rootProgress);
-        return result;
-    }
-
     // - PreComp layer: Controls - 02 - Hamburger - 02 - NormalToPressed
     // Transforms for Controls - 02 - Hamburger - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_12()
+    CompositionContainerShape ContainerShape_09()
     {
         const auto result = _c.CreateContainerShape();
         result.CenterPoint({ 7.5F, -5.0F });
@@ -662,14 +667,14 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_37());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_38());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_08(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_6(), _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 02 - Hamburger - 02 - NormalToPressed
     // Transforms for Controls - 02 - Hamburger - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_13()
+    CompositionContainerShape ContainerShape_10()
     {
         const auto result = _c.CreateContainerShape();
         result.CenterPoint({ -7.5F, -5.0F });
@@ -681,18 +686,18 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_40());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_41());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_09(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_7(), _rootProgress);
         return result;
     }
 
     // - PreComp layer: Controls - 02 - Hamburger - 02 - NormalToPressed
     // Transforms for Controls - 02 - Hamburger - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_14()
+    CompositionContainerShape ContainerShape_11()
     {
         const auto result = _c.CreateContainerShape();
         result.CenterPoint({ 0.0480000004F, -5.0F });
-        result.Offset({ 23.9559994F, 28.9139996F });
+        result.Offset({ 23.9559994F, 29.0F });
         const auto shapes = result.Shapes();
         // ShapeGroup: Group 3 Offset:<0, -10>
         shapes.Append(SpriteShape_42());
@@ -700,112 +705,69 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         shapes.Append(SpriteShape_43());
         // ShapeGroup: Group 1
         shapes.Append(SpriteShape_44());
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p749_to_1p433(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p75_to_2p75_4(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p749_to_1p433_1(), _rootProgress);
+        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p75_to_2p75_3(), _rootProgress);
         return result;
     }
 
-    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_15()
+    CompositionPathGeometry PathGeometry_00()
     {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ 7.5F, -5.0F });
-        result.Scale({ 2.75F, 2.75F });
-        const auto shapes = result.Shapes();
-        // ShapeGroup: Group 3 Offset:<0, -10>
-        shapes.Append(SpriteShape_45());
-        // ShapeGroup: Group 2 Offset:<0, -4.85>
-        shapes.Append(SpriteShape_46());
-        // ShapeGroup: Group 1
-        shapes.Append(SpriteShape_47());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_10(), _rootProgress);
-        return result;
+        return _pathGeometry_00 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_00())));
     }
 
-    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_16()
+    CompositionPathGeometry PathGeometry_01()
     {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ -7.5F, -5.0F });
-        result.Scale({ 2.75F, 2.75F });
-        const auto shapes = result.Shapes();
-        // ShapeGroup: Group 3 Offset:<0, -10>
-        shapes.Append(SpriteShape_48());
-        // ShapeGroup: Group 2 Offset:<0, -4.85>
-        shapes.Append(SpriteShape_49());
-        // ShapeGroup: Group 1
-        shapes.Append(SpriteShape_50());
-        StartProgressBoundAnimation(result, L"Offset", OffsetVector2Animation_11(), _rootProgress);
-        return result;
+        return _pathGeometry_01 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_01())));
     }
 
-    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
-    CompositionContainerShape ContainerShape_17()
+    CompositionPathGeometry PathGeometry_02()
     {
-        const auto result = _c.CreateContainerShape();
-        result.CenterPoint({ 0.0480000004F, -5.0F });
-        result.Offset({ 23.9559994F, 28.9139996F });
-        const auto shapes = result.Shapes();
-        // ShapeGroup: Group 3 Offset:<0, -10>
-        shapes.Append(SpriteShape_51());
-        // ShapeGroup: Group 2 Offset:<0, -4.85>
-        shapes.Append(SpriteShape_52());
-        // ShapeGroup: Group 1
-        shapes.Append(SpriteShape_53());
-        StartProgressBoundAnimation(result, L"Scale.X", ScaleXScalarAnimation_2p749_to_1p963(), _rootProgress);
-        StartProgressBoundAnimation(result, L"Scale.Y", ScaleYScalarAnimation_2p75_to_2p75_5(), _rootProgress);
-        return result;
+        return _pathGeometry_02 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_02())));
     }
 
-    CompositionPathGeometry PathGeometry_0()
+    CompositionPathGeometry PathGeometry_03()
     {
-        return _pathGeometry_0 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_0())));
+        return _pathGeometry_03 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_03())));
     }
 
-    CompositionPathGeometry PathGeometry_1()
+    CompositionPathGeometry PathGeometry_04()
     {
-        return _pathGeometry_1 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_1())));
+        return _pathGeometry_04 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_04())));
     }
 
-    CompositionPathGeometry PathGeometry_2()
+    CompositionPathGeometry PathGeometry_05()
     {
-        return _pathGeometry_2 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_2())));
+        return _pathGeometry_05 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_05())));
     }
 
-    CompositionPathGeometry PathGeometry_3()
+    CompositionPathGeometry PathGeometry_06()
     {
-        return _pathGeometry_3 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_3())));
+        return _pathGeometry_06 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_06())));
     }
 
-    CompositionPathGeometry PathGeometry_4()
+    CompositionPathGeometry PathGeometry_07()
     {
-        return _pathGeometry_4 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_4())));
+        return _pathGeometry_07 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_07())));
     }
 
-    CompositionPathGeometry PathGeometry_5()
+    CompositionPathGeometry PathGeometry_08()
     {
-        return _pathGeometry_5 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_5())));
+        return _pathGeometry_08 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_08())));
     }
 
-    CompositionPathGeometry PathGeometry_6()
+    CompositionPathGeometry PathGeometry_09()
     {
-        return _pathGeometry_6 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_6())));
+        return _pathGeometry_09 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_09())));
     }
 
-    CompositionPathGeometry PathGeometry_7()
+    CompositionPathGeometry PathGeometry_10()
     {
-        return _pathGeometry_7 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_7())));
+        return _pathGeometry_10 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_10())));
     }
 
-    CompositionPathGeometry PathGeometry_8()
+    CompositionPathGeometry PathGeometry_11()
     {
-        return _pathGeometry_8 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_8())));
+        return _pathGeometry_11 = _c.CreatePathGeometry(CompositionPath(CanvasGeometryToIGeometrySource2D(Geometry_11())));
     }
 
     // - - PreComp layer: Controls - 02 - Hamburger - 06 - PressedToPointerOver
@@ -815,7 +777,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_00()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(PathGeometry_0(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, ThemeColor_Foreground());
+        const auto result = CreateSpriteShape(PathGeometry_00(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, ThemeColor_Foreground());
         return result;
     }
 
@@ -826,7 +788,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_01()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(PathGeometry_1(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(PathGeometry_01(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -836,7 +798,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_02()
     {
-        const auto result = _c.CreateSpriteShape(PathGeometry_2());
+        const auto result = _c.CreateSpriteShape(PathGeometry_02());
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -848,7 +810,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_03()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(PathGeometry_3(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(PathGeometry_03(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -859,7 +821,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_04()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(PathGeometry_4(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(PathGeometry_04(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -869,7 +831,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_05()
     {
-        const auto result = _c.CreateSpriteShape(PathGeometry_5());
+        const auto result = _c.CreateSpriteShape(PathGeometry_05());
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -881,7 +843,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_06()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(PathGeometry_6(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(PathGeometry_06(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -892,7 +854,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_07()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(PathGeometry_7(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(PathGeometry_07(), { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -902,7 +864,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_08()
     {
-        const auto result = _c.CreateSpriteShape(PathGeometry_8());
+        const auto result = _c.CreateSpriteShape(PathGeometry_08());
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -914,7 +876,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_09()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_0, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_00, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -925,7 +887,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_10()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_1, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_01, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -935,7 +897,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_11()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_2);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_02);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -947,7 +909,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_12()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_3, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_03, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -958,7 +920,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_13()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_4, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_04, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -968,7 +930,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_14()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_5);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_05);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -980,7 +942,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_15()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_6, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_06, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -991,7 +953,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_16()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_7, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_07, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1001,7 +963,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_17()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_8);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_08);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -1013,7 +975,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_18()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_0, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_00, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1024,7 +986,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_19()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_1, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_01, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1034,7 +996,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_20()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_2);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_02);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -1046,7 +1008,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_21()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_3, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_03, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1057,7 +1019,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_22()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_4, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_04, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1067,7 +1029,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_23()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_5);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_05);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -1079,7 +1041,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_24()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_6, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_06, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1090,7 +1052,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_25()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_7, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_07, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1100,107 +1062,101 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_26()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_8);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_08);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_27()
     {
-        // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_0, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        // Offset:<24.383, 10.25>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_00, { 2.75F, 0.0F, 0.0F, 2.75F, 24.3829994F, 10.25F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_28()
     {
-        // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_1, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        // Offset:<24.383, 24.4125>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_01, { 2.75F, 0.0F, 0.0F, 2.75F, 24.3829994F, 24.4125004F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_29()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_2);
-        result.FillBrush(_themeColor_Foreground);
+        // Offset:<24.383, 37.75>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_02, { 2.75F, 0.0F, 0.0F, 2.75F, 24.3829994F, 37.75F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_30()
     {
-        // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_3, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        // Offset:<23.629, 10.25>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_03, { 2.75F, 0.0F, 0.0F, 2.75F, 23.6289997F, 10.25F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_31()
     {
-        // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_4, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        // Offset:<23.629, 24.4125>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_04, { 2.75F, 0.0F, 0.0F, 2.75F, 23.6289997F, 24.4125004F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_32()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_5);
-        result.FillBrush(_themeColor_Foreground);
+        // Offset:<23.629, 37.75>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_05, { 2.75F, 0.0F, 0.0F, 2.75F, 23.6289997F, 37.75F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_33()
     {
-        // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_6, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        // Offset:<23.872047, 10.25>, Rotation:-0.009138340298435101 degrees,
+        // Scale:<2.749, 2.75>
+        const auto result = CreateSpriteShape(PathGeometry_09(), { 2.74900007F, 0.0F, 0.0F, 2.75F, 23.8720474F, 10.25F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_34()
     {
-        // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_7, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        // Offset:<23.872047, 24.4125>, Rotation:-0.009138340298435101 degrees,
+        // Scale:<2.749, 2.75>
+        const auto result = CreateSpriteShape(PathGeometry_10(), { 2.74900007F, 0.0F, 0.0F, 2.75F, 23.8720474F, 24.4125004F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
+    // Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_35()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_8);
-        result.FillBrush(_themeColor_Foreground);
+        // Offset:<23.872047, 37.75>, Rotation:-0.009138340298435101 degrees,
+        // Scale:<2.749, 2.75>
+        const auto result = CreateSpriteShape(PathGeometry_11(), { 2.74900007F, 0.0F, 0.0F, 2.75F, 23.8720474F, 37.75F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1211,7 +1167,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_36()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_0, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_00, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1222,7 +1178,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_37()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_1, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_01, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1232,7 +1188,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_38()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_2);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_02);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -1244,7 +1200,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_39()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_3, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_03, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1255,7 +1211,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_40()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_4, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_04, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1265,7 +1221,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_41()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_5);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_05);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
@@ -1277,7 +1233,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_42()
     {
         // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_6, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_06, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1288,7 +1244,7 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     CompositionSpriteShape SpriteShape_43()
     {
         // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_7, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        const auto result = CreateSpriteShape(_pathGeometry_07, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1298,107 +1254,101 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Path 1
     CompositionSpriteShape SpriteShape_44()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_8);
+        const auto result = _c.CreateSpriteShape(_pathGeometry_08);
         result.FillBrush(_themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_45()
     {
-        // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_0, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        // Offset:<24.383, 10.25>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_00, { 2.75F, 0.0F, 0.0F, 2.75F, 24.3829994F, 10.25F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_46()
     {
-        // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_1, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        // Offset:<24.383, 24.4125>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_01, { 2.75F, 0.0F, 0.0F, 2.75F, 24.3829994F, 24.4125004F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_47()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_2);
-        result.FillBrush(_themeColor_Foreground);
+        // Offset:<24.383, 37.75>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_02, { 2.75F, 0.0F, 0.0F, 2.75F, 24.3829994F, 37.75F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_48()
     {
-        // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_3, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        // Offset:<23.629, 10.25>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_03, { 2.75F, 0.0F, 0.0F, 2.75F, 23.6289997F, 10.25F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_49()
     {
-        // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_4, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        // Offset:<23.629, 24.4125>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_04, { 2.75F, 0.0F, 0.0F, 2.75F, 23.6289997F, 24.4125004F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_50()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_5);
-        result.FillBrush(_themeColor_Foreground);
+        // Offset:<23.629, 37.75>, Scale:<2.75, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_05, { 2.75F, 0.0F, 0.0F, 2.75F, 23.6289997F, 37.75F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_51()
     {
-        // Offset:<0, -10>
-        const auto result = CreateSpriteShape(_pathGeometry_6, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -10.0F }, _themeColor_Foreground);
+        // Offset:<23.872047, 10.25>, Rotation:-0.009138340298435101 degrees,
+        // Scale:<2.749, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_09, { 2.74900007F, 0.0F, 0.0F, 2.75F, 23.8720474F, 10.25F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_52()
     {
-        // Offset:<0, -4.85>
-        const auto result = CreateSpriteShape(_pathGeometry_7, { 1.0F, 0.0F, 0.0F, 1.0F, 0.0F, -4.8499999F }, _themeColor_Foreground);
+        // Offset:<23.872047, 24.4125>, Rotation:-0.009138340298435101 degrees,
+        // Scale:<2.749, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_10, { 2.74900007F, 0.0F, 0.0F, 2.75F, 23.8720474F, 24.4125004F }, _themeColor_Foreground);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
+    // - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
+    // Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
     // Path 1
     CompositionSpriteShape SpriteShape_53()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry_8);
-        result.FillBrush(_themeColor_Foreground);
+        // Offset:<23.872047, 37.75>, Rotation:-0.009138340298435101 degrees,
+        // Scale:<2.749, 2.75>
+        const auto result = CreateSpriteShape(_pathGeometry_11, { 2.74900007F, 0.0F, 0.0F, 2.75F, 23.8720474F, 37.75F }, _themeColor_Foreground);
         return result;
     }
 
@@ -1533,26 +1483,6 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         return _cubicBezierEasingFunction_3 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.0F }, { 0.0F, 1.0F });
     }
 
-    CubicBezierEasingFunction CubicBezierEasingFunction_4()
-    {
-        return _cubicBezierEasingFunction_4 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.25F, 1.0F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_5()
-    {
-        return _cubicBezierEasingFunction_5 = _c.CreateCubicBezierEasingFunction({ 0.0F, 0.0F }, { 0.833000004F, 0.833000004F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_6()
-    {
-        return _cubicBezierEasingFunction_6 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.0F }, { 0.25F, 1.0F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_7()
-    {
-        return _cubicBezierEasingFunction_7 = _c.CreateCubicBezierEasingFunction({ 0.0F, 0.0F }, { 0.833000004F, 1.0F });
-    }
-
     ExpressionAnimation RootProgress()
     {
         const auto result = _rootProgress = _c.CreateExpressionAnimation(L"_.Progress");
@@ -1570,12 +1500,16 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 06 - PressedToPointerOver Scale(1,1,0)
     // Layer: Right Caps 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p433_to_1p963()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p433_to_2p749_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.43256998F, _stepThenHoldEasingFunction);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, 1.43256998F, _holdThenStepEasingFunction);
+        // Frame 68.
         result.InsertKeyFrame(0.850000024F, 2.88000011F, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.987500012F, 1.96300006F, _cubicBezierEasingFunction_1);
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, 2.74850011F, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -1583,11 +1517,15 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 05 - PressedToNormal Scale(1,1,0)
     // Layer: Right Caps 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p433_to_2p749()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p433_to_2p749_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.43256998F, _stepThenHoldEasingFunction);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, 1.43256998F, _holdThenStepEasingFunction);
+        // Frame 48.
         result.InsertKeyFrame(0.600000024F, 2.88000011F, _cubicBezierEasingFunction_0);
+        // Frame 59.
         result.InsertKeyFrame(0.737500012F, 2.74850011F, _cubicBezierEasingFunction_1);
         return result;
     }
@@ -1596,67 +1534,45 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 04 - PointerOverToPressed Scale(1,1,0)
     // Layer: Right Caps 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p963_to_1p433()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p749_to_1p433_0()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.96300006F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, 1.96300006F, _holdThenStepEasingFunction);
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.74900007F, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, 2.74900007F, _holdThenStepEasingFunction);
+        // Frame 39.
         result.InsertKeyFrame(0.487500012F, 1.43256998F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_1p963_to_1p963()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 1.96300006F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, 1.96300006F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, 2.74900007F, _cubicBezierEasingFunction_4);
-        result.InsertKeyFrame(0.625F, 1.96300006F, _cubicBezierEasingFunction_5);
-        result.InsertKeyFrame(0.75F, 1.43256998F, _cubicBezierEasingFunction_2);
-        result.InsertKeyFrame(0.850000024F, 2.88000011F, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(1.0F, 1.96300006F, _cubicBezierEasingFunction_1);
-        return result;
-    }
-
     // - - PreComp layer: Controls - 02 - Hamburger - 02 - NormalToPressed
     // - Transforms for Controls - 02 - Hamburger - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Right Caps 2
     // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p749_to_1p433()
+    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p749_to_1p433_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.74900007F, _stepThenHoldEasingFunction);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, 2.74900007F, _holdThenStepEasingFunction);
+        // Frame 19.
         result.InsertKeyFrame(0.237499997F, 1.43256998F, _cubicBezierEasingFunction_2);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleXScalarAnimation_2p749_to_1p963()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.74900007F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, 1.96300006F, _cubicBezierEasingFunction_4);
-        result.InsertKeyFrame(0.375F, 1.96300006F, _cubicBezierEasingFunction_7);
-        result.InsertKeyFrame(0.5F, 1.43256998F, _cubicBezierEasingFunction_2);
-        result.InsertKeyFrame(0.600000024F, 2.88000011F, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.75F, 1.96300006F, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(1.0F, 1.96300006F, _cubicBezierEasingFunction_7);
-        return result;
-    }
-
     // - - PreComp layer: Controls - 02 - Hamburger - 06 - PressedToPointerOver
     // - Transforms for Controls - 02 - Hamburger - 06 - PressedToPointerOver Scale(1,1,0)
     // Layer: Right Caps 2
     // Scale
     ScalarKeyFrameAnimation ScaleYScalarAnimation_2p75_to_2p75_0()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.75F, _stepThenHoldEasingFunction);
+        // Frame 60.
         result.InsertKeyFrame(0.75F, 2.75F, _holdThenStepEasingFunction);
+        // Frame 68.
         result.InsertKeyFrame(0.850000024F, 2.73294997F, _cubicBezierEasingFunction_0);
+        // Frame 79.
         result.InsertKeyFrame(0.987500012F, 2.75F, _cubicBezierEasingFunction_1);
         return result;
     }
@@ -1667,9 +1583,13 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Scale
     ScalarKeyFrameAnimation ScaleYScalarAnimation_2p75_to_2p75_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.75F, _stepThenHoldEasingFunction);
+        // Frame 40.
         result.InsertKeyFrame(0.5F, 2.75F, _holdThenStepEasingFunction);
+        // Frame 48.
         result.InsertKeyFrame(0.600000024F, 2.73294997F, _cubicBezierEasingFunction_0);
+        // Frame 59.
         result.InsertKeyFrame(0.737500012F, 2.75F, _cubicBezierEasingFunction_1);
         return result;
     }
@@ -1680,56 +1600,30 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // Scale
     ScalarKeyFrameAnimation ScaleYScalarAnimation_2p75_to_2p75_2()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.75F, _stepThenHoldEasingFunction);
+        // Frame 30.
         result.InsertKeyFrame(0.375F, 2.75F, _holdThenStepEasingFunction);
+        // Frame 39.
         result.InsertKeyFrame(0.487500012F, 2.75F, CubicBezierEasingFunction_3());
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p75_to_2p75_3()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.75F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, 2.75F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, 2.75F, CubicBezierEasingFunction_6());
-        result.InsertKeyFrame(0.625F, 2.75F, CubicBezierEasingFunction_7());
-        result.InsertKeyFrame(0.75F, 2.75F, _cubicBezierEasingFunction_3);
-        result.InsertKeyFrame(0.850000024F, 2.73294997F, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(1.0F, 2.75F, _cubicBezierEasingFunction_1);
-        return result;
-    }
-
     // - - PreComp layer: Controls - 02 - Hamburger - 02 - NormalToPressed
     // - Transforms for Controls - 02 - Hamburger - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Right Caps 2
     // Scale
-    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p75_to_2p75_4()
+    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p75_to_2p75_3()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.75F, _stepThenHoldEasingFunction);
+        // Frame 10.
         result.InsertKeyFrame(0.125F, 2.75F, _holdThenStepEasingFunction);
+        // Frame 19.
         result.InsertKeyFrame(0.237499997F, 2.75F, _cubicBezierEasingFunction_3);
         return result;
     }
 
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Scale
-    ScalarKeyFrameAnimation ScaleYScalarAnimation_2p75_to_2p75_5()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 2.75F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, 2.75F, _cubicBezierEasingFunction_6);
-        result.InsertKeyFrame(0.375F, 2.75F, _cubicBezierEasingFunction_7);
-        result.InsertKeyFrame(0.5F, 2.75F, _cubicBezierEasingFunction_3);
-        result.InsertKeyFrame(0.600000024F, 2.73294997F, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.75F, 2.75F, _cubicBezierEasingFunction_1);
-        result.InsertKeyFrame(1.0F, 2.75F, _cubicBezierEasingFunction_7);
-        return result;
-    }
-
     // PreComp layer: Controls - 02 - Hamburger - 06 - PressedToPointerOver
     // Layer aggregator
     ShapeVisual ShapeVisual_0()
@@ -1786,11 +1680,23 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         result.Size({ 48.0F, 48.0F });
         const auto shapes = result.Shapes();
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_09());
+        shapes.Append(SpriteShape_27());
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_10());
+        shapes.Append(SpriteShape_28());
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_11());
+        shapes.Append(SpriteShape_29());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_30());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_31());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_32());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_33());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_34());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_35());
         return result;
     }
 
@@ -1802,11 +1708,11 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         result.Size({ 48.0F, 48.0F });
         const auto shapes = result.Shapes();
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_12());
+        shapes.Append(ContainerShape_09());
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_13());
+        shapes.Append(ContainerShape_10());
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_14());
+        shapes.Append(ContainerShape_11());
         return result;
     }
 
@@ -1818,11 +1724,23 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
         result.Size({ 48.0F, 48.0F });
         const auto shapes = result.Shapes();
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_15());
+        shapes.Append(SpriteShape_45());
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_16());
+        shapes.Append(SpriteShape_46());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_47());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_48());
         // Layer: Right Caps 2
-        shapes.Append(ContainerShape_17());
+        shapes.Append(SpriteShape_49());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_50());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_51());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_52());
+        // Layer: Right Caps 2
+        shapes.Append(SpriteShape_53());
         return result;
     }
 
@@ -1844,12 +1762,16 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 06 - PressedToPointerOver Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_00()
+    Vector2KeyFrameAnimation OffsetVector2Animation_0()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 27.5079994F, 28.9139996F }, StepThenHoldEasingFunction());
-        result.InsertKeyFrame(0.75F, { 27.5079994F, 28.9139996F }, HoldThenStepEasingFunction());
-        result.InsertKeyFrame(0.850000024F, { 38.5040016F, 28.9139996F }, CubicBezierEasingFunction_0());
-        result.InsertKeyFrame(0.987500012F, { 31.5079994F, 28.9139996F }, CubicBezierEasingFunction_1());
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 27.5079994F, 29.0F }, StepThenHoldEasingFunction());
+        // Frame 60.
+        result.InsertKeyFrame(0.75F, { 27.5079994F, 29.0F }, HoldThenStepEasingFunction());
+        // Frame 68.
+        result.InsertKeyFrame(0.850000024F, { 38.5040016F, 29.0F }, CubicBezierEasingFunction_0());
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, { 37.5079994F, 29.0F }, CubicBezierEasingFunction_1());
         return result;
     }
 
@@ -1857,12 +1779,16 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 06 - PressedToPointerOver Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_01()
+    Vector2KeyFrameAnimation OffsetVector2Animation_1()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 20.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.75F, { 20.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.850000024F, { 9.50800037F, 28.9139996F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.987500012F, { 16.5079994F, 28.9139996F }, _cubicBezierEasingFunction_1);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 20.5079994F, 29.0F }, _stepThenHoldEasingFunction);
+        // Frame 60.
+        result.InsertKeyFrame(0.75F, { 20.5079994F, 29.0F }, _holdThenStepEasingFunction);
+        // Frame 68.
+        result.InsertKeyFrame(0.850000024F, { 9.50800037F, 29.0F }, _cubicBezierEasingFunction_0);
+        // Frame 79.
+        result.InsertKeyFrame(0.987500012F, { 10.5039997F, 29.0F }, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -1870,12 +1796,16 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 05 - PressedToNormal Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_02()
+    Vector2KeyFrameAnimation OffsetVector2Animation_2()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 27.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.5F, { 27.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.600000024F, { 38.5040016F, 28.9139996F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.737500012F, { 37.5079994F, 28.9139996F }, _cubicBezierEasingFunction_1);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 27.5079994F, 29.0F }, _stepThenHoldEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.5F, { 27.5079994F, 29.0F }, _holdThenStepEasingFunction);
+        // Frame 48.
+        result.InsertKeyFrame(0.600000024F, { 38.5040016F, 29.0F }, _cubicBezierEasingFunction_0);
+        // Frame 59.
+        result.InsertKeyFrame(0.737500012F, { 37.5079994F, 29.0F }, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -1883,12 +1813,16 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 05 - PressedToNormal Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_03()
+    Vector2KeyFrameAnimation OffsetVector2Animation_3()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 20.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.5F, { 20.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.600000024F, { 9.50800037F, 28.9139996F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.737500012F, { 10.5039997F, 28.9139996F }, _cubicBezierEasingFunction_1);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 20.5079994F, 29.0F }, _stepThenHoldEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.5F, { 20.5079994F, 29.0F }, _holdThenStepEasingFunction);
+        // Frame 48.
+        result.InsertKeyFrame(0.600000024F, { 9.50800037F, 29.0F }, _cubicBezierEasingFunction_0);
+        // Frame 59.
+        result.InsertKeyFrame(0.737500012F, { 10.5039997F, 29.0F }, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -1896,11 +1830,14 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 04 - PointerOverToPressed Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_04()
+    Vector2KeyFrameAnimation OffsetVector2Animation_4()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 31.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, { 31.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.487500012F, { 27.5079994F, 28.9139996F }, CubicBezierEasingFunction_2());
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 37.5079994F, 29.0F }, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, { 37.5079994F, 29.0F }, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.487500012F, { 27.5079994F, 29.0F }, CubicBezierEasingFunction_2());
         return result;
     }
 
@@ -1908,43 +1845,14 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 04 - PointerOverToPressed Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_05()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 16.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.375F, { 16.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.487500012F, { 20.5079994F, 28.9139996F }, _cubicBezierEasingFunction_2);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_06()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 31.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, { 31.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, { 37.5079994F, 28.9139996F }, CubicBezierEasingFunction_4());
-        result.InsertKeyFrame(0.625F, { 31.5079994F, 28.9139996F }, CubicBezierEasingFunction_5());
-        result.InsertKeyFrame(0.75F, { 27.5079994F, 28.9139996F }, _cubicBezierEasingFunction_2);
-        result.InsertKeyFrame(0.850000024F, { 38.5040016F, 28.9139996F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(1.0F, { 31.5079994F, 28.9139996F }, _cubicBezierEasingFunction_1);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 02 - Hamburger - 03 - PointerOverToNormal
-    // - Transforms for Controls - 02 - Hamburger - 03 - PointerOverToNormal Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_07()
+    Vector2KeyFrameAnimation OffsetVector2Animation_5()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 16.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, { 16.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.362500012F, { 10.5039997F, 28.9139996F }, _cubicBezierEasingFunction_4);
-        result.InsertKeyFrame(0.625F, { 16.5079994F, 28.9139996F }, _cubicBezierEasingFunction_5);
-        result.InsertKeyFrame(0.75F, { 20.5079994F, 28.9139996F }, _cubicBezierEasingFunction_2);
-        result.InsertKeyFrame(0.850000024F, { 9.50800037F, 28.9139996F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(1.0F, { 16.5079994F, 28.9139996F }, _cubicBezierEasingFunction_1);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 10.5039997F, 29.0F }, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.375F, { 10.5039997F, 29.0F }, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.487500012F, { 20.5079994F, 29.0F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1952,11 +1860,14 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_08()
+    Vector2KeyFrameAnimation OffsetVector2Animation_6()
     {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 37.5079994F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.125F, { 37.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.237499997F, { 27.5079994F, 28.9139996F }, _cubicBezierEasingFunction_2);
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 37.5079994F, 29.0F }, _stepThenHoldEasingFunction);
+        // Frame 10.
+        result.InsertKeyFrame(0.125F, { 37.5079994F, 29.0F }, _holdThenStepEasingFunction);
+        // Frame 19.
+        result.InsertKeyFrame(0.237499997F, { 27.5079994F, 29.0F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
@@ -1964,41 +1875,14 @@ class AnimatedGlobalNavigationButtonVisualSource_AnimatedVisual : public winrt::
     // - Transforms for Controls - 02 - Hamburger - 02 - NormalToPressed Scale(1,1,0)
     // Layer: Right Caps 2
     // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_09()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 10.5039997F, 28.9139996F }, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.125F, { 10.5039997F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.237499997F, { 20.5079994F, 28.9139996F }, _cubicBezierEasingFunction_2);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_10()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 37.5079994F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, { 31.5079994F, 28.9139996F }, _cubicBezierEasingFunction_4);
-        result.InsertKeyFrame(0.375F, { 31.5079994F, 28.9139996F }, _cubicBezierEasingFunction_5);
-        result.InsertKeyFrame(0.5F, { 27.5079994F, 28.9139996F }, _cubicBezierEasingFunction_2);
-        result.InsertKeyFrame(0.600000024F, { 38.5040016F, 28.9139996F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.75F, { 31.5079994F, 28.9139996F }, _cubicBezierEasingFunction_1);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 02 - Hamburger - 01 - NormalToPointerOver
-    // - Transforms for Controls - 02 - Hamburger - 01 - NormalToPointerOver Scale(1,1,0)
-    // Layer: Right Caps 2
-    // Offset
-    Vector2KeyFrameAnimation OffsetVector2Animation_11()
-    {
-        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 10.5039997F, 28.9139996F }, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.112499997F, { 16.5079994F, 28.9139996F }, _cubicBezierEasingFunction_4);
-        result.InsertKeyFrame(0.375F, { 16.5079994F, 28.9139996F }, _cubicBezierEasingFunction_5);
-        result.InsertKeyFrame(0.5F, { 20.5079994F, 28.9139996F }, _cubicBezierEasingFunction_2);
-        result.InsertKeyFrame(0.600000024F, { 9.50800037F, 28.9139996F }, _cubicBezierEasingFunction_0);
-        result.InsertKeyFrame(0.75F, { 16.5079994F, 28.9139996F }, _cubicBezierEasingFunction_1);
+    Vector2KeyFrameAnimation OffsetVector2Animation_7()
+    {
+        // Frame 0.
+        const auto result = CreateVector2KeyFrameAnimation(0.0F, { 10.5039997F, 29.0F }, _stepThenHoldEasingFunction);
+        // Frame 10.
+        result.InsertKeyFrame(0.125F, { 10.5039997F, 29.0F }, _holdThenStepEasingFunction);
+        // Frame 19.
+        result.InsertKeyFrame(0.237499997F, { 20.5079994F, 29.0F }, _cubicBezierEasingFunction_2);
         return result;
     }
 
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.h
index 88ffbdac10..7b2f5d1893 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.h
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.h
@@ -4,13 +4,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedGlobalNavigationButtonVisualSource.json
 //       
 //       Input file:
-//           AnimatedGlobalNavigationButtonVisualSource.json (52226 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedGlobalNavigationButtonVisualSource.json (37639 bytes created 9:25-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -47,7 +47,6 @@
 // |________________|____________|_______|_________________|
 // | Foreground     | Foreground | Color | #FF000000 Black |
 // ---------------------------------------------------------
-
 class AnimatedGlobalNavigationButtonVisualSource
     : public winrt::implementation::AnimatedGlobalNavigationButtonVisualSourceT<AnimatedGlobalNavigationButtonVisualSource>
 {
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.idl
index db0119b0b3..15d2a85116 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.idl
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedGlobalNavigationButtonVisualSource.idl
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedGlobalNavigationButtonVisualSource.json
 //       
 //       Input file:
-//           AnimatedGlobalNavigationButtonVisualSource.json (52226 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedGlobalNavigationButtonVisualSource.json (37639 bytes created 9:25-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.cpp b/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.cpp
index de47c01e8f..1c774b5d3f 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.cpp
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.cpp
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedSettingsVisualSource.json
 //       
 //       Input file:
-//           AnimatedSettingsVisualSource.json (28755 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedSettingsVisualSource.json (28705 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
@@ -21,11 +21,11 @@
 // ____________________________________
 // |       Object stats       | Count |
 // |__________________________|_______|
-// | All CompositionObjects   |   107 |
+// | All CompositionObjects   |    97 |
 // |--------------------------+-------|
-// | Expression animators     |    13 |
-// | KeyFrame animators       |    12 |
-// | Reference parameters     |    13 |
+// | Expression animators     |    11 |
+// | KeyFrame animators       |    10 |
+// | Reference parameters     |    11 |
 // | Expression operations    |     4 |
 // |--------------------------+-------|
 // | Animated brushes         |     1 |
@@ -117,7 +117,6 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     ContainerVisual _root{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_0{ nullptr };
     CubicBezierEasingFunction _cubicBezierEasingFunction_1{ nullptr };
-    CubicBezierEasingFunction _cubicBezierEasingFunction_2{ nullptr };
     ExpressionAnimation _rootProgress{ nullptr };
     InsetClip _insetClip_0{ nullptr };
     StepEasingFunction _holdThenStepEasingFunction{ nullptr };
@@ -164,9 +163,18 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
         return result;
     }
 
+    CompositionSpriteShape CreateSpriteShape(CompositionGeometry geometry, winrt::float3x2 transformMatrix, CompositionBrush fillBrush)
+    {
+        const auto result = _c.CreateSpriteShape(geometry);
+        result.TransformMatrix(transformMatrix);
+        result.FillBrush(fillBrush);
+        return result;
+    }
+
     // PreComp layer: Controls - 04 - Settings - 06 - PressedToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_0()
     {
+        // Frame 80.
         const auto result = CreateBooleanKeyFrameAnimation(0.666666687F, true);
         return result;
     }
@@ -174,7 +182,9 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // PreComp layer: Controls - 04 - Settings - 05 - PressedToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_1()
     {
+        // Frame 40.
         const auto result = CreateBooleanKeyFrameAnimation(0.333333343F, true);
+        // Frame 80.
         result.InsertKeyFrame(0.666666687F, false);
         return result;
     }
@@ -182,7 +192,9 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // PreComp layer: Controls - 04 - Settings - 04 - PointerOverToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_2()
     {
+        // Frame 30.
         const auto result = CreateBooleanKeyFrameAnimation(0.25F, true);
+        // Frame 40.
         result.InsertKeyFrame(0.333333343F, false);
         return result;
     }
@@ -190,7 +202,9 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // PreComp layer: Controls - 04 - Settings - 03 - PointerOverToNormal
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_3()
     {
+        // Frame 20.
         const auto result = CreateBooleanKeyFrameAnimation(0.166666672F, true);
+        // Frame 30.
         result.InsertKeyFrame(0.25F, false);
         return result;
     }
@@ -198,7 +212,9 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // PreComp layer: Controls - 04 - Settings - 02 - NormalToPressed
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_4()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.0833333358F, true);
+        // Frame 20.
         result.InsertKeyFrame(0.166666672F, false);
         return result;
     }
@@ -206,6 +222,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // PreComp layer: Controls - 04 - Settings - 01 - NormalToPointerOver
     BooleanKeyFrameAnimation IsVisibleBooleanAnimation_5()
     {
+        // Frame 10.
         const auto result = CreateBooleanKeyFrameAnimation(0.0833333358F, false);
         return result;
     }
@@ -378,7 +395,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     CompositionColorBrush ThemeColor_Foreground()
     {
         const auto result = _themeColor_Foreground = _c.CreateColorBrush();
-        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W*1,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
+        BindProperty(result, L"Color", L"ColorRGB(_theme.Foreground.W,_theme.Foreground.X,_theme.Foreground.Y,_theme.Foreground.Z)", L"_theme", _themeProperties);
         return result;
     }
 
@@ -398,7 +415,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
         result.Offset({ -31.8590012F, -9.23899841F });
         result.Scale({ 3.0F, 3.0F });
         result.FillBrush(ThemeColor_Foreground());
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_m20_to_350(), RootProgress());
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_360_0(), RootProgress());
         return result;
     }
 
@@ -412,7 +429,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
         result.Offset({ -31.8590012F, -9.23899841F });
         result.Scale({ 3.0F, 3.0F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_m20_to_360(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_360_1(), _rootProgress);
         return result;
     }
 
@@ -426,7 +443,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
         result.Offset({ -31.8590012F, -9.23899841F });
         result.Scale({ 3.0F, 3.0F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_m10_to_m20(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_m20_0(), _rootProgress);
         return result;
     }
 
@@ -435,12 +452,8 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // Path 4+Path 3+Path 2+Path 1
     CompositionSpriteShape SpriteShape_3()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.CenterPoint({ 55.8590012F, 33.2389984F });
-        result.Offset({ -31.8590012F, -9.23899841F });
-        result.Scale({ 3.0F, 3.0F });
-        result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_m10_to_0(), _rootProgress);
+        // Offset:<-143.577, -75.716995>, Scale:<3, 3>
+        const auto result = CreateSpriteShape(_pathGeometry, { 3.0F, 0.0F, 0.0F, 3.0F, -143.576996F, -75.7169952F }, _themeColor_Foreground);
         return result;
     }
 
@@ -454,7 +467,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
         result.Offset({ -31.8590012F, -9.23899841F });
         result.Scale({ 3.0F, 3.0F });
         result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_m20(), _rootProgress);
+        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_m20_1(), _rootProgress);
         return result;
     }
 
@@ -463,12 +476,8 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // Path 4+Path 3+Path 2+Path 1
     CompositionSpriteShape SpriteShape_5()
     {
-        const auto result = _c.CreateSpriteShape(_pathGeometry);
-        result.CenterPoint({ 55.8590012F, 33.2389984F });
-        result.Offset({ -31.8590012F, -9.23899841F });
-        result.Scale({ 3.0F, 3.0F });
-        result.FillBrush(_themeColor_Foreground);
-        StartProgressBoundAnimation(result, L"RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_m10(), _rootProgress);
+        // Offset:<-143.577, -75.716995>, Scale:<3, 3>
+        const auto result = CreateSpriteShape(_pathGeometry, { 3.0F, 0.0F, 0.0F, 3.0F, -143.576996F, -75.7169952F }, _themeColor_Foreground);
         return result;
     }
 
@@ -585,17 +594,12 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
 
     CubicBezierEasingFunction CubicBezierEasingFunction_0()
     {
-        return _cubicBezierEasingFunction_0 = _c.CreateCubicBezierEasingFunction({ 0.349999994F, 0.0F }, { 0.0F, 1.0F });
+        return _cubicBezierEasingFunction_0 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 1.0F, 1.0F });
     }
 
     CubicBezierEasingFunction CubicBezierEasingFunction_1()
     {
-        return _cubicBezierEasingFunction_1 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.75F, 1.0F });
-    }
-
-    CubicBezierEasingFunction CubicBezierEasingFunction_2()
-    {
-        return _cubicBezierEasingFunction_2 = _c.CreateCubicBezierEasingFunction({ 0.166999996F, 0.166999996F }, { 0.449999988F, 1.0F });
+        return _cubicBezierEasingFunction_1 = _c.CreateCubicBezierEasingFunction({ 0.0F, 0.0F }, { 0.0F, 1.0F });
     }
 
     ExpressionAnimation RootProgress()
@@ -611,38 +615,37 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
         return result;
     }
 
-    // - - PreComp layer: Controls - 04 - Settings - 01 - NormalToPointerOver
-    // - Transforms for Controls - 04 - Settings - 01 - NormalToPointerOver Scale(1,1,0)
+    // - - PreComp layer: Controls - 04 - Settings - 06 - PressedToPointerOver
+    // - Transforms for Controls - 04 - Settings - 06 - PressedToPointerOver Scale(1,1,0)
     // ShapeGroup: Group 1
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_m10()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_360_0()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.075000003F, -10.0F, _cubicBezierEasingFunction_2);
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, StepThenHoldEasingFunction());
+        // Frame 70.
+        result.InsertKeyFrame(0.583333313F, 0.0F, HoldThenStepEasingFunction());
+        // Frame 80.
+        result.InsertKeyFrame(0.666666687F, -20.0F, CubicBezierEasingFunction_0());
+        // Frame 119.
+        result.InsertKeyFrame(0.991666675F, 360.0F, CubicBezierEasingFunction_1());
         return result;
     }
 
-    // - - PreComp layer: Controls - 04 - Settings - 02 - NormalToPressed
-    // - Transforms for Controls - 04 - Settings - 02 - NormalToPressed Scale(1,1,0)
+    // - - PreComp layer: Controls - 04 - Settings - 05 - PressedToNormal
+    // - Transforms for Controls - 04 - Settings - 05 - PressedToNormal Scale(1,1,0)
     // ShapeGroup: Group 1
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_m20()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_360_1()
     {
+        // Frame 0.
         const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.0833333358F, 0.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.158333331F, -20.0F, _cubicBezierEasingFunction_1);
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 04 - Settings - 03 - PointerOverToNormal
-    // - Transforms for Controls - 04 - Settings - 03 - PointerOverToNormal Scale(1,1,0)
-    // ShapeGroup: Group 1
-    // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_m10_to_0()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, -10.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.166666672F, -10.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.24166666F, 0.0F, CubicBezierEasingFunction_2());
+        // Frame 30.
+        result.InsertKeyFrame(0.25F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 40.
+        result.InsertKeyFrame(0.333333343F, -20.0F, _cubicBezierEasingFunction_0);
+        // Frame 79.
+        result.InsertKeyFrame(0.658333361F, 360.0F, _cubicBezierEasingFunction_1);
         return result;
     }
 
@@ -650,35 +653,29 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     // - Transforms for Controls - 04 - Settings - 04 - PointerOverToPressed Scale(1,1,0)
     // ShapeGroup: Group 1
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_m10_to_m20()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_m20_0()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, -10.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.25F, -10.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.324999988F, -20.0F, CubicBezierEasingFunction_1());
-        return result;
-    }
-
-    // - - PreComp layer: Controls - 04 - Settings - 06 - PressedToPointerOver
-    // - Transforms for Controls - 04 - Settings - 06 - PressedToPointerOver Scale(1,1,0)
-    // ShapeGroup: Group 1
-    // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_m20_to_350()
-    {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, -20.0F, StepThenHoldEasingFunction());
-        result.InsertKeyFrame(0.666666687F, -20.0F, HoldThenStepEasingFunction());
-        result.InsertKeyFrame(0.991666675F, 350.0F, CubicBezierEasingFunction_0());
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
+        // Frame 30.
+        result.InsertKeyFrame(0.25F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 39.
+        result.InsertKeyFrame(0.324999988F, -20.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
-    // - - PreComp layer: Controls - 04 - Settings - 05 - PressedToNormal
-    // - Transforms for Controls - 04 - Settings - 05 - PressedToNormal Scale(1,1,0)
+    // - - PreComp layer: Controls - 04 - Settings - 02 - NormalToPressed
+    // - Transforms for Controls - 04 - Settings - 02 - NormalToPressed Scale(1,1,0)
     // ShapeGroup: Group 1
     // Rotation
-    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_m20_to_360()
+    ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_m20_1()
     {
-        const auto result = CreateScalarKeyFrameAnimation(0.0F, -20.0F, _stepThenHoldEasingFunction);
-        result.InsertKeyFrame(0.333333343F, -20.0F, _holdThenStepEasingFunction);
-        result.InsertKeyFrame(0.658333361F, 360.0F, _cubicBezierEasingFunction_0);
+        // Frame 0.
+        const auto result = CreateScalarKeyFrameAnimation(0.0F, 0.0F, _stepThenHoldEasingFunction);
+        // Frame 10.
+        result.InsertKeyFrame(0.0833333358F, 0.0F, _holdThenStepEasingFunction);
+        // Frame 19.
+        result.InsertKeyFrame(0.158333331F, -20.0F, _cubicBezierEasingFunction_0);
         return result;
     }
 
@@ -721,7 +718,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Group 1
+        // Scale:3,3, Offset:<-31.859001, -9.238998>
         result.Shapes().Append(SpriteShape_3());
         return result;
     }
@@ -743,7 +740,7 @@ class AnimatedSettingsVisualSource_AnimatedVisual : public winrt::implements<Ani
     {
         const auto result = _c.CreateShapeVisual();
         result.Size({ 48.0F, 48.0F });
-        // ShapeGroup: Group 1
+        // Scale:3,3, Offset:<-31.859001, -9.238998>
         result.Shapes().Append(SpriteShape_5());
         return result;
     }
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.h b/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.h
index 640889efc4..a34bc93f90 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.h
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.h
@@ -4,13 +4,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedSettingsVisualSource.json
 //       
 //       Input file:
-//           AnimatedSettingsVisualSource.json (28755 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedSettingsVisualSource.json (28705 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie
diff --git a/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.idl b/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.idl
index b795468ef5..0bf798d821 100644
--- a/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.idl
+++ b/dev/AnimatedIcon/AnimatedVisuals/AnimatedSettingsVisualSource.idl
@@ -3,13 +3,13 @@
 //     This code was generated by a tool.
 //
 //       LottieGen version:
-//           7.0.0-build.101+g12769c43d3
+//           7.0.2+gebbbdfc697
 //       
 //       Command:
 //           LottieGen -Language Cppwinrt -WinUIVersion 2.4 -InputFile AnimatedSettingsVisualSource.json
 //       
 //       Input file:
-//           AnimatedSettingsVisualSource.json (28755 bytes created 11:16-08:00 Mar 5 2021)
+//           AnimatedSettingsVisualSource.json (28705 bytes created 9:26-07:00 Jun 8 2021)
 //       
 //       LottieGen source:
 //           http://aka.ms/Lottie

From 06b7e342b2fc95d5a229c7d26c5a9f334c69787b Mon Sep 17 00:00:00 2001
From: Stephen Peters <stpete@microsoft.com>
Date: Tue, 8 Jun 2021 14:39:32 -0700
Subject: [PATCH 2/3] Add a queue for the queued state and test helper that
 lets you set the queue size

---
 dev/AnimatedIcon/AnimatedIcon.cpp             |  77 +++++++++----
 dev/AnimatedIcon/AnimatedIcon.h               |   6 +-
 dev/AnimatedIcon/AnimatedIconTestHooks.cpp    |   8 ++
 dev/AnimatedIcon/AnimatedIconTestHooks.h      |   1 +
 dev/AnimatedIcon/AnimatedIconTestHooks.idl    |   1 +
 dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml |  12 +-
 .../TestUI/AnimatedIconPage.xaml.cs           | 103 ++++++++++++++++++
 7 files changed, 179 insertions(+), 29 deletions(-)

diff --git a/dev/AnimatedIcon/AnimatedIcon.cpp b/dev/AnimatedIcon/AnimatedIcon.cpp
index da768984f4..830af06e86 100644
--- a/dev/AnimatedIcon/AnimatedIcon.cpp
+++ b/dev/AnimatedIcon/AnimatedIcon.cpp
@@ -223,13 +223,13 @@ void AnimatedIcon::OnLayoutUpdatedAfterStateChanged(winrt::IInspectable const& s
     case winrt::AnimatedIconAnimationQueueBehavior::QueueOne:
         if (m_isPlaying)
         {
-            // If we already have a queued state, cancel the current animation with the previously queued transition
+            // If we already have too many queued states, cancel the current animation with the previously queued transition
             // then Queue this new transition.
-            if (!m_queuedState.empty())
+            if (m_queuedStates.size() >= m_queueLength)
             {
-                TransitionAndUpdateStates(m_currentState, m_queuedState);
+                TransitionAndUpdateStates(m_currentState, m_queuedStates.front());
             }
-            m_queuedState = m_pendingState;
+            m_queuedStates.push(m_pendingState);
         }
         else
         {
@@ -239,29 +239,38 @@ void AnimatedIcon::OnLayoutUpdatedAfterStateChanged(winrt::IInspectable const& s
     case winrt::AnimatedIconAnimationQueueBehavior::SpeedUpQueueOne:
         if (m_isPlaying)
         {
-            // Cancel the previous animation completed handler, before we cancel that animation by starting a new one.
-            if (m_batch)
-            {
-                m_batchCompletedRevoker.revoke();
-            }
-
-            // If we already have a queued state, cancel the current animation with the previously queued transition
+            // If we already have too many queued states, cancel the current animation with the previously queued transition
             //  played speed up then Queue this new transition.
-            if (!m_queuedState.empty())
+            if (m_queuedStates.size() >= m_queueLength)
             {
-                TransitionAndUpdateStates(m_currentState, m_queuedState, m_speedUpMultiplier);
-                m_queuedState = m_pendingState;
+                // Cancel the previous animation completed handler, before we cancel that animation by starting a new one.
+                if (m_batch)
+                {
+                    m_batchCompletedRevoker.revoke();
+                }
+                TransitionAndUpdateStates(m_currentState, m_queuedStates.front(), m_speedUpMultiplier);
+                m_queuedStates.push(m_pendingState);
             }
             else
             {
-                m_queuedState = m_pendingState;
-
-                auto const markers = Source().Markers();
-                winrt::hstring transitionEndName = StringUtil::FormatString(L"%1!s!%2!s!%3!s!%4!s!", m_previousState.c_str(), s_transitionInfix.data(), m_currentState.c_str(), s_transitionEndSuffix.data());
-                auto const hasEndMarker = markers.HasKey(transitionEndName);
-                if (hasEndMarker)
+                m_queuedStates.push(m_pendingState);
+                if (!m_isSpeedUp)
                 {
-                    PlaySegment(NAN, static_cast<float>(markers.Lookup(transitionEndName)), m_speedUpMultiplier);
+                    // Cancel the previous animation completed handler, before we cancel that animation by starting a new one.
+                    if (m_batch)
+                    {
+                        m_batchCompletedRevoker.revoke();
+                    }
+
+                    m_isSpeedUp = true;
+
+                    auto const markers = Source().Markers();
+                    winrt::hstring transitionEndName = StringUtil::FormatString(L"%1!s!%2!s!%3!s!%4!s!", m_previousState.c_str(), s_transitionInfix.data(), m_currentState.c_str(), s_transitionEndSuffix.data());
+                    auto const hasEndMarker = markers.HasKey(transitionEndName);
+                    if (hasEndMarker)
+                    {
+                        PlaySegment(NAN, static_cast<float>(markers.Lookup(transitionEndName)), m_speedUpMultiplier);
+                    }
                 }
             }
         }
@@ -279,7 +288,10 @@ void AnimatedIcon::TransitionAndUpdateStates(const winrt::hstring& fromState, co
     TransitionStates(fromState, toState, playbackMultiplier);
     m_previousState = fromState;
     m_currentState = toState;
-    m_queuedState = L"";
+    if (!m_queuedStates.empty())
+    {
+        m_queuedStates.pop();
+    }
 }
 
 void AnimatedIcon::TransitionStates(const winrt::hstring& fromState, const winrt::hstring& toState, float playbackMultiplier)
@@ -606,10 +618,22 @@ void AnimatedIcon::OnAnimationCompleted(winrt::IInspectable const&, winrt::Compo
     case winrt::AnimatedIconAnimationQueueBehavior::Cut:
         break;
     case winrt::AnimatedIconAnimationQueueBehavior::QueueOne:
+        if (!m_queuedStates.empty())
+        {
+            TransitionAndUpdateStates(m_currentState, m_queuedStates.front());
+        }
+        break;
     case winrt::AnimatedIconAnimationQueueBehavior::SpeedUpQueueOne:
-        if (!m_queuedState.empty())
+        if (!m_queuedStates.empty())
         {
-            TransitionAndUpdateStates(m_currentState, m_queuedState);
+            if (m_queuedStates.size() == 1)
+            {
+                TransitionAndUpdateStates(m_currentState, m_queuedStates.front());
+            }
+            else
+            {
+                TransitionAndUpdateStates(m_currentState, m_queuedStates.front(), m_isSpeedUp ? m_speedUpMultiplier : 1.0f);
+            }
         }
         break;
     }
@@ -632,6 +656,11 @@ void AnimatedIcon::SetSpeedUpMultiplier(float multiplier)
     m_speedUpMultiplier = multiplier;
 }
 
+void AnimatedIcon::SetQueueLength(unsigned int length)
+{
+    m_queueLength = length;
+}
+
 winrt::hstring AnimatedIcon::GetLastAnimationSegment()
 {
     return m_lastAnimationSegment;
diff --git a/dev/AnimatedIcon/AnimatedIcon.h b/dev/AnimatedIcon/AnimatedIcon.h
index f9081a5b1b..eb53f65dcf 100644
--- a/dev/AnimatedIcon/AnimatedIcon.h
+++ b/dev/AnimatedIcon/AnimatedIcon.h
@@ -8,6 +8,7 @@
 
 #include "AnimatedIcon.g.h"
 #include "AnimatedIcon.properties.h"
+#include <queue>
 
 class AnimatedIcon :
     public ReferenceTracker<AnimatedIcon, DeriveFromPathIconHelper_base, winrt::AnimatedIcon>,
@@ -44,6 +45,7 @@ class AnimatedIcon :
     void SetAnimationQueueBehavior(winrt::AnimatedIconAnimationQueueBehavior behavior);
     void SetDurationMultiplier(float multiplier);
     void SetSpeedUpMultiplier(float multiplier);
+    void SetQueueLength(unsigned int length);
     winrt::hstring GetLastAnimationSegment();
     winrt::hstring GetLastAnimationSegmentStart();
     winrt::hstring GetLastAnimationSegmentEnd();
@@ -67,7 +69,8 @@ class AnimatedIcon :
 
     winrt::hstring m_currentState{ L"" };
     winrt::hstring m_previousState{ L"" };
-    winrt::hstring m_queuedState{ L"" };
+    std::queue<winrt::hstring> m_queuedStates{};
+    unsigned int m_queueLength{ 4 };
     winrt::hstring m_pendingState{ L"" };
     winrt::hstring m_lastAnimationSegment{ L"" };
     winrt::hstring m_lastAnimationSegmentStart{ L"" };
@@ -77,6 +80,7 @@ class AnimatedIcon :
     float m_previousSegmentLength{ 1.0f };
     float m_durationMultiplier{ 1.0 };
     float m_speedUpMultiplier{ 7.0f };
+    bool m_isSpeedUp{ false };
 
 
     winrt::Composition::CompositionPropertySet m_progressPropertySet{ nullptr };
diff --git a/dev/AnimatedIcon/AnimatedIconTestHooks.cpp b/dev/AnimatedIcon/AnimatedIconTestHooks.cpp
index e38e08e76f..0df7f75f7b 100644
--- a/dev/AnimatedIcon/AnimatedIconTestHooks.cpp
+++ b/dev/AnimatedIcon/AnimatedIconTestHooks.cpp
@@ -39,6 +39,14 @@ void AnimatedIconTestHooks::SetSpeedUpMultiplier(const winrt::AnimatedIcon& anim
     }
 }
 
+void AnimatedIconTestHooks::SetQueueLength(const winrt::AnimatedIcon& animatedIcon, int length)
+{
+    if (animatedIcon)
+    {
+        winrt::get_self<AnimatedIcon>(animatedIcon)->SetQueueLength(length);
+    }
+}
+
 winrt::hstring AnimatedIconTestHooks::GetLastAnimationSegment(const winrt::AnimatedIcon& animatedIcon)
 {
     if (animatedIcon)
diff --git a/dev/AnimatedIcon/AnimatedIconTestHooks.h b/dev/AnimatedIcon/AnimatedIconTestHooks.h
index f00e1a0d46..9275c89aa3 100644
--- a/dev/AnimatedIcon/AnimatedIconTestHooks.h
+++ b/dev/AnimatedIcon/AnimatedIconTestHooks.h
@@ -18,6 +18,7 @@ class AnimatedIconTestHooks :
     static void SetAnimationQueueBehavior(const winrt::AnimatedIcon& animatedIcon, winrt::AnimatedIconAnimationQueueBehavior behavior);
     static void SetDurationMultiplier(const winrt::AnimatedIcon& animatedIcon, float multiplier);
     static void SetSpeedUpMultiplier(const winrt::AnimatedIcon& animatedIcon, float multiplier);
+    static void SetQueueLength(const winrt::AnimatedIcon& animatedIcon, int length);
 
     static winrt::hstring GetLastAnimationSegment(const winrt::AnimatedIcon& animatedIcon);
     static winrt::hstring GetLastAnimationSegmentStart(const winrt::AnimatedIcon& animatedIcon);
diff --git a/dev/AnimatedIcon/AnimatedIconTestHooks.idl b/dev/AnimatedIcon/AnimatedIconTestHooks.idl
index 5284606380..8a671167c9 100644
--- a/dev/AnimatedIcon/AnimatedIconTestHooks.idl
+++ b/dev/AnimatedIcon/AnimatedIconTestHooks.idl
@@ -18,6 +18,7 @@ runtimeclass AnimatedIconTestHooks
     static void SetAnimationQueueBehavior(MU_XC_NAMESPACE.AnimatedIcon animatedIcon, AnimatedIconAnimationQueueBehavior easingFunction);
     static void SetDurationMultiplier(MU_XC_NAMESPACE.AnimatedIcon animatedIcon, Single multiplier);
     static void SetSpeedUpMultiplier(MU_XC_NAMESPACE.AnimatedIcon animatedIcon, Single multiplier);
+    static void SetQueueLength(MU_XC_NAMESPACE.AnimatedIcon animatedIcon, Int32 length);
 
     static String GetLastAnimationSegment(MU_XC_NAMESPACE.AnimatedIcon animatedIcon);
     static String GetLastAnimationSegmentStart(MU_XC_NAMESPACE.AnimatedIcon animatedIcon);
diff --git a/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml b/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml
index ffc48a1d3a..11b8e5f8cd 100644
--- a/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml
+++ b/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml
@@ -150,14 +150,18 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             <TextBlock HorizontalAlignment="Center" Text="Animation Duration Multiplier" Grid.Row="0"/>
             <Slider HorizontalAlignment="Center" Minimum="0.1" Maximum="5.0" StepFrequency="0.1" Value="1.0" ValueChanged="Slider_ValueChanged" Width="150" Grid.Row="1"/>
             <TextBlock HorizontalAlignment="Center" Text="Speed Up behavior Multiplier" Grid.Row="2"/>
             <Slider HorizontalAlignment="Center" Minimum="1.0" Maximum="15.0" StepFrequency="0.1" Value="7.0" ValueChanged="SpeedUpSlider_ValueChanged" Width="150" Grid.Row="3"/>
-            <TextBlock HorizontalAlignment="Center" Text="Foreground Color" Grid.Row="4"/>
-            <Button HorizontalAlignment="Center" Grid.Row="5">
+            <TextBlock HorizontalAlignment="Center" Text="Queue Length" Grid.Row="4"/>
+            <Slider HorizontalAlignment="Center" Minimum="1.0" Maximum="100.0" StepFrequency="1" Value="4" ValueChanged="QueueLengthSlider_ValueChanged" Width="500" Grid.Row="5"/>
+            <TextBlock HorizontalAlignment="Center" Text="Foreground Color" Grid.Row="6"/>
+            <Button HorizontalAlignment="Center" Grid.Row="7">
                 <Rectangle Height="100" Width="100">
                     <Rectangle.Fill>
                         <SolidColorBrush Color="{Binding ElementName=ForegoundColorPicker, Path=Color}"/>
@@ -169,8 +173,8 @@
                     </Flyout>
                 </Button.Flyout>
             </Button>
-            <CheckBox Content="Is LeftToRight" IsChecked="True" Checked="IsLeftToRightChecked" Unchecked="IsLeftToRightUnchecked" HorizontalAlignment="Center" Grid.Row="6"/>
-            <ScrollViewer Grid.Row="7">
+            <CheckBox Content="Is LeftToRight" IsChecked="True" Checked="IsLeftToRightChecked" Unchecked="IsLeftToRightUnchecked" HorizontalAlignment="Center" Grid.Row="8"/>
+            <ScrollViewer Grid.Row="9">
                 <StackPanel>
                     <StackPanel Orientation="Horizontal" Windows10FallCreatorsUpdate:Spacing="5">
                         <StackPanel>
diff --git a/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml.cs b/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml.cs
index 5ada5b8c87..a3994f1f8f 100644
--- a/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml.cs
+++ b/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml.cs
@@ -270,6 +270,109 @@ private void SpeedUpSlider_ValueChanged(object sender, RangeBaseValueChangedEven
             }
         }
 
+        private void QueueLengthSlider_ValueChanged(object sender, RangeBaseValueChangedEventArgs e)
+        {
+            if (this.DropDownIcon_Cut != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.DropDownIcon_Cut.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.DropDownIcon_Queue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.DropDownIcon_Queue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.DropDownIcon_SpeedUpQueue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.DropDownIcon_SpeedUpQueue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.DropDownIconNavView_Cut != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.DropDownIconNavView_Cut.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.DropDownIconNavView_Queue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.DropDownIconNavView_Queue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.DropDownIconNavView_SpeedUpQueue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.DropDownIconNavView_SpeedUpQueue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SideChevron_Cut != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SideChevron_Cut.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SideChevron_Queue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SideChevron_Queue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SideChevron_SpeedUpQueue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SideChevron_SpeedUpQueue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.HamburgerIcon_Cut != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.HamburgerIcon_Cut.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.HamburgerIcon_Queue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.HamburgerIcon_Queue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.HamburgerIcon_SpeedUpQueue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.HamburgerIcon_SpeedUpQueue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SettingsIcon_Cut != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SettingsIcon_Cut.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SettingsIcon_Queue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SettingsIcon_Queue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SettingsIcon_SpeedUpQueue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SettingsIcon_SpeedUpQueue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.BackIcon_Cut != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.BackIcon_Cut.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.BackIcon_Queue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.BackIcon_Queue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.BackIcon_SpeedUpQueue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.BackIcon_SpeedUpQueue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SearchIcon_Cut != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SearchIcon_Cut.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SearchIcon_Queue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SearchIcon_Queue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.SearchIcon_SpeedUpQueue != null)
+            {
+                AnimatedIconTestHooks.SetQueueLength(this.SearchIcon_SpeedUpQueue.GetAnimatedIcon(), (int)e.NewValue);
+            }
+            if (this.AnimatedCheckbox != null)
+            {
+                var rootGrid = VisualTreeHelper.GetChild(AnimatedCheckbox, 0);
+                var grid = VisualTreeHelper.GetChild(rootGrid, 0);
+                var CheckIcon = VisualTreeHelper.GetChild(grid, 1) as AnimatedIcon;
+
+                AnimatedIconTestHooks.SetQueueLength(CheckIcon, (int)e.NewValue);
+            }
+            if (this.LargeAnimatedCheckbox != null)
+            {
+                var rootGrid = VisualTreeHelper.GetChild(LargeAnimatedCheckbox, 0);
+                var grid = VisualTreeHelper.GetChild(rootGrid, 0);
+                var CheckIcon = VisualTreeHelper.GetChild(grid, 1) as AnimatedIcon;
+
+                AnimatedIconTestHooks.SetQueueLength(CheckIcon, (int)e.NewValue);
+            }
+        }
         public void IsLeftToRightChecked(object sender, RoutedEventArgs args)
         {
             this.FlowDirection = FlowDirection.LeftToRight;

From 01d32e77dce5a63974bef844998a2617c45286ae Mon Sep 17 00:00:00 2001
From: Stephen Peters <stpete@microsoft.com>
Date: Tue, 8 Jun 2021 23:10:25 -0700
Subject: [PATCH 3/3] change default queue length to 2 and default to behavior
 to Queue

---
 dev/AnimatedIcon/AnimatedIcon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/AnimatedIcon/AnimatedIcon.h b/dev/AnimatedIcon/AnimatedIcon.h
index eb53f65dcf..d8ec389238 100644
--- a/dev/AnimatedIcon/AnimatedIcon.h
+++ b/dev/AnimatedIcon/AnimatedIcon.h
@@ -70,7 +70,7 @@ class AnimatedIcon :
     winrt::hstring m_currentState{ L"" };
     winrt::hstring m_previousState{ L"" };
     std::queue<winrt::hstring> m_queuedStates{};
-    unsigned int m_queueLength{ 4 };
+    unsigned int m_queueLength{ 2 };
     winrt::hstring m_pendingState{ L"" };
     winrt::hstring m_lastAnimationSegment{ L"" };
     winrt::hstring m_lastAnimationSegmentStart{ L"" };
@@ -91,5 +91,5 @@ class AnimatedIcon :
     winrt::FrameworkElement::LayoutUpdated_revoker m_layoutUpdatedRevoker{};
     PropertyChanged_revoker m_foregroundColorPropertyChangedRevoker{};
 
-    winrt::AnimatedIconAnimationQueueBehavior m_queueBehavior{ winrt::AnimatedIconAnimationQueueBehavior::SpeedUpQueueOne };
+    winrt::AnimatedIconAnimationQueueBehavior m_queueBehavior{ winrt::AnimatedIconAnimationQueueBehavior::QueueOne };
 };