diff --git a/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.Designer.cs b/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.Designer.cs
index 5ab86c78..85edf085 100644
--- a/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.Designer.cs
+++ b/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.Designer.cs
@@ -89,8 +89,8 @@
 
         #endregion
 		private System.Windows.Forms.Button cancelButton;
-		public System.Windows.Forms.Label label2;
-		public System.Windows.Forms.Button okBtn;
         private MetroFramework.Controls.MetroComboBox ComboBox;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Button okBtn;
     }
 }
\ No newline at end of file
diff --git a/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.cs b/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.cs
index efb7f1b0..c5017b39 100644
--- a/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.cs
+++ b/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.cs
@@ -7,6 +7,17 @@ namespace PckStudio.Forms.Additional_Popups
 	{
 		public string SelectedItem => DialogResult == DialogResult.OK ? ComboBox.Text : string.Empty;
 
+		public string LabelText
+        {
+            get => label2.Text;
+            set => label2.Text = value;
+        }
+		public string ButtonText
+        {
+            get => okBtn.Text;
+            set => okBtn.Text = value;
+        }
+
         public ItemSelectionPopUp(params string[] items)
 		{
 			InitializeComponent();
diff --git a/PCK-Studio/Forms/Editor/ANIMEditor.cs b/PCK-Studio/Forms/Editor/ANIMEditor.cs
index bd27d242..3184ae33 100644
--- a/PCK-Studio/Forms/Editor/ANIMEditor.cs
+++ b/PCK-Studio/Forms/Editor/ANIMEditor.cs
@@ -182,6 +182,7 @@ namespace PckStudio.Forms.Editor
 
         public ANIMEditor(SkinANIM skinANIM) : this()
         {
+            initialANIM = skinANIM;
             setDisplayAnim(skinANIM);
             ruleset.ApplyAnim(skinANIM);
         }
@@ -345,8 +346,8 @@ namespace PckStudio.Forms.Editor
         private void templateButton_Click(object sender, EventArgs e)
         {
             var diag = new ItemSelectionPopUp(Templates.Keys.ToArray());
-            diag.label2.Text = "Presets";
-            diag.okBtn.Text = "Load";
+            diag.ButtonText = "Presets";
+            diag.ButtonText = "Load";
 
             if (diag.ShowDialog() != DialogResult.OK)
                 return;
diff --git a/PCK-Studio/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs
index 7c04fa28..3ac86ddc 100644
--- a/PCK-Studio/Forms/Editor/AudioEditor.cs
+++ b/PCK-Studio/Forms/Editor/AudioEditor.cs
@@ -577,7 +577,7 @@ namespace PckStudio.Forms.Editor
 			if (available.Length > 0)
 			{
 				using ItemSelectionPopUp add = new ItemSelectionPopUp(available);
-				add.okBtn.Text = "Save";
+				add.ButtonText = "Save";
 				if (add.ShowDialog() != DialogResult.OK) return;
 
 				audioFile.RemoveCategory(category.audioType);
diff --git a/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs b/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs
index 7e412717..44b2175b 100644
--- a/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs
+++ b/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs
@@ -50,8 +50,8 @@ namespace PckStudio.Forms.Editor
         private void PromptForCompressionType()
         {
             ItemSelectionPopUp dialog = new ItemSelectionPopUp("Wii U, PS Vita", "PS3", "Xbox 360");
-            dialog.label2.Text = "Type";
-            dialog.okBtn.Text = "Ok";
+            dialog.LabelText = "Type";
+            dialog.ButtonText = "Ok";
             if (dialog.ShowDialog() == DialogResult.OK)
             {
                 switch(dialog.SelectedItem)