From efb08c4704bfa06a12e06788f4cd01c32f0efeef Mon Sep 17 00:00:00 2001
From: Nicolas Gnyra <nicolas@gnyra.com>
Date: Sat, 23 Mar 2024 13:06:04 -0400
Subject: [PATCH] Create prefabs for all tags on scene load

---
 BeatSaberMarkupLanguage/BSMLParser.cs         | 110 +++++++++++++-----
 .../Components/CustomCellListTableData.cs     |   8 ++
 .../Components/CustomListTableData.cs         |   8 ++
 .../Components/TabSelector.cs                 |   4 +-
 .../Harmony Patches/MainMenuInstaller.cs      |  10 +-
 BeatSaberMarkupLanguage/Tags/BSMLTag.cs       |   7 ++
 BeatSaberMarkupLanguage/Tags/BackgroundTag.cs |  15 +--
 BeatSaberMarkupLanguage/Tags/ButtonTag.cs     |  16 +--
 .../Tags/ButtonWithIconTag.cs                 |  28 +++--
 .../Tags/ClickableImageTag.cs                 |   7 +-
 .../Tags/ClickableTextTag.cs                  |   8 +-
 BeatSaberMarkupLanguage/Tags/CustomListTag.cs |  21 ++--
 BeatSaberMarkupLanguage/Tags/GridLayoutTag.cs |   7 +-
 .../Tags/HorizontalLayoutTag.cs               |  14 +--
 .../Tags/IconSegmentedControlTag.cs           |  16 +--
 BeatSaberMarkupLanguage/Tags/ImageTag.cs      |   7 +-
 .../Tags/LeaderboardTag.cs                    |  16 +--
 BeatSaberMarkupLanguage/Tags/ListTag.cs       |  20 ++--
 .../Tags/LoadingIndicatorTag.cs               |  16 +--
 .../Tags/ModalColorPickerTag.cs               |   4 +-
 .../Tags/ModalKeyboardTag.cs                  |  26 +++--
 BeatSaberMarkupLanguage/Tags/ModalTag.cs      |  23 ++--
 .../Tags/ModifierContainerTag.cs              |   8 +-
 BeatSaberMarkupLanguage/Tags/ModifierTag.cs   |  18 +--
 BeatSaberMarkupLanguage/Tags/PageButtonTag.cs |  33 +++---
 BeatSaberMarkupLanguage/Tags/PrefabBSMLTag.cs |  76 ++++++++++++
 .../Tags/PrimaryButtonTag.cs                  |   9 +-
 BeatSaberMarkupLanguage/Tags/RawImageTag.cs   |   7 +-
 .../Tags/ScrollIndicatorTag.cs                |  27 +----
 BeatSaberMarkupLanguage/Tags/ScrollViewTag.cs |  16 +--
 .../Tags/ScrollableContainerTag.cs            |  30 +++--
 .../Tags/ScrollableSettingsContainerTag.cs    |   8 +-
 .../Tags/Settings/ColorSettingTag.cs          |   5 +-
 .../Tags/Settings/DropdownListSettingTag.cs   |  33 ++----
 .../Tags/Settings/GenericSliderSettingTag.cs  |  16 +--
 .../Tags/Settings/IncDecSettingTag.cs         |  16 +--
 .../Tags/Settings/StringSettingTag.cs         |   3 +-
 .../Tags/Settings/SubmenuTag.cs               |  54 +++++----
 .../Tags/Settings/ToggleSettingTag.cs         |  19 +--
 .../Tags/StackLayoutTag.cs                    |   7 +-
 .../Tags/TabSelectorTag.cs                    |  19 ++-
 BeatSaberMarkupLanguage/Tags/TabTag.cs        |  11 +-
 .../Tags/TextPageScrollViewTag.cs             |  15 +--
 .../Tags/TextSegmentedControlTag.cs           |  16 +--
 BeatSaberMarkupLanguage/Tags/TextTag.cs       |  16 +--
 .../Tags/VerticalIconSegmentedControlTag.cs   |  10 +-
 .../Tags/VerticalLayoutTag.cs                 |  14 +--
 BeatSaberMarkupLanguage/Util/TestPresenter.cs |   6 +-
 48 files changed, 439 insertions(+), 444 deletions(-)
 create mode 100644 BeatSaberMarkupLanguage/Tags/PrefabBSMLTag.cs

diff --git a/BeatSaberMarkupLanguage/BSMLParser.cs b/BeatSaberMarkupLanguage/BSMLParser.cs
index 0bf589fa..27aa0d64 100644
--- a/BeatSaberMarkupLanguage/BSMLParser.cs
+++ b/BeatSaberMarkupLanguage/BSMLParser.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -11,6 +12,7 @@
 using BeatSaberMarkupLanguage.Tags;
 using BeatSaberMarkupLanguage.TypeHandlers;
 using BeatSaberMarkupLanguage.Util;
+using IPA.Loader;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
@@ -19,7 +21,7 @@
 
 namespace BeatSaberMarkupLanguage
 {
-    public class BSMLParser : PersistentSingleton<BSMLParser>, IInitializable
+    public class BSMLParser : PersistentSingleton<BSMLParser>, ILateDisposable
     {
         internal static readonly string MacroPrefix = "macro.";
         internal static readonly string RetrieveValuePrefix = "~";
@@ -35,6 +37,8 @@ public class BSMLParser : PersistentSingleton<BSMLParser>, IInitializable
             IgnoreComments = true,
         };
 
+        private bool sceneContextResolved;
+
         public BSMLParser()
         {
             foreach (BSMLTag tag in Utilities.GetInstancesOfDescendants<BSMLTag>())
@@ -59,37 +63,9 @@ public BSMLParser()
             }
         }
 
-        public void Initialize()
+        public void LateDispose()
         {
-            foreach (BSMLTag tag in tags.Values)
-            {
-                if (!tag.isInitialized)
-                {
-                    tag.Setup();
-                    tag.isInitialized = true;
-                }
-            }
-
-#if false//don't worry about this, it's for the docs
-            string contents = "";
-            foreach (BSMLTag tag in Utilities.GetListOfType<BSMLTag>())
-            {
-                tag.Setup();
-                contents += $"- type: {tag.GetType().Name}\n";
-                contents += $"  aliases:\n";
-                foreach (string alias in tag.Aliases)
-                    contents += $"  - {alias}\n";
-                contents += $"  components:\n";
-                GameObject currentNode = tag.CreateObject(transform);
-                foreach (TypeHandler typeHandler in typeHandlers)
-                {
-                    Type type = typeHandler.GetType().GetCustomAttribute<ComponentHandler>(true).type;
-                    if (GetExternalComponent(currentNode, type) != null)
-                        contents += $"  - {type.Name}\n";
-                }
-            }
-            File.WriteAllText(Path.Combine(Environment.CurrentDirectory, "Tags.yml"), contents);
-#endif
+            sceneContextResolved = false;
         }
 
         public void RegisterTag(BSMLTag tag)
@@ -126,6 +102,11 @@ public BSMLParserParams Parse(XmlNode parentNode, GameObject parent, object host
                 return null;
             }
 
+            if (!sceneContextResolved)
+            {
+                Logger.Log.Warn($"BSMLParser.Parse called by {GetCallerMods()} before Zenject initialization was completed! This may lead to unexpected results and will throw an exception in a future release.");
+            }
+
             BSMLParserParams parserParams = new(host);
 
             FieldAccessOption fieldAccessOptions = FieldAccessOption.Auto;
@@ -291,6 +272,51 @@ public void HandleNode(XmlNode node, GameObject parent, BSMLParserParams parserP
             }
         }
 
+        internal void SceneContext_PreResolve()
+        {
+            Stopwatch stopwatch = Stopwatch.StartNew();
+            foreach (BSMLTag tag in tags.Values.Distinct())
+            {
+#pragma warning disable CS0612, CS0618
+                if (!tag.isInitialized)
+                {
+                    tag.Setup();
+                    tag.isInitialized = true;
+                }
+#pragma warning restore CS0612, CS0618
+
+                tag.SetUp();
+            }
+
+            Logger.Log.Notice("Setup completed in " + stopwatch.Elapsed);
+
+#if false//don't worry about this, it's for the docs
+            string contents = "";
+            foreach (BSMLTag tag in Utilities.GetListOfType<BSMLTag>())
+            {
+                tag.Setup();
+                contents += $"- type: {tag.GetType().Name}\n";
+                contents += $"  aliases:\n";
+                foreach (string alias in tag.Aliases)
+                    contents += $"  - {alias}\n";
+                contents += $"  components:\n";
+                GameObject currentNode = tag.CreateObject(transform);
+                foreach (TypeHandler typeHandler in typeHandlers)
+                {
+                    Type type = typeHandler.GetType().GetCustomAttribute<ComponentHandler>(true).type;
+                    if (GetExternalComponent(currentNode, type) != null)
+                        contents += $"  - {type.Name}\n";
+                }
+            }
+            File.WriteAllText(Path.Combine(Environment.CurrentDirectory, "Tags.yml"), contents);
+#endif
+        }
+
+        internal void SceneContext_PostResolve()
+        {
+            sceneContextResolved = true;
+        }
+
         private void HandleTagNode(XmlNode node, GameObject parent, BSMLParserParams parserParams, out IEnumerable<ComponentTypeWithData> componentInfo)
         {
             if (!this.tags.TryGetValue(node.Name, out BSMLTag currentTag))
@@ -467,6 +493,28 @@ private bool IsMainMenuSceneLoaded()
             return instance.IsValid() && ((SceneProvider.SceneOp)instance.m_InternalOp).m_DepOp.Result.Select(op => op.Result).OfType<AssetBundleResource>().All(ab => ab.m_AssetBundle != null);
         }
 
+        private string GetCallerMods()
+        {
+            List<string> callers = new StackTrace()
+                .GetFrames()
+                .Select(f => f.GetMethod().DeclaringType.Assembly)
+                .Distinct()
+                .Where(a => a != Assembly.GetExecutingAssembly())
+                .Select(a => PluginManager.EnabledPlugins.FirstOrDefault(p => p.Assembly == a))
+                .Where(m => m != null)
+                .Select(m => $"{m.Name} ({m.Assembly.GetName()?.Name})")
+                .ToList();
+
+            if (callers.Count > 0)
+            {
+                return string.Join(", ", callers);
+            }
+            else
+            {
+                return "<unknown>";
+            }
+        }
+
         public struct ComponentTypeWithData
         {
             public TypeHandler typeHandler;
diff --git a/BeatSaberMarkupLanguage/Components/CustomCellListTableData.cs b/BeatSaberMarkupLanguage/Components/CustomCellListTableData.cs
index bf482e3b..be74fd1c 100644
--- a/BeatSaberMarkupLanguage/Components/CustomCellListTableData.cs
+++ b/BeatSaberMarkupLanguage/Components/CustomCellListTableData.cs
@@ -41,6 +41,14 @@ public int NumberOfCells()
         {
             return data.Count;
         }
+
+        private void Awake()
+        {
+            if (tableView != null)
+            {
+                tableView.SetDataSource(this, false);
+            }
+        }
     }
 
     public class CustomCellTableCell : TableCell
