diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo
index 28ba0e3c..c8a6ab90 100644
Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index bcd81540..63c271ff 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -121,6 +121,7 @@
     <Compile Include="Assets\Scripts\NumberValidator.cs" />
     <Compile Include="Assets\Scripts\RequiresAnimationDef.cs" />
     <Compile Include="Assets\Scripts\Singleton.cs" />
+    <Compile Include="Assets\Scripts\SnapToKeyframe.cs" />
     <Compile Include="Assets\Scripts\Utilities\PawnUtility.cs" />
     <Compile Include="Assets\Scripts\Utilities\XmlUtility.cs" />
     <Compile Include="Assets\Scripts\Workspace\HistoricRecord.cs" />
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index c6060ab4..a7e76762 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -911,7 +911,7 @@ MonoBehaviour:
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 1
+  m_Text: 0
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
@@ -1649,8 +1649,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 439, y: -7.5}
-  m_SizeDelta: {x: 878, y: 15}
+  m_AnchoredPosition: {x: 305.5, y: -7.5}
+  m_SizeDelta: {x: 611, y: 15}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &138865805
 MonoBehaviour:
@@ -16133,6 +16133,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1289465654}
   - component: {fileID: 1289465655}
+  - component: {fileID: 1289465656}
   m_Layer: 5
   m_Name: AnimTimelineSlider
   m_TagString: Untagged
@@ -16225,6 +16226,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &1289465656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1289465653}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9b19816966eab6a4eba748f04532fb61, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1293104865
 GameObject:
   m_ObjectHideFlags: 0
@@ -19044,7 +19057,7 @@ MonoBehaviour:
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 1
+  m_Text: 0
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs
index 2f50f370..50f7f909 100644
--- a/Assets/Scripts/GUI/KeyframeSlider.cs
+++ b/Assets/Scripts/GUI/KeyframeSlider.cs
@@ -128,6 +128,15 @@ namespace RimWorldAnimationStudio
             interactable = true;
             base.OnDrag(eventData);
 
+            int targetTick = Workspace.FindClosestKeyFrameAtTick(keyframe.atTick.Value, Mathf.CeilToInt(Workspace.StageWindowSize * 0.01f), actorID);
+
+            if (Input.GetKey(KeyCode.LeftShift) && Workspace.Instance.DoesPawnKeyframeExistAtTick(Workspace.stageID, actorID, targetTick) == false)
+            { value = (float)targetTick; }
+
+            // Prevent frames from being moved to tick 1
+            if (value == 1)
+            { value = 2; }
+
             //AnimationController.Instance.stageTick = keyframe.atTick.Value;
             Workspace.actorID = actorID;
         }
diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs
index e42c5ea5..837769e0 100644
--- a/Assets/Scripts/Managers/AnimationController.cs
+++ b/Assets/Scripts/Managers/AnimationController.cs
@@ -95,8 +95,8 @@ namespace RimWorldAnimationStudio
 
                     else
                     { 
-                        stageTick = Workspace.StageWindowSize; 
-                        isAnimating = false; 
+                        //stageTick = Workspace.StageWindowSize; 
+                        //isAnimating = false; 
                     }
                 }
             }