diff --git a/BeatSaberMarkupLanguage/Components/CustomListTableData.cs b/BeatSaberMarkupLanguage/Components/CustomListTableData.cs
index a0a618a0..ee33f71e 100644
--- a/BeatSaberMarkupLanguage/Components/CustomListTableData.cs
+++ b/BeatSaberMarkupLanguage/Components/CustomListTableData.cs
@@ -184,6 +184,14 @@ public int NumberOfCells()
             return data.Count();
         }
 
+        private void Awake()
+        {
+            if (tableView != null)
+            {
+                tableView.SetDataSource(this, false);
+            }
+        }
+
         public class CustomCellInfo
         {
             public string text;
diff --git a/BeatSaberMarkupLanguage/Components/TabSelector.cs b/BeatSaberMarkupLanguage/Components/TabSelector.cs
index 3746db68..56d90f2f 100644
--- a/BeatSaberMarkupLanguage/Components/TabSelector.cs
+++ b/BeatSaberMarkupLanguage/Components/TabSelector.cs
@@ -48,7 +48,7 @@ public void Setup()
                 tab.selector = this;
             }
 
-            if (leftButtonTag != null)
+            if (!string.IsNullOrEmpty(leftButtonTag))
             {
                 leftButton = parserParams.GetObjectsWithTag(leftButtonTag).FirstOrDefault().GetComponent<Button>();
             }
@@ -58,7 +58,7 @@ public void Setup()
                 leftButton.onClick.AddListener(PageLeft);
             }
 
-            if (rightButtonTag != null)
+            if (!string.IsNullOrEmpty(rightButtonTag))
             {
                 rightButton = parserParams.GetObjectsWithTag(rightButtonTag).FirstOrDefault().GetComponent<Button>();
             }
diff --git a/BeatSaberMarkupLanguage/Harmony Patches/MainMenuInstaller.cs b/BeatSaberMarkupLanguage/Harmony Patches/MainMenuInstaller.cs
index e31f0bb4..28c328c6 100644
--- a/BeatSaberMarkupLanguage/Harmony Patches/MainMenuInstaller.cs	
+++ b/BeatSaberMarkupLanguage/Harmony Patches/MainMenuInstaller.cs	
@@ -17,11 +17,15 @@ private static void Prefix(MainSettingsMenuViewControllersInstaller __instance)
 
             BeatSaberUI.DiContainer = container;
 
+            // some mods call Parse() in/around Construct (BAD) so we need to run our stuff early
+            container.Resolve<SceneContext>().PreResolve += () => container.Resolve<BSMLParser>().SceneContext_PreResolve();
+            container.Resolve<SceneContext>().PostResolve += () => container.Resolve<BSMLParser>().SceneContext_PostResolve();
+
             // Eventually this should go in an installer & not use static instances but for now this is good enough. This is kind of janky since the
             // instance persists across restarts (like PersistentSingleton did) so Initialize/Dispose can be called multiple times on the same instance.
             container.Bind(typeof(AnimationController), typeof(ITickable)).FromInstance(AnimationController.instance);
             container.Bind(typeof(BSMLSettings), typeof(IInitializable), typeof(ILateDisposable)).FromInstance(BSMLSettings.instance);
-            container.Bind(typeof(BSMLParser), typeof(IInitializable)).FromInstance(BSMLParser.instance);
+            container.Bind(typeof(BSMLParser), typeof(ILateDisposable)).FromInstance(BSMLParser.instance);
             container.Bind(typeof(MenuButtons.MenuButtons), typeof(ILateDisposable)).FromInstance(MenuButtons.MenuButtons.instance);
             container.Bind(typeof(GameplaySetup.GameplaySetup), typeof(IInitializable), typeof(IDisposable), typeof(ILateDisposable)).FromInstance(GameplaySetup.GameplaySetup.instance);
 
@@ -31,9 +35,11 @@ private static void Prefix(MainSettingsMenuViewControllersInstaller __instance)
             container.QueueForInject(MenuButtons.MenuButtons.instance);
             container.QueueForInject(GameplaySetup.GameplaySetup.instance);
 
+            // LateDispose later
+            container.BindLateDisposableExecutionOrder<BSMLParser>(-1000);
+
             // initialize all our stuff late
             container.BindInitializableExecutionOrder<BSMLSettings>(1000);
-            container.BindInitializableExecutionOrder<BSMLParser>(1000);
             container.BindInitializableExecutionOrder<GameplaySetup.GameplaySetup>(1000);
 
             ModSettingsFlowCoordinator modSettingsFlowCoordinator = BeatSaberUI.CreateFlowCoordinator<ModSettingsFlowCoordinator>();