@@ -132,10 +132,10 @@ namespace RimWorldAnimationStudio
             for (int actorID = 0; actorID < _actorBodies.Count; actorID++)
             {
                 if (Workspace.stageID >= Workspace.animationDef?.animationStages.Count)
-                { /*Debug.Log("Waiting for animation stage data to initialize...");*/ return; }
+                { return; }
 
                 if (actorID >= Workspace.animationDef?.animationStages[Workspace.stageID]?.animationClips.Count)
-                { /*Debug.Log("Waiting for animation clip data to initialize...");*/ return; }
+                { return; }
 
                 Actor actor = Workspace.animationDef.actors[actorID];
                 PawnAnimationClip clip = Workspace.animationDef?.animationStages[Workspace.stageID]?.animationClips[actorID];
@@ -146,6 +146,9 @@ namespace RimWorldAnimationStudio
                 float clipPercent = (float)(stageTick % clip.duration) / clip.duration;
                 if (stageTick == clip.duration) clipPercent = 1f;
 
+                if (Workspace.animationDef.animationStages[Workspace.stageID].isLooping == false)
+                { clipPercent = (float)stageTick / clip.duration; }
+                
                 AlienRaceDef alienRaceDef = actor.GetAlienRaceDef();
                 ActorBody actorBody = _actorBodies[actorID];
                 string bodyType = alienRaceDef.isHumanoid ? actor.bodyType : "None";
@@ -155,15 +158,6 @@ namespace RimWorldAnimationStudio
                 float bodyAngle = clip.BodyAngle.Evaluate(clipPercent);
                 float headAngle = clip.HeadAngle.Evaluate(clipPercent);
 
-                /*if (bodyAngle < 0) bodyAngle = 360 - ((-1f * bodyAngle) % 360);
-                if (bodyAngle > 360) bodyAngle %= 360;
-
-                if (headAngle < 0) headAngle = 360 - ((-1f * headAngle) % 360);
-                if (headAngle > 360) headAngle %= 360;
-
-                bodyAngle = bodyAngle > 180 ? 180 - bodyAngle : bodyAngle;
-                headAngle = headAngle > 180 ? 180 - headAngle : headAngle;*/
-
                 int bodyFacing = (int)clip.BodyFacing.Evaluate(clipPercent);
                 int headFacing = (int)clip.HeadFacing.Evaluate(clipPercent);
 
@@ -233,7 +227,9 @@ namespace RimWorldAnimationStudio
         public void InitializeAnimationTimeline()
         {
             cyclesNormalField.text = Mathf.Max(Mathf.CeilToInt((float)Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks / Workspace.StageWindowSize), 1).ToString();
-            cyclesFastField.text = Mathf.Max(Mathf.CeilToInt((float)Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick / Workspace.StageWindowSize), 1).ToString();
+            cyclesFastField.text = Mathf.Max(Mathf.CeilToInt((float)Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick / Workspace.StageWindowSize), 0).ToString();
+
+            Workspace.animationDef.animationStages[Workspace.stageID].isLooping = int.Parse(cyclesNormalField.text) > 1 ? true : false;
 
             for (int actorID = 0; actorID < Workspace.animationDef.actors.Count; actorID++)
             {
diff --git a/Assets/Scripts/SnapToKeyframe.cs b/Assets/Scripts/SnapToKeyframe.cs
new file mode 100644
index 00000000..d31c12f6
--- /dev/null
+++ b/Assets/Scripts/SnapToKeyframe.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.EventSystems;
+
+namespace RimWorldAnimationStudio
+{
+    public class SnapToKeyframe : MonoBehaviour, IDragHandler
+    {
+        private Slider slider;
+
+        public void Start()
+        {
+            slider = GetComponent<Slider>();
+        }
+
+        public void OnDrag(PointerEventData eventData)
+        {
+            int targetTick = Workspace.FindClosestKeyFrameAtTick((int)slider.value, Mathf.CeilToInt(Workspace.StageWindowSize * 0.01f));
+
+            if (Input.GetKey(KeyCode.LeftShift))
+            { slider.value = (float)targetTick; }
+        }
+    }
+}
diff --git a/Assets/Scripts/SnapToKeyframe.cs.meta b/Assets/Scripts/SnapToKeyframe.cs.meta
new file mode 100644
index 00000000..5babfd19
--- /dev/null
+++ b/Assets/Scripts/SnapToKeyframe.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9b19816966eab6a4eba748f04532fb61
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs
index 67954bec..d98965ae 100644
--- a/Assets/Scripts/Workspace/Workspace.cs
+++ b/Assets/Scripts/Workspace/Workspace.cs
@@ -103,7 +103,77 @@ namespace RimWorldAnimationStudio
 
             return null;
         }
-             
+
+        public bool DoesPawnKeyframeExistAtTick(int stageID, int actorID, int atTick)
+        {
+            return animationDef.animationStages[stageID].animationClips[actorID].keyframes.Any(x => x.atTick == atTick);
+        }
+
+        public static void FindAdjacentKeyframes(int atTick, out PawnKeyframe prevKeyframe, out PawnKeyframe nextKeyframe, int actorID = -1, int excludedActorID = -1, bool ignoreSelf = true, int searchDistance = int.MaxValue)
+        {
+            prevKeyframe = null;
+            nextKeyframe = null;
+
+            List<PawnKeyframe> keyframesToCheck;
+
+            if (actorID >= 0)
+            { keyframesToCheck = animationDef.animationStages[stageID].animationClips[actorID].keyframes; }
+
+            else
+            {
+                keyframesToCheck = animationDef.animationStages[stageID].animationClips.Where(x =>
+                    animationDef.animationStages[stageID].animationClips.IndexOf(x) != excludedActorID).SelectMany(x => x.keyframes)?.ToList();
+            }
+
+            foreach (PawnKeyframe keyframe in keyframesToCheck)
+            {
+                if (keyframe.atTick <= atTick && atTick - keyframe.atTick <= searchDistance)
+                {
+                    if (keyframe.atTick != atTick || ignoreSelf)
+                    { prevKeyframe = keyframe; }
+
+                    else
+                    { prevKeyframe = null; }
+                }
+
+                if (nextKeyframe == null && keyframe.atTick > atTick && keyframe.atTick - atTick <= searchDistance)
+                { nextKeyframe = keyframe; }
+            }
+        }
+
+        public static int FindClosestKeyFrameAtTick(int atTick, int searchDistance = int.MaxValue, int excludedActorID = -1)
+        {
+            List<PawnKeyframe> keyframesToCheck;
+
+            if (excludedActorID >= 0)
+            {
+                keyframesToCheck = animationDef.animationStages[stageID].animationClips.Where(x =>
+                     animationDef.animationStages[stageID].animationClips.IndexOf(x) != excludedActorID).SelectMany(x => x.keyframes)?.ToList();
+            }
+
+            else
+            { keyframesToCheck = animationDef.animationStages[stageID].animationClips.SelectMany(x => x.keyframes)?.ToList(); }
+            
+            keyframesToCheck = keyframesToCheck.Where(x => Mathf.Abs(atTick - x.atTick.Value) <= searchDistance)?.ToList();
+
+            if (keyframesToCheck.NullOrEmpty())
+            { return atTick; }
+
+            int minDist = int.MaxValue;
+            int bestAtTick = -1;
+
+            foreach (PawnKeyframe keyframe_ in keyframesToCheck)
+            {
+                if (Mathf.Abs(keyframe_.atTick.Value - atTick) < minDist)
+                {
+                    minDist = Mathf.Abs(keyframe_.atTick.Value - atTick);
+                    bestAtTick = keyframe_.atTick.Value;
+                }
+            }
+
+            return bestAtTick;
+        }
+
         [SerializeField]
         public LinkedList<HistoricRecord> pastSnapshots = new LinkedList<HistoricRecord>();
         public LinkedList<HistoricRecord> futureSnapshots = new LinkedList<HistoricRecord>();
diff --git a/Assets/StreamingAssets/AnimationDefs/newAnimationDef.xml b/Assets/StreamingAssets/AnimationDefs/newAnimationDef.xml
index a76d4ff7..2da60b71 100644
--- a/Assets/StreamingAssets/AnimationDefs/newAnimationDef.xml
+++ b/Assets/StreamingAssets/AnimationDefs/newAnimationDef.xml
@@ -19,7 +19,7 @@
         <stageName>NewStage</stageName>
         <stageIndex>0</stageIndex>
         <playTimeTicks>600</playTimeTicks>
-        <playTimeTicksQuick>-1</playTimeTicksQuick>
+        <playTimeTicksQuick>600</playTimeTicksQuick>
         <isLooping>false</isLooping>
         <animationClips>
           <li Class="Rimworld_Animations.PawnAnimationClip">
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll
index 85b3e4f1..605eeb34 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll
index 327befc7..26ce4006 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll
index b87def44..1458a668 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll
index a6292052..a38fc264 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll
index c6d37cc2..842db926 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll
index 2d9b77cc..3d4d67a3 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll
index bf279e64..6e83e57d 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll
index 4a1ef51c..8616b994 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll
index cededa10..1ee51660 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll
index 24573618..00e43188 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll
index 9315edff..95c1a520 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/StreamingAssets/AnimationDefs/newAnimationDef.xml b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/AnimationDefs/newAnimationDef.xml
index a76d4ff7..2da60b71 100644
--- a/Build/RimWorld-Animation-Studio_Data/StreamingAssets/AnimationDefs/newAnimationDef.xml
+++ b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/AnimationDefs/newAnimationDef.xml
@@ -19,7 +19,7 @@
         <stageName>NewStage</stageName>
         <stageIndex>0</stageIndex>
         <playTimeTicks>600</playTimeTicks>
-        <playTimeTicksQuick>-1</playTimeTicksQuick>
+        <playTimeTicksQuick>600</playTimeTicksQuick>
         <isLooping>false</isLooping>
         <animationClips>
           <li Class="Rimworld_Animations.PawnAnimationClip">
diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers
index 6be6f81d..bdc7054f 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers differ
diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets
index ee1ba83e..c0bc72c9 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets differ
diff --git a/Build/RimWorld-Animation-Studio_Data/level0 b/Build/RimWorld-Animation-Studio_Data/level0
index af2810ba..568cbc0b 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/level0 and b/Build/RimWorld-Animation-Studio_Data/level0 differ
diff --git a/Build/RimWorld-Animation-Studio_Data/resources.assets b/Build/RimWorld-Animation-Studio_Data/resources.assets
index 1951d957..cb6e8df6 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/resources.assets and b/Build/RimWorld-Animation-Studio_Data/resources.assets differ
diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets
index fa6d4adc..27a1581e 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets differ
diff --git a/Library/ArtifactDB b/Library/ArtifactDB
index 860276b9..c73a1b9a 100644
Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ
diff --git a/Library/Artifacts/08/08ae1935c3c7711973f4135a4959841a b/Library/Artifacts/08/08ae1935c3c7711973f4135a4959841a
new file mode 100644
index 00000000..65bb3a0b
Binary files /dev/null and b/Library/Artifacts/08/08ae1935c3c7711973f4135a4959841a differ
diff --git a/Library/Artifacts/0b/0bb3da36a4d1ee1b9f94739cca77e678 b/Library/Artifacts/0b/0bb3da36a4d1ee1b9f94739cca77e678
new file mode 100644
index 00000000..e454b0b0
Binary files /dev/null and b/Library/Artifacts/0b/0bb3da36a4d1ee1b9f94739cca77e678 differ
diff --git a/Library/Artifacts/10/1077bba537b1904e7dd93ba2033112e3 b/Library/Artifacts/10/1077bba537b1904e7dd93ba2033112e3
new file mode 100644
index 00000000..53f76645
Binary files /dev/null and b/Library/Artifacts/10/1077bba537b1904e7dd93ba2033112e3 differ
diff --git a/Library/Artifacts/6d/6d7804155c7a45dfac2d65fd9e4b13a6 b/Library/Artifacts/12/12378e7458135f0de028526443229943
similarity index 96%
rename from Library/Artifacts/6d/6d7804155c7a45dfac2d65fd9e4b13a6
rename to Library/Artifacts/12/12378e7458135f0de028526443229943
index 50134821..d5ebaac7 100644
Binary files a/Library/Artifacts/6d/6d7804155c7a45dfac2d65fd9e4b13a6 and b/Library/Artifacts/12/12378e7458135f0de028526443229943 differ
diff --git a/Library/Artifacts/12/1264b312e9a542e2293111864e592c23 b/Library/Artifacts/12/1264b312e9a542e2293111864e592c23
deleted file mode 100644
index 9bc1090f..00000000
Binary files a/Library/Artifacts/12/1264b312e9a542e2293111864e592c23 and /dev/null differ
diff --git a/Library/Artifacts/16/16e40efe4416de8f173e35d04799e192 b/Library/Artifacts/16/16e40efe4416de8f173e35d04799e192
new file mode 100644
index 00000000..30ac3975
Binary files /dev/null and b/Library/Artifacts/16/16e40efe4416de8f173e35d04799e192 differ
diff --git a/Library/Artifacts/1f/1f422eb1e235abd20092c1df0bcd375e b/Library/Artifacts/1f/1f422eb1e235abd20092c1df0bcd375e
new file mode 100644
index 00000000..aa1bed6f
Binary files /dev/null and b/Library/Artifacts/1f/1f422eb1e235abd20092c1df0bcd375e differ
diff --git a/Library/Artifacts/1f/1fbfe68e175288f0e2df5afa34deccfc b/Library/Artifacts/1f/1fbfe68e175288f0e2df5afa34deccfc
new file mode 100644
index 00000000..a43052b8
Binary files /dev/null and b/Library/Artifacts/1f/1fbfe68e175288f0e2df5afa34deccfc differ
diff --git a/Library/Artifacts/61/616fc6faef9935a1c570a8a9d4dfa1ac b/Library/Artifacts/21/214c84c8424b5586c75e02ac49863143
similarity index 72%
rename from Library/Artifacts/61/616fc6faef9935a1c570a8a9d4dfa1ac
rename to Library/Artifacts/21/214c84c8424b5586c75e02ac49863143
index 44bc6e57..afd9b1b8 100644
Binary files a/Library/Artifacts/61/616fc6faef9935a1c570a8a9d4dfa1ac and b/Library/Artifacts/21/214c84c8424b5586c75e02ac49863143 differ
diff --git a/Library/Artifacts/27/27f28e57fa1cd9ce98ac65d20964ad76 b/Library/Artifacts/27/27f28e57fa1cd9ce98ac65d20964ad76
new file mode 100644
index 00000000..09b778ff
Binary files /dev/null and b/Library/Artifacts/27/27f28e57fa1cd9ce98ac65d20964ad76 differ
diff --git a/Library/Artifacts/ec/ec14014b6eeae8de12e46d3f93c715df b/Library/Artifacts/29/2922f683c1d5e3b640cab03856a39d0d
similarity index 78%
rename from Library/Artifacts/ec/ec14014b6eeae8de12e46d3f93c715df
rename to Library/Artifacts/29/2922f683c1d5e3b640cab03856a39d0d
index 52f013a5..81e3ca7f 100644
Binary files a/Library/Artifacts/ec/ec14014b6eeae8de12e46d3f93c715df and b/Library/Artifacts/29/2922f683c1d5e3b640cab03856a39d0d differ
diff --git a/Library/Artifacts/39/395660f8f3bc99f24ad57d88e8aa01fc b/Library/Artifacts/3f/3fa73cee402b2ab31ddce959dcecd292
similarity index 89%
rename from Library/Artifacts/39/395660f8f3bc99f24ad57d88e8aa01fc
rename to Library/Artifacts/3f/3fa73cee402b2ab31ddce959dcecd292
index db10e04a..28f0fb16 100644
Binary files a/Library/Artifacts/39/395660f8f3bc99f24ad57d88e8aa01fc and b/Library/Artifacts/3f/3fa73cee402b2ab31ddce959dcecd292 differ
diff --git a/Library/Artifacts/41/41113419aab5598bcf20f804937ad645 b/Library/Artifacts/41/41113419aab5598bcf20f804937ad645
deleted file mode 100644
index 6fe67e2a..00000000
Binary files a/Library/Artifacts/41/41113419aab5598bcf20f804937ad645 and /dev/null differ
diff --git a/Library/Artifacts/7b/7b2b0fb13cb89e503a42bdef83c33e8c b/Library/Artifacts/4b/4bcf8c677c0ce95575fd04f92cddd44a
similarity index 94%
rename from Library/Artifacts/7b/7b2b0fb13cb89e503a42bdef83c33e8c
rename to Library/Artifacts/4b/4bcf8c677c0ce95575fd04f92cddd44a
index 15ec5b11..29da0cc0 100644
Binary files a/Library/Artifacts/7b/7b2b0fb13cb89e503a42bdef83c33e8c and b/Library/Artifacts/4b/4bcf8c677c0ce95575fd04f92cddd44a differ
diff --git a/Library/Artifacts/8e/8e47f0bbb5e45d50b533e69e51899eb2 b/Library/Artifacts/58/58ab404c6d94dd89dade6509eb616f2a
similarity index 83%
rename from Library/Artifacts/8e/8e47f0bbb5e45d50b533e69e51899eb2
rename to Library/Artifacts/58/58ab404c6d94dd89dade6509eb616f2a
index 17347203..5e7bca4a 100644
Binary files a/Library/Artifacts/8e/8e47f0bbb5e45d50b533e69e51899eb2 and b/Library/Artifacts/58/58ab404c6d94dd89dade6509eb616f2a differ
diff --git a/Library/Artifacts/6f/6f722158073ef0cd047a16f7dee41da7 b/Library/Artifacts/6f/6f722158073ef0cd047a16f7dee41da7
new file mode 100644
index 00000000..2f632bb8
Binary files /dev/null and b/Library/Artifacts/6f/6f722158073ef0cd047a16f7dee41da7 differ
diff --git a/Library/Artifacts/70/70abfb32c652785aa36cb70c9b52b0db b/Library/Artifacts/70/70abfb32c652785aa36cb70c9b52b0db
deleted file mode 100644
index 5056a1a6..00000000
Binary files a/Library/Artifacts/70/70abfb32c652785aa36cb70c9b52b0db and /dev/null differ
diff --git a/Library/Artifacts/71/71e59e783a8a01e9e495b0b24be17437 b/Library/Artifacts/71/71e59e783a8a01e9e495b0b24be17437
deleted file mode 100644
index edd59cde..00000000
Binary files a/Library/Artifacts/71/71e59e783a8a01e9e495b0b24be17437 and /dev/null differ
diff --git a/Library/Artifacts/78/78a9a9faac6499aba30db209690f900f b/Library/Artifacts/78/78a9a9faac6499aba30db209690f900f
new file mode 100644
index 00000000..c931204f
Binary files /dev/null and b/Library/Artifacts/78/78a9a9faac6499aba30db209690f900f differ
diff --git a/Library/Artifacts/7d/7d1c54d30ed263ff08a84f3a7cca1bdc b/Library/Artifacts/7d/7d1c54d30ed263ff08a84f3a7cca1bdc
new file mode 100644
index 00000000..b631c9c5
Binary files /dev/null and b/Library/Artifacts/7d/7d1c54d30ed263ff08a84f3a7cca1bdc differ
diff --git a/Library/Artifacts/7f/7f6aaa16f97571a6434049fc34b718bd b/Library/Artifacts/7f/7f6aaa16f97571a6434049fc34b718bd
new file mode 100644
index 00000000..de7c2f9d
Binary files /dev/null and b/Library/Artifacts/7f/7f6aaa16f97571a6434049fc34b718bd differ
diff --git a/Library/Artifacts/7e/7ee87a5e3db0570414b5a5838ade4c61 b/Library/Artifacts/82/824b0ef43242c4e53108f0cb470bd2b9
similarity index 82%
rename from Library/Artifacts/7e/7ee87a5e3db0570414b5a5838ade4c61
rename to Library/Artifacts/82/824b0ef43242c4e53108f0cb470bd2b9
index b2668a45..a42b5f00 100644
Binary files a/Library/Artifacts/7e/7ee87a5e3db0570414b5a5838ade4c61 and b/Library/Artifacts/82/824b0ef43242c4e53108f0cb470bd2b9 differ
diff --git a/Library/Artifacts/35/35dbbea1757fa28afb8cef6ef676a73b b/Library/Artifacts/89/89bc333af6b27ad83500f9dfce5f1eff
similarity index 93%
rename from Library/Artifacts/35/35dbbea1757fa28afb8cef6ef676a73b
rename to Library/Artifacts/89/89bc333af6b27ad83500f9dfce5f1eff
index 896f98db..ba757a6b 100644
Binary files a/Library/Artifacts/35/35dbbea1757fa28afb8cef6ef676a73b and b/Library/Artifacts/89/89bc333af6b27ad83500f9dfce5f1eff differ
diff --git a/Library/Artifacts/8a/8aad68960d1a93681e12961504576217 b/Library/Artifacts/8a/8aad68960d1a93681e12961504576217
new file mode 100644
index 00000000..0db2b0b8
Binary files /dev/null and b/Library/Artifacts/8a/8aad68960d1a93681e12961504576217 differ
diff --git a/Library/Artifacts/93/931f3274a595c2eb6fadef75857aafe8 b/Library/Artifacts/93/931f3274a595c2eb6fadef75857aafe8
new file mode 100644
index 00000000..b967ffb0
Binary files /dev/null and b/Library/Artifacts/93/931f3274a595c2eb6fadef75857aafe8 differ
diff --git a/Library/Artifacts/33/33d94ca559de6698343ba2cb4570b305 b/Library/Artifacts/94/9441fb22ed53bba950fedf10d162749f
similarity index 96%
rename from Library/Artifacts/33/33d94ca559de6698343ba2cb4570b305
rename to Library/Artifacts/94/9441fb22ed53bba950fedf10d162749f
index 336f2abd..6902ba37 100644
Binary files a/Library/Artifacts/33/33d94ca559de6698343ba2cb4570b305 and b/Library/Artifacts/94/9441fb22ed53bba950fedf10d162749f differ
diff --git a/Library/Artifacts/e4/e4979aef194e3a80954eef1d3c1f78da b/Library/Artifacts/95/956c5b4520e3fa97ae747c497fb7e05e
similarity index 98%
rename from Library/Artifacts/e4/e4979aef194e3a80954eef1d3c1f78da
rename to Library/Artifacts/95/956c5b4520e3fa97ae747c497fb7e05e
index 8846b377..1a453f77 100644
Binary files a/Library/Artifacts/e4/e4979aef194e3a80954eef1d3c1f78da and b/Library/Artifacts/95/956c5b4520e3fa97ae747c497fb7e05e differ
diff --git a/Library/Artifacts/8c/8c9a76c4b9ed0149cbf22e72004b53c8 b/Library/Artifacts/96/960035e9156fae4b45263ed75a65d191
similarity index 74%
rename from Library/Artifacts/8c/8c9a76c4b9ed0149cbf22e72004b53c8
rename to Library/Artifacts/96/960035e9156fae4b45263ed75a65d191
index 7e5c310b..fcad72cd 100644
Binary files a/Library/Artifacts/8c/8c9a76c4b9ed0149cbf22e72004b53c8 and b/Library/Artifacts/96/960035e9156fae4b45263ed75a65d191 differ
diff --git a/Library/Artifacts/06/067b5839d2498a55ee31b48b48345944 b/Library/Artifacts/96/9641fdc866cd967c0332c0a8c3c25c03
similarity index 80%
rename from Library/Artifacts/06/067b5839d2498a55ee31b48b48345944
rename to Library/Artifacts/96/9641fdc866cd967c0332c0a8c3c25c03
index 57149c18..67c72885 100644
Binary files a/Library/Artifacts/06/067b5839d2498a55ee31b48b48345944 and b/Library/Artifacts/96/9641fdc866cd967c0332c0a8c3c25c03 differ
diff --git a/Library/Artifacts/9b/9b24acc6361c24a1e2469826207f248e b/Library/Artifacts/9b/9b24acc6361c24a1e2469826207f248e
new file mode 100644
index 00000000..d524b026
Binary files /dev/null and b/Library/Artifacts/9b/9b24acc6361c24a1e2469826207f248e differ
diff --git a/Library/Artifacts/9b/9bcf2ced00f3698e17cc489beaf0574f b/Library/Artifacts/9b/9bcf2ced00f3698e17cc489beaf0574f
deleted file mode 100644
index 05711333..00000000
Binary files a/Library/Artifacts/9b/9bcf2ced00f3698e17cc489beaf0574f and /dev/null differ
diff --git a/Library/Artifacts/a8/a818e3fbec59f406239d254f3d46d7c6 b/Library/Artifacts/a8/a818e3fbec59f406239d254f3d46d7c6
new file mode 100644
index 00000000..f14873e4
Binary files /dev/null and b/Library/Artifacts/a8/a818e3fbec59f406239d254f3d46d7c6 differ
diff --git a/Library/Artifacts/ad/ade5b7606ff80c1e71cee92507ddaf5b b/Library/Artifacts/ad/ade5b7606ff80c1e71cee92507ddaf5b
new file mode 100644
index 00000000..2ba6d572
Binary files /dev/null and b/Library/Artifacts/ad/ade5b7606ff80c1e71cee92507ddaf5b differ
diff --git a/Library/Artifacts/ea/eaf8e32b3c034007c0198d0e9957046c b/Library/Artifacts/ae/aeb30524997acd0ce19591748240fc62
similarity index 71%
rename from Library/Artifacts/ea/eaf8e32b3c034007c0198d0e9957046c
rename to Library/Artifacts/ae/aeb30524997acd0ce19591748240fc62
index b02336d1..b2921f2c 100644
Binary files a/Library/Artifacts/ea/eaf8e32b3c034007c0198d0e9957046c and b/Library/Artifacts/ae/aeb30524997acd0ce19591748240fc62 differ
diff --git a/Library/Artifacts/b5/b5a910b4a582fc419587a683d29e2190 b/Library/Artifacts/b5/b5a910b4a582fc419587a683d29e2190
new file mode 100644
index 00000000..c544a243
Binary files /dev/null and b/Library/Artifacts/b5/b5a910b4a582fc419587a683d29e2190 differ
diff --git a/Library/Artifacts/c9/c933b2dbef131fcf56982bca6249ca73 b/Library/Artifacts/c9/c933b2dbef131fcf56982bca6249ca73
new file mode 100644
index 00000000..e008e50b
Binary files /dev/null and b/Library/Artifacts/c9/c933b2dbef131fcf56982bca6249ca73 differ
diff --git a/Library/Artifacts/cb/cbe45db60f412aa7f4a0c834ceb02bd4 b/Library/Artifacts/cb/cbe45db60f412aa7f4a0c834ceb02bd4
new file mode 100644
index 00000000..471e9033
Binary files /dev/null and b/Library/Artifacts/cb/cbe45db60f412aa7f4a0c834ceb02bd4 differ
diff --git a/Library/Artifacts/d0/d07fd9b49a31f0fd1857cab2e11d70f6 b/Library/Artifacts/d0/d07fd9b49a31f0fd1857cab2e11d70f6
new file mode 100644
index 00000000..3a929a18
Binary files /dev/null and b/Library/Artifacts/d0/d07fd9b49a31f0fd1857cab2e11d70f6 differ
diff --git a/Library/Artifacts/d5/d5b84316c31adf495e7404bcd9c04947 b/Library/Artifacts/d5/d5b84316c31adf495e7404bcd9c04947
new file mode 100644
index 00000000..883fa8a9
Binary files /dev/null and b/Library/Artifacts/d5/d5b84316c31adf495e7404bcd9c04947 differ
diff --git a/Library/Artifacts/da/da018ee3064e8a2319cca5d364bb29e3 b/Library/Artifacts/da/da018ee3064e8a2319cca5d364bb29e3
new file mode 100644
index 00000000..48308e69
Binary files /dev/null and b/Library/Artifacts/da/da018ee3064e8a2319cca5d364bb29e3 differ
diff --git a/Library/Artifacts/19/19b453c251c7032967db51c975ec194d b/Library/Artifacts/e3/e3fa02bae8da3f4fe8b06fc85068fbc6
similarity index 81%
rename from Library/Artifacts/19/19b453c251c7032967db51c975ec194d
rename to Library/Artifacts/e3/e3fa02bae8da3f4fe8b06fc85068fbc6
index 98e27385..7e572352 100644
Binary files a/Library/Artifacts/19/19b453c251c7032967db51c975ec194d and b/Library/Artifacts/e3/e3fa02bae8da3f4fe8b06fc85068fbc6 differ
diff --git a/Library/Artifacts/ee/eededef1678a4beaf8d6c87cd909d3ea b/Library/Artifacts/ee/eededef1678a4beaf8d6c87cd909d3ea
new file mode 100644
index 00000000..fc07c518
Binary files /dev/null and b/Library/Artifacts/ee/eededef1678a4beaf8d6c87cd909d3ea differ
diff --git a/Library/Artifacts/f0/f02e3687b39f4690086c1f8260449df1 b/Library/Artifacts/f0/f02e3687b39f4690086c1f8260449df1
new file mode 100644
index 00000000..e3f8d92c
Binary files /dev/null and b/Library/Artifacts/f0/f02e3687b39f4690086c1f8260449df1 differ
diff --git a/Library/Artifacts/f9/f9d8e4bc9bad09ac33c1cf74a38c693f b/Library/Artifacts/f9/f9d8e4bc9bad09ac33c1cf74a38c693f
new file mode 100644
index 00000000..d11d6e44
Binary files /dev/null and b/Library/Artifacts/f9/f9d8e4bc9bad09ac33c1cf74a38c693f differ
diff --git a/Library/Artifacts/cc/ccb165680e9fd751795f632c0dc906e1 b/Library/Artifacts/fd/fd45ddbce65e3124f9880f45f80d2fcc
similarity index 96%
rename from Library/Artifacts/cc/ccb165680e9fd751795f632c0dc906e1
rename to Library/Artifacts/fd/fd45ddbce65e3124f9880f45f80d2fcc
index 994a2f54..322e8e52 100644
Binary files a/Library/Artifacts/cc/ccb165680e9fd751795f632c0dc906e1 and b/Library/Artifacts/fd/fd45ddbce65e3124f9880f45f80d2fcc differ
diff --git a/Library/Artifacts/ff/ff321c03627e1c87770a7242005d93b4 b/Library/Artifacts/ff/ff321c03627e1c87770a7242005d93b4
new file mode 100644
index 00000000..74e744f2
Binary files /dev/null and b/Library/Artifacts/ff/ff321c03627e1c87770a7242005d93b4 differ
diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt
index 253e2374..e5063333 100644
--- a/Library/CurrentLayout-default.dwlt
+++ b/Library/CurrentLayout-default.dwlt
@@ -21,7 +21,7 @@ MonoBehaviour:
   m_ShowMode: 4
   m_Title: 
   m_RootView: {fileID: 2}
-  m_MinSize: {x: 875, y: 521}
+  m_MinSize: {x: 875, y: 542}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
@@ -46,7 +46,7 @@ MonoBehaviour:
     y: 0
     width: 1920
     height: 997
-  m_MinSize: {x: 875, y: 521}
+  m_MinSize: {x: 875, y: 542}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &3
 MonoBehaviour:
@@ -112,10 +112,10 @@ MonoBehaviour:
     y: 30
     width: 1920
     height: 947
-  m_MinSize: {x: 678, y: 471}
-  m_MaxSize: {x: 14000, y: 14021}
+  m_MinSize: {x: 678, y: 492}
+  m_MaxSize: {x: 14002, y: 14042}
   vertical: 0
-  controlID: 8042
+  controlID: 6748
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -137,10 +137,10 @@ MonoBehaviour:
     y: 0
     width: 1314
     height: 947
-  m_MinSize: {x: 403, y: 471}
-  m_MaxSize: {x: 10000, y: 14021}
+  m_MinSize: {x: 402, y: 492}
+  m_MaxSize: {x: 10001, y: 14042}
   vertical: 1
-  controlID: 8043
+  controlID: 6749
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -162,10 +162,10 @@ MonoBehaviour:
     y: 0
     width: 1314
     height: 426
-  m_MinSize: {x: 403, y: 221}
-  m_MaxSize: {x: 8003, y: 4021}
+  m_MinSize: {x: 402, y: 221}
+  m_MaxSize: {x: 8002, y: 4021}
   vertical: 0
-  controlID: 8044
+  controlID: 6750
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -398,7 +398,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: d81effffec1effff8a1fffff0c58ffff2058ffffbe58ffff787cffff4afbffffa23a00003e3d0000e83f0000
+      m_ExpandedIDs: f45bfeff085cfeffa65cfeffc661feffda61feff7862fefff6a0feff0aa1feffa8a1feff62fbffffa23a0000f03f0000ba2a0100b62c0100542d0100822d010082300100c4300100e4320100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -458,9 +458,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1077.5, y: 57.5, z: 0}
+    m_Target: {x: 598.16425, y: 121.84375, z: -73.88001}
     speed: 2
-    m_Value: {x: 1077.5, y: 57.5, z: 0}
+    m_Value: {x: 598.16425, y: 121.84375, z: -73.88001}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -510,9 +510,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 829.6356
+    m_Target: 291.54535
     speed: 2
-    m_Value: 829.6356
+    m_Value: 291.54535
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1104,20 +1104,20 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Resources/Prefabs
+    - Assets
   m_ViewMode: 1
   m_StartGridSize: 67
   m_LastFolders:
-  - Assets/Resources/Prefabs
+  - Assets
   m_LastFoldersGridSize: 67
   m_LastProjectPath: C:\UnityDev\rimworld-animation-studio
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 14480000
-    m_LastClickedID: 18452
-    m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
+    m_SelectedIDs: 40480000
+    m_LastClickedID: 18496
+    m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1145,7 +1145,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
+    m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1172,7 +1172,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c43000000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt
index 314d53dd..7a7a64e3 100644
--- a/Library/CurrentMaximizeLayout.dwlt
+++ b/Library/CurrentMaximizeLayout.dwlt
@@ -21,10 +21,10 @@ MonoBehaviour:
     y: 30
     width: 1920
     height: 947
-  m_MinSize: {x: 678, y: 471}
-  m_MaxSize: {x: 14000, y: 14021}
+  m_MinSize: {x: 678, y: 492}
+  m_MaxSize: {x: 14002, y: 14042}
   vertical: 0
-  controlID: 7920
+  controlID: 6521
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -138,10 +138,10 @@ MonoBehaviour:
     y: 0
     width: 1314
     height: 947
-  m_MinSize: {x: 403, y: 471}
-  m_MaxSize: {x: 10000, y: 14021}
+  m_MinSize: {x: 402, y: 492}
+  m_MaxSize: {x: 10001, y: 14042}
   vertical: 1
-  controlID: 7921
+  controlID: 6522
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -163,10 +163,10 @@ MonoBehaviour:
     y: 0
     width: 1314
     height: 426
-  m_MinSize: {x: 403, y: 221}
-  m_MaxSize: {x: 8003, y: 4021}
+  m_MinSize: {x: 402, y: 221}
+  m_MaxSize: {x: 8002, y: 4021}
   vertical: 0
-  controlID: 7890
+  controlID: 6523
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -186,8 +186,8 @@ MonoBehaviour:
     y: 0
     width: 441
     height: 426
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 6}
   m_Panes:
   - {fileID: 6}