diff --git a/BeatSaberMarkupLanguage/Tags/BSMLTag.cs b/BeatSaberMarkupLanguage/Tags/BSMLTag.cs
index 96dd95ef..71fec61e 100644
--- a/BeatSaberMarkupLanguage/Tags/BSMLTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/BSMLTag.cs
@@ -9,20 +9,27 @@ namespace BeatSaberMarkupLanguage.Tags
 {
     public abstract class BSMLTag
     {
+        [Obsolete]
         public bool isInitialized = false;
 
         public abstract string[] Aliases { get; }
 
         public virtual bool AddChildren { get => true; }
 
+        [Obsolete("Use BeatSaberUI.DiContainer instead")]
         protected DiContainer DiContainer => BeatSaberUI.DiContainer;
 
         public abstract GameObject CreateObject(Transform parent);
 
+        [Obsolete("This method is only called once in the entire lifetime of the application. Please use SetUp instead, which is called on internal restarts as well.")]
         public virtual void Setup()
         {
         }
 
+        public virtual void SetUp()
+        {
+        }
+
         protected LocalizedTextMeshProUGUI CreateLocalizableText(GameObject gameObject)
         {
             if (!gameObject.TryGetComponent(out TextMeshProUGUI textMesh))
diff --git a/BeatSaberMarkupLanguage/Tags/BackgroundTag.cs b/BeatSaberMarkupLanguage/Tags/BackgroundTag.cs
index a80dd4a2..6443648d 100644
--- a/BeatSaberMarkupLanguage/Tags/BackgroundTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/BackgroundTag.cs
@@ -4,27 +4,22 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class BackgroundTag : BSMLTag
+    public class BackgroundTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "bg", "background", "div" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject gameObject = new("BSMLBackground")
-            {
-                layer = 5,
-            };
-
-            gameObject.transform.SetParent(parent, false);
+            GameObject gameObject = new("BSMLBackground");
             gameObject.AddComponent<ContentSizeFitter>();
             gameObject.AddComponent<Backgroundable>();
 
-            RectTransform rectTransform = gameObject.transform as RectTransform;
+            RectTransform rectTransform = (RectTransform)gameObject.transform;
             rectTransform.anchorMin = new Vector2(0, 0);
             rectTransform.anchorMax = new Vector2(1, 1);
             rectTransform.sizeDelta = new Vector2(0, 0);
 
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ButtonTag.cs b/BeatSaberMarkupLanguage/Tags/ButtonTag.cs
index 7974b126..34d818c1 100644
--- a/BeatSaberMarkupLanguage/Tags/ButtonTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ButtonTag.cs
@@ -6,27 +6,19 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ButtonTag : BSMLTag
+    public class ButtonTag : PrefabBSMLTag
     {
-        private Button buttonPrefab;
-
         public override string[] Aliases => new[] { "button" };
 
         public virtual Button PrefabButton => BeatSaberUI.DiContainer.Resolve<StandardLevelDetailViewController>()._standardLevelDetailView.practiceButton;
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (buttonPrefab == null)
-            {
-                buttonPrefab = PrefabButton;
-            }
-
-            Button button = Object.Instantiate(buttonPrefab, parent, false);
+            Button button = Object.Instantiate(PrefabButton);
             button.name = "BSMLButton";
             button.interactable = true;
 
             GameObject gameObject = button.gameObject;
-            gameObject.SetActive(true);
 
             ExternalComponents externalComponents = gameObject.AddComponent<ExternalComponents>();
             GameObject textObject = button.transform.Find("Content/Text").gameObject;
@@ -51,7 +43,7 @@ public override GameObject CreateObject(Transform parent)
                 externalComponents.components.Add(stackLayoutGroup);
             }
 
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ButtonWithIconTag.cs b/BeatSaberMarkupLanguage/Tags/ButtonWithIconTag.cs
index b0ec5c8f..37674060 100644
--- a/BeatSaberMarkupLanguage/Tags/ButtonWithIconTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ButtonWithIconTag.cs
@@ -6,30 +6,28 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ButtonWithIconTag : BSMLTag
+    public class ButtonWithIconTag : PrefabBSMLTag
     {
-        private Button buttonWithIconTemplate;
-
         public override string[] Aliases => new[] { "button-with-icon", "icon-button" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (buttonWithIconTemplate == null)
-            {
-                buttonWithIconTemplate = BeatSaberUI.DiContainer.Resolve<StandardLevelDetailViewController>()._standardLevelDetailView.practiceButton;
-            }
-
-            Button button = Object.Instantiate(buttonWithIconTemplate, parent, false);
+            Button button = Object.Instantiate(BeatSaberUI.DiContainer.Resolve<StandardLevelDetailViewController>()._standardLevelDetailView.practiceButton);
             button.name = "BSMLIconButton";
             button.interactable = true;
 
+            GameObject gameObject = button.gameObject;
+
             Object.Destroy(button.GetComponent<HoverHint>());
             Object.Destroy(button.GetComponent<LocalizedHoverHint>());
-            button.gameObject.AddComponent<ExternalComponents>().components.Add(button.GetComponentsInChildren<LayoutGroup>().Where(x => x.name == "Content").First());
+            gameObject.AddComponent<ExternalComponents>().components.Add(button.GetComponentsInChildren<LayoutGroup>().Where(x => x.name == "Content").First());
 
             Transform contentTransform = button.transform.Find("Content");
             Object.Destroy(contentTransform.Find("Text").gameObject);
-            Image iconImage = new GameObject("Icon").AddComponent<ImageView>();
+            Image iconImage = new GameObject("Icon")
+            {
+                layer = 5,
+            }.AddComponent<ImageView>();
             iconImage.material = Utilities.ImageResources.NoGlowMat;
             iconImage.rectTransform.SetParent(contentTransform, false);
             iconImage.rectTransform.sizeDelta = new Vector2(20f, 20f);
@@ -37,17 +35,17 @@ public override GameObject CreateObject(Transform parent)
             iconImage.preserveAspect = true;
             if (iconImage != null)
             {
-                ButtonIconImage btnIcon = button.gameObject.AddComponent<ButtonIconImage>();
+                ButtonIconImage btnIcon = gameObject.AddComponent<ButtonIconImage>();
                 btnIcon.image = iconImage;
             }
 
             Object.Destroy(button.transform.Find("Content").GetComponent<LayoutElement>());
 
-            ContentSizeFitter buttonSizeFitter = button.gameObject.AddComponent<ContentSizeFitter>();
+            ContentSizeFitter buttonSizeFitter = gameObject.AddComponent<ContentSizeFitter>();
             buttonSizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
             buttonSizeFitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
 
-            return button.gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ClickableImageTag.cs b/BeatSaberMarkupLanguage/Tags/ClickableImageTag.cs
index b94f6dcf..5a3a5a48 100644
--- a/BeatSaberMarkupLanguage/Tags/ClickableImageTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ClickableImageTag.cs
@@ -4,11 +4,11 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ClickableImageTag : BSMLTag
+    public class ClickableImageTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "clickable-image" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = new("BSMLClickableImage")
             {
@@ -17,12 +17,11 @@ public override GameObject CreateObject(Transform parent)
 
             Image image = gameObject.AddComponent<ClickableImage>();
             image.material = Utilities.ImageResources.NoGlowMat;
-            image.rectTransform.SetParent(parent, false);
             image.rectTransform.sizeDelta = new Vector2(20f, 20f);
             image.sprite = Utilities.ImageResources.BlankSprite;
 
             gameObject.AddComponent<LayoutElement>();
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ClickableTextTag.cs b/BeatSaberMarkupLanguage/Tags/ClickableTextTag.cs
index eef417e1..4e0585ab 100644
--- a/BeatSaberMarkupLanguage/Tags/ClickableTextTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ClickableTextTag.cs
@@ -3,11 +3,11 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ClickableTextTag : BSMLTag
+    public class ClickableTextTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "clickable-text" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = new("BSMLClickableText")
             {
@@ -19,7 +19,6 @@ public override GameObject CreateObject(Transform parent)
             ClickableText clickableText = gameObject.AddComponent<ClickableText>();
             clickableText.font = BeatSaberUI.MainTextFont;
             clickableText.fontSharedMaterial = BeatSaberUI.MainUIFontMaterial;
-            clickableText.rectTransform.SetParent(parent, false);
             clickableText.text = "Default Text";
             clickableText.fontSize = 5;
             clickableText.color = Color.white;
@@ -27,8 +26,7 @@ public override GameObject CreateObject(Transform parent)
 
             CreateLocalizableText(gameObject);
 
-            gameObject.SetActive(true);
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/CustomListTag.cs b/BeatSaberMarkupLanguage/Tags/CustomListTag.cs
index d43804d1..37b22a18 100644
--- a/BeatSaberMarkupLanguage/Tags/CustomListTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/CustomListTag.cs
@@ -6,7 +6,7 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class CustomListTag : BSMLTag
+    public class CustomListTag : PrefabBSMLTag
     {
         private Canvas canvasTemplate;
 
@@ -14,38 +14,35 @@ public class CustomListTag : BSMLTag
 
         public override bool AddChildren { get => false; }
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject containerObject = new("BSMLCustomListContainer", typeof(RectTransform), typeof(LayoutElement))
             {
                 layer = 5,
             };
 
-            RectTransform container = (RectTransform)containerObject.transform;
-            container.SetParent(parent, false);
-
             GameObject gameObject = new("BSMLCustomList")
             {
                 layer = 5,
             };
 
-            gameObject.transform.SetParent(container, false);
+            gameObject.transform.SetParent(containerObject.transform, false);
             gameObject.SetActive(false);
 
             if (canvasTemplate == null)
             {
-                canvasTemplate = DiContainer.Resolve<GameplaySetupViewController>()._playerSettingsPanelController._noteJumpStartBeatOffsetDropdown._simpleTextDropdown._tableView.GetComponent<Canvas>();
+                canvasTemplate = BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>()._playerSettingsPanelController._noteJumpStartBeatOffsetDropdown._simpleTextDropdown._tableView.GetComponent<Canvas>();
             }
 
             gameObject.AddComponent<ScrollRect>();
             gameObject.AddComponent(canvasTemplate);
-            DiContainer.InstantiateComponent<VRGraphicRaycaster>(gameObject);
+            BeatSaberUI.DiContainer.InstantiateComponent<VRGraphicRaycaster>(gameObject);
             gameObject.AddComponent<Touchable>();
             gameObject.AddComponent<EventSystemListener>();
-            ScrollView scrollView = DiContainer.InstantiateComponent<ScrollView>(gameObject);
+            ScrollView scrollView = BeatSaberUI.DiContainer.InstantiateComponent<ScrollView>(gameObject);
 
             TableView tableView = gameObject.AddComponent<BSMLTableView>();
-            CustomCellListTableData tableData = container.gameObject.AddComponent<CustomCellListTableData>();
+            CustomCellListTableData tableData = containerObject.AddComponent<CustomCellListTableData>();
             tableData.tableView = tableView;
 
             tableView._preallocatedCells = new TableView.CellsGroup[0];
@@ -73,9 +70,7 @@ public override GameObject CreateObject(Transform parent)
             (tableView.transform as RectTransform).sizeDelta = new Vector2(0f, 0f);
             (tableView.transform as RectTransform).anchoredPosition = new Vector3(0f, 0f);
 
-            // Changed the bool param to "false", as it would otherwise trigger LazyInit earlier than we want it to
-            tableView.SetDataSource(tableData, false);
-            return container.gameObject;
+            return new PrefabParams(containerObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/GridLayoutTag.cs b/BeatSaberMarkupLanguage/Tags/GridLayoutTag.cs
index 190a357f..35e2d641 100644
--- a/BeatSaberMarkupLanguage/Tags/GridLayoutTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/GridLayoutTag.cs
@@ -4,18 +4,17 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class GridLayoutTag : BSMLTag
+    public class GridLayoutTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "grid" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = new("BSMLGridLayoutGroup")
             {
                 layer = 5,
             };
 
-            gameObject.transform.SetParent(parent, false);
             gameObject.AddComponent<GridLayoutGroup>();
             gameObject.AddComponent<ContentSizeFitter>();
             gameObject.AddComponent<Backgroundable>();
@@ -25,7 +24,7 @@ public override GameObject CreateObject(Transform parent)
             rectTransform.anchorMax = new Vector2(1, 1);
             rectTransform.sizeDelta = new Vector2(0, 0);
 
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/HorizontalLayoutTag.cs b/BeatSaberMarkupLanguage/Tags/HorizontalLayoutTag.cs
index f38bdcee..c71381d2 100644
--- a/BeatSaberMarkupLanguage/Tags/HorizontalLayoutTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/HorizontalLayoutTag.cs
@@ -4,18 +4,13 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class HorizontalLayoutTag : BSMLTag
+    public class HorizontalLayoutTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "horizontal" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject gameObject = new("BSMLHorizontalLayoutGroup")
-            {
-                layer = 5,
-            };
-
-            gameObject.transform.SetParent(parent, false);
+            GameObject gameObject = new("BSMLHorizontalLayoutGroup");
             gameObject.AddComponent<HorizontalLayoutGroup>();
 
             ContentSizeFitter contentSizeFitter = gameObject.AddComponent<ContentSizeFitter>();
@@ -28,7 +23,8 @@ public override GameObject CreateObject(Transform parent)
             rectTransform.sizeDelta = new Vector2(0, 0);
 
             gameObject.AddComponent<LayoutElement>();
-            return gameObject;
+
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/IconSegmentedControlTag.cs b/BeatSaberMarkupLanguage/Tags/IconSegmentedControlTag.cs
index cc0be368..bf1e1610 100644
--- a/BeatSaberMarkupLanguage/Tags/IconSegmentedControlTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/IconSegmentedControlTag.cs
@@ -3,20 +3,14 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class IconSegmentedControlTag : BSMLTag
+    public class IconSegmentedControlTag : PrefabBSMLTag
     {
-        private IconSegmentedControl segmentedControlTemplate;
-
         public override string[] Aliases => new[] { "icon-segments" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (segmentedControlTemplate == null)
-            {
-                segmentedControlTemplate = DiContainer.Resolve<StandardLevelDetailViewController>()._standardLevelDetailView._beatmapCharacteristicSegmentedControlController.GetComponent<IconSegmentedControl>();
-            }
-
-            IconSegmentedControl iconSegmentedControl = DiContainer.InstantiatePrefabForComponent<IconSegmentedControl>(segmentedControlTemplate, parent);
+            IconSegmentedControl segmentedControlTemplate = BeatSaberUI.DiContainer.Resolve<StandardLevelDetailViewController>()._standardLevelDetailView._beatmapCharacteristicSegmentedControlController.GetComponent<IconSegmentedControl>();
+            IconSegmentedControl iconSegmentedControl = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<IconSegmentedControl>(segmentedControlTemplate);
             iconSegmentedControl.name = "BSMLIconSegmentedControl";
             (iconSegmentedControl.transform as RectTransform).anchoredPosition = new Vector2(0, 0);
             foreach (Transform transform in iconSegmentedControl.transform)
@@ -25,7 +19,7 @@ public override GameObject CreateObject(Transform parent)
             }
 
             Object.Destroy(iconSegmentedControl.GetComponent<BeatmapCharacteristicSegmentedControlController>());
-            return iconSegmentedControl.gameObject;
+            return new PrefabParams(iconSegmentedControl.gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ImageTag.cs b/BeatSaberMarkupLanguage/Tags/ImageTag.cs
index f020c6a2..8b5abbd8 100644
--- a/BeatSaberMarkupLanguage/Tags/ImageTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ImageTag.cs
@@ -4,11 +4,11 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ImageTag : BSMLTag
+    public class ImageTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "image", "img" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = new("BSMLImage")
             {
@@ -17,12 +17,11 @@ public override GameObject CreateObject(Transform parent)
 
             Image image = gameObject.AddComponent<ImageView>();
             image.material = Utilities.ImageResources.NoGlowMat;
-            image.rectTransform.SetParent(parent, false);
             image.rectTransform.sizeDelta = new Vector2(20f, 20f);
             image.sprite = Utilities.ImageResources.BlankSprite;
 
             gameObject.AddComponent<LayoutElement>();
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/LeaderboardTag.cs b/BeatSaberMarkupLanguage/Tags/LeaderboardTag.cs
index ccbcf07d..55bdb045 100644
--- a/BeatSaberMarkupLanguage/Tags/LeaderboardTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/LeaderboardTag.cs
@@ -2,20 +2,14 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class LeaderboardTag : BSMLTag
+    public class LeaderboardTag : PrefabBSMLTag
     {
-        private LeaderboardTableView leaderboardTemplate;
-
         public override string[] Aliases => new[] { "leaderboard" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (leaderboardTemplate == null)
-            {
-                leaderboardTemplate = DiContainer.Resolve<PlatformLeaderboardViewController>()._leaderboardTableView;
-            }
-
-            LeaderboardTableView table = DiContainer.InstantiatePrefabForComponent<LeaderboardTableView>(leaderboardTemplate, parent);
+            LeaderboardTableView leaderboardTemplate = BeatSaberUI.DiContainer.Resolve<PlatformLeaderboardViewController>()._leaderboardTableView;
+            LeaderboardTableView table = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<LeaderboardTableView>(leaderboardTemplate);
             table.name = "BSMLLeaderboard";
 
             // This is to ensure if a leaderboard with scores already on it gets cloned that old scores are cleared off
@@ -24,7 +18,7 @@ public override GameObject CreateObject(Transform parent)
                 Object.Destroy(tableCell.gameObject);
             }
 
-            return table.gameObject;
+            return new PrefabParams(table.gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ListTag.cs b/BeatSaberMarkupLanguage/Tags/ListTag.cs
index 87c600ad..58994710 100644
--- a/BeatSaberMarkupLanguage/Tags/ListTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ListTag.cs
@@ -6,44 +6,41 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ListTag : BSMLTag
+    public class ListTag : PrefabBSMLTag
     {
         private Canvas canvasTemplate;
 
         public override string[] Aliases => new[] { "list" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject containerObject = new("BSMLListContainer", typeof(RectTransform), typeof(LayoutElement))
             {
                 layer = 5,
             };
 
-            RectTransform container = (RectTransform)containerObject.transform;
-            container.SetParent(parent, false);
-
             GameObject gameObject = new("BSMLList")
             {
                 layer = 5,
             };
 
-            gameObject.transform.SetParent(container, false);
+            gameObject.transform.SetParent(containerObject.transform, false);
             gameObject.SetActive(false);
 
             if (canvasTemplate == null)
             {
-                canvasTemplate = DiContainer.Resolve<GameplaySetupViewController>()._playerSettingsPanelController._noteJumpStartBeatOffsetDropdown._simpleTextDropdown._tableView.GetComponent<Canvas>();
+                canvasTemplate = BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>()._playerSettingsPanelController._noteJumpStartBeatOffsetDropdown._simpleTextDropdown._tableView.GetComponent<Canvas>();
             }
 
             gameObject.AddComponent<ScrollRect>();
             gameObject.AddComponent(canvasTemplate);
-            DiContainer.InstantiateComponent<VRGraphicRaycaster>(gameObject);
+            BeatSaberUI.DiContainer.InstantiateComponent<VRGraphicRaycaster>(gameObject);
             gameObject.AddComponent<Touchable>();
             gameObject.AddComponent<EventSystemListener>();
-            ScrollView scrollView = DiContainer.InstantiateComponent<ScrollView>(gameObject);
+            ScrollView scrollView = BeatSaberUI.DiContainer.InstantiateComponent<ScrollView>(gameObject);
 
             TableView tableView = gameObject.AddComponent<BSMLTableView>();
-            CustomListTableData tableData = container.gameObject.AddComponent<CustomListTableData>();
+            CustomListTableData tableData = containerObject.AddComponent<CustomListTableData>();
             tableData.tableView = tableView;
 
             tableView._preallocatedCells = new TableView.CellsGroup[0];
@@ -71,8 +68,7 @@ public override GameObject CreateObject(Transform parent)
             (tableView.transform as RectTransform).sizeDelta = new Vector2(0f, 0f);
             (tableView.transform as RectTransform).anchoredPosition = new Vector3(0f, 0f);
 
-            tableView.SetDataSource(tableData, false);
-            return container.gameObject;
+            return new PrefabParams(containerObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/LoadingIndicatorTag.cs b/BeatSaberMarkupLanguage/Tags/LoadingIndicatorTag.cs
index add804e9..e19ec263 100644
--- a/BeatSaberMarkupLanguage/Tags/LoadingIndicatorTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/LoadingIndicatorTag.cs
@@ -3,25 +3,17 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class LoadingIndicatorTag : BSMLTag
+    public class LoadingIndicatorTag : PrefabBSMLTag
     {
-        private GameObject loadingTemplate;
-
         public override string[] Aliases => new string[] { "loading", "loading-indicator" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (loadingTemplate == null)
-            {
-                loadingTemplate = DiContainer.Resolve<LevelCollectionNavigationController>()._loadingControl._loadingContainer.transform.Find("LoadingIndicator").gameObject;
-            }
-
-            GameObject loadingIndicator = Object.Instantiate(loadingTemplate, parent, false);
+            GameObject loadingIndicator = Object.Instantiate(BeatSaberUI.DiContainer.Resolve<LevelCollectionNavigationController>()._loadingControl._loadingContainer.transform.Find("LoadingIndicator").gameObject);
             loadingIndicator.name = "BSMLLoadingIndicator";
-
             loadingIndicator.AddComponent<LayoutElement>();
 
-            return loadingIndicator;
+            return new PrefabParams(loadingIndicator);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ModalColorPickerTag.cs b/BeatSaberMarkupLanguage/Tags/ModalColorPickerTag.cs
index 15355396..761fb2d7 100644
--- a/BeatSaberMarkupLanguage/Tags/ModalColorPickerTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ModalColorPickerTag.cs
@@ -23,7 +23,7 @@ public override GameObject CreateObject(Transform parent)
             ModalColorPicker colorPicker = gameObject.AddComponent<ModalColorPicker>();
             colorPicker.modalView = gameObject.GetComponent<ModalView>();
 
-            EditColorSchemeController editColorSchemeController = DiContainer.Resolve<GameplaySetupViewController>().GetComponentInChildren<EditColorSchemeController>(true);
+            EditColorSchemeController editColorSchemeController = BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>().GetComponentInChildren<EditColorSchemeController>(true);
 
             if (rgbTemplate == null)
             {
@@ -37,7 +37,7 @@ public override GameObject CreateObject(Transform parent)
 
             if (currentColorTemplate == null)
             {
-                currentColorTemplate = DiContainer.Resolve<GameplaySetupViewController>()._colorsOverrideSettingsPanelController._colorSchemeDropDown._cellPrefab._colorSchemeView._saberAColorImage;
+                currentColorTemplate = BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>()._colorsOverrideSettingsPanelController._colorSchemeDropDown._cellPrefab._colorSchemeView._saberAColorImage;
             }
 
             RGBPanelController rgbController = Object.Instantiate(rgbTemplate, gameObject.transform, false);
diff --git a/BeatSaberMarkupLanguage/Tags/ModalKeyboardTag.cs b/BeatSaberMarkupLanguage/Tags/ModalKeyboardTag.cs
index c79e26c3..c81d240c 100644
--- a/BeatSaberMarkupLanguage/Tags/ModalKeyboardTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ModalKeyboardTag.cs
@@ -12,6 +12,22 @@ public override GameObject CreateObject(Transform parent)
         {
             GameObject gameObject = base.CreateObject(parent);
 
+            KEYBOARD keyboard = new((RectTransform)gameObject.transform, KEYBOARD.QWERTY, true, 4, -12);
+            ((RectTransform)gameObject.transform).localScale *= 1.4f;
+
+            ModalKeyboard modalKeyboard = gameObject.AddComponent<ModalKeyboard>();
+            modalKeyboard.keyboard = keyboard;
+            modalKeyboard.modalView = gameObject.GetComponent<ModalView>();
+            keyboard.EnterPressed += modalKeyboard.OnEnter;
+
+            return gameObject;
+        }
+
+        protected override PrefabParams CreatePrefab()
+        {
+            PrefabParams prefab = base.CreatePrefab();
+            GameObject gameObject = prefab.ContainerObject;
+
             RectTransform windowTransform = gameObject.transform as RectTransform;
             windowTransform.name = "BSMLModalKeyboard";
             windowTransform.sizeDelta = new Vector2(135, 75);
@@ -19,15 +35,7 @@ public override GameObject CreateObject(Transform parent)
             RectTransform parentTransform = new GameObject("KeyboardParent").AddComponent<RectTransform>();
             parentTransform.SetParent(gameObject.transform, false);
 
-            KEYBOARD keyboard = new(parentTransform, KEYBOARD.QWERTY, true, 4, -12);
-            parentTransform.localScale *= 1.4f;
-
-            ModalKeyboard modalKeyboard = gameObject.AddComponent<ModalKeyboard>();
-            modalKeyboard.keyboard = keyboard;
-            modalKeyboard.modalView = gameObject.GetComponent<ModalView>();
-            keyboard.EnterPressed += (value) => modalKeyboard.OnEnter(value);
-
-            return gameObject;
+            return new PrefabParams(prefab.RootObject, gameObject, false);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ModalTag.cs b/BeatSaberMarkupLanguage/Tags/ModalTag.cs
index 65c2c353..01418f73 100644
--- a/BeatSaberMarkupLanguage/Tags/ModalTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ModalTag.cs
@@ -4,23 +4,16 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ModalTag : BSMLTag
+    public class ModalTag : PrefabBSMLTag
     {
-        private ModalView modalViewTemplate;
-
         public override string[] Aliases => new[] { "modal" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (modalViewTemplate == null)
-            {
-                modalViewTemplate = DiContainer.Resolve<GameplaySetupViewController>()._colorsOverrideSettingsPanelController._colorSchemeDropDown._modalView;
-            }
-
-            ModalView modalView = DiContainer.InstantiatePrefabForComponent<ModalView>(modalViewTemplate, parent);
+            ModalView modalViewTemplate = BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>()._colorsOverrideSettingsPanelController._colorSchemeDropDown._modalView;
+            ModalView modalView = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<ModalView>(modalViewTemplate);
             modalView.name = "BSMLModal";
-            modalView._presentPanelAnimations = modalViewTemplate._presentPanelAnimations;
-            modalView._dismissPanelAnimation = modalViewTemplate._dismissPanelAnimation;
+            modalView.gameObject.SetActive(false);
 
             Object.DestroyImmediate(modalView.GetComponent<TableView>());
             Object.DestroyImmediate(modalView.GetComponent<ScrollRect>());
@@ -40,14 +33,12 @@ public override GameObject CreateObject(Transform parent)
                 }
             }
 
-            RectTransform rectTransform = modalView.transform as RectTransform;
+            RectTransform rectTransform = (RectTransform)modalView.transform;
             rectTransform.anchorMin = new Vector2(0.5f, 0.5f);
             rectTransform.anchorMax = new Vector2(0.5f, 0.5f);
             rectTransform.sizeDelta = new Vector2(0, 0);
 
-            modalView.gameObject.SetActive(false);
-
-            return modalView.gameObject;
+            return new PrefabParams(modalView.gameObject, false);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ModifierContainerTag.cs b/BeatSaberMarkupLanguage/Tags/ModifierContainerTag.cs
index 99e0d90d..85e30aa5 100644
--- a/BeatSaberMarkupLanguage/Tags/ModifierContainerTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ModifierContainerTag.cs
@@ -3,19 +3,17 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ModifierContainerTag : BSMLTag
+    public class ModifierContainerTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "modifier-container" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = new("BSMLModifierContainer")
             {
                 layer = 5,
             };
 
-            gameObject.transform.SetParent(parent, false);
-
             VerticalLayoutGroup vertical = gameObject.AddComponent<VerticalLayoutGroup>();
             vertical.padding = new RectOffset(3, 3, 2, 2);
             vertical.childControlHeight = false;
@@ -30,7 +28,7 @@ public override GameObject CreateObject(Transform parent)
             rectTransform.sizeDelta = new Vector2(54, 0);
 
             gameObject.AddComponent<LayoutElement>();
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ModifierTag.cs b/BeatSaberMarkupLanguage/Tags/ModifierTag.cs
index 910d64ae..3e499c55 100644
--- a/BeatSaberMarkupLanguage/Tags/ModifierTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ModifierTag.cs
@@ -10,20 +10,14 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ModifierTag : BSMLTag
+    public class ModifierTag : PrefabBSMLTag
     {
-        private GameplayModifierToggle toggleTemplate;
-
         public override string[] Aliases => new[] { "modifier" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (toggleTemplate == null)
-            {
-                toggleTemplate = DiContainer.Resolve<GameplaySetupViewController>()._gameplayModifiersPanelController.GetComponentsInChildren<GameplayModifierToggle>().First(gmt => gmt.name == "InstaFail");
-            }
-
-            GameplayModifierToggle baseModifier = Object.Instantiate(toggleTemplate, parent, false);
+            GameplayModifierToggle toggleTemplate = BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>()._gameplayModifiersPanelController.GetComponentsInChildren<GameplayModifierToggle>().First(gmt => gmt.name == "InstaFail");
+            GameplayModifierToggle baseModifier = Object.Instantiate(toggleTemplate);
             baseModifier.name = "BSMLModifier";
 
             GameObject gameObject = baseModifier.gameObject;
@@ -49,9 +43,7 @@ public override GameObject CreateObject(Transform parent)
             toggleSetting.toggle = gameObject.GetComponent<Toggle>();
             toggleSetting.toggle.onValueChanged.RemoveAllListeners();
 
-            gameObject.SetActive(true);
-
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/PageButtonTag.cs b/BeatSaberMarkupLanguage/Tags/PageButtonTag.cs
index 1bac81d0..15658cdc 100644
--- a/BeatSaberMarkupLanguage/Tags/PageButtonTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/PageButtonTag.cs
@@ -6,46 +6,39 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class PageButtonTag : BSMLTag
+    public class PageButtonTag : PrefabBSMLTag
     {
-        private Button buttonTemplate;
-
         public override string[] Aliases => new[] { "page-button", "pg-button" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (buttonTemplate == null)
-            {
-                buttonTemplate = DiContainer.Resolve<PlayerOptionsViewController>()._playerSettingsPanelController.GetComponent<ScrollView>()._pageUpButton;
-            }
-
-            Button button = Object.Instantiate(buttonTemplate, parent, false);
-            button.gameObject.SetActive(false);
+            Button button = Object.Instantiate(BeatSaberUI.DiContainer.Resolve<PlayerOptionsViewController>()._playerSettingsPanelController.GetComponent<ScrollView>()._pageUpButton);
+            GameObject buttonObject = button.gameObject;
+            buttonObject.SetActive(false);
             button.name = "BSMLPageButton";
             button.interactable = true;
-            button.gameObject.AddComponent<PageButton>();
-            LayoutElement layoutElement = button.gameObject.AddComponent<LayoutElement>();
+            buttonObject.AddComponent<PageButton>();
+            LayoutElement layoutElement = buttonObject.AddComponent<LayoutElement>();
             layoutElement.preferredWidth = -1;
             layoutElement.preferredHeight = -1;
             layoutElement.flexibleHeight = 0;
             layoutElement.flexibleWidth = 0;
 
-            ContentSizeFitter sizeFitter = button.gameObject.AddComponent<ContentSizeFitter>();
+            ContentSizeFitter sizeFitter = buttonObject.AddComponent<ContentSizeFitter>();
             sizeFitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
             sizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
 
-            RectTransform buttonTransform = button.transform.GetChild(0) as RectTransform;
+            RectTransform buttonTransform = (RectTransform)button.transform.GetChild(0);
             buttonTransform.anchorMin = new Vector2(0, 0);
             buttonTransform.anchorMax = new Vector2(1, 1);
             buttonTransform.sizeDelta = new Vector2(0, 0);
 
-            (button.transform as RectTransform).pivot = new Vector2(.5f, .5f);
+            ((RectTransform)button.transform).pivot = new Vector2(.5f, .5f);
 
-            ButtonIconImage btnIcon = button.gameObject.AddComponent<ButtonIconImage>();
-            btnIcon.image = button.gameObject.GetComponentsInChildren<Image>(true).Where(x => x.gameObject.name == "Icon").FirstOrDefault();
+            ButtonIconImage btnIcon = buttonObject.AddComponent<ButtonIconImage>();
+            btnIcon.image = buttonObject.GetComponentsInChildren<Image>(true).Where(x => x.gameObject.name == "Icon").FirstOrDefault();
 
-            button.gameObject.SetActive(true);
-            return button.gameObject;
+            return new PrefabParams(buttonObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/PrefabBSMLTag.cs b/BeatSaberMarkupLanguage/Tags/PrefabBSMLTag.cs
new file mode 100644
index 00000000..06b7c2d9
--- /dev/null
+++ b/BeatSaberMarkupLanguage/Tags/PrefabBSMLTag.cs
@@ -0,0 +1,76 @@
+using System;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace BeatSaberMarkupLanguage.Tags
+{
+    public abstract class PrefabBSMLTag : BSMLTag
+    {
+        private BSMLPrefab prefab;
+
+        public sealed override void SetUp()
+        {
+            PrefabParams prefabParams = CreatePrefab();
+
+            prefab = prefabParams.RootObject.AddComponent<BSMLPrefab>();
+            prefab.ContainerObject = prefabParams.ContainerObject;
+            prefab.EnableOnInstantiate = prefabParams.EnableOnInstantiate;
+            prefabParams.RootObject.SetActive(false);
+        }
+
+        public override GameObject CreateObject(Transform parent)
+        {
+            if (prefab == null)
+            {
+                throw new InvalidOperationException("CreateObject called before or during CreatePrefab");
+            }
+
+            BSMLPrefab instance = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<BSMLPrefab>(prefab, parent);
+            Object.Destroy(instance);
+
+            string name = instance.name;
+            instance.name = name.Substring(0, name.Length - 7); // remove (Clone)
+
+            if (instance.EnableOnInstantiate)
+            {
+                instance.gameObject.SetActive(true);
+            }
+
+            return instance.ContainerObject;
+        }
+
+        protected abstract PrefabParams CreatePrefab();
+
+        protected readonly struct PrefabParams
+        {
+            internal PrefabParams(GameObject rootObject, bool enableOnInstantiate = true)
+            {
+                RootObject = rootObject;
+                ContainerObject = rootObject;
+                EnableOnInstantiate = enableOnInstantiate;
+            }
+
+            internal PrefabParams(GameObject rootObject, GameObject containerObject, bool enableOnInstantiate = true)
+            {
+                RootObject = rootObject;
+                ContainerObject = containerObject;
+                EnableOnInstantiate = enableOnInstantiate;
+            }
+
+            internal GameObject RootObject { get; }
+
+            internal GameObject ContainerObject { get; }
+
+            internal bool EnableOnInstantiate { get; }
+        }
+
+        private class BSMLPrefab : MonoBehaviour
+        {
+            [SerializeField]
+            internal GameObject ContainerObject;
+
+            [SerializeField]
+            internal bool EnableOnInstantiate;
+        }
+    }
+}
diff --git a/BeatSaberMarkupLanguage/Tags/PrimaryButtonTag.cs b/BeatSaberMarkupLanguage/Tags/PrimaryButtonTag.cs
index 96d6c82e..e54dc304 100644
--- a/BeatSaberMarkupLanguage/Tags/PrimaryButtonTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/PrimaryButtonTag.cs
@@ -1,5 +1,4 @@
-using UnityEngine;
-using UnityEngine.UI;
+using UnityEngine.UI;
 
 namespace BeatSaberMarkupLanguage.Tags
 {
@@ -9,9 +8,11 @@ public class PrimaryButtonTag : ButtonTag
 
         public override Button PrefabButton => BeatSaberUI.DiContainer.Resolve<PracticeViewController>()._playButton;
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            return base.CreateObject(parent).AddComponent<LayoutElement>().gameObject;
+            PrefabParams prefab = base.CreatePrefab();
+            prefab.ContainerObject.AddComponent<LayoutElement>();
+            return prefab;
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/RawImageTag.cs b/BeatSaberMarkupLanguage/Tags/RawImageTag.cs
index 7155e2e5..796b1950 100644
--- a/BeatSaberMarkupLanguage/Tags/RawImageTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/RawImageTag.cs
@@ -3,11 +3,11 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class RawImageTag : BSMLTag
+    public class RawImageTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "raw-image" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = new("BSMLRawImage")
             {
@@ -16,12 +16,11 @@ public override GameObject CreateObject(Transform parent)
 
             RawImage rawImage = gameObject.AddComponent<RawImage>();
             rawImage.material = Utilities.ImageResources.NoGlowMat;
-            rawImage.rectTransform.SetParent(parent, false);
             rawImage.rectTransform.sizeDelta = new Vector2(20f, 20f);
             rawImage.texture = Utilities.ImageResources.BlankSprite.texture;
 
             gameObject.AddComponent<LayoutElement>();
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ScrollIndicatorTag.cs b/BeatSaberMarkupLanguage/Tags/ScrollIndicatorTag.cs
index 072c7bf3..deff38ed 100644
--- a/BeatSaberMarkupLanguage/Tags/ScrollIndicatorTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ScrollIndicatorTag.cs
@@ -5,40 +5,25 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ScrollIndicatorTag : BSMLTag
+    public class ScrollIndicatorTag : PrefabBSMLTag
     {
-        private static GameObject verticalScrollTemplate = null;
-
-        public static GameObject VerticalScrollTemplate
-        {
-            get
-            {
-                if (verticalScrollTemplate == null)
-                {
-                    verticalScrollTemplate = BeatSaberUI.DiContainer.Resolve<LevelCollectionNavigationController>()._levelCollectionViewController._levelCollectionTableView.GetComponent<ScrollView>()._verticalScrollIndicator.gameObject;
-                }
-
-                return verticalScrollTemplate;
-            }
-        }
+        public static GameObject VerticalScrollTemplate => ScrollViewTag.ScrollViewTemplate._verticalScrollIndicator.gameObject;
 
         public override string[] Aliases { get; } = new[] { "vertical-scroll-indicator", "scroll-indicator" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = Object.Instantiate(VerticalScrollTemplate);
             gameObject.SetActive(false);
             gameObject.name = "BSMLScrollIndicator";
 
-            RectTransform transform = gameObject.GetComponent<RectTransform>();
-            transform.SetParent(parent, false);
+            RectTransform transform = (RectTransform)gameObject.transform;
 
             Object.DestroyImmediate(gameObject.GetComponent<VerticalScrollIndicator>());
             BSMLScrollIndicator indicator = gameObject.AddComponent<BSMLScrollIndicator>();
-            indicator.Handle = transform.GetChild(0).GetComponent<RectTransform>();
+            indicator.Handle = (RectTransform)transform.GetChild(0);
 
-            gameObject.SetActive(true);
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ScrollViewTag.cs b/BeatSaberMarkupLanguage/Tags/ScrollViewTag.cs
index b59ab056..034c90b2 100644
--- a/BeatSaberMarkupLanguage/Tags/ScrollViewTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ScrollViewTag.cs
@@ -6,7 +6,7 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ScrollViewTag : BSMLTag
+    public class ScrollViewTag : PrefabBSMLTag
     {
         private static TextPageScrollView scrollViewTemplate;
 
@@ -16,7 +16,7 @@ public static TextPageScrollView ScrollViewTemplate
             {
                 if (scrollViewTemplate == null)
                 {
-                    scrollViewTemplate = Object.FindObjectOfType<EulaDisplayViewController>(true)._textPageScrollView;
+                    scrollViewTemplate = BeatSaberUI.DiContainer.Resolve<EulaDisplayViewController>()._textPageScrollView;
                 }
 
                 return scrollViewTemplate;
@@ -25,23 +25,23 @@ public static TextPageScrollView ScrollViewTemplate
 
         public override string[] Aliases => new[] { "scroll-view" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            TextPageScrollView textScrollView = Object.Instantiate(ScrollViewTemplate, parent);
+            TextPageScrollView textScrollView = Object.Instantiate(ScrollViewTemplate);
             textScrollView.name = "BSMLScrollView";
             Button pageUpButton = textScrollView._pageUpButton;
             Button pageDownButton = textScrollView._pageDownButton;
             VerticalScrollIndicator verticalScrollIndicator = textScrollView._verticalScrollIndicator;
 
             RectTransform viewport = textScrollView._viewport;
-            DiContainer.InstantiateComponent<VRGraphicRaycaster>(viewport.gameObject);
+            BeatSaberUI.DiContainer.InstantiateComponent<VRGraphicRaycaster>(viewport.gameObject);
 
             Object.Destroy(textScrollView._text.gameObject);
             GameObject gameObject = textScrollView.gameObject;
             Object.Destroy(textScrollView);
             gameObject.SetActive(false);
 
-            BSMLScrollView scrollView = DiContainer.InstantiateComponent<BSMLScrollView>(gameObject);
+            BSMLScrollView scrollView = BeatSaberUI.DiContainer.InstantiateComponent<BSMLScrollView>(gameObject);
             scrollView._pageUpButton = pageUpButton;
             scrollView._pageDownButton = pageDownButton;
             scrollView._verticalScrollIndicator = verticalScrollIndicator;
@@ -96,8 +96,8 @@ public override GameObject CreateObject(Transform parent)
             (child.transform as RectTransform).sizeDelta = new Vector2(0, -1);
 
             scrollView._contentRectTransform = parentObj.transform as RectTransform;
-            gameObject.SetActive(true);
-            return child;
+
+            return new PrefabParams(gameObject, child);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ScrollableContainerTag.cs b/BeatSaberMarkupLanguage/Tags/ScrollableContainerTag.cs
index 12c7001a..5aa724b9 100644
--- a/BeatSaberMarkupLanguage/Tags/ScrollableContainerTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ScrollableContainerTag.cs
@@ -5,21 +5,20 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ScrollableContainerTag : BSMLTag
+    public class ScrollableContainerTag : PrefabBSMLTag
     {
         public override string[] Aliases { get; } = new[] { "scrollable-container" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject go = new("BSMLScrollScrollableContainer")
+            GameObject gameObject = new("BSMLScrollScrollableContainer")
             {
                 layer = 5,
             };
 
-            go.SetActive(false);
+            gameObject.SetActive(false);
 
-            RectTransform transform = go.AddComponent<RectTransform>();
-            transform.SetParent(parent, false);
+            RectTransform transform = gameObject.AddComponent<RectTransform>();
             transform.localPosition = Vector2.zero;
             transform.anchorMin = Vector2.zero;
             transform.anchorMax = Vector2.one;
@@ -46,12 +45,12 @@ public override GameObject CreateObject(Transform parent)
             vpimage.sprite = Utilities.ImageResources.WhitePixel;
             vpimage.material = Utilities.ImageResources.NoGlowMat;
 
-            GameObject contentgo = new("Content Wrapper")
+            GameObject contentGameObject = new("Content Wrapper")
             {
                 layer = 5,
             };
 
-            RectTransform content = contentgo.AddComponent<RectTransform>();
+            RectTransform content = contentGameObject.AddComponent<RectTransform>();
             content.SetParent(viewport, false);
             content.localPosition = Vector2.zero;
             content.anchorMin = new Vector2(0f, 1f);
@@ -59,24 +58,23 @@ public override GameObject CreateObject(Transform parent)
             content.anchoredPosition = Vector2.zero;
             content.pivot = new Vector2(0.5f, 1f);
 
-            ContentSizeFitter contentFitter = contentgo.AddComponent<ContentSizeFitter>();
+            ContentSizeFitter contentFitter = contentGameObject.AddComponent<ContentSizeFitter>();
             contentFitter.horizontalFit = ContentSizeFitter.FitMode.Unconstrained;
             contentFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
-            VerticalLayoutGroup layout = contentgo.AddComponent<VerticalLayoutGroup>();
+            VerticalLayoutGroup layout = contentGameObject.AddComponent<VerticalLayoutGroup>();
             layout.childControlHeight = false;
             layout.childForceExpandHeight = false;
             layout.childForceExpandWidth = false;
 
-            go.AddComponent<Touchable>(); // Required by EventSystemListener
-            go.AddComponent<EventSystemListener>(); // Required by ScrollView
-            BSMLScrollableContainer scrollView = DiContainer.InstantiateComponent<BSMLScrollableContainer>(go);
+            gameObject.AddComponent<Touchable>(); // Required by EventSystemListener
+            gameObject.AddComponent<EventSystemListener>(); // Required by ScrollView
+            BSMLScrollableContainer scrollView = BeatSaberUI.DiContainer.InstantiateComponent<BSMLScrollableContainer>(gameObject);
             scrollView.ContentRect = content;
             scrollView.Viewport = viewport;
 
-            contentgo.AddComponent<ExternalComponents>().components.Add(scrollView);
+            contentGameObject.AddComponent<ExternalComponents>().components.Add(scrollView);
 
-            go.SetActive(true);
-            return contentgo;
+            return new PrefabParams(gameObject, contentGameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/ScrollableSettingsContainerTag.cs b/BeatSaberMarkupLanguage/Tags/ScrollableSettingsContainerTag.cs
index 67d6da74..9135262b 100644
--- a/BeatSaberMarkupLanguage/Tags/ScrollableSettingsContainerTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/ScrollableSettingsContainerTag.cs
@@ -7,17 +7,17 @@ public class ScrollableSettingsContainerTag : ScrollViewTag
     {
         public override string[] Aliases => new[] { "settings-scroll-view", "scrollable-settings-container", "settings-container" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject content = base.CreateObject(parent);
-            ExternalComponents externalComponents = content.GetComponent<ExternalComponents>();
+            PrefabParams prefab = base.CreatePrefab();
+            ExternalComponents externalComponents = prefab.ContainerObject.GetComponent<ExternalComponents>();
             RectTransform scrollTransform = externalComponents.Get<RectTransform>();
             scrollTransform.anchorMin = Vector2.zero;
             scrollTransform.anchorMax = Vector2.one;
             scrollTransform.anchoredPosition = new Vector2(2, 6);
             scrollTransform.sizeDelta = new Vector2(0, -20);
             scrollTransform.gameObject.name = "BSMLScrollableSettingsContainer";
-            return content;
+            return prefab;
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/Settings/ColorSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/ColorSettingTag.cs
index c7bd7fdd..3db1f49d 100644
--- a/BeatSaberMarkupLanguage/Tags/Settings/ColorSettingTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/Settings/ColorSettingTag.cs
@@ -21,7 +21,7 @@ public override GameObject CreateObject(Transform parent)
         {
             if (baseSettings == null)
             {
-                baseSettings = DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/VRRenderingScale").GetComponent<FormattedFloatListSettingsValueController>();
+                baseSettings = BeatSaberUI.DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/VRRenderingScale").GetComponent<FormattedFloatListSettingsValueController>();
             }
 
             FormattedFloatListSettingsValueController baseSetting = Object.Instantiate(baseSettings, parent, false);
@@ -62,7 +62,7 @@ public override GameObject CreateObject(Transform parent)
 
             if (colorImage == null)
             {
-                colorImage = (ImageView)DiContainer.Resolve<GameplaySetupViewController>()._colorsOverrideSettingsPanelController._editColorSchemeController._previousColorPanelController._graphics.First(g => g.name == "ColorImage");
+                colorImage = (ImageView)BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>()._colorsOverrideSettingsPanelController._editColorSchemeController._previousColorPanelController._graphics.First(g => g.name == "ColorImage");
             }
 
             Image instance = Object.Instantiate(colorImage, valuePick, false);
@@ -84,7 +84,6 @@ public override GameObject CreateObject(Transform parent)
 
             colorSetting.modalColorPicker = base.CreateObject(gameObject.transform).GetComponent<ModalColorPicker>();
 
-            gameObject.SetActive(true);
             return gameObject;
         }
     }
diff --git a/BeatSaberMarkupLanguage/Tags/Settings/DropdownListSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/DropdownListSettingTag.cs
index 5c34a696..bbac0740 100644
--- a/BeatSaberMarkupLanguage/Tags/Settings/DropdownListSettingTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/Settings/DropdownListSettingTag.cs
@@ -8,32 +8,17 @@
 
 namespace BeatSaberMarkupLanguage.Tags.Settings
 {
-    public class DropdownListSettingTag : BSMLTag
+    public class DropdownListSettingTag : PrefabBSMLTag
     {
-        private GameObject dropdownTemplate;
-        private GameObject safePrefab;
-
         public override string[] Aliases => new[] { "dropdown-list-setting" };
 
-        public override void Setup()
-        {
-            if (dropdownTemplate == null)
-            {
-                dropdownTemplate = DiContainer.Resolve<GameplaySetupViewController>()._environmentOverrideSettingsPanelController._elementsGO.transform.Find("NormalLevels").gameObject;
-            }
-
-            safePrefab = Object.Instantiate(dropdownTemplate);
-            safePrefab.SetActive(false);
-            safePrefab.name = "BSMLDropdownListPrefab";
-            Object.DontDestroyOnLoad(safePrefab);
-        }
-
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject gameObject = DiContainer.InstantiatePrefab(safePrefab, parent);
+            GameObject gameObject = BeatSaberUI.DiContainer.InstantiatePrefab(BeatSaberUI.DiContainer.Resolve<GameplaySetupViewController>()._environmentOverrideSettingsPanelController._elementsGO.transform.Find("NormalLevels").gameObject);
             gameObject.name = "BSMLDropdownList";
             SimpleTextDropdown dropdown = gameObject.GetComponentInChildren<SimpleTextDropdown>();
-            dropdown.gameObject.SetActive(false);
+            GameObject dropdownGameObject = dropdown.gameObject;
+            dropdownGameObject.SetActive(false);
             dropdown.name = "Dropdown";
 
             GameObject labelObject = gameObject.transform.Find("Label").gameObject;
@@ -46,17 +31,15 @@ public override GameObject CreateObject(Transform parent)
             layoutElement.preferredHeight = 8;
             layoutElement.preferredWidth = 90;
 
-            List<Component> externalComponents = dropdown.gameObject.AddComponent<ExternalComponents>().components;
+            List<Component> externalComponents = dropdownGameObject.AddComponent<ExternalComponents>().components;
             externalComponents.Add(textMesh);
             externalComponents.Add(localizedText);
             externalComponents.Add(layoutElement);
 
-            DropDownListSetting dropDownListSetting = dropdown.gameObject.AddComponent<DropDownListSetting>();
+            DropDownListSetting dropDownListSetting = dropdownGameObject.AddComponent<DropDownListSetting>();
 
             dropDownListSetting.dropdown = dropdown;
-            dropdown.gameObject.SetActive(true);
-            gameObject.SetActive(true);
-            return dropdown.gameObject;
+            return new PrefabParams(gameObject, dropdownGameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs
index 00835bda..adaecc3d 100644
--- a/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs
@@ -10,19 +10,12 @@
 
 namespace BeatSaberMarkupLanguage.Tags.Settings
 {
-    public abstract class GenericSliderSettingTag<T> : BSMLTag
+    public abstract class GenericSliderSettingTag<T> : PrefabBSMLTag
         where T : GenericSliderSetting
     {
-        private LayoutElement controllersTransformTemplate;
-
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (controllersTransformTemplate == null)
-            {
-                controllersTransformTemplate = DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.First(m => m.viewController is ControllersTransformSettingsViewController).viewController.transform.Find("Content/PositionX").GetComponent<LayoutElement>();
-            }
-
-            LayoutElement baseSetting = Object.Instantiate(controllersTransformTemplate, parent, false);
+            LayoutElement baseSetting = Object.Instantiate(BeatSaberUI.DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.First(m => m.viewController is ControllersTransformSettingsViewController).viewController.transform.Find("Content/PositionX").GetComponent<LayoutElement>());
             baseSetting.name = "BSMLSliderSetting";
 
             GameObject gameObject = baseSetting.gameObject;
@@ -54,8 +47,7 @@ public override GameObject CreateObject(Transform parent)
 
             baseSetting.preferredWidth = 90;
 
-            gameObject.SetActive(true);
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/Settings/IncDecSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/IncDecSettingTag.cs
index 454603b0..2e81fe60 100644
--- a/BeatSaberMarkupLanguage/Tags/Settings/IncDecSettingTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/Settings/IncDecSettingTag.cs
@@ -9,19 +9,12 @@
 
 namespace BeatSaberMarkupLanguage.Tags.Settings
 {
-    public abstract class IncDecSettingTag<T> : BSMLTag
+    public abstract class IncDecSettingTag<T> : PrefabBSMLTag
         where T : IncDecSetting
     {
-        private FormattedFloatListSettingsValueController valueControllerTemplate;
-
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (valueControllerTemplate == null)
-            {
-                valueControllerTemplate = DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/VRRenderingScale").GetComponent<FormattedFloatListSettingsValueController>();
-            }
-
-            FormattedFloatListSettingsValueController baseSetting = Object.Instantiate(valueControllerTemplate, parent, false);
+            FormattedFloatListSettingsValueController baseSetting = Object.Instantiate(BeatSaberUI.DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/VRRenderingScale").GetComponent<FormattedFloatListSettingsValueController>());
             baseSetting.name = "BSMLIncDecSetting";
 
             GameObject gameObject = baseSetting.gameObject;
@@ -49,8 +42,7 @@ public override GameObject CreateObject(Transform parent)
 
             gameObject.GetComponent<LayoutElement>().preferredWidth = 90;
 
-            gameObject.SetActive(true);
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/Settings/StringSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/StringSettingTag.cs
index 494b9a65..01c65066 100644
--- a/BeatSaberMarkupLanguage/Tags/Settings/StringSettingTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/Settings/StringSettingTag.cs
@@ -20,7 +20,7 @@ public override GameObject CreateObject(Transform parent)
         {
             if (valueControllerTemplate == null)
             {
-                valueControllerTemplate = DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/VRRenderingScale").GetComponent<FormattedFloatListSettingsValueController>();
+                valueControllerTemplate = BeatSaberUI.DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/VRRenderingScale").GetComponent<FormattedFloatListSettingsValueController>();
             }
 
             FormattedFloatListSettingsValueController baseSetting = Object.Instantiate(valueControllerTemplate, parent, false);
@@ -78,7 +78,6 @@ public override GameObject CreateObject(Transform parent)
 
             stringSetting.modalKeyboard = base.CreateObject(gameObject.transform).GetComponent<ModalKeyboard>();
 
-            gameObject.SetActive(true);
             return gameObject;
         }
     }
diff --git a/BeatSaberMarkupLanguage/Tags/Settings/SubmenuTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/SubmenuTag.cs
index f3d3a580..209dd251 100644
--- a/BeatSaberMarkupLanguage/Tags/Settings/SubmenuTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/Settings/SubmenuTag.cs
@@ -4,20 +4,42 @@
 using HMUI;
 using TMPro;
 using UnityEngine;
-using Zenject;
 
 namespace BeatSaberMarkupLanguage.Tags.Settings
 {
-    public class SubmenuTag : BSMLTag
+    public class SubmenuTag : PrefabBSMLTag
     {
-        private ModSettingsFlowCoordinator modSettingsFlowCoordinator;
-
         public override string[] Aliases => new[] { "settings-submenu" };
 
         public override GameObject CreateObject(Transform parent)
         {
-            modSettingsFlowCoordinator = DiContainer.Resolve<ModSettingsFlowCoordinator>();
+            GameObject gameObject = base.CreateObject(parent);
+            ModSettingsFlowCoordinator modSettingsFlowCoordinator = BeatSaberUI.DiContainer.Resolve<ModSettingsFlowCoordinator>();
+
+            ViewController submenuController = BeatSaberUI.CreateViewController<ViewController>();
+            SettingsMenu.SetupViewControllerTransform(submenuController);
+
+            ClickableText clickableText = gameObject.GetComponent<ClickableText>();
+            LocalizedTextMeshProUGUI localizedText = gameObject.GetComponent<LocalizedTextMeshProUGUI>();
+
+            ExternalComponents externalComponents = submenuController.gameObject.AddComponent<ExternalComponents>();
+            externalComponents.components.Add(clickableText);
+            externalComponents.components.Add(clickableText.rectTransform);
+            externalComponents.components.Add(localizedText);
 
+            clickableText.OnClickEvent += (eventData) =>
+            {
+                if (modSettingsFlowCoordinator != null)
+                {
+                    modSettingsFlowCoordinator.OpenMenu(submenuController, true, false);
+                }
+            };
+
+            return submenuController.gameObject;
+        }
+
+        protected override PrefabParams CreatePrefab()
+        {
             GameObject gameObj = new("BSMLSubmenu")
             {
                 layer = 5,
@@ -28,33 +50,15 @@ public override GameObject CreateObject(Transform parent)
             ClickableText clickableText = gameObj.AddComponent<ClickableText>();
             clickableText.font = BeatSaberUI.MainTextFont;
             clickableText.fontSharedMaterial = BeatSaberUI.MainUIFontMaterial;
-            clickableText.rectTransform.SetParent(parent, false);
             clickableText.text = "Default Text";
             clickableText.fontSize = 4;
             clickableText.fontStyle = FontStyles.Italic;
             clickableText.color = Color.white;
             clickableText.rectTransform.sizeDelta = new Vector2(90, 8);
 
-            LocalizedTextMeshProUGUI localizedText = CreateLocalizableText(gameObj);
-
-            ViewController submenuController = BeatSaberUI.CreateViewController<ViewController>();
-            SettingsMenu.SetupViewControllerTransform(submenuController);
+            CreateLocalizableText(gameObj);
 
-            clickableText.OnClickEvent += (eventData) =>
-            {
-                if (modSettingsFlowCoordinator != null)
-                {
-                    modSettingsFlowCoordinator.OpenMenu(submenuController, true, false);
-                }
-            };
-
-            ExternalComponents externalComponents = submenuController.gameObject.AddComponent<ExternalComponents>();
-            externalComponents.components.Add(clickableText);
-            externalComponents.components.Add(clickableText.rectTransform);
-            externalComponents.components.Add(localizedText);
-
-            gameObj.SetActive(true);
-            return submenuController.gameObject;
+            return new PrefabParams(gameObj);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/Settings/ToggleSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/ToggleSettingTag.cs
index ae170bbe..d3fbfa9b 100644
--- a/BeatSaberMarkupLanguage/Tags/Settings/ToggleSettingTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/Settings/ToggleSettingTag.cs
@@ -10,20 +10,15 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class ToggleSettingTag : BSMLTag
+    public class ToggleSettingTag : PrefabBSMLTag
     {
-        private GameObject toggleTemplate;
-
         public override string[] Aliases => new[] { "toggle-setting", "bool-setting", "checkbox-setting", "checkbox" };
 
-        public override GameObject CreateObject(Transform parent)
-        {
-            if (toggleTemplate == null)
-            {
-                toggleTemplate = DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/Fullscreen").gameObject;
-            }
+        public virtual string PrefabToggleName => "Fullscreen";
 
-            GameObject gameObject = Object.Instantiate(toggleTemplate, parent, false);
+        protected override PrefabParams CreatePrefab()
+        {
+            GameObject gameObject = Object.Instantiate(BeatSaberUI.DiContainer.Resolve<MainSettingsMenuViewController>()._settingsSubMenuInfos.Select(m => m.viewController).First(vc => vc.name == "GraphicSettings").transform.Find("ViewPort/Content/Fullscreen").gameObject);
             GameObject nameText = gameObject.transform.Find("NameText").gameObject;
             GameObject switchView = gameObject.transform.Find("SwitchView").gameObject;
             Object.Destroy(gameObject.GetComponent<BoolSettingsController>());
@@ -54,9 +49,7 @@ public override GameObject CreateObject(Transform parent)
 
             gameObject.GetComponent<LayoutElement>().preferredWidth = 90;
 
-            gameObject.SetActive(true);
-
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/StackLayoutTag.cs b/BeatSaberMarkupLanguage/Tags/StackLayoutTag.cs
index 69e6bcdd..99083935 100644
--- a/BeatSaberMarkupLanguage/Tags/StackLayoutTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/StackLayoutTag.cs
@@ -5,18 +5,17 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class StackLayoutTag : BSMLTag
+    public class StackLayoutTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "stack" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             GameObject gameObject = new("BSMLStackLayoutGroup")
             {
                 layer = 5,
             };
 
-            gameObject.transform.SetParent(parent, false);
             gameObject.AddComponent<StackLayoutGroup>();
             gameObject.AddComponent<ContentSizeFitter>();
             gameObject.AddComponent<Backgroundable>();
@@ -27,7 +26,7 @@ public override GameObject CreateObject(Transform parent)
             rectTransform.sizeDelta = new Vector2(0, 0);
 
             gameObject.AddComponent<LayoutElement>();
-            return gameObject;
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/TabSelectorTag.cs b/BeatSaberMarkupLanguage/Tags/TabSelectorTag.cs
index 19ec0474..0beed096 100644
--- a/BeatSaberMarkupLanguage/Tags/TabSelectorTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/TabSelectorTag.cs
@@ -4,29 +4,24 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class TabSelectorTag : BSMLTag
+    public class TabSelectorTag : PrefabBSMLTag
     {
-        private TextSegmentedControl segmentControlTemplate;
-
         public override string[] Aliases => new[] { "tab-select", "tab-selector" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (segmentControlTemplate == null)
-            {
-                segmentControlTemplate = DiContainer.Resolve<PlayerStatisticsViewController>()._statsScopeSegmentedControl;
-            }
-
-            TextSegmentedControl textSegmentedControl = DiContainer.InstantiatePrefabForComponent<TextSegmentedControl>(segmentControlTemplate, parent);
+            TextSegmentedControl segmentControlTemplate = BeatSaberUI.DiContainer.Resolve<PlayerStatisticsViewController>().GetComponentInChildren<TextSegmentedControl>();
+            TextSegmentedControl textSegmentedControl = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<TextSegmentedControl>(segmentControlTemplate);
             textSegmentedControl.name = "BSMLTabSelector";
-            (textSegmentedControl.transform as RectTransform).anchoredPosition = new Vector2(0, 0);
+            ((RectTransform)textSegmentedControl.transform).anchoredPosition = new Vector2(0, 0);
+
             foreach (Transform transform in textSegmentedControl.transform)
             {
                 Object.Destroy(transform.gameObject);
             }
 
             textSegmentedControl.gameObject.AddComponent<TabSelector>().textSegmentedControl = textSegmentedControl;
-            return textSegmentedControl.gameObject;
+            return new PrefabParams(textSegmentedControl.gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/TabTag.cs b/BeatSaberMarkupLanguage/Tags/TabTag.cs
index bc6a4249..ed249a34 100644
--- a/BeatSaberMarkupLanguage/Tags/TabTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/TabTag.cs
@@ -1,5 +1,4 @@
 using BeatSaberMarkupLanguage.Components;
-using UnityEngine;
 
 namespace BeatSaberMarkupLanguage.Tags
 {
@@ -7,12 +6,12 @@ public class TabTag : BackgroundTag
     {
         public override string[] Aliases => new[] { "tab" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject gameObject = base.CreateObject(parent);
-            gameObject.name = "BSMLTab";
-            gameObject.AddComponent<Tab>();
-            return gameObject;
+            PrefabParams prefab = base.CreatePrefab();
+            prefab.RootObject.name = "BSMLTab";
+            prefab.ContainerObject.AddComponent<Tab>();
+            return prefab;
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/TextPageScrollViewTag.cs b/BeatSaberMarkupLanguage/Tags/TextPageScrollViewTag.cs
index 72ff44f0..6967d1ce 100644
--- a/BeatSaberMarkupLanguage/Tags/TextPageScrollViewTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/TextPageScrollViewTag.cs
@@ -7,20 +7,13 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class TextPageScrollViewTag : BSMLTag
+    public class TextPageScrollViewTag : PrefabBSMLTag
     {
-        private TextPageScrollView pageTemplate;
-
         public override string[] Aliases => new[] { "text-page" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (pageTemplate == null)
-            {
-                pageTemplate = Object.FindObjectOfType<EulaDisplayViewController>(true)._textPageScrollView;
-            }
-
-            TextPageScrollView scrollView = DiContainer.InstantiatePrefabForComponent<TextPageScrollView>(pageTemplate, parent);
+            TextPageScrollView scrollView = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<TextPageScrollView>(ScrollViewTag.ScrollViewTemplate);
             scrollView.name = "BSMLTextPageScrollView";
             scrollView.enabled = true;
 
@@ -35,7 +28,7 @@ public override GameObject CreateObject(Transform parent)
             components.Add(textMesh);
             components.Add(localizedText);
 
-            return scrollView.gameObject;
+            return new PrefabParams(scrollView.gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/TextSegmentedControlTag.cs b/BeatSaberMarkupLanguage/Tags/TextSegmentedControlTag.cs
index 9cacef3d..13d36b91 100644
--- a/BeatSaberMarkupLanguage/Tags/TextSegmentedControlTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/TextSegmentedControlTag.cs
@@ -3,20 +3,14 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class TextSegmentedControlTag : BSMLTag
+    public class TextSegmentedControlTag : PrefabBSMLTag
     {
-        private TextSegmentedControl segmentControlTemplate;
-
         public override string[] Aliases => new[] { "text-segments" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            if (segmentControlTemplate == null)
-            {
-                segmentControlTemplate = DiContainer.Resolve<StandardLevelDetailViewController>()._standardLevelDetailView._beatmapDifficultySegmentedControlController.GetComponent<TextSegmentedControl>();
-            }
-
-            TextSegmentedControl textSegmentedControl = DiContainer.InstantiatePrefabForComponent<TextSegmentedControl>(segmentControlTemplate, parent);
+            TextSegmentedControl segmentControlTemplate = BeatSaberUI.DiContainer.Resolve<StandardLevelDetailViewController>()._standardLevelDetailView._beatmapDifficultySegmentedControlController.GetComponent<TextSegmentedControl>();
+            TextSegmentedControl textSegmentedControl = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<TextSegmentedControl>(segmentControlTemplate);
             textSegmentedControl.name = "BSMLTextSegmentedControl";
             (textSegmentedControl.transform as RectTransform).anchoredPosition = new Vector2(0, 0);
             foreach (Transform transform in textSegmentedControl.transform)
@@ -25,7 +19,7 @@ public override GameObject CreateObject(Transform parent)
             }
 
             Object.Destroy(textSegmentedControl.GetComponent<BeatmapDifficultySegmentedControlController>());
-            return textSegmentedControl.gameObject;
+            return new PrefabParams(textSegmentedControl.gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/TextTag.cs b/BeatSaberMarkupLanguage/Tags/TextTag.cs
index b5283bd8..85d32c02 100644
--- a/BeatSaberMarkupLanguage/Tags/TextTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/TextTag.cs
@@ -3,19 +3,14 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class TextTag : BSMLTag
+    public class TextTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "text", "label" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject gameObj = new("BSMLText")
-            {
-                layer = 5,
-            };
-
+            GameObject gameObj = new("BSMLText");
             gameObj.SetActive(false);
-            gameObj.transform.SetParent(parent, false);
 
             FormattableText textMesh = gameObj.AddComponent<FormattableText>();
             textMesh.font = BeatSaberUI.MainTextFont;
@@ -28,10 +23,7 @@ public override GameObject CreateObject(Transform parent)
             textMesh.rectTransform.anchorMax = new Vector2(0.5f, 0.5f);
 
             CreateLocalizableText(gameObj);
-
-            gameObj.SetActive(true);
-
-            return gameObj;
+            return new PrefabParams(gameObj);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/VerticalIconSegmentedControlTag.cs b/BeatSaberMarkupLanguage/Tags/VerticalIconSegmentedControlTag.cs
index d7d2b5bd..21a30b92 100644
--- a/BeatSaberMarkupLanguage/Tags/VerticalIconSegmentedControlTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/VerticalIconSegmentedControlTag.cs
@@ -3,20 +3,20 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class VerticalIconSegmentedControlTag : BSMLTag
+    public class VerticalIconSegmentedControlTag : PrefabBSMLTag
     {
         private static IconSegmentedControl prefab;
 
         public override string[] Aliases => new[] { "vertical-icon-segments" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
             if (prefab == null)
             {
-                prefab = DiContainer.Resolve<PlatformLeaderboardViewController>()._scopeSegmentedControl;
+                prefab = BeatSaberUI.DiContainer.Resolve<PlatformLeaderboardViewController>()._scopeSegmentedControl;
             }
 
-            IconSegmentedControl control = DiContainer.InstantiatePrefabForComponent<IconSegmentedControl>(prefab, parent);
+            IconSegmentedControl control = BeatSaberUI.DiContainer.InstantiatePrefabForComponent<IconSegmentedControl>(prefab);
             control.name = "BSMLVerticalIconSegmentedControl";
 
             RectTransform rt = control.transform as RectTransform;
@@ -30,7 +30,7 @@ public override GameObject CreateObject(Transform parent)
                 Object.Destroy(transform.gameObject);
             }
 
-            return control.gameObject;
+            return new PrefabParams(control.gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Tags/VerticalLayoutTag.cs b/BeatSaberMarkupLanguage/Tags/VerticalLayoutTag.cs
index 82a456e8..6b8644ed 100644
--- a/BeatSaberMarkupLanguage/Tags/VerticalLayoutTag.cs
+++ b/BeatSaberMarkupLanguage/Tags/VerticalLayoutTag.cs
@@ -4,18 +4,13 @@
 
 namespace BeatSaberMarkupLanguage.Tags
 {
-    public class VerticalLayoutTag : BSMLTag
+    public class VerticalLayoutTag : PrefabBSMLTag
     {
         public override string[] Aliases => new[] { "vertical" };
 
-        public override GameObject CreateObject(Transform parent)
+        protected override PrefabParams CreatePrefab()
         {
-            GameObject gameObject = new("BSMLVerticalLayoutGroup")
-            {
-                layer = 5,
-            };
-
-            gameObject.transform.SetParent(parent, false);
+            GameObject gameObject = new("BSMLVerticalLayoutGroup");
             gameObject.AddComponent<VerticalLayoutGroup>();
 
             ContentSizeFitter contentSizeFitter = gameObject.AddComponent<ContentSizeFitter>();
@@ -28,7 +23,8 @@ public override GameObject CreateObject(Transform parent)
             rectTransform.sizeDelta = new Vector2(0, 0);
 
             gameObject.AddComponent<LayoutElement>();
-            return gameObject;
+
+            return new PrefabParams(gameObject);
         }
     }
 }
diff --git a/BeatSaberMarkupLanguage/Util/TestPresenter.cs b/BeatSaberMarkupLanguage/Util/TestPresenter.cs
index 482fc080..fd2f018e 100644
--- a/BeatSaberMarkupLanguage/Util/TestPresenter.cs
+++ b/BeatSaberMarkupLanguage/Util/TestPresenter.cs
@@ -11,11 +11,11 @@ internal class TestPresenter : IInitializable
     {
         public void Initialize()
         {
-            // GameplaySetup.GameplaySetup.instance.AddTab("Test", "BeatSaberMarkupLanguage.Views.gameplay-setup-test.bsml", new GameplaySetup.GameplaySetupTest());
-            // Settings.BSMLSettings.instance.AddSettingsMenu("Test", "BeatSaberMarkupLanguage.Views.settings-test.bsml", new Settings.SettingsTest());
+            GameplaySetup.GameplaySetup.instance.AddTab("Test", "BeatSaberMarkupLanguage.Views.gameplay-setup-test.bsml", new GameplaySetup.GameplaySetupTest());
+            Settings.BSMLSettings.instance.AddSettingsMenu("Test", "BeatSaberMarkupLanguage.Views.settings-test.bsml", new Settings.SettingsTest());
             // _ = PresentTest<ViewControllers.TestViewController>();
             // _ = PresentTest<ViewControllers.LocalizationTestViewController>();
-            // MenuButtons.MenuButtons.instance.RegisterButton(new MenuButtons.MenuButton("test", () => MenuButtons.MenuButtons.instance.RegisterButton(new MenuButtons.MenuButton("test2", null))));
+            MenuButtons.MenuButtons.instance.RegisterButton(new MenuButtons.MenuButton("test", () => MenuButtons.MenuButtons.instance.RegisterButton(new MenuButtons.MenuButton("test2", null))));
         }
 
         private async Task PresentTest<T>()