@@ -224,7 +224,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 0c58ffff2058ffffbe58ffff787cffff4afbffffa23a00003e3d0000e83f0000
+      m_ExpandedIDs: c661feffda61feff7862fefff6a0feff0aa1feffa8a1feff62fbffffa23a0000f03f0000ba2a0100b62c0100542d0100822d010082300100c4300100e4320100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -313,9 +313,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1077.5, y: 57.5, z: 0}
+    m_Target: {x: 598.16425, y: 121.84375, z: -73.88001}
     speed: 2
-    m_Value: {x: 1077.5, y: 57.5, z: 0}
+    m_Value: {x: 598.16425, y: 121.84375, z: -73.88001}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -365,9 +365,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 829.6356
+    m_Target: 291.54535
     speed: 2
-    m_Value: 829.6356
+    m_Value: 291.54535
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -939,8 +939,8 @@ MonoBehaviour:
     y: 426
     width: 1314
     height: 521
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
+  m_MinSize: {x: 230, y: 250}
+  m_MaxSize: {x: 10000, y: 10000}
   m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 12}
@@ -987,20 +987,20 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Resources/Prefabs
+    - Assets
   m_ViewMode: 1
   m_StartGridSize: 67
   m_LastFolders:
-  - Assets/Resources/Prefabs
+  - Assets
   m_LastFoldersGridSize: 67
   m_LastProjectPath: C:\UnityDev\rimworld-animation-studio
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 14480000
-    m_LastClickedID: 18452
-    m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
+    m_SelectedIDs: 40480000
+    m_LastClickedID: 18496
+    m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1028,7 +1028,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
+    m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1160,8 +1160,8 @@ MonoBehaviour:
     y: 0
     width: 606
     height: 947
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset
index 19fad74e..5e92d4c9 100644
Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ
diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport
index 5816ee10..10cbe7cf 100644
Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll
index 85b3e4f1..605eeb34 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll
index 327befc7..26ce4006 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll
index b87def44..1458a668 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll
index a6292052..a38fc264 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll
index c6d37cc2..842db926 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll
index 2d9b77cc..3d4d67a3 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll
index bf279e64..6e83e57d 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll
index 4a1ef51c..8616b994 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll
index cededa10..1ee51660 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll
index 24573618..00e43188 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll
index 9315edff..95c1a520 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll and b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Library/PlayerDataCache/Win/Data/globalgamemanagers
index 6be6f81d..bdc7054f 100644
Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ
diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets
index ee1ba83e..c0bc72c9 100644
Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets and b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets differ
diff --git a/Library/PlayerDataCache/Win/Data/level0 b/Library/PlayerDataCache/Win/Data/level0
index af2810ba..568cbc0b 100644
Binary files a/Library/PlayerDataCache/Win/Data/level0 and b/Library/PlayerDataCache/Win/Data/level0 differ
diff --git a/Library/PlayerDataCache/Win/Data/resources.assets b/Library/PlayerDataCache/Win/Data/resources.assets
index 1951d957..cb6e8df6 100644
Binary files a/Library/PlayerDataCache/Win/Data/resources.assets and b/Library/PlayerDataCache/Win/Data/resources.assets differ
diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets
index fa6d4adc..27a1581e 100644
Binary files a/Library/PlayerDataCache/Win/Data/sharedassets0.assets and b/Library/PlayerDataCache/Win/Data/sharedassets0.assets differ
diff --git a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml
index 473082a1..b3685878 100644
--- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml
+++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml
@@ -31,6 +31,7 @@ ScriptsOnlyBuild:
     - RimWorldAnimationStudio.SelectRaceDropdown
     - RimWorldAnimationStudio.SelectSexTypesDialog
     - RimWorldAnimationStudio.SelectSoundDefDialog
+    - RimWorldAnimationStudio.SnapToKeyframe
     - RimWorldAnimationStudio.StageCard
     - RimWorldAnimationStudio.StageCardManager
     - RimWorldAnimationStudio.Workspace
@@ -111,101 +112,103 @@ ScriptsOnlyBuild:
     - Class: 114
       Script: {instanceID: 11262}
     - Class: 114
-      Script: {instanceID: 11290}
+      Script: {instanceID: 11288}
     - Class: 114
-      Script: {instanceID: 11450}
+      Script: {instanceID: 11448}
     - Class: 114
-      Script: {instanceID: 11502}
+      Script: {instanceID: 11500}
+    - Class: 114
+      Script: {instanceID: 11596}
     - Class: 114
       Script: {instanceID: 11598}
     - Class: 114
-      Script: {instanceID: 11600}
+      Script: {instanceID: 11652}
     - Class: 114
-      Script: {instanceID: 11654}
+      Script: {instanceID: 11728}
     - Class: 114
-      Script: {instanceID: 11730}
+      Script: {instanceID: 11752}
     - Class: 114
-      Script: {instanceID: 11754}
+      Script: {instanceID: 11764}
     - Class: 114
-      Script: {instanceID: 11766}
+      Script: {instanceID: 11774}
     - Class: 114
-      Script: {instanceID: 11776}
+      Script: {instanceID: 11796}
     - Class: 114
-      Script: {instanceID: 11798}
+      Script: {instanceID: 11858}
     - Class: 114
-      Script: {instanceID: 11860}
+      Script: {instanceID: 12128}
     - Class: 114
-      Script: {instanceID: 12130}
+      Script: {instanceID: 12164}
     - Class: 114
-      Script: {instanceID: 12166}
+      Script: {instanceID: 12330}
     - Class: 114
-      Script: {instanceID: 12332}
+      Script: {instanceID: 12344}
     - Class: 114
-      Script: {instanceID: 12346}
+      Script: {instanceID: 12592}
     - Class: 114
-      Script: {instanceID: 12594}
+      Script: {instanceID: 12706}
     - Class: 114
-      Script: {instanceID: 12708}
+      Script: {instanceID: 12730}
     - Class: 114
-      Script: {instanceID: 12732}
+      Script: {instanceID: 12894}
     - Class: 114
-      Script: {instanceID: 12896}
+      Script: {instanceID: 13140}
     - Class: 114
-      Script: {instanceID: 13142}
+      Script: {instanceID: 13164}
     - Class: 114
-      Script: {instanceID: 13166}
+      Script: {instanceID: 13204}
     - Class: 114
-      Script: {instanceID: 13206}
+      Script: {instanceID: 13222}
     - Class: 114
-      Script: {instanceID: 13224}
+      Script: {instanceID: 13232}
     - Class: 114
-      Script: {instanceID: 13234}
+      Script: {instanceID: 13350}
     - Class: 114
-      Script: {instanceID: 13352}
+      Script: {instanceID: 13382}
     - Class: 114
-      Script: {instanceID: 13384}
+      Script: {instanceID: 13420}
     - Class: 114
-      Script: {instanceID: 13422}
+      Script: {instanceID: 13438}
     - Class: 114
-      Script: {instanceID: 13440}
+      Script: {instanceID: 13454}
     - Class: 114
-      Script: {instanceID: 13456}
+      Script: {instanceID: 13466}
     - Class: 114
-      Script: {instanceID: 13468}
+      Script: {instanceID: 13470}
     - Class: 114
-      Script: {instanceID: 13472}
+      Script: {instanceID: 13504}
     - Class: 114
-      Script: {instanceID: 13506}
+      Script: {instanceID: 13622}
     - Class: 114
-      Script: {instanceID: 13624}
+      Script: {instanceID: 13636}
     - Class: 114
-      Script: {instanceID: 13638}
+      Script: {instanceID: 13662}
     - Class: 114
-      Script: {instanceID: 13664}
+      Script: {instanceID: 13864}
     - Class: 114
-      Script: {instanceID: 13866}
+      Script: {instanceID: 14058}
     - Class: 114
-      Script: {instanceID: 14060}
+      Script: {instanceID: 14140}
     - Class: 114
-      Script: {instanceID: 14142}
+      Script: {instanceID: 14154}
     - Class: 114
-      Script: {instanceID: 14156}
+      Script: {instanceID: 14302}
     - Class: 114
-      Script: {instanceID: 14304}
+      Script: {instanceID: 14448}
     - Class: 114
-      Script: {instanceID: 14450}
+      Script: {instanceID: 14476}
     - Class: 114
-      Script: {instanceID: 14478}
+      Script: {instanceID: 14508}
     - Class: 114
-      Script: {instanceID: 14510}
+      Script: {instanceID: 14530}
     - Class: 114
       Script: {instanceID: 14532}
     - Class: 114
-      Script: {instanceID: 14534}
+      Script: {instanceID: 14572}
     - Class: 114
-      Script: {instanceID: 14574}
+      Script: {instanceID: 14578}
     - Class: 114
-      Script: {instanceID: 14580}
+      Script: {instanceID: 79764}
     - Class: 115
       Script: {instanceID: 0}
     - Class: 128
@@ -915,6 +918,12 @@ ScriptsOnlyBuild:
     assemblyName: Unity.Timeline.dll
     namespaceName: UnityEngine.Timeline
     className: PlayableTrack
+  - hash:
+      serializedVersion: 2
+      Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
+    assemblyName: Assembly-CSharp.dll
+    namespaceName: RimWorldAnimationStudio
+    className: SnapToKeyframe
   platform: 5
   scenePathNames:
   - Assets/Scenes/MainScene.unity
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
index 5b1cf6fb..343e72d5 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
index d5f90c55..5f83f5b8 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb
index 84e4d8de..68f22f27 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ
diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB
index 9cfafc21..c9907487 100644
Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ
diff --git a/Library/StateCache/SceneView/352ee9-mainStage.json b/Library/StateCache/SceneView/352ee9-mainStage.json
index 8ec9f95f..f2c79316 100644
--- a/Library/StateCache/SceneView/352ee9-mainStage.json
+++ b/Library/StateCache/SceneView/352ee9-mainStage.json
@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":1077.5,"y":57.5,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":829.6356201171875,"orthographic":true}
\ No newline at end of file
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":598.1642456054688,"y":121.84375,"z":-73.88001251220703},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":291.54534912109377,"orthographic":true}
\ No newline at end of file
diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
index 444007a6..c50563b2 100644
Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ
diff --git a/quick_start.txt b/quick_start.txt
index be6da8ce..0a0f2387 100644
--- a/quick_start.txt
+++ b/quick_start.txt
@@ -29,6 +29,7 @@ LIME: Determines the number of times the animation repeats itself before moving
 - Left Ctrl + backspace / delete: Delete all selected keyframes
 - Left Ctrl + Z: Undo last action
 - Left Ctrl + Y: Redo last action
+- Left Shift: Hold to enable 'key snapping' - this will snap a dragged key to the same position as another key in an adjacent timeline
 
 *** Tips ***
 - If an animation fails to load, check to make sure there are no empty numeric values in the animation file (search for ‘></’ to quickly find empty tags and put a ‘0’ in them)