From e198e57a527848294a520adf04f6cb0d1c234c0b Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Thu, 27 Nov 2025 10:18:07 +0000
Subject: [PATCH 01/11] Initial check-in for Unity 6 update - thank you Unity
 for continuing to support Unity UI

---
 Examples~ | 2 +-
 README.md | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Examples~ b/Examples~
index 1cfaa42b..97d0fad5 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit 1cfaa42b3fcc454950009cc03a8280fd18e38197
+Subproject commit 97d0fad5a0f68c8497621cbefb143d22ec4b7d2a
diff --git a/README.md b/README.md
index 1647b4d0..e30d1fcf 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,10 @@ To get started with the project, here's a little guide:
 
 ## [Updates:](https://unity-ui-extensions.github.io/ReleaseNotes/RELEASENOTES)
 
+## Release 2.4.0 - Unity supports Unity UI - 2025/11/20
+
+Stay tuned as we begin work on a Unity 6 update, to verify Unity 6 support and possibly get some new controls in the mix.
+
 ## Release 2.3.2 - Rejuvenation - 2023/11/26
 
 2023 is certainly an interesting year to keep you on your toes, and finding time to keep managing all the requests and updates that come in are taking their toll, especially for a FREE project, but nonetheless, I still do it.

From c7df19fd935fc9fdad40c0fba33007e7a29e7912 Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Tue, 2 Dec 2025 16:10:17 +0000
Subject: [PATCH 02/11] Update workflows from base update

---
 .github/workflows/development-buildandtestupmrelease.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/development-buildandtestupmrelease.yml b/.github/workflows/development-buildandtestupmrelease.yml
index e2133b94..5d726a9f 100644
--- a/.github/workflows/development-buildandtestupmrelease.yml
+++ b/.github/workflows/development-buildandtestupmrelease.yml
@@ -32,10 +32,6 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         unity-version:
-          - 2019
-          - 2020
-          - 2021
-          - 2022
           - 6000.0.x
           - 6000
         include:

From 37edee57aea0a1d4755f6e954ad22b975dee4166 Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 11:16:41 +0000
Subject: [PATCH 03/11] Unity 6 script clean-up (remove legacy dependencies)

---
 Editor/CUIImageEditor.cs                      |   4 -
 Editor/CanvasGroupActivator.cs                |   6 +-
 Editor/UIExtensionsMenuOptions.cs             | 184 ++--
 Examples~                                     |   2 +-
 .../Controls/ColorPicker/ColorLabel.cs        |  12 -
 .../Controls/ComboBox/AutoCompleteComboBox.cs |   4 -
 Runtime/Scripts/Controls/ComboBox/ComboBox.cs |   6 +-
 .../Controls/ComboBox/DropDownListButton.cs   |   8 -
 .../ReorderableList/ReorderableListDebug.cs   |   8 -
 Runtime/Scripts/Controls/Segment.cs           |   4 -
 .../SelectionBox/ExampleSelectable.cs         |   8 -
 .../Controls/SelectionBox/SelectionBox.cs     | 392 +++++----
 Runtime/Scripts/Controls/Sliders/BoxSlider.cs |   7 +-
 Runtime/Scripts/Controls/TextPic.cs           | 822 ++++++++++--------
 Runtime/Scripts/Effects/BestFitOutline.cs     |  59 +-
 Runtime/Scripts/Effects/CurlyUI/CUIText.cs    |   8 -
 Runtime/Scripts/Effects/CurvedText.cs         |  12 -
 Runtime/Scripts/Effects/CylinderText.cs       |  16 +-
 Runtime/Scripts/Effects/Gradient2.cs          |  46 +-
 Runtime/Scripts/Effects/LetterSpacing.cs      | 117 ++-
 Runtime/Scripts/Effects/MonoSpacing.cs        | 105 +--
 Runtime/Scripts/Effects/NicerOutline.cs       |  62 +-
 Runtime/Scripts/Effects/SoftMaskScript.cs     |   4 -
 Runtime/Scripts/Effects/UIParticleSystem.cs   |  12 +-
 .../Scripts/Layout/UIHorizontalScroller.cs    |  10 +-
 Runtime/Scripts/Layout/UIVerticalScroller.cs  |  10 +-
 .../ToolTips/BoundTooltip/BoundTooltipItem.cs |   8 +-
 Runtime/Scripts/ToolTips/HoverTooltip.cs      |   4 -
 Runtime/Scripts/ToolTips/ToolTip.cs           |  71 +-
 Runtime/Scripts/Utilities/ExtensionsToggle.cs |   5 -
 Runtime/Scripts/Utilities/PPIViewer.cs        |  12 -
 .../Utilities/UIExtensionsInputManager.cs     |   2 +-
 32 files changed, 970 insertions(+), 1060 deletions(-)

diff --git a/Editor/CUIImageEditor.cs b/Editor/CUIImageEditor.cs
index a3eb6f1c..f3ac1839 100644
--- a/Editor/CUIImageEditor.cs
+++ b/Editor/CUIImageEditor.cs
@@ -68,11 +68,7 @@ protected override void OnSceneGUI()
 
                 Handles.color = Color.gray;
                 EditorGUI.BeginChangeCheck();
-#if UNITY_2022_1_OR_NEWER
                 Vector3 newCornerPos = Handles.FreeMoveHandle(script.transform.TransformPoint(cornerPos), HandleUtility.GetHandleSize(script.transform.TransformPoint(cornerPos)) / 7, Vector3.one, Handles.SphereHandleCap);
-#else
-                Vector3 newCornerPos = Handles.FreeMoveHandle(script.transform.TransformPoint(cornerPos), script.transform.rotation, HandleUtility.GetHandleSize(script.transform.TransformPoint(cornerPos)) / 7, Vector3.one, Handles.SphereHandleCap);
-#endif
 
                 Handles.Label(newCornerPos, string.Format("Corner Mover"));
 
diff --git a/Editor/CanvasGroupActivator.cs b/Editor/CanvasGroupActivator.cs
index cd716573..99cb48e0 100644
--- a/Editor/CanvasGroupActivator.cs
+++ b/Editor/CanvasGroupActivator.cs
@@ -29,11 +29,7 @@ void OnFocus()
 
         void ObtainCanvasGroups()
         {
-#if UNITY_2023_1_OR_NEWER
-			canvasGroups = GameObject.FindObjectsByType<CanvasGroup>(FindObjectsSortMode.None);
-#else
-            canvasGroups = GameObject.FindObjectsOfType<CanvasGroup>();
-#endif            
+            canvasGroups = GameObject.FindObjectsByType<CanvasGroup>(FindObjectsSortMode.None);
         }
 
         void OnGUI()
diff --git a/Editor/UIExtensionsMenuOptions.cs b/Editor/UIExtensionsMenuOptions.cs
index ac4bbe42..def2a80b 100644
--- a/Editor/UIExtensionsMenuOptions.cs
+++ b/Editor/UIExtensionsMenuOptions.cs
@@ -1,4 +1,4 @@
-#if UNITY_2019_1_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER
+#if !ENABLE_LEGACY_INPUT_MANAGER
 #define NEW_INPUT_SYSTEM
 #endif
 
@@ -159,11 +159,7 @@ private static void CreateEventSystem(bool select)
 
 		private static void CreateEventSystem(bool select, GameObject parent)
 		{
-#if UNITY_2023_1_OR_NEWER
 			var esys = Object.FindFirstObjectByType<EventSystem>();
-#else
-			var esys = Object.FindObjectOfType<EventSystem>();
-#endif     			
 			if (esys == null)
 			{
 				var eventSystem = new GameObject("EventSystem");
@@ -195,11 +191,7 @@ static public GameObject GetOrCreateCanvasGameObject()
 				return canvas.gameObject;
 
 			// No canvas in selection or its parents? Then use just any canvas..
-#if UNITY_2023_1_OR_NEWER
 			canvas = Object.FindFirstObjectByType<Canvas>();
-#else
-			canvas = Object.FindObjectOfType(typeof(Canvas)) as Canvas;
-#endif
 			if (canvas != null && canvas.gameObject.activeInHierarchy)
 				return canvas.gameObject;
 
@@ -677,91 +669,91 @@ static public void AddUIVerticallScroller(MenuCommand menuCommand)
 
 			Selection.activeGameObject = uiVerticalScrollerRoot;
 		}
-        #endregion
-
-        #region UIHorizontal Scroller
-        [MenuItem("GameObject/UI/Extensions/Layout/UI Horizontal Scroller", false)]
-        static public void AddUIHorizontalScroller(MenuCommand menuCommand)
-        {
-            GameObject uiHorizontalScrollerRoot = CreateUIElementRoot("UI Horizontal Scroller", menuCommand, s_ThickGUIElementSize);
-
-            GameObject uiScrollerCenter = CreateUIObject("Center", uiHorizontalScrollerRoot);
-
-            GameObject childContent = CreateUIObject("Content", uiHorizontalScrollerRoot);
-
-            // Set RectTransform to stretch
-            RectTransform rectTransformScrollSnapRoot = uiHorizontalScrollerRoot.GetComponent<RectTransform>();
-            rectTransformScrollSnapRoot.anchorMin = new Vector2(0.5f, 0.5f);
-            rectTransformScrollSnapRoot.anchorMax = new Vector2(0.5f, 0.5f);
-            rectTransformScrollSnapRoot.anchoredPosition = Vector2.zero;
-            rectTransformScrollSnapRoot.sizeDelta = new Vector2(500f, 150f);
-
-            // Add required ScrollRect
-            ScrollRect sr = uiHorizontalScrollerRoot.AddComponent<ScrollRect>();
-            sr.vertical = false;
-            sr.horizontal = true;
-            sr.movementType = ScrollRect.MovementType.Unrestricted;
-            var uiscr = uiHorizontalScrollerRoot.AddComponent<UIHorizontalScroller>();
-
-            //Setup container center point
-            RectTransform rectTransformCenter = uiScrollerCenter.GetComponent<RectTransform>();
-            rectTransformCenter.anchorMin = new Vector2(0.3f,0f);
-            rectTransformCenter.anchorMax = new Vector2(0.6f,1f);
-            rectTransformCenter.sizeDelta = Vector2.zero;
-
-            uiscr.Center = uiScrollerCenter.GetComponent<RectTransform>();
-
-            //Setup Content container
-            RectTransform rectTransformContent = childContent.GetComponent<RectTransform>();
-            rectTransformContent.anchorMin = Vector2.zero;
-            rectTransformContent.anchorMax = new Vector2(1f, 1f);
-            rectTransformContent.sizeDelta = Vector2.zero;
-
-            sr.content = rectTransformContent;
-
-            // Add sample children
-            for (int i = 0; i < 10; i++)
-            {
-                GameObject childPage = CreateUIObject("Page_" + i, childContent);
-
-                GameObject childText = CreateUIObject("Text", childPage);
-
-                //Setup 1st Child
-                Image pageImage = childPage.AddComponent<Image>();
-                pageImage.sprite = AssetDatabase.GetBuiltinExtraResource<Sprite>(kStandardSpritePath);
-                pageImage.type = Image.Type.Sliced;
-                pageImage.color = s_DefaultSelectableColor;
-
-                RectTransform rectTransformPage = childPage.GetComponent<RectTransform>();
-                rectTransformPage.anchorMin = new Vector2(0.5f, 0);
-                rectTransformPage.anchorMax = new Vector2(0.5f, 1f);
-                rectTransformPage.sizeDelta = new Vector2(80f, 0f);
-                rectTransformPage.pivot = new Vector2(0.5f, 0.5f);
-                rectTransformPage.localPosition = new Vector3(80 * i, 0, 0);
-                childPage.AddComponent<Button>();
-
-                var childCG = childPage.AddComponent<CanvasGroup>();
-                childCG.interactable = false;
-
-                //Setup Text on Item
-                Text text = childText.AddComponent<Text>();
-                text.text = "Item_" + i;
-                text.alignment = TextAnchor.MiddleCenter;
-                text.color = new Color(0.196f, 0.196f, 0.196f);
-
-                //Setup Text on Item
-                RectTransform rectTransformPageText = childText.GetComponent<RectTransform>();
-                rectTransformPageText.anchorMin = new Vector2(0.5f, 0.5f);
-                rectTransformPageText.anchorMax = new Vector2(0.5f, 0.5f);
-                rectTransformPageText.pivot = new Vector2(0.5f, 0.5f);
-            }
-
-            Selection.activeGameObject = uiHorizontalScrollerRoot;
-        }
-        #endregion
-
-        #region UI Button
-        [MenuItem("GameObject/UI/Extensions/Controls/UI Button", false)]
+		#endregion
+
+		#region UIHorizontal Scroller
+		[MenuItem("GameObject/UI/Extensions/Layout/UI Horizontal Scroller", false)]
+		static public void AddUIHorizontalScroller(MenuCommand menuCommand)
+		{
+			GameObject uiHorizontalScrollerRoot = CreateUIElementRoot("UI Horizontal Scroller", menuCommand, s_ThickGUIElementSize);
+
+			GameObject uiScrollerCenter = CreateUIObject("Center", uiHorizontalScrollerRoot);
+
+			GameObject childContent = CreateUIObject("Content", uiHorizontalScrollerRoot);
+
+			// Set RectTransform to stretch
+			RectTransform rectTransformScrollSnapRoot = uiHorizontalScrollerRoot.GetComponent<RectTransform>();
+			rectTransformScrollSnapRoot.anchorMin = new Vector2(0.5f, 0.5f);
+			rectTransformScrollSnapRoot.anchorMax = new Vector2(0.5f, 0.5f);
+			rectTransformScrollSnapRoot.anchoredPosition = Vector2.zero;
+			rectTransformScrollSnapRoot.sizeDelta = new Vector2(500f, 150f);
+
+			// Add required ScrollRect
+			ScrollRect sr = uiHorizontalScrollerRoot.AddComponent<ScrollRect>();
+			sr.vertical = false;
+			sr.horizontal = true;
+			sr.movementType = ScrollRect.MovementType.Unrestricted;
+			var uiscr = uiHorizontalScrollerRoot.AddComponent<UIHorizontalScroller>();
+
+			//Setup container center point
+			RectTransform rectTransformCenter = uiScrollerCenter.GetComponent<RectTransform>();
+			rectTransformCenter.anchorMin = new Vector2(0.3f, 0f);
+			rectTransformCenter.anchorMax = new Vector2(0.6f, 1f);
+			rectTransformCenter.sizeDelta = Vector2.zero;
+
+			uiscr.Center = uiScrollerCenter.GetComponent<RectTransform>();
+
+			//Setup Content container
+			RectTransform rectTransformContent = childContent.GetComponent<RectTransform>();
+			rectTransformContent.anchorMin = Vector2.zero;
+			rectTransformContent.anchorMax = new Vector2(1f, 1f);
+			rectTransformContent.sizeDelta = Vector2.zero;
+
+			sr.content = rectTransformContent;
+
+			// Add sample children
+			for (int i = 0; i < 10; i++)
+			{
+				GameObject childPage = CreateUIObject("Page_" + i, childContent);
+
+				GameObject childText = CreateUIObject("Text", childPage);
+
+				//Setup 1st Child
+				Image pageImage = childPage.AddComponent<Image>();
+				pageImage.sprite = AssetDatabase.GetBuiltinExtraResource<Sprite>(kStandardSpritePath);
+				pageImage.type = Image.Type.Sliced;
+				pageImage.color = s_DefaultSelectableColor;
+
+				RectTransform rectTransformPage = childPage.GetComponent<RectTransform>();
+				rectTransformPage.anchorMin = new Vector2(0.5f, 0);
+				rectTransformPage.anchorMax = new Vector2(0.5f, 1f);
+				rectTransformPage.sizeDelta = new Vector2(80f, 0f);
+				rectTransformPage.pivot = new Vector2(0.5f, 0.5f);
+				rectTransformPage.localPosition = new Vector3(80 * i, 0, 0);
+				childPage.AddComponent<Button>();
+
+				var childCG = childPage.AddComponent<CanvasGroup>();
+				childCG.interactable = false;
+
+				//Setup Text on Item
+				Text text = childText.AddComponent<Text>();
+				text.text = "Item_" + i;
+				text.alignment = TextAnchor.MiddleCenter;
+				text.color = new Color(0.196f, 0.196f, 0.196f);
+
+				//Setup Text on Item
+				RectTransform rectTransformPageText = childText.GetComponent<RectTransform>();
+				rectTransformPageText.anchorMin = new Vector2(0.5f, 0.5f);
+				rectTransformPageText.anchorMax = new Vector2(0.5f, 0.5f);
+				rectTransformPageText.pivot = new Vector2(0.5f, 0.5f);
+			}
+
+			Selection.activeGameObject = uiHorizontalScrollerRoot;
+		}
+		#endregion
+
+		#region UI Button
+		[MenuItem("GameObject/UI/Extensions/Controls/UI Button", false)]
 		static public void AddUIButton(MenuCommand menuCommand)
 		{
 			GameObject uiButtonRoot = CreateUIElementRoot("UI Button", menuCommand, s_ThickGUIElementSize);
@@ -1265,11 +1257,7 @@ private static void CreateToolTipItem(bool select)
 
 		private static void CreateToolTipItem(bool select, GameObject parent)
 		{
-#if UNITY_2023_1_OR_NEWER
 			var btti = Object.FindFirstObjectByType<BoundTooltipItem>();
-#else
-			var btti = Object.FindObjectOfType<BoundTooltipItem>();
-#endif
 			if (btti == null)
 			{
 				var boundTooltipItem = CreateUIObject("ToolTipItem", parent.GetComponentInParent<Canvas>().gameObject);
diff --git a/Examples~ b/Examples~
index 97d0fad5..befd8e9b 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit 97d0fad5a0f68c8497621cbefb143d22ec4b7d2a
+Subproject commit befd8e9b06224fbb2c225eacf52095070be40b37
diff --git a/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs b/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs
index 5582ca82..919194be 100644
--- a/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs
+++ b/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs
@@ -5,11 +5,7 @@
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
 
-#if UNITY_2022_1_OR_NEWER
     [RequireComponent(typeof(TMPro.TMP_Text))]
-#else
-    [RequireComponent(typeof(Text))]
-#endif
     public class ColorLabel : MonoBehaviour
     {
         public ColorPickerControl picker;
@@ -22,18 +18,10 @@ public class ColorLabel : MonoBehaviour
 
         public int precision = 0;
 
-#if UNITY_2022_1_OR_NEWER
         private TMPro.TMP_Text label;
-#else
-        private Text label;
-#endif
         private void Awake()
         {
-#if UNITY_2022_1_OR_NEWER
             label = GetComponent<TMPro.TMP_Text>();
-#else
-            label = GetComponent<Text>();
-#endif
             if (!label)
             {
                 Debug.LogError($"{gameObject.name} does not have a Text component assigned for the {nameof(ColorLabel)}");
diff --git a/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs b/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
index 684c323a..39f9eca0 100644
--- a/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
+++ b/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
@@ -339,11 +339,7 @@ private void RebuildPanel()
                 if (i < AvailableOptions.Count)
                 {
                     itemObjs[i].name = "Item " + i + " " + _panelItems[i];
-#if UNITY_2022_1_OR_NEWER
                     itemObjs[i].transform.Find("Text").GetComponent<TMPro.TMP_Text>().text = AvailableOptions[i]; //set the text value
-#else
-                    itemObjs[i].transform.Find("Text").GetComponent<Text>().text = AvailableOptions[i]; //set the text value
-#endif
                     Button itemBtn = itemObjs[i].GetComponent<Button>();
                     itemBtn.onClick.RemoveAllListeners();
                     string textOfItem = _panelItems[i]; //has to be copied for anonymous function or it gets garbage collected away
diff --git a/Runtime/Scripts/Controls/ComboBox/ComboBox.cs b/Runtime/Scripts/Controls/ComboBox/ComboBox.cs
index 78d1346f..0302d8d8 100644
--- a/Runtime/Scripts/Controls/ComboBox/ComboBox.cs
+++ b/Runtime/Scripts/Controls/ComboBox/ComboBox.cs
@@ -92,7 +92,7 @@ public int ItemsToDisplay
                 RedrawPanel();
             }
         }
-        
+
         public void Awake()
         {
             Initialize();
@@ -246,11 +246,7 @@ private void RebuildPanel()
                 if (i < AvailableOptions.Count)
                 {
                     itemObjs[i].name = "Item " + i + " " + _panelItems[i];
-#if UNITY_2022_1_OR_NEWER
                     itemObjs[i].transform.Find("Text").GetComponent<TMPro.TMP_Text>().text = AvailableOptions[i]; //set the text value
-#else
-                    itemObjs[i].transform.Find("Text").GetComponent<Text>().text = AvailableOptions[i]; //set the text value
-#endif
                     Button itemBtn = itemObjs[i].GetComponent<Button>();
                     itemBtn.onClick.RemoveAllListeners();
                     string textOfItem = _panelItems[i]; //has to be copied for anonymous function or it gets garbage collected away
diff --git a/Runtime/Scripts/Controls/ComboBox/DropDownListButton.cs b/Runtime/Scripts/Controls/ComboBox/DropDownListButton.cs
index 19cc1827..9800a85d 100644
--- a/Runtime/Scripts/Controls/ComboBox/DropDownListButton.cs
+++ b/Runtime/Scripts/Controls/ComboBox/DropDownListButton.cs
@@ -8,11 +8,7 @@ public class DropDownListButton
     {
         public RectTransform rectTransform;
         public Button btn;
-#if UNITY_2022_1_OR_NEWER
         public TMPro.TMP_Text txt;
-#else
-        public Text txt;
-#endif
         public Image btnImg;
         public Image img;
         public GameObject gameobject;
@@ -23,11 +19,7 @@ public DropDownListButton(GameObject btnObj)
             rectTransform = btnObj.GetComponent<RectTransform>();
             btnImg = btnObj.GetComponent<Image>();
             btn = btnObj.GetComponent<Button>();
-#if UNITY_2022_1_OR_NEWER
             txt = rectTransform.Find("Text").GetComponent<TMPro.TMP_Text>();
-#else
-            txt = rectTransform.Find("Text").GetComponent<Text>();
-#endif
             img = rectTransform.Find("Image").GetComponent<Image>();
         }
     }
diff --git a/Runtime/Scripts/Controls/ReorderableList/ReorderableListDebug.cs b/Runtime/Scripts/Controls/ReorderableList/ReorderableListDebug.cs
index 2d5b9b59..039228c9 100644
--- a/Runtime/Scripts/Controls/ReorderableList/ReorderableListDebug.cs
+++ b/Runtime/Scripts/Controls/ReorderableList/ReorderableListDebug.cs
@@ -5,19 +5,11 @@ namespace UnityEngine.UI.Extensions
 {
     public class ReorderableListDebug : MonoBehaviour
     {
-#if UNITY_2022_1_OR_NEWER
         public TMPro.TMP_Text DebugLabel;
-#else
-        public Text DebugLabel;
-#endif
 
         void Awake()
         {
-#if UNITY_2023_1_OR_NEWER
             foreach (var list in FindObjectsByType<ReorderableList>(FindObjectsSortMode.None))
-#else
-            foreach (var list in FindObjectsOfType<ReorderableList>())
-#endif
             {
                 list.OnElementDropped.AddListener(ElementDropped);
             }
diff --git a/Runtime/Scripts/Controls/Segment.cs b/Runtime/Scripts/Controls/Segment.cs
index 55e44a1c..42a41e30 100644
--- a/Runtime/Scripts/Controls/Segment.cs
+++ b/Runtime/Scripts/Controls/Segment.cs
@@ -203,11 +203,7 @@ void StartColorTween(Color targetColor, bool instant)
 
         void ChangeTextColor(Color targetColor)
         {
-#if UNITY_2022_1_OR_NEWER
             var text = GetComponentInChildren<TMPro.TMP_Text>();
-#else
-            var text = GetComponentInChildren<Text>();
-#endif
             if (!text)
                 return;
 
diff --git a/Runtime/Scripts/Controls/SelectionBox/ExampleSelectable.cs b/Runtime/Scripts/Controls/SelectionBox/ExampleSelectable.cs
index 6e8f4ed0..9ca9132e 100644
--- a/Runtime/Scripts/Controls/SelectionBox/ExampleSelectable.cs
+++ b/Runtime/Scripts/Controls/SelectionBox/ExampleSelectable.cs
@@ -40,21 +40,13 @@ public bool preSelected
         //We want the test object to be either a UI element, a 2D element or a 3D element, so we'll get the appropriate components
         SpriteRenderer spriteRenderer;
         Image image;
-#if UNITY_2022_1_OR_NEWER
         TMPro.TMP_Text text;
-#else
-        Text text;
-#endif
 
         void Start()
         {
             spriteRenderer = transform.GetComponent<SpriteRenderer>();
             image = transform.GetComponent<Image>();
-#if UNITY_2022_1_OR_NEWER
             text = transform.GetComponent<TMPro.TMP_Text>();
-#else
-            text = transform.GetComponent<Text>();
-#endif
         }
 
         void Update()
diff --git a/Runtime/Scripts/Controls/SelectionBox/SelectionBox.cs b/Runtime/Scripts/Controls/SelectionBox/SelectionBox.cs
index a4566ec7..b890a84e 100644
--- a/Runtime/Scripts/Controls/SelectionBox/SelectionBox.cs
+++ b/Runtime/Scripts/Controls/SelectionBox/SelectionBox.cs
@@ -31,60 +31,63 @@
 
 namespace UnityEngine.UI.Extensions
 {
-    [RequireComponent(typeof(Canvas))]
+	[RequireComponent(typeof(Canvas))]
 	[AddComponentMenu("UI/Extensions/Selection Box")]
 	public class SelectionBox : MonoBehaviour
 	{
-		
+
 		// The color of the selection box.
 		public Color color;
-		
+
 		// An optional parameter, but you can add a sprite to the selection box to give it a border or a stylized look.
 		// It's suggested you use a monochrome sprite so that the selection
 		// Box color is still relevant.
 		public Sprite art;
-		
+
 		// Will store the location of wherever we first click before dragging.
 		private Vector2 origin;
-		
+
 		// A rectTransform set by the User that can limit which part of the screen is eligible for drag selection
 		public RectTransform selectionMask;
-		
+
 		//Stores the rectTransform connected to the generated gameObject being used for the selection box visuals
 		private RectTransform boxRect;
-		
+
 		// Stores all of the selectable game objects
 		private IBoxSelectable[] selectables;
-		
+
 		// A secondary storage of objects that the user can manually set.
 		private MonoBehaviour[] selectableGroup;
-		
+
 		//Stores the selectable that was touched when the mouse button was pressed down
 		private IBoxSelectable clickedBeforeDrag;
-		
+
 		//Stores the selectable that was touched when the mouse button was released
 		private IBoxSelectable clickedAfterDrag;
-		
+
 		//Custom UnityEvent so we can add Listeners to this instance when Selections are changed.
-		public class SelectionEvent : UnityEvent<IBoxSelectable[]> {}
+		public class SelectionEvent : UnityEvent<IBoxSelectable[]> { }
 		public SelectionEvent onSelectionChange = new SelectionEvent();
-		
+
 		//Ensures that the canvas that this component is attached to is set to the correct render mode. If not, it will not render the selection box properly.
-		void ValidateCanvas(){
+		void ValidateCanvas()
+		{
 			var canvas = gameObject.GetComponent<Canvas>();
-			
-			if (canvas.renderMode != RenderMode.ScreenSpaceOverlay) {
+
+			if (canvas.renderMode != RenderMode.ScreenSpaceOverlay)
+			{
 				throw new System.Exception("SelectionBox component must be placed on a canvas in Screen Space Overlay mode.");
 			}
-			
+
 			var canvasScaler = gameObject.GetComponent<CanvasScaler>();
-			
-			if (canvasScaler && canvasScaler.enabled && (!Mathf.Approximately(canvasScaler.scaleFactor, 1f) || canvasScaler.uiScaleMode != CanvasScaler.ScaleMode.ConstantPixelSize)) {
+
+			if (canvasScaler && canvasScaler.enabled && (!Mathf.Approximately(canvasScaler.scaleFactor, 1f) || canvasScaler.uiScaleMode != CanvasScaler.ScaleMode.ConstantPixelSize))
+			{
 				Destroy(canvasScaler);
 				Debug.LogWarning("SelectionBox component is on a gameObject with a Canvas Scaler component. As of now, Canvas Scalers without the default settings throw off the coordinates of the selection box. Canvas Scaler has been removed.");
 			}
 		}
-		
+
 		/*
 	 * The user can manually set a group of objects with monoBehaviours to be the pool of objects considered to be selectable. The benefits of this are two fold:
 	 *
@@ -92,50 +95,56 @@ void ValidateCanvas(){
 	 * 2) The user can filter which objects should be selectable, for example units versus menu selections
 	 *
 	 */
-		void SetSelectableGroup(IEnumerable<MonoBehaviour> behaviourCollection) {
-			
+		void SetSelectableGroup(IEnumerable<MonoBehaviour> behaviourCollection)
+		{
+
 			// If null, the selectionbox reverts to it's default behaviour
-			if (behaviourCollection == null) {
+			if (behaviourCollection == null)
+			{
 				selectableGroup = null;
-				
+
 				return;
 			}
-			
+
 			//Runs a double check to ensure each of the objects in the collection can be selectable, and doesn't include them if not.
 			var behaviourList = new List<MonoBehaviour>();
-			
-			foreach(var behaviour in behaviourCollection) {
-				if (behaviour as IBoxSelectable != null) {
-					behaviourList.Add (behaviour);
+
+			foreach (var behaviour in behaviourCollection)
+			{
+				if (behaviour as IBoxSelectable != null)
+				{
+					behaviourList.Add(behaviour);
 				}
 			}
-			
+
 			selectableGroup = behaviourList.ToArray();
 		}
-		
-		void CreateBoxRect(){
+
+		void CreateBoxRect()
+		{
 			var selectionBoxGO = new GameObject();
-			
+
 			selectionBoxGO.name = "Selection Box";
 			selectionBoxGO.transform.parent = transform;
 			selectionBoxGO.AddComponent<Image>();
-			
+
 			boxRect = selectionBoxGO.transform as RectTransform;
-			
+
 		}
-		
+
 		//Set all of the relevant rectTransform properties to zero, 
 		//finally deactivates the boxRect gameobject since it doesn't
 		//need to be enabled when not in a selection action.
-		void ResetBoxRect(){
-			
+		void ResetBoxRect()
+		{
+
 			//Update the art and color on the off chance they've changed
 			Image image = boxRect.GetComponent<Image>();
 			image.color = color;
 			image.sprite = art;
-			
+
 			origin = Vector2.zero;
-			
+
 			boxRect.anchoredPosition = Vector2.zero;
 			boxRect.sizeDelta = Vector2.zero;
 			boxRect.anchorMax = Vector2.zero;
@@ -143,136 +152,151 @@ void ResetBoxRect(){
 			boxRect.pivot = Vector2.zero;
 			boxRect.gameObject.SetActive(false);
 		}
-		
-		
-		void BeginSelection(){
+
+
+		void BeginSelection()
+		{
 			// Click somewhere in the Game View.
 			if (!UIExtensionsInputManager.GetMouseButtonDown(0))
 				return;
-			
+
 			//The boxRect will be inactive up until the point we start selecting
 			boxRect.gameObject.SetActive(true);
-			
+
 			// Get the initial click position of the mouse. 
 			origin = new Vector2(UIExtensionsInputManager.MousePosition.x, UIExtensionsInputManager.MousePosition.y);
-			
+
 			//If the initial click point is not inside the selection mask, we abort the selection
-			if (!PointIsValidAgainstSelectionMask(origin)) {
+			if (!PointIsValidAgainstSelectionMask(origin))
+			{
 				ResetBoxRect();
 				return;
 			}
-			
+
 			// The anchor is set to the same place.
 			boxRect.anchoredPosition = origin;
-			
+
 			MonoBehaviour[] behavioursToGetSelectionsFrom;
-			
+
 			// If we do not have a group of selectables already set, we'll just loop through every object that's a monobehaviour, and look for selectable interfaces in them
-			if (selectableGroup == null) {
-#if UNITY_2023_1_OR_NEWER
+			if (selectableGroup == null)
+			{
 				behavioursToGetSelectionsFrom = GameObject.FindObjectsByType<MonoBehaviour>(FindObjectsSortMode.None);
-#else
-				behavioursToGetSelectionsFrom = GameObject.FindObjectsOfType<MonoBehaviour>();
-#endif
-			} else {
+			}
+			else
+			{
 				behavioursToGetSelectionsFrom = selectableGroup;
 			}
-			
+
 			//Temporary list to store the found selectables before converting to the main selectables array
 			List<IBoxSelectable> selectableList = new List<IBoxSelectable>();
-			
-			foreach (MonoBehaviour behaviour in behavioursToGetSelectionsFrom) {
-				
+
+			foreach (MonoBehaviour behaviour in behavioursToGetSelectionsFrom)
+			{
+
 				//If the behaviour implements the selectable interface, we add it to the selectable list
 				IBoxSelectable selectable = behaviour as IBoxSelectable;
-				if (selectable != null) {
-					selectableList.Add (selectable); 
-					
+				if (selectable != null)
+				{
+					selectableList.Add(selectable);
+
 					//We're using left shift to act as the "Add To Selection" command. So if left shift isn't pressed, we want everything to begin deselected
-					if (!UIExtensionsInputManager.GetKey (KeyCode.LeftShift)) {
+					if (!UIExtensionsInputManager.GetKey(KeyCode.LeftShift))
+					{
 						selectable.selected = false;
 					}
 				}
-				
+
 			}
 			selectables = selectableList.ToArray();
-			
+
 			//For single-click actions, we need to get the selectable that was clicked when selection began (if any)
 			clickedBeforeDrag = GetSelectableAtMousePosition();
-			
+
 		}
-		
-		bool PointIsValidAgainstSelectionMask(Vector2 screenPoint){
+
+		bool PointIsValidAgainstSelectionMask(Vector2 screenPoint)
+		{
 			//If there is no selection mask, any point is valid
-			if (!selectionMask) {
+			if (!selectionMask)
+			{
 				return true;
 			}
-			
+
 			Camera screenPointCamera = GetScreenPointCamera(selectionMask);
-			
+
 			return RectTransformUtility.RectangleContainsScreenPoint(selectionMask, screenPoint, screenPointCamera);
 		}
-		
-		IBoxSelectable GetSelectableAtMousePosition() {
+
+		IBoxSelectable GetSelectableAtMousePosition()
+		{
 			//Firstly, we cannot click on something that is not inside the selection mask (if we have one)
-			if (!PointIsValidAgainstSelectionMask(UIExtensionsInputManager.MousePosition)) {
+			if (!PointIsValidAgainstSelectionMask(UIExtensionsInputManager.MousePosition))
+			{
 				return null;
 			}
-			
+
 			//This gets a bit tricky, because we have to make considerations depending on the hierarchy of the selectable's gameObject
-			foreach (var selectable in selectables) {
-				
+			foreach (var selectable in selectables)
+			{
+
 				//First we check to see if the selectable has a rectTransform
 				var rectTransform = (selectable.transform as RectTransform);
-				
-				if (rectTransform) {
+
+				if (rectTransform)
+				{
 					//Because if it does, the camera we use to calculate it's screen point will vary
 					var screenCamera = GetScreenPointCamera(rectTransform);
-					
+
 					//Once we've found the rendering camera, we check if the selectables rectTransform contains the click. That way we
 					//Can click anywhere on a rectTransform to select it.
-					if (RectTransformUtility.RectangleContainsScreenPoint(rectTransform, UIExtensionsInputManager.MousePosition, screenCamera)) {
-						
+					if (RectTransformUtility.RectangleContainsScreenPoint(rectTransform, UIExtensionsInputManager.MousePosition, screenCamera))
+					{
+
 						//And if it does, we select it and send it back
 						return selectable;
 					}
-				} else {
+				}
+				else
+				{
 					//If it doesn't have a rectTransform, we need to get the radius so we can use it as an area around the center to detect a click.
 					//This works because a 2D or 3D renderer will both return a radius
 					var radius = selectable.transform.GetComponent<UnityEngine.Renderer>().bounds.extents.magnitude;
-					
+
 					var selectableScreenPoint = GetScreenPointOfSelectable(selectable);
-					
+
 					//Check that the click fits within the screen-radius of the selectable
-					if (Vector2.Distance(selectableScreenPoint, UIExtensionsInputManager.MousePosition) <= radius) {
-						
+					if (Vector2.Distance(selectableScreenPoint, UIExtensionsInputManager.MousePosition) <= radius)
+					{
+
 						//And if it does, we select it and send it back
 						return selectable;
 					}
-					
+
 				}
 			}
-			
+
 			return null;
 		}
-		
-		
-		void DragSelection(){
+
+
+		void DragSelection()
+		{
 			//Return if we're not dragging or if the selection has been aborted (BoxRect disabled)
 			if (!UIExtensionsInputManager.GetMouseButton(0) || !boxRect.gameObject.activeSelf)
 				return;
-			
+
 			// Store the current mouse position in screen space.
 			Vector2 currentMousePosition = new Vector2(UIExtensionsInputManager.MousePosition.x, UIExtensionsInputManager.MousePosition.y);
-			
+
 			// How far have we moved the mouse?
 			Vector2 difference = currentMousePosition - origin;
-			
+
 			// Copy the initial click position to a new variable. Using the original variable will cause
 			// the anchor to move around to wherever the current mouse position is,
 			// which isn't desirable.
 			Vector2 startPoint = origin;
-			
+
 			// The following code accounts for dragging in various directions.
 			if (difference.x < 0)
 			{
@@ -284,76 +308,85 @@ void DragSelection(){
 				startPoint.y = currentMousePosition.y;
 				difference.y = -difference.y;
 			}
-			
+
 			// Set the anchor, width and height every frame.
 			boxRect.anchoredPosition = startPoint;
 			boxRect.sizeDelta = difference;
-			
+
 			//Then we check our list of Selectables to see if they're being preselected or not.
-			foreach(var selectable in selectables) {
-				
+			foreach (var selectable in selectables)
+			{
+
 				Vector3 screenPoint = GetScreenPointOfSelectable(selectable);
-				
+
 				//If the box Rect contains the selectables screen point and that point is inside a valid selection mask, it's being preselected, otherwise it is not.
 				selectable.preSelected = RectTransformUtility.RectangleContainsScreenPoint(boxRect, screenPoint, null) && PointIsValidAgainstSelectionMask(screenPoint);
-				
+
 			}
-			
+
 			//Finally, since it's possible for our first clicked object to not be within the bounds of the selection box
 			//If it exists, we always ensure that it is preselected.
-			if (clickedBeforeDrag != null) {
+			if (clickedBeforeDrag != null)
+			{
 				clickedBeforeDrag.preSelected = true;
 			}
 		}
-		
-		void ApplySingleClickDeselection(){
-			
+
+		void ApplySingleClickDeselection()
+		{
+
 			//If we didn't touch anything with the original mouse press, we don't need to continue checking
 			if (clickedBeforeDrag == null)
 				return;
-			
+
 			//If we clicked a selectable without dragging, and that selectable was previously selected, we must be trying to deselect it.
-			if (clickedAfterDrag != null && clickedBeforeDrag.selected && clickedBeforeDrag.transform == clickedAfterDrag.transform ) {
+			if (clickedAfterDrag != null && clickedBeforeDrag.selected && clickedBeforeDrag.transform == clickedAfterDrag.transform)
+			{
 				clickedBeforeDrag.selected = false;
 				clickedBeforeDrag.preSelected = false;
-				
+
 			}
-			
+
 		}
-		
-		void ApplyPreSelections(){
-			
-			foreach(var selectable in selectables) {
-				
+
+		void ApplyPreSelections()
+		{
+
+			foreach (var selectable in selectables)
+			{
+
 				//If the selectable was preSelected, we finalize it as selected.
-				if (selectable.preSelected) {
+				if (selectable.preSelected)
+				{
 					selectable.selected = true;
 					selectable.preSelected = false;
 				}
 			}
-			
+
 		}
-		
-		Vector2 GetScreenPointOfSelectable(IBoxSelectable selectable) {
+
+		Vector2 GetScreenPointOfSelectable(IBoxSelectable selectable)
+		{
 			//Getting the screen point requires it's own function, because we have to take into consideration the selectables hierarchy.
-			
+
 			//Cast the transform as a rectTransform
 			var rectTransform = selectable.transform as RectTransform;
-			
+
 			//If it has a rectTransform component, it must be in the hierarchy of a canvas, somewhere.
-			if (rectTransform) {
-				
+			if (rectTransform)
+			{
+
 				//And the camera used to calculate it's screen point will vary.
 				Camera renderingCamera = GetScreenPointCamera(rectTransform);
-				
+
 				return RectTransformUtility.WorldToScreenPoint(renderingCamera, selectable.transform.position);
 			}
-			
+
 			//If it's no in the hierarchy of a canvas, the regular Camera.main.WorldToScreenPoint will do.
-			return Camera.main.WorldToScreenPoint(selectable.transform.position);				                                         
-			
+			return Camera.main.WorldToScreenPoint(selectable.transform.position);
+
 		}
-		
+
 		/*
 	 * Finding the camera used to calculate the screenPoint of an object causes a couple of problems:
 	 * 
@@ -362,83 +395,94 @@ Vector2 GetScreenPointOfSelectable(IBoxSelectable selectable) {
 	 * 
 	 * This function solves that problem. 
 	 */
-		Camera GetScreenPointCamera(RectTransform rectTransform) {
-			
+		Camera GetScreenPointCamera(RectTransform rectTransform)
+		{
+
 			Canvas rootCanvas = null;
 			RectTransform rectCheck = rectTransform;
-			
+
 			//We're going to check all the canvases in the hierarchy of this rectTransform until we find the root.
-			do {
+			do
+			{
 				rootCanvas = rectCheck.GetComponent<Canvas>();
-				
+
 				//If we found a canvas on this Object, and it's not the rootCanvas, then we don't want to keep it
-				if (rootCanvas && !rootCanvas.isRootCanvas) {
+				if (rootCanvas && !rootCanvas.isRootCanvas)
+				{
 					rootCanvas = null;
 				}
-				
+
 				//Then we promote the rect we're checking to it's parent.
 				rectCheck = (RectTransform)rectCheck.parent;
-				
+
 			} while (rootCanvas == null);
-			
+
 			//Once we've found the root Canvas, we return a camera depending on it's render mode.
-			switch (rootCanvas.renderMode) {
-			case RenderMode.ScreenSpaceOverlay:
-				//If we send back a camera when set to screen space overlay, the coordinates will not be accurate. If we return null, they will be.
-				return null;
-				
-			case RenderMode.ScreenSpaceCamera:
-				//If it's set to screen space we use the world Camera that the Canvas is using.
-				//If it doesn't have one set, however, we have to send back the current camera. otherwise the coordinates will not be accurate.
-				return (rootCanvas.worldCamera) ? rootCanvas.worldCamera : Camera.main;
-				
-			default:
-			case RenderMode.WorldSpace:
-				//World space always uses the current camera.
-				return Camera.main;
+			switch (rootCanvas.renderMode)
+			{
+				case RenderMode.ScreenSpaceOverlay:
+					//If we send back a camera when set to screen space overlay, the coordinates will not be accurate. If we return null, they will be.
+					return null;
+
+				case RenderMode.ScreenSpaceCamera:
+					//If it's set to screen space we use the world Camera that the Canvas is using.
+					//If it doesn't have one set, however, we have to send back the current camera. otherwise the coordinates will not be accurate.
+					return (rootCanvas.worldCamera) ? rootCanvas.worldCamera : Camera.main;
+
+				default:
+				case RenderMode.WorldSpace:
+					//World space always uses the current camera.
+					return Camera.main;
 			}
-			
+
 		}
-		
-		public IBoxSelectable[] GetAllSelected(){
-			if (selectables == null) {
+
+		public IBoxSelectable[] GetAllSelected()
+		{
+			if (selectables == null)
+			{
 				return new IBoxSelectable[0];
 			}
-			
+
 			var selectedList = new List<IBoxSelectable>();
-			
-			foreach(var selectable in selectables) {
-				if (selectable.selected) {
-					selectedList.Add (selectable);
+
+			foreach (var selectable in selectables)
+			{
+				if (selectable.selected)
+				{
+					selectedList.Add(selectable);
 				}
 			}
-			
+
 			return selectedList.ToArray();
 		}
-		
-		void EndSelection(){
+
+		void EndSelection()
+		{
 			//Get out if we haven't finished selecting, or if the selection has been aborted (boxRect disabled)
 			if (!UIExtensionsInputManager.GetMouseButtonUp(0) || !boxRect.gameObject.activeSelf)
 				return;
-			
+
 			clickedAfterDrag = GetSelectableAtMousePosition();
-			
+
 			ApplySingleClickDeselection();
 			ApplyPreSelections();
 			ResetBoxRect();
 			onSelectionChange.Invoke(GetAllSelected());
 		}
-		
-		void Start(){
+
+		void Start()
+		{
 			ValidateCanvas();
 			CreateBoxRect();
 			ResetBoxRect();
 		}
-		
-		void Update() {
-			BeginSelection ();
-			DragSelection ();
-			EndSelection ();
+
+		void Update()
+		{
+			BeginSelection();
+			DragSelection();
+			EndSelection();
 		}
 	}
 }
diff --git a/Runtime/Scripts/Controls/Sliders/BoxSlider.cs b/Runtime/Scripts/Controls/Sliders/BoxSlider.cs
index ce0e6b40..467933cb 100644
--- a/Runtime/Scripts/Controls/Sliders/BoxSlider.cs
+++ b/Runtime/Scripts/Controls/Sliders/BoxSlider.cs
@@ -137,14 +137,9 @@ protected override void OnValidate()
             SetX(m_ValueX, false);
             SetY(m_ValueY, false);
             // Update rects since other things might affect them even if value didn't change.
-            if(!Application.isPlaying) UpdateVisuals();
+            if (!Application.isPlaying) UpdateVisuals();
 
-#if UNITY_2018_3_OR_NEWER
             if (!Application.isPlaying)
-#else
-            var prefabType = UnityEditor.PrefabUtility.GetPrefabType(this);
-            if (prefabType != UnityEditor.PrefabType.Prefab && !Application.isPlaying)
-#endif
             {
                 CanvasUpdateRegistry.RegisterCanvasElementForLayoutRebuild(this);
             }
diff --git a/Runtime/Scripts/Controls/TextPic.cs b/Runtime/Scripts/Controls/TextPic.cs
index 123e3e08..749d4e39 100644
--- a/Runtime/Scripts/Controls/TextPic.cs
+++ b/Runtime/Scripts/Controls/TextPic.cs
@@ -8,136 +8,136 @@
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 
-namespace UnityEngine.UI.Extensions {
-    // Image according to the label inside the name attribute to load, read from the Resources directory. The size of the image is controlled by the size property.
-
-    // Use: Add Icon name and sprite to the icons list
-
-    [AddComponentMenu("UI/Extensions/TextPic")]
-       
-    [ExecuteInEditMode] // Needed for culling images that are not used //
-#if UNITY_2022_1_OR_NEWER
-    public class TextPic : TMPro.TMP_Text, IPointerClickHandler, IPointerExitHandler, IPointerEnterHandler, ISelectHandler
-#else
-    public class TextPic : Text, IPointerClickHandler, IPointerExitHandler, IPointerEnterHandler, ISelectHandler
-#endif
+namespace UnityEngine.UI.Extensions
+{
+	// Image according to the label inside the name attribute to load, read from the Resources directory. The size of the image is controlled by the size property.
+
+	// Use: Add Icon name and sprite to the icons list
+
+	[AddComponentMenu("UI/Extensions/TextPic")]
+
+	[ExecuteInEditMode] // Needed for culling images that are not used //
+	public class TextPic : TMPro.TMP_Text, IPointerClickHandler, IPointerExitHandler, IPointerEnterHandler, ISelectHandler
 	{
 		// Icon entry to replace text with
-        [Serializable]
-        public struct IconName {
-            public string name;
-            public Sprite sprite;
+		[Serializable]
+		public struct IconName
+		{
+			public string name;
+			public Sprite sprite;
 			public Vector2 offset;
 			public Vector2 scale;
-        }
+		}
 
 		// Icons and text to replace
-        public IconName[] inspectorIconList;
+		public IconName[] inspectorIconList;
 
 		[Tooltip("Global scaling factor for all images")]
-        public float ImageScalingFactor = 1;
+		public float ImageScalingFactor = 1;
 
-        // Write the name or hex value of the hyperlink color
-        public string hyperlinkColor = "blue";
+		// Write the name or hex value of the hyperlink color
+		public string hyperlinkColor = "blue";
 
-        // Offset image by x, y
-        public Vector2 imageOffset = Vector2.zero;
-        public bool isCreating_m_HrefInfos = true;
+		// Offset image by x, y
+		public Vector2 imageOffset = Vector2.zero;
+		public bool isCreating_m_HrefInfos = true;
 
-        [Serializable]
-        public class HrefClickEvent : UnityEvent<string> { }
+		[Serializable]
+		public class HrefClickEvent : UnityEvent<string> { }
 
-        [SerializeField]
-        private HrefClickEvent m_OnHrefClick = new HrefClickEvent();
+		[SerializeField]
+		private HrefClickEvent m_OnHrefClick = new HrefClickEvent();
 
-        /// <summary>
-        /// Hyperlink Click Event
-        /// </summary>
-        public HrefClickEvent onHrefClick {
-            get { return m_OnHrefClick; }
-            set { m_OnHrefClick = value; }
-        }
+		/// <summary>
+		/// Hyperlink Click Event
+		/// </summary>
+		public HrefClickEvent onHrefClick
+		{
+			get { return m_OnHrefClick; }
+			set { m_OnHrefClick = value; }
+		}
 
-        /// <summary>
-        /// Image Pool
-        /// </summary>
-        private readonly List<Image> m_ImagesPool = new List<Image>();
-        private readonly List<GameObject> culled_ImagesPool = new List<GameObject>();
+		/// <summary>
+		/// Image Pool
+		/// </summary>
+		private readonly List<Image> m_ImagesPool = new List<Image>();
+		private readonly List<GameObject> culled_ImagesPool = new List<GameObject>();
 
 		// Used for check for culling images
-        private bool clearImages = false;
+		private bool clearImages = false;
 
 		// Lock to ensure images get culled properly
 		private Object thisLock = new Object();
 
-        /// <summary>
-        /// Vertex Index
-        /// </summary>
-        private readonly List<int> m_ImagesVertexIndex = new List<int>();
+		/// <summary>
+		/// Vertex Index
+		/// </summary>
+		private readonly List<int> m_ImagesVertexIndex = new List<int>();
 
-        /// <summary>
-        /// Regular expression to replace 
-        /// </summary>
-        private static readonly Regex s_Regex =
-            new Regex(@"<quad name=(.+?) size=(\d*\.?\d+%?) width=(\d*\.?\d+%?) />", RegexOptions.Singleline);
+		/// <summary>
+		/// Regular expression to replace 
+		/// </summary>
+		private static readonly Regex s_Regex =
+			new Regex(@"<quad name=(.+?) size=(\d*\.?\d+%?) width=(\d*\.?\d+%?) />", RegexOptions.Singleline);
 
-        /// <summary>
-        /// Hyperlink Regular Expression
-        /// </summary>
-        private static readonly Regex s_HrefRegex =
-            new Regex(@"<a href=([^>\n\s]+)>(.*?)(</a>)", RegexOptions.Singleline);
+		/// <summary>
+		/// Hyperlink Regular Expression
+		/// </summary>
+		private static readonly Regex s_HrefRegex =
+			new Regex(@"<a href=([^>\n\s]+)>(.*?)(</a>)", RegexOptions.Singleline);
 
 		// String to create quads
-        private string fixedString;
+		private string fixedString;
 
 		// Update the quad images when true
 		private bool updateQuad = false;
 
-        /// <summary>
-        /// After parsing the final text
-        /// </summary>
-        private string m_OutputText;
+		/// <summary>
+		/// After parsing the final text
+		/// </summary>
+		private string m_OutputText;
 
-        private Button button;
+		private Button button;
 
-        // Used for custom selection as a variable for other scripts
-        private bool selected = false;
+		// Used for custom selection as a variable for other scripts
+		private bool selected = false;
 
-        public bool Selected
-        {
-            get { return selected; }
-            set { selected = value; }
-        }
+		public bool Selected
+		{
+			get { return selected; }
+			set { selected = value; }
+		}
 
-        // Positions of images for icon placement
-        private List<Vector2> positions = new List<Vector2>();
-        
-        // Little hack to support multiple hrefs with same name
-        private string previousText = "";
+		// Positions of images for icon placement
+		private List<Vector2> positions = new List<Vector2>();
 
-        /// <summary>
-        /// Hyperlinks Info
-        /// </summary>
+		// Little hack to support multiple hrefs with same name
+		private string previousText = "";
+
+		/// <summary>
+		/// Hyperlinks Info
+		/// </summary>
 		[Serializable]
-        public class HrefInfo {
-            public int startIndex;
+		public class HrefInfo
+		{
+			public int startIndex;
 
-            public int endIndex;
+			public int endIndex;
 
-            public string name;
+			public string name;
 
-            public readonly List<Rect> boxes = new List<Rect>();
-        }
+			public readonly List<Rect> boxes = new List<Rect>();
+		}
 
-        /// <summary>
-        /// Hyperlink List
-        /// </summary>
-        private readonly List<HrefInfo> m_HrefInfos = new List<HrefInfo>();
+		/// <summary>
+		/// Hyperlink List
+		/// </summary>
+		private readonly List<HrefInfo> m_HrefInfos = new List<HrefInfo>();
 
-        /// <summary>
-        /// Text Builder
-        /// </summary>
-        private static readonly StringBuilder s_TextBuilder = new StringBuilder();
+		/// <summary>
+		/// Text Builder
+		/// </summary>
+		private static readonly StringBuilder s_TextBuilder = new StringBuilder();
 
 		// Matches for quad tags
 		private MatchCollection matches;
@@ -161,12 +161,11 @@ public class HrefInfo {
 		// There is no directive for incremented versions so will have to hack together
 		private bool usesNewRendering = false;
 
-		#if UNITY_2019_1_OR_NEWER
-        /// <summary>
-        /// Regular expression to remove non rendered characters
-        /// </summary>
-        private static readonly Regex remove_Regex =
-            new Regex(@"<b>|</b>|<i>|</i>|<size=.*?>|</size>|<color=.*?>|</color>|<material=.*?>|</material>|<quad name=(.+?) size=(\d*\.?\d+%?) width=(\d*\.?\d+%?) />|<a href=([^>\n\s]+)>|</a>|\s", RegexOptions.Singleline);
+		/// <summary>
+		/// Regular expression to remove non rendered characters
+		/// </summary>
+		private static readonly Regex remove_Regex =
+			new Regex(@"<b>|</b>|<i>|</i>|<size=.*?>|</size>|<color=.*?>|</color>|<material=.*?>|</material>|<quad name=(.+?) size=(\d*\.?\d+%?) width=(\d*\.?\d+%?) />|<a href=([^>\n\s]+)>|</a>|\s", RegexOptions.Singleline);
 
 		// List of indexes that are compared against matches to remove quad tags
 		List<int> indexes = new List<int>();
@@ -179,7 +178,6 @@ public class HrefInfo {
 
 		// Characters to remove from string for finding the correct end index for vertices for href bounds
 		private int endCharactersRemoved = 0;
-		#endif
 
 		// Count of current href
 		private int count = 0;
@@ -199,30 +197,37 @@ public class HrefInfo {
 
 		/// METHODS ///
 
-		public void ResetIconList() {
-            Reset_m_HrefInfos ();
+		public void ResetIconList()
+		{
+			Reset_m_HrefInfos();
 			base.Start();
-        }
+		}
 
-        protected void UpdateQuadImage() {
-#if UNITY_EDITOR && !UNITY_2018_3_OR_NEWER
-            if (UnityEditor.PrefabUtility.GetPrefabType(this) == UnityEditor.PrefabType.Prefab) {
-                return;
-            }
+		protected void UpdateQuadImage()
+		{
+#if UNITY_EDITOR
+			if (UnityEditor.PrefabUtility.GetPrefabAssetType(this) == UnityEditor.PrefabAssetType.Regular)
+			{
+				return;
+			}
 #endif
-            m_OutputText = GetOutputText();
+			m_OutputText = GetOutputText();
 
 			matches = s_Regex.Matches(m_OutputText);
 
-			if (matches != null && matches.Count > 0) {
-				for (int i = 0; i < matches.Count; i++) {
+			if (matches != null && matches.Count > 0)
+			{
+				for (int i = 0; i < matches.Count; i++)
+				{
 					m_ImagesPool.RemoveAll(image => image == null);
 
-					if (m_ImagesPool.Count == 0) {
+					if (m_ImagesPool.Count == 0)
+					{
 						GetComponentsInChildren<Image>(true, m_ImagesPool);
 					}
 
-					if (matches.Count > m_ImagesPool.Count) {
+					if (matches.Count > m_ImagesPool.Count)
+					{
 						DefaultControls.Resources resources = new DefaultControls.Resources();
 						GameObject go = DefaultControls.CreateImage(resources);
 
@@ -230,7 +235,8 @@ protected void UpdateQuadImage() {
 
 						RectTransform rt = go.transform as RectTransform;
 
-						if (rt) {
+						if (rt)
+						{
 							rt.SetParent(rectTransform);
 							rt.anchoredPosition3D = Vector3.zero;
 							rt.localRotation = Quaternion.identity;
@@ -246,13 +252,17 @@ protected void UpdateQuadImage() {
 
 					Vector2 imgoffset = Vector2.zero;
 
-					if (img.sprite == null || img.sprite.name != spriteName) {
-						if (inspectorIconList != null && inspectorIconList.Length > 0) {
-							for (int s = 0; s < inspectorIconList.Length; s++) {
-								if (inspectorIconList[s].name == spriteName) {
+					if (img.sprite == null || img.sprite.name != spriteName)
+					{
+						if (inspectorIconList != null && inspectorIconList.Length > 0)
+						{
+							for (int s = 0; s < inspectorIconList.Length; s++)
+							{
+								if (inspectorIconList[s].name == spriteName)
+								{
 									img.sprite = inspectorIconList[s].sprite;
 									img.preserveAspect = true;
-									img.rectTransform.sizeDelta = new Vector2(fontSize * ImageScalingFactor * inspectorIconList[s].scale.x, 
+									img.rectTransform.sizeDelta = new Vector2(fontSize * ImageScalingFactor * inspectorIconList[s].scale.x,
 																				fontSize * ImageScalingFactor * inspectorIconList[s].scale.y);
 									imgoffset = inspectorIconList[s].offset;
 
@@ -264,16 +274,21 @@ protected void UpdateQuadImage() {
 
 					img.enabled = true;
 
-					if (positions.Count > 0 && i < positions.Count) {
+					if (positions.Count > 0 && i < positions.Count)
+					{
 						img.rectTransform.anchoredPosition = positions[i] += imgoffset;
 					}
 				}
 			}
-			else {
+			else
+			{
 				// If there are no matches, remove the images from the pool
-				for (int i = m_ImagesPool.Count - 1; i > 0; i--) {
-					if (m_ImagesPool[i]) {
-						if (!culled_ImagesPool.Contains(m_ImagesPool[i].gameObject)) {
+				for (int i = m_ImagesPool.Count - 1; i > 0; i--)
+				{
+					if (m_ImagesPool[i])
+					{
+						if (!culled_ImagesPool.Contains(m_ImagesPool[i].gameObject))
+						{
 							culled_ImagesPool.Add(m_ImagesPool[i].gameObject);
 							m_ImagesPool.Remove(m_ImagesPool[i]);
 						}
@@ -282,10 +297,14 @@ protected void UpdateQuadImage() {
 			}
 
 			// Remove any images that are not being used
-			for (int i = m_ImagesPool.Count - 1; i >= matches.Count; i--) {
-				if (i >= 0 && m_ImagesPool.Count > 0) {
-					if (m_ImagesPool[i]) {
-						if (!culled_ImagesPool.Contains(m_ImagesPool[i].gameObject)) {
+			for (int i = m_ImagesPool.Count - 1; i >= matches.Count; i--)
+			{
+				if (i >= 0 && m_ImagesPool.Count > 0)
+				{
+					if (m_ImagesPool[i])
+					{
+						if (!culled_ImagesPool.Contains(m_ImagesPool[i].gameObject))
+						{
 							culled_ImagesPool.Add(m_ImagesPool[i].gameObject);
 							m_ImagesPool.Remove(m_ImagesPool[i]);
 						}
@@ -294,65 +313,77 @@ protected void UpdateQuadImage() {
 			}
 
 			// Clear the images when it is safe to do so
-            if (culled_ImagesPool.Count > 0) {
-                clearImages = true;
-            }
-        }
-
-        // Reseting m_HrefInfos array if there is any change in text
-        void Reset_m_HrefInfos () {
-            previousText = text;
-
-            m_HrefInfos.Clear();
-
-            isCreating_m_HrefInfos = true;
-        }
-
-        /// <summary>
-        /// Finally, the output text hyperlinks get parsed
-        /// </summary>
-        /// <returns></returns>
-        protected string GetOutputText() {
-            s_TextBuilder.Length = 0;
-            
-            indexText = 0;
-
-            fixedString = this.text;
-
-            if (inspectorIconList != null && inspectorIconList.Length > 0) {
-                for (int i = 0; i < inspectorIconList.Length; i++) {
-                    if (!string.IsNullOrEmpty(inspectorIconList[i].name)) {
-                        fixedString = fixedString.Replace(inspectorIconList[i].name, 
+			if (culled_ImagesPool.Count > 0)
+			{
+				clearImages = true;
+			}
+		}
+
+		// Reseting m_HrefInfos array if there is any change in text
+		void Reset_m_HrefInfos()
+		{
+			previousText = text;
+
+			m_HrefInfos.Clear();
+
+			isCreating_m_HrefInfos = true;
+		}
+
+		/// <summary>
+		/// Finally, the output text hyperlinks get parsed
+		/// </summary>
+		/// <returns></returns>
+		protected string GetOutputText()
+		{
+			s_TextBuilder.Length = 0;
+
+			indexText = 0;
+
+			fixedString = this.text;
+
+			if (inspectorIconList != null && inspectorIconList.Length > 0)
+			{
+				for (int i = 0; i < inspectorIconList.Length; i++)
+				{
+					if (!string.IsNullOrEmpty(inspectorIconList[i].name))
+					{
+						fixedString = fixedString.Replace(inspectorIconList[i].name,
 														"<quad name=" + inspectorIconList[i].name + " size=" + fontSize + " width=1 />");
-                    }
-                }
-            }
+					}
+				}
+			}
 
-            count = 0;
+			count = 0;
 
 			href_matches = s_HrefRegex.Matches(fixedString);
 
-			if (href_matches != null && href_matches.Count > 0) {
-				for (int i = 0; i < href_matches.Count; i++ ) {
+			if (href_matches != null && href_matches.Count > 0)
+			{
+				for (int i = 0; i < href_matches.Count; i++)
+				{
 					s_TextBuilder.Append(fixedString.Substring(indexText, href_matches[i].Index - indexText));
 					s_TextBuilder.Append("<color=" + hyperlinkColor + ">");  // Hyperlink color
 
 					var group = href_matches[i].Groups[1];
 
-					if (isCreating_m_HrefInfos) {
-						HrefInfo hrefInfo = new HrefInfo {
+					if (isCreating_m_HrefInfos)
+					{
+						HrefInfo hrefInfo = new HrefInfo
+						{
 							// Hyperlinks in text starting index
-							startIndex = (usesNewRendering ? s_TextBuilder.Length : s_TextBuilder.Length * 4), 
+							startIndex = (usesNewRendering ? s_TextBuilder.Length : s_TextBuilder.Length * 4),
 							endIndex = (usesNewRendering ? (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) : (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) * 4 + 3),
 							name = group.Value
 						};
 
 						m_HrefInfos.Add(hrefInfo);
 					}
-					else {
-						if (count <= m_HrefInfos.Count - 1) {
+					else
+					{
+						if (count <= m_HrefInfos.Count - 1)
+						{
 							// Hyperlinks in text starting index
-							m_HrefInfos[count].startIndex = (usesNewRendering ? s_TextBuilder.Length : s_TextBuilder.Length * 4); 
+							m_HrefInfos[count].startIndex = (usesNewRendering ? s_TextBuilder.Length : s_TextBuilder.Length * 4);
 							m_HrefInfos[count].endIndex = (usesNewRendering ? (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) : (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) * 4 + 3);
 
 							count++;
@@ -366,52 +397,54 @@ protected string GetOutputText() {
 				}
 			}
 
-            // we should create array only once or if there is any change in the text
-            if (isCreating_m_HrefInfos)
-                isCreating_m_HrefInfos = false;
-                
-            s_TextBuilder.Append(fixedString.Substring(indexText, fixedString.Length - indexText));
+			// we should create array only once or if there is any change in the text
+			if (isCreating_m_HrefInfos)
+				isCreating_m_HrefInfos = false;
+
+			s_TextBuilder.Append(fixedString.Substring(indexText, fixedString.Length - indexText));
 
 			m_OutputText = s_TextBuilder.ToString();
 
-            m_ImagesVertexIndex.Clear();
+			m_ImagesVertexIndex.Clear();
 
 			matches = s_Regex.Matches(m_OutputText);
 
-			#if UNITY_2019_1_OR_NEWER
 			href_matches = s_HrefRegex.Matches(m_OutputText);
 
 			indexes.Clear();
 
-			for (int r = 0; r < matches.Count; r++) { 
+			for (int r = 0; r < matches.Count; r++)
+			{
 				indexes.Add(matches[r].Index);
 			}
-			#endif
 
-
-			if (matches != null && matches.Count > 0) {
-				for (int i = 0; i < matches.Count; i++) {
+			if (matches != null && matches.Count > 0)
+			{
+				for (int i = 0; i < matches.Count; i++)
+				{
 					picIndex = matches[i].Index;
 
-					#if UNITY_2019_1_OR_NEWER
-					if (usesNewRendering) {
+					if (usesNewRendering)
+					{
 						charactersRemoved = 0;
 
 						removeCharacters = remove_Regex.Matches(m_OutputText);
 
-						for (int r = 0; r < removeCharacters.Count; r++) { 
-							if (removeCharacters[r].Index < picIndex && !indexes.Contains(removeCharacters[r].Index)) {
+						for (int r = 0; r < removeCharacters.Count; r++)
+						{
+							if (removeCharacters[r].Index < picIndex && !indexes.Contains(removeCharacters[r].Index))
+							{
 								charactersRemoved += removeCharacters[r].Length;
 							}
 						}
 
-						for (int r = 0; r < i; r++) { 
+						for (int r = 0; r < i; r++)
+						{
 							charactersRemoved += (matches[r].Length - 1);
 						}
 
 						picIndex -= charactersRemoved;
 					}
-					#endif
 
 					vertIndex = picIndex * 4 + 3;
 
@@ -419,27 +452,34 @@ protected string GetOutputText() {
 				}
 			}
 
-			#if UNITY_2019_1_OR_NEWER
-			if (usesNewRendering) {
-				if (m_HrefInfos != null && m_HrefInfos.Count > 0) {
-					for (int i = 0; i < m_HrefInfos.Count; i++) {
+			if (usesNewRendering)
+			{
+				if (m_HrefInfos != null && m_HrefInfos.Count > 0)
+				{
+					for (int i = 0; i < m_HrefInfos.Count; i++)
+					{
 						startCharactersRemoved = 0;
 						endCharactersRemoved = 0;
 
 						removeCharacters = remove_Regex.Matches(m_OutputText);
 
-						for (int r = 0; r < removeCharacters.Count; r++) { 
-							if (removeCharacters[r].Index < m_HrefInfos[i].startIndex && !indexes.Contains(removeCharacters[r].Index)) {
+						for (int r = 0; r < removeCharacters.Count; r++)
+						{
+							if (removeCharacters[r].Index < m_HrefInfos[i].startIndex && !indexes.Contains(removeCharacters[r].Index))
+							{
 								startCharactersRemoved += removeCharacters[r].Length;
 							}
-							else if (removeCharacters[r].Index < m_HrefInfos[i].startIndex && indexes.Contains(removeCharacters[r].Index)) {
+							else if (removeCharacters[r].Index < m_HrefInfos[i].startIndex && indexes.Contains(removeCharacters[r].Index))
+							{
 								startCharactersRemoved += removeCharacters[r].Length - 1;
 							}
 
-							if (removeCharacters[r].Index < m_HrefInfos[i].endIndex && !indexes.Contains(removeCharacters[r].Index)) {
+							if (removeCharacters[r].Index < m_HrefInfos[i].endIndex && !indexes.Contains(removeCharacters[r].Index))
+							{
 								endCharactersRemoved += removeCharacters[r].Length;
 							}
-							else if (removeCharacters[r].Index < m_HrefInfos[i].endIndex && indexes.Contains(removeCharacters[r].Index)) {
+							else if (removeCharacters[r].Index < m_HrefInfos[i].endIndex && indexes.Contains(removeCharacters[r].Index))
+							{
 								endCharactersRemoved += removeCharacters[r].Length - 1;
 							}
 						}
@@ -454,13 +494,13 @@ protected string GetOutputText() {
 					}
 				}
 			}
-			#endif
 
-            return m_OutputText;
-        }
+			return m_OutputText;
+		}
 
 		// Process href links to open them as a url, can override this function for custom functionality
-		public virtual void OnHrefClick(string hrefName) {
+		public virtual void OnHrefClick(string hrefName)
+		{
 			Application.OpenURL(hrefName);
 
 			// Debug.Log(hrefName);
@@ -469,31 +509,24 @@ public virtual void OnHrefClick(string hrefName) {
 
 		/// UNITY METHODS ///
 
-        protected override void OnPopulateMesh(VertexHelper toFill) {
-#if UNITY_2022_1_OR_NEWER
-            originalText = text;
-            text = GetOutputText();
+		protected override void OnPopulateMesh(VertexHelper toFill)
+		{
+			originalText = text;
+			text = GetOutputText();
 			base.OnPopulateMesh(toFill);
 
-            text = originalText;
-#else
-            originalText = m_Text;
-            m_Text = GetOutputText();
-            base.OnPopulateMesh(toFill);
-
-            m_DisableFontTextureRebuiltCallback = true;
+			text = originalText;
 
-            m_Text = originalText;
-#endif
-
-            positions.Clear();
+			positions.Clear();
 
-            vert = new UIVertex();
+			vert = new UIVertex();
 
-            for (int i = 0; i < m_ImagesVertexIndex.Count; i++) {
-                int endIndex = m_ImagesVertexIndex[i];
+			for (int i = 0; i < m_ImagesVertexIndex.Count; i++)
+			{
+				int endIndex = m_ImagesVertexIndex[i];
 
-				if (endIndex < toFill.currentVertCount) {
+				if (endIndex < toFill.currentVertCount)
+				{
 					toFill.PopulateUIVertex(ref vert, endIndex);
 
 					positions.Add(new Vector2((vert.position.x + fontSize / 2), (vert.position.y + fontSize / 2)) + imageOffset);
@@ -503,178 +536,215 @@ protected override void OnPopulateMesh(VertexHelper toFill) {
 
 					Vector3 pos = vert.position;
 
-					for (int j = endIndex, m = endIndex - 3; j > m; j--) {
+					for (int j = endIndex, m = endIndex - 3; j > m; j--)
+					{
 						toFill.PopulateUIVertex(ref vert, endIndex);
 						vert.position = pos;
 						toFill.SetUIVertex(vert, j);
 					}
 				}
-            }
+			}
 
-            // Hyperlinks surround processing box
-            for (int h = 0; h < m_HrefInfos.Count; h++) {
-                m_HrefInfos[h].boxes.Clear();
+			// Hyperlinks surround processing box
+			for (int h = 0; h < m_HrefInfos.Count; h++)
+			{
+				m_HrefInfos[h].boxes.Clear();
 
-                if (m_HrefInfos[h].startIndex >= toFill.currentVertCount) {
-                    continue;
-                }
+				if (m_HrefInfos[h].startIndex >= toFill.currentVertCount)
+				{
+					continue;
+				}
 
-                // Hyperlink inside the text is added to surround the vertex index coordinate frame
-                toFill.PopulateUIVertex(ref vert, m_HrefInfos[h].startIndex);
+				// Hyperlink inside the text is added to surround the vertex index coordinate frame
+				toFill.PopulateUIVertex(ref vert, m_HrefInfos[h].startIndex);
 
-                Vector3 pos = vert.position;
+				Vector3 pos = vert.position;
 
-                Bounds bounds = new Bounds(pos, Vector3.zero);
+				Bounds bounds = new Bounds(pos, Vector3.zero);
 
-                for (int i = m_HrefInfos[h].startIndex, m = m_HrefInfos[h].endIndex; i < m; i++) {
-                    if (i >= toFill.currentVertCount) {
-                        break;
-                    }
+				for (int i = m_HrefInfos[h].startIndex, m = m_HrefInfos[h].endIndex; i < m; i++)
+				{
+					if (i >= toFill.currentVertCount)
+					{
+						break;
+					}
 
-                    toFill.PopulateUIVertex(ref vert, i);
+					toFill.PopulateUIVertex(ref vert, i);
 
-                    pos = vert.position;
+					pos = vert.position;
 
 					// Wrap re-add surround frame
-                    if (pos.x < bounds.min.x)  {
-                        m_HrefInfos[h].boxes.Add(new Rect(bounds.min, bounds.size));
-                        bounds = new Bounds(pos, Vector3.zero);
-                    }
-                    else {
-                        bounds.Encapsulate(pos); // Extended enclosed box
-                    }
-                }
-
-                m_HrefInfos[h].boxes.Add(new Rect(bounds.min, bounds.size));
-            }
+					if (pos.x < bounds.min.x)
+					{
+						m_HrefInfos[h].boxes.Add(new Rect(bounds.min, bounds.size));
+						bounds = new Bounds(pos, Vector3.zero);
+					}
+					else
+					{
+						bounds.Encapsulate(pos); // Extended enclosed box
+					}
+				}
+
+				m_HrefInfos[h].boxes.Add(new Rect(bounds.min, bounds.size));
+			}
 
 			// Update the quad images
-            updateQuad = true;
+			updateQuad = true;
 
 #if !UNITY_2022_1_OR_NEWER
 			m_DisableFontTextureRebuiltCallback = false;
 #endif
 		}
 
-        /// <summary>
-        /// Click event is detected whether to click a hyperlink text
-        /// </summary>
-        /// <param name="eventData"></param>
-        public void OnPointerClick(PointerEventData eventData) { 
-            RectTransformUtility.ScreenPointToLocalPointInRectangle(
-                rectTransform, eventData.position, eventData.pressEventCamera, out lp);
-
-            for (int h = 0; h < m_HrefInfos.Count; h++) {
-                for (int i = 0; i < m_HrefInfos[h].boxes.Count; ++i) {
-                    if (m_HrefInfos[h].boxes[i].Contains(lp)) {
-                        m_OnHrefClick.Invoke(m_HrefInfos[h].name);
-                        return;
-                    }
-                }
-            }
-        }
-
-        public void OnPointerEnter(PointerEventData eventData) {
-            //do your stuff when highlighted
-            selected = true;
-
-            if (m_ImagesPool.Count >= 1) {
-                for (int i = 0; i < m_ImagesPool.Count; i++) {
-                    if (button != null && button.isActiveAndEnabled) {
-                        m_ImagesPool[i].color = button.colors.highlightedColor;
-                    }
-                }
-            }
-        }
-
-        public void OnPointerExit(PointerEventData eventData) {
-            //do your stuff when highlighted
-            selected = false;
-
-            if (m_ImagesPool.Count >= 1) {
-                for (int i = 0; i < m_ImagesPool.Count; i++) {
-                    if (button != null && button.isActiveAndEnabled) {
-                        m_ImagesPool[i].color = button.colors.normalColor;
-                    }
-                    else {
-                        m_ImagesPool[i].color = color;
-                    }
-                }
-            }
-        }
-
-        public void OnSelect(BaseEventData eventData) {
-            //do your stuff when selected
-            selected = true;
-
-            if (m_ImagesPool.Count >= 1) {
-                for (int i = 0; i < m_ImagesPool.Count; i++) {
-                    if (button != null && button.isActiveAndEnabled) {
-                        m_ImagesPool[i].color = button.colors.highlightedColor;
-                    }
-                }
-            }
-        }
-
-        public void OnDeselect(BaseEventData eventData) {
-            //do your stuff when selected
-            selected = false;
-
-            if (m_ImagesPool.Count >= 1) {
-                for (int i = 0; i < m_ImagesPool.Count; i++) {
-                    if (button != null && button.isActiveAndEnabled) {
-                        m_ImagesPool[i].color = button.colors.normalColor;
-                    }
-                }
-            }
-        }
-
-
-        public override void SetVerticesDirty() {
-            base.SetVerticesDirty();
+		/// <summary>
+		/// Click event is detected whether to click a hyperlink text
+		/// </summary>
+		/// <param name="eventData"></param>
+		public void OnPointerClick(PointerEventData eventData)
+		{
+			RectTransformUtility.ScreenPointToLocalPointInRectangle(
+				rectTransform, eventData.position, eventData.pressEventCamera, out lp);
+
+			for (int h = 0; h < m_HrefInfos.Count; h++)
+			{
+				for (int i = 0; i < m_HrefInfos[h].boxes.Count; ++i)
+				{
+					if (m_HrefInfos[h].boxes[i].Contains(lp))
+					{
+						m_OnHrefClick.Invoke(m_HrefInfos[h].name);
+						return;
+					}
+				}
+			}
+		}
+
+		public void OnPointerEnter(PointerEventData eventData)
+		{
+			//do your stuff when highlighted
+			selected = true;
+
+			if (m_ImagesPool.Count >= 1)
+			{
+				for (int i = 0; i < m_ImagesPool.Count; i++)
+				{
+					if (button != null && button.isActiveAndEnabled)
+					{
+						m_ImagesPool[i].color = button.colors.highlightedColor;
+					}
+				}
+			}
+		}
+
+		public void OnPointerExit(PointerEventData eventData)
+		{
+			//do your stuff when highlighted
+			selected = false;
+
+			if (m_ImagesPool.Count >= 1)
+			{
+				for (int i = 0; i < m_ImagesPool.Count; i++)
+				{
+					if (button != null && button.isActiveAndEnabled)
+					{
+						m_ImagesPool[i].color = button.colors.normalColor;
+					}
+					else
+					{
+						m_ImagesPool[i].color = color;
+					}
+				}
+			}
+		}
+
+		public void OnSelect(BaseEventData eventData)
+		{
+			//do your stuff when selected
+			selected = true;
+
+			if (m_ImagesPool.Count >= 1)
+			{
+				for (int i = 0; i < m_ImagesPool.Count; i++)
+				{
+					if (button != null && button.isActiveAndEnabled)
+					{
+						m_ImagesPool[i].color = button.colors.highlightedColor;
+					}
+				}
+			}
+		}
+
+		public void OnDeselect(BaseEventData eventData)
+		{
+			//do your stuff when selected
+			selected = false;
+
+			if (m_ImagesPool.Count >= 1)
+			{
+				for (int i = 0; i < m_ImagesPool.Count; i++)
+				{
+					if (button != null && button.isActiveAndEnabled)
+					{
+						m_ImagesPool[i].color = button.colors.normalColor;
+					}
+				}
+			}
+		}
+
+
+		public override void SetVerticesDirty()
+		{
+			base.SetVerticesDirty();
 
 			// Update the quad images
-            updateQuad = true;
-        }
+			updateQuad = true;
+		}
 
 #if UNITY_EDITOR
-        protected override void OnValidate() {
-            base.OnValidate();
+		protected override void OnValidate()
+		{
+			base.OnValidate();
 
 			// Update the quad images
-            updateQuad = true;
-            
-            if (inspectorIconList != null) {
-                for (int i = 0; i < inspectorIconList.Length; i++) {
-                    if (inspectorIconList[i].scale == Vector2.zero) {
-                        inspectorIconList[i].scale = Vector2.one;
-                    }
-                }
-            }
-        }
+			updateQuad = true;
+
+			if (inspectorIconList != null)
+			{
+				for (int i = 0; i < inspectorIconList.Length; i++)
+				{
+					if (inspectorIconList[i].scale == Vector2.zero)
+					{
+						inspectorIconList[i].scale = Vector2.one;
+					}
+				}
+			}
+		}
 #endif
 
-		protected override void OnEnable() {
-#if UNITY_2019_1_OR_NEWER
+		protected override void OnEnable()
+		{
 			// Here is the hack to see if Unity is using the new rendering system for text
 			usesNewRendering = false;
 
-			if (Application.unityVersion.StartsWith("2019.1.")) { 
-				if (!Char.IsDigit(Application.unityVersion[8])) {
+			if (Application.unityVersion.StartsWith("2019.1."))
+			{
+				if (!Char.IsDigit(Application.unityVersion[8]))
+				{
 					int number = Convert.ToInt32(Application.unityVersion[7].ToString());
 
-					if (number > 4) {
+					if (number > 4)
+					{
 						usesNewRendering = true;
 					}
 				}
-				else {
+				else
+				{
 					usesNewRendering = true;
 				}
 			}
-			else {
+			else
+			{
 				usesNewRendering = true;
 			}
-#endif
 
 			base.OnEnable();
 
@@ -683,13 +753,16 @@ protected override void OnEnable() {
 			alignByGeometry = true;
 #endif
 			// Enable images on TextPic disable
-            if (m_ImagesPool.Count >= 1) {
-                for (int i = 0; i < m_ImagesPool.Count; i++) {
-                    if(m_ImagesPool[i] != null) {
+			if (m_ImagesPool.Count >= 1)
+			{
+				for (int i = 0; i < m_ImagesPool.Count; i++)
+				{
+					if (m_ImagesPool[i] != null)
+					{
 						m_ImagesPool[i].enabled = true;
 					}
-                }
-            }
+				}
+			}
 
 			// Update the quads on re-enable
 			updateQuad = true;
@@ -697,46 +770,57 @@ protected override void OnEnable() {
 			this.onHrefClick.AddListener(OnHrefClick);
 		}
 
-		protected override void OnDisable() {
+		protected override void OnDisable()
+		{
 			base.OnDisable();
 
 			// Disable images on TextPic disable
-            if (m_ImagesPool.Count >= 1) {
-                for (int i = 0; i < m_ImagesPool.Count; i++) {
-                    if (m_ImagesPool[i] != null) {
+			if (m_ImagesPool.Count >= 1)
+			{
+				for (int i = 0; i < m_ImagesPool.Count; i++)
+				{
+					if (m_ImagesPool[i] != null)
+					{
 						m_ImagesPool[i].enabled = false;
 					}
-                }
-            }
+				}
+			}
 
 			this.onHrefClick.RemoveListener(OnHrefClick);
 		}
 
-        new void Start() {
-            button = GetComponent<Button>();
-            ResetIconList();
-        }
+		new void Start()
+		{
+			button = GetComponent<Button>();
+			ResetIconList();
+		}
 
-        void LateUpdate() {
+		void LateUpdate()
+		{
 			// Reset the hrefs if text is changed
-            if (previousText != text) {
-                Reset_m_HrefInfos();
+			if (previousText != text)
+			{
+				Reset_m_HrefInfos();
 
 				// Update the quad on text change
 				updateQuad = true;
 			}
 
 			// Need to lock to remove images properly
-			lock (thisLock) {
+			lock (thisLock)
+			{
 				// Can only update the images when it is not in a rebuild, this prevents the error
-				if (updateQuad) {
+				if (updateQuad)
+				{
 					UpdateQuadImage();
 					updateQuad = false;
 				}
 
 				// Destroy any images that are not in use
-				if (clearImages) {
-					for (int i = 0; i < culled_ImagesPool.Count; i++) {
+				if (clearImages)
+				{
+					for (int i = 0; i < culled_ImagesPool.Count; i++)
+					{
 						DestroyImmediate(culled_ImagesPool[i]);
 					}
 
@@ -745,6 +829,6 @@ void LateUpdate() {
 					clearImages = false;
 				}
 			}
-        }
-    }
+		}
+	}
 }
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/BestFitOutline.cs b/Runtime/Scripts/Effects/BestFitOutline.cs
index 1e5a6de6..b03c139f 100644
--- a/Runtime/Scripts/Effects/BestFitOutline.cs
+++ b/Runtime/Scripts/Effects/BestFitOutline.cs
@@ -3,72 +3,63 @@
 /// NOT supported in Unity 2022
 
 using System;
-#if !UNITY_2022_1_OR_NEWER
 using System.Collections.Generic;
-#endif
 
 namespace UnityEngine.UI.Extensions
 {
-#if UNITY_2022_1_OR_NEWER
-	[Obsolete("BestFitOutline is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
-	public class BestFitOutline : Shadow
-	{
-	}
-#else
-    [AddComponentMenu("UI/Effects/Extensions/BestFit Outline")]
+	[AddComponentMenu("UI/Effects/Extensions/BestFit Outline")]
 	public class BestFitOutline : Shadow
 	{
 		//
 		// Constructors
 		//
-		protected BestFitOutline ()
+		protected BestFitOutline()
 		{
 		}
-		
+
 		//
 		// Methods
 		//
-		public override void ModifyMesh (Mesh mesh)
+		public override void ModifyMesh(Mesh mesh)
 		{
-			if (!this.IsActive ())
+			if (!this.IsActive())
 			{
 				return;
 			}
 
-            List<UIVertex> verts = new List<UIVertex>();
-            using (var helper = new VertexHelper(mesh))
-            {
-                helper.GetUIVertexStream(verts);
-            }
+			List<UIVertex> verts = new List<UIVertex>();
+			using (var helper = new VertexHelper(mesh))
+			{
+				helper.GetUIVertexStream(verts);
+			}
 
-            Text foundtext = GetComponent<Text>();
+			Text foundtext = GetComponent<Text>();
 
 			float best_fit_adjustment = 1f;
 
-			if (foundtext && foundtext.resizeTextForBestFit)  
+			if (foundtext && foundtext.resizeTextForBestFit)
 			{
-				best_fit_adjustment = (float)foundtext.cachedTextGenerator.fontSizeUsedForBestFit / (foundtext.resizeTextMaxSize-1); //max size seems to be exclusive 
+				best_fit_adjustment = (float)foundtext.cachedTextGenerator.fontSizeUsedForBestFit / (foundtext.resizeTextMaxSize - 1); //max size seems to be exclusive 
 			}
-			
+
 			int start = 0;
 			int count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, base.effectDistance.x*best_fit_adjustment, base.effectDistance.y*best_fit_adjustment);
+			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, base.effectDistance.x * best_fit_adjustment, base.effectDistance.y * best_fit_adjustment);
 			start = count;
 			count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, base.effectDistance.x*best_fit_adjustment, -base.effectDistance.y*best_fit_adjustment);
+			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, base.effectDistance.x * best_fit_adjustment, -base.effectDistance.y * best_fit_adjustment);
 			start = count;
 			count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, -base.effectDistance.x*best_fit_adjustment, base.effectDistance.y*best_fit_adjustment);
+			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, -base.effectDistance.x * best_fit_adjustment, base.effectDistance.y * best_fit_adjustment);
 			start = count;
 			count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, -base.effectDistance.x*best_fit_adjustment, -base.effectDistance.y*best_fit_adjustment);
+			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, -base.effectDistance.x * best_fit_adjustment, -base.effectDistance.y * best_fit_adjustment);
 
-            using (var helper = new VertexHelper())
-            {
-                helper.AddUIVertexTriangleStream(verts);
-                helper.FillMesh(mesh);
-            }
-        }
+			using (var helper = new VertexHelper())
+			{
+				helper.AddUIVertexTriangleStream(verts);
+				helper.FillMesh(mesh);
+			}
+		}
 	}
-#endif
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/CurlyUI/CUIText.cs b/Runtime/Scripts/Effects/CurlyUI/CUIText.cs
index c96b0e6e..8e46c7e2 100644
--- a/Runtime/Scripts/Effects/CurlyUI/CUIText.cs
+++ b/Runtime/Scripts/Effects/CurlyUI/CUIText.cs
@@ -4,11 +4,7 @@
 namespace UnityEngine.UI.Extensions
 {
     [RequireComponent(typeof(RectTransform))]
-#if UNITY_2022_1_OR_NEWER
     [RequireComponent(typeof(TMPro.TMP_Text))]
-#else
-    [RequireComponent(typeof(Text))]
-#endif
     [AddComponentMenu("UI/Effects/Extensions/Curly UI Text")]
     public class CUIText : CUIGraphic
     {
@@ -16,11 +12,7 @@ public override void ReportSet()
         {
             if (uiGraphic == null)
             {
-#if UNITY_2022_1_OR_NEWER
                 uiGraphic = GetComponent<TMPro.TMP_Text>();
-#else
-                uiGraphic = GetComponent<Text>();
-#endif
             }
 
             base.ReportSet();
diff --git a/Runtime/Scripts/Effects/CurvedText.cs b/Runtime/Scripts/Effects/CurvedText.cs
index ef27a413..ffdd25ec 100644
--- a/Runtime/Scripts/Effects/CurvedText.cs
+++ b/Runtime/Scripts/Effects/CurvedText.cs
@@ -1,17 +1,6 @@
 
-using System;
-
 namespace UnityEngine.UI.Extensions
 {
-#if UNITY_2022_1_OR_NEWER
-    [Obsolete("CurvedText is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
-    public class CurvedText : BaseMeshEffect
-    {
-        public override void ModifyMesh(VertexHelper vh)
-        {
-        }
-    }
-#else
     [RequireComponent(typeof(Text))]
     [RequireComponent(typeof(RectTransform))]
     [AddComponentMenu("UI/Effects/Extensions/Curved Text")]
@@ -91,5 +80,4 @@ protected override void OnRectTransformDimensionsChange()
             }
         }
     }
-#endif
 }
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/CylinderText.cs b/Runtime/Scripts/Effects/CylinderText.cs
index cdd592ee..83742eed 100644
--- a/Runtime/Scripts/Effects/CylinderText.cs
+++ b/Runtime/Scripts/Effects/CylinderText.cs
@@ -6,15 +6,6 @@
 /// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/#post-1777407
 namespace UnityEngine.UI.Extensions
 {
-#if UNITY_2022_1_OR_NEWER
-    [Obsolete("CylinderText is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
-    public class CylinderText : BaseMeshEffect
-    {
-        public override void ModifyMesh(VertexHelper vh)
-        {
-        }
-    }
-#else
     [RequireComponent(typeof(Text))]
     [RequireComponent(typeof(RectTransform))]
     [AddComponentMenu("UI/Effects/Extensions/Cylinder Text")]
@@ -40,7 +31,7 @@ protected override void OnEnable()
         }
         public override void ModifyMesh(VertexHelper vh)
         {
-            if (! IsActive()) return;
+            if (!IsActive()) return;
 
             int count = vh.currentVertCount;
             if (!IsActive() || count == 0)
@@ -53,15 +44,14 @@ public override void ModifyMesh(VertexHelper vh)
                 vh.PopulateUIVertex(ref uiVertex, index);
 
                 // get x position
-                var x = uiVertex.position.x;                
+                var x = uiVertex.position.x;
 
                 // calculate bend based on pivot and radius
                 uiVertex.position.z = -radius * Mathf.Cos(x / radius);
                 uiVertex.position.x = radius * Mathf.Sin(x / radius);
-                
+
                 vh.SetUIVertex(uiVertex, index);
             }
         }
     }
-#endif
 }
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/Gradient2.cs b/Runtime/Scripts/Effects/Gradient2.cs
index c82bb0c7..3d2f2560 100644
--- a/Runtime/Scripts/Effects/Gradient2.cs
+++ b/Runtime/Scripts/Effects/Gradient2.cs
@@ -9,12 +9,8 @@
 /// </summary>
 using System;
 using System.Collections.Generic;
-#if UNITY_2021_2_OR_NEWER
 using System.Buffers;
-#endif
-#if UNITY_2021_1_OR_NEWER
 using UnityEngine.Pool;
-#endif
 
 namespace UnityEngine.UI.Extensions
 {
@@ -44,7 +40,7 @@ public class Gradient2 : BaseMeshEffect
 
         private GradientColorKey[] _colorKeys;
         private GradientAlphaKey[] _alphaKeys;
-        
+
         #region Properties
         public Blend BlendMode
         {
@@ -112,11 +108,7 @@ public override void ModifyMesh(VertexHelper helper)
             if (!IsActive() || helper.currentVertCount == 0)
                 return;
 
-#if UNITY_2021_1_OR_NEWER
             List<UIVertex> _vertexList = ListPool<UIVertex>.Get();
-#else
-            List<UIVertex> _vertexList = new List<UIVertex>();
-#endif
 
             helper.GetUIVertexStream(_vertexList);
 
@@ -231,7 +223,7 @@ public override void ModifyMesh(VertexHelper helper)
 
                             helper.AddVert(centralVertex);
 
-                            for (int i = 1; i < steps; i++) helper.AddTriangle(i, i-1, steps);
+                            for (int i = 1; i < steps; i++) helper.AddTriangle(i, i - 1, steps);
                             helper.AddTriangle(0, steps - 1, steps);
                         }
 
@@ -252,9 +244,7 @@ public override void ModifyMesh(VertexHelper helper)
                     break;
             }
 
-#if UNITY_2021_1_OR_NEWER
             ListPool<UIVertex>.Release(_vertexList);
-#endif
         }
 
         Rect GetBounds(List<UIVertex> vertices)
@@ -281,11 +271,7 @@ Rect GetBounds(List<UIVertex> vertices)
 
         void SplitTrianglesAtGradientStops(List<UIVertex> _vertexList, Rect bounds, float zoomOffset, VertexHelper helper)
         {
-#if UNITY_2021_1_OR_NEWER
             List<float> stops = FindStops(zoomOffset, bounds, ListPool<float>.Get());
-#else
-            List<float> stops = FindStops(zoomOffset, bounds, new List<float>());
-#endif
             if (stops.Count > 0)
             {
                 helper.Clear();
@@ -293,23 +279,13 @@ void SplitTrianglesAtGradientStops(List<UIVertex> _vertexList, Rect bounds, floa
                 int nCount = _vertexList.Count;
                 for (int i = 0; i < nCount; i += 3)
                 {
-#if UNITY_2021_2_OR_NEWER
                     var positions = ArrayPool<float>.Shared.Rent(3);
-#else
-                    var positions = new float[3];
-#endif
-                    
+
                     GetPositions(_vertexList, i, ref positions);
-                    
-#if UNITY_2021_1_OR_NEWER
+
                     List<int> originIndices = ListPool<int>.Get();
                     List<UIVertex> starts = ListPool<UIVertex>.Get();
                     List<UIVertex> ends = ListPool<UIVertex>.Get();
-#else
-                    List<int> originIndices = new List<int>(3);
-                    List<UIVertex> starts = new List<UIVertex>(3);
-                    List<UIVertex> ends = new List<UIVertex>(2);
-#endif
 
                     for (int s = 0; s < stops.Count; s++)
                     {
@@ -438,19 +414,13 @@ void SplitTrianglesAtGradientStops(List<UIVertex> _vertexList, Rect bounds, floa
                         helper.AddTriangle(vertexCount - 3, vertexCount - 2, vertexCount - 1);
                     }
 
-#if UNITY_2021_2_OR_NEWER
                     ArrayPool<float>.Shared.Return(positions);
-#endif
-#if UNITY_2021_1_OR_NEWER
                     ListPool<int>.Release(originIndices);
                     ListPool<UIVertex>.Release(starts);
                     ListPool<UIVertex>.Release(ends);
-#endif
                 }
             }
-#if UNITY_2021_1_OR_NEWER
             ListPool<float>.Release(stops);
-#endif
         }
 
         void GetPositions(List<UIVertex> _vertexList, int index, ref float[] positions)
@@ -468,7 +438,7 @@ void GetPositions(List<UIVertex> _vertexList, int index, ref float[] positions)
                 positions[2] = _vertexList[index + 2].position.y;
             }
         }
-        
+
         List<float> FindStops(float zoomOffset, Rect bounds, List<float> stops)
         {
             var offset = Offset * (1 - zoomOffset);
@@ -476,7 +446,7 @@ List<float> FindStops(float zoomOffset, Rect bounds, List<float> stops)
             var endBoundary = (1 - zoomOffset) - offset;
 
             _colorKeys = EffectGradient.colorKeys;
-            
+
             foreach (var color in _colorKeys)
             {
                 if (color.time >= endBoundary)
@@ -486,7 +456,7 @@ List<float> FindStops(float zoomOffset, Rect bounds, List<float> stops)
             }
 
             _alphaKeys = _effectGradient.alphaKeys;
-            
+
             foreach (var alpha in _alphaKeys)
             {
                 if (alpha.time >= endBoundary)
@@ -509,7 +479,7 @@ List<float> FindStops(float zoomOffset, Rect bounds, List<float> stops)
                 if (x == y) return 0;
                 return -1;
             });
-            
+
             for (int i = 0; i < stops.Count; i++)
             {
                 stops[i] = (stops[i] * size) + min;
diff --git a/Runtime/Scripts/Effects/LetterSpacing.cs b/Runtime/Scripts/Effects/LetterSpacing.cs
index ce5e2b29..567c4eda 100644
--- a/Runtime/Scripts/Effects/LetterSpacing.cs
+++ b/Runtime/Scripts/Effects/LetterSpacing.cs
@@ -43,48 +43,40 @@ This component doesn't really work with Rich Text. You don't need to remember to
 #endif
 
 using System;
+using System.Collections.Generic;
 
 /// Credit Deeperbeige
 /// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
 namespace UnityEngine.UI.Extensions
 {
-#if UNITY_2022_1_OR_NEWER
-    [Obsolete("LetterSpacing is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
-    public class LetterSpacing : BaseMeshEffect
-    {
-        public override void ModifyMesh(VertexHelper vh)
-        {
-        }
-    }
-#else
     [AddComponentMenu("UI/Effects/Extensions/Letter Spacing")]
     ///Summary
     /// Note, Vertex Count has changed in 5.2.1+, is now 6 (two tris) instead of 4 (tri strip).
     public class LetterSpacing : BaseMeshEffect
-	{
-		[SerializeField]
-		private float m_spacing = 0f;
+    {
+        [SerializeField]
+        private float m_spacing = 0f;
+
+        protected LetterSpacing() { }
 
-		protected LetterSpacing() { }
-		
 #if UNITY_EDITOR
-		protected override void OnValidate()
-		{
-			spacing = m_spacing;
-			base.OnValidate();
-		}
+        protected override void OnValidate()
+        {
+            spacing = m_spacing;
+            base.OnValidate();
+        }
 #endif
-		
-		public float spacing
-		{
-			get { return m_spacing; }
-			set
-			{
-				if (m_spacing == value) return;
-				m_spacing = value;
-				if (graphic != null) graphic.SetVerticesDirty();
-			}
-		}
+
+        public float spacing
+        {
+            get { return m_spacing; }
+            set
+            {
+                if (m_spacing == value) return;
+                m_spacing = value;
+                if (graphic != null) graphic.SetVerticesDirty();
+            }
+        }
 
         protected override void Awake()
         {
@@ -93,7 +85,7 @@ protected override void Awake()
 
         public override void ModifyMesh(VertexHelper vh)
         {
-            if (! IsActive()) return;
+            if (!IsActive()) return;
 
             List<UIVertex> verts = new List<UIVertex>();
             vh.GetUIVertexStream(verts);
@@ -101,16 +93,16 @@ public override void ModifyMesh(VertexHelper vh)
             var text = GetComponent<Text>();
 
             if (text == null)
-			{
-				Debug.LogWarning("LetterSpacing: Missing Text component");
-				return;
-			}
-			
-			string[] lines = text.text.Split('\n');
-			Vector3  pos;
-			float    letterOffset    = spacing * (float)text.fontSize / 100f;
-			float    alignmentFactor = 0;
-			int      glyphIdx        = 0;
+            {
+                Debug.LogWarning("LetterSpacing: Missing Text component");
+                return;
+            }
+
+            string[] lines = text.text.Split('\n');
+            Vector3 pos;
+            float letterOffset = spacing * (float)text.fontSize / 100f;
+            float alignmentFactor = 0;
+            int glyphIdx = 0;
 
             switch (text.alignment)
             {
@@ -132,18 +124,18 @@ public override void ModifyMesh(VertexHelper vh)
                     alignmentFactor = 1f;
                     break;
             }
-      
-            for (int lineIdx=0; lineIdx < lines.Length; lineIdx++)
-			{
-				string line = lines[lineIdx];
-				float lineOffset = (line.Length -1) * letterOffset * alignmentFactor;
-
-				for (int charIdx = 0; charIdx < line.Length; charIdx++)
-				{
-					int idx1 = glyphIdx * 6 + 0;
-					int idx2 = glyphIdx * 6 + 1;
-					int idx3 = glyphIdx * 6 + 2;
-					int idx4 = glyphIdx * 6 + 3;
+
+            for (int lineIdx = 0; lineIdx < lines.Length; lineIdx++)
+            {
+                string line = lines[lineIdx];
+                float lineOffset = (line.Length - 1) * letterOffset * alignmentFactor;
+
+                for (int charIdx = 0; charIdx < line.Length; charIdx++)
+                {
+                    int idx1 = glyphIdx * 6 + 0;
+                    int idx2 = glyphIdx * 6 + 1;
+                    int idx3 = glyphIdx * 6 + 2;
+                    int idx4 = glyphIdx * 6 + 3;
                     int idx5 = glyphIdx * 6 + 4;
                     int idx6 = glyphIdx * 6 + 5;
 
@@ -167,21 +159,20 @@ public override void ModifyMesh(VertexHelper vh)
                     vert6.position += pos;
 
                     verts[idx1] = vert1;
-					verts[idx2] = vert2;
-					verts[idx3] = vert3;
-					verts[idx4] = vert4;
+                    verts[idx2] = vert2;
+                    verts[idx3] = vert3;
+                    verts[idx4] = vert4;
                     verts[idx5] = vert5;
                     verts[idx6] = vert6;
 
                     glyphIdx++;
-				}
-				
-				// Offset for carriage return character that still generates verts
-				glyphIdx++;
-			}
+                }
+
+                // Offset for carriage return character that still generates verts
+                glyphIdx++;
+            }
             vh.Clear();
             vh.AddUIVertexTriangleStream(verts);
         }
-	}
-#endif
+    }
 }
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/MonoSpacing.cs b/Runtime/Scripts/Effects/MonoSpacing.cs
index ab70127a..2749ce34 100644
--- a/Runtime/Scripts/Effects/MonoSpacing.cs
+++ b/Runtime/Scripts/Effects/MonoSpacing.cs
@@ -43,29 +43,21 @@ This component doesn't really work with Rich Text. You don't need to remember to
 #endif
 
 using System;
+using System.Collections.Generic;
 
 /// Credit herbst / derived from LetterSpacing by Deeperbeige
 /// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
 namespace UnityEngine.UI.Extensions
 {
-#if UNITY_2022_1_OR_NEWER
-    [Obsolete("MonoSpacing is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
-    public class MonoSpacing : BaseMeshEffect
-    {
-        public override void ModifyMesh(VertexHelper vh)
-        {
-        }
-    }
-#else
     [AddComponentMenu("UI/Effects/Extensions/Mono Spacing")]
     [RequireComponent(typeof(Text))]
     [RequireComponent(typeof(RectTransform))]
     ///Summary
     /// Note, Vertex Count has changed in 5.2.1+, is now 6 (two tris) instead of 4 (tri strip).
     public class MonoSpacing : BaseMeshEffect
-	{
-		[SerializeField]
-		private float m_spacing = 0f;
+    {
+        [SerializeField]
+        private float m_spacing = 0f;
         public float HalfCharWidth = 1;
         public bool UseHalfCharWidth = false;
 
@@ -73,7 +65,7 @@ public class MonoSpacing : BaseMeshEffect
 
         private Text text;
 
-		protected MonoSpacing() { }
+        protected MonoSpacing() { }
 
         protected override void Awake()
         {
@@ -89,35 +81,35 @@ protected override void Awake()
 
 #if UNITY_EDITOR
         protected override void OnValidate()
-		{
-			Spacing = m_spacing;
-			base.OnValidate();
-		}
+        {
+            Spacing = m_spacing;
+            base.OnValidate();
+        }
 #endif
-		
-		public float Spacing
-		{
-			get { return m_spacing; }
-			set
-			{
-				if (m_spacing == value) return;
-				m_spacing = value;
-				if (graphic != null) graphic.SetVerticesDirty();
-			}
-		}
+
+        public float Spacing
+        {
+            get { return m_spacing; }
+            set
+            {
+                if (m_spacing == value) return;
+                m_spacing = value;
+                if (graphic != null) graphic.SetVerticesDirty();
+            }
+        }
 
         public override void ModifyMesh(VertexHelper vh)
         {
-            if (! IsActive()) return;
+            if (!IsActive()) return;
 
             List<UIVertex> verts = new List<UIVertex>();
             vh.GetUIVertexStream(verts);
-			
-			string[] lines = text.text.Split('\n');
-			// Vector3  pos;
-			float    letterOffset    = Spacing * (float)text.fontSize / 100f;
-			float    alignmentFactor = 0;
-			int      glyphIdx        = 0;
+
+            string[] lines = text.text.Split('\n');
+            // Vector3  pos;
+            float letterOffset = Spacing * (float)text.fontSize / 100f;
+            float alignmentFactor = 0;
+            int glyphIdx = 0;
 
             switch (text.alignment)
             {
@@ -140,19 +132,19 @@ public override void ModifyMesh(VertexHelper vh)
                     break;
             }
 
-            for (int lineIdx=0; lineIdx < lines.Length; lineIdx++)
-			{
-				string line = lines[lineIdx];
+            for (int lineIdx = 0; lineIdx < lines.Length; lineIdx++)
+            {
+                string line = lines[lineIdx];
                 float lineOffset = (line.Length - 1) * letterOffset * (alignmentFactor) - (alignmentFactor - 0.5f) * rectTransform.rect.width;
 
                 var offsetX = -lineOffset + letterOffset / 2 * (1 - alignmentFactor * 2);
 
-				for (int charIdx = 0; charIdx < line.Length; charIdx++)
-				{
-					int idx1 = glyphIdx * 6 + 0;
-					int idx2 = glyphIdx * 6 + 1;
-					int idx3 = glyphIdx * 6 + 2;
-					int idx4 = glyphIdx * 6 + 3;
+                for (int charIdx = 0; charIdx < line.Length; charIdx++)
+                {
+                    int idx1 = glyphIdx * 6 + 0;
+                    int idx2 = glyphIdx * 6 + 1;
+                    int idx3 = glyphIdx * 6 + 2;
+                    int idx4 = glyphIdx * 6 + 3;
                     int idx5 = glyphIdx * 6 + 4;
                     int idx6 = glyphIdx * 6 + 5;
 
@@ -170,8 +162,8 @@ public override void ModifyMesh(VertexHelper vh)
                     float charWidth = (vert2.position - vert1.position).x;
                     var smallChar = UseHalfCharWidth && (charWidth < HalfCharWidth);
 
-                    var smallCharOffset = smallChar ? -letterOffset/4 : 0;
-                    
+                    var smallCharOffset = smallChar ? -letterOffset / 4 : 0;
+
                     vert1.position += new Vector3(-vert1.position.x + offsetX + -.5f * charWidth + smallCharOffset, 0, 0);
                     vert2.position += new Vector3(-vert2.position.x + offsetX + .5f * charWidth + smallCharOffset, 0, 0);
                     vert3.position += new Vector3(-vert3.position.x + offsetX + .5f * charWidth + smallCharOffset, 0, 0);
@@ -185,21 +177,20 @@ public override void ModifyMesh(VertexHelper vh)
                         offsetX += letterOffset;
 
                     verts[idx1] = vert1;
-					verts[idx2] = vert2;
-					verts[idx3] = vert3;
-					verts[idx4] = vert4;
+                    verts[idx2] = vert2;
+                    verts[idx3] = vert3;
+                    verts[idx4] = vert4;
                     verts[idx5] = vert5;
                     verts[idx6] = vert6;
 
                     glyphIdx++;
-				}
-				
-				// Offset for carriage return character that still generates verts
-				glyphIdx++;
-			}
+                }
+
+                // Offset for carriage return character that still generates verts
+                glyphIdx++;
+            }
             vh.Clear();
             vh.AddUIVertexTriangleStream(verts);
         }
-	}
-#endif
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/NicerOutline.cs b/Runtime/Scripts/Effects/NicerOutline.cs
index 8c0d1c81..3415dd24 100644
--- a/Runtime/Scripts/Effects/NicerOutline.cs
+++ b/Runtime/Scripts/Effects/NicerOutline.cs
@@ -1,9 +1,5 @@
 
-#if !UNITY_2022_1_OR_NEWER
 using System.Collections.Generic;
-#endif
-
-using System;
 
 /// Credit Melang, Lee Hui
 /// Sourced from - http://forum.unity3d.com/members/melang.593409/
@@ -11,29 +7,20 @@
 /// NOT supported in Unity 2022
 namespace UnityEngine.UI.Extensions
 {
-#if UNITY_2022_1_OR_NEWER
-	[Obsolete("BestFitOutline is not supported in Unity 2022.1 or newer. Use TMPro instead.")]
-	public class NicerOutline : BaseMeshEffect
-	{
-        public override void ModifyMesh(VertexHelper vh)
-        {
-        }
-    }
-#else
-    //An outline that looks a bit nicer than the default one. It has less "holes" in the outline by drawing more copies of the effect
-    [AddComponentMenu("UI/Effects/Extensions/Nicer Outline")]
+	//An outline that looks a bit nicer than the default one. It has less "holes" in the outline by drawing more copies of the effect
+	[AddComponentMenu("UI/Effects/Extensions/Nicer Outline")]
 	public class NicerOutline : BaseMeshEffect
 	{
 		[SerializeField]
-		private Color m_EffectColor = new Color (0f, 0f, 0f, 0.5f);
+		private Color m_EffectColor = new Color(0f, 0f, 0f, 0.5f);
 
 		[SerializeField]
-		private Vector2 m_EffectDistance = new Vector2 (1f, -1f);
+		private Vector2 m_EffectDistance = new Vector2(1f, -1f);
 
 		[SerializeField]
 		private bool m_UseGraphicAlpha = true;
 
-		private List < UIVertex > m_Verts = new List<UIVertex>();
+		private List<UIVertex> m_Verts = new List<UIVertex>();
 
 		//
 		// Properties
@@ -49,7 +36,7 @@ public Color effectColor
 				this.m_EffectColor = value;
 				if (base.graphic != null)
 				{
-					base.graphic.SetVerticesDirty ();
+					base.graphic.SetVerticesDirty();
 				}
 			}
 		}
@@ -85,7 +72,7 @@ public Vector2 effectDistance
 				this.m_EffectDistance = value;
 				if (base.graphic != null)
 				{
-					base.graphic.SetVerticesDirty ();
+					base.graphic.SetVerticesDirty();
 				}
 			}
 		}
@@ -101,28 +88,28 @@ public bool useGraphicAlpha
 				this.m_UseGraphicAlpha = value;
 				if (base.graphic != null)
 				{
-					base.graphic.SetVerticesDirty ();
+					base.graphic.SetVerticesDirty();
 				}
 			}
 		}
-		
-        public override void ModifyMesh(VertexHelper vh)
-        {
-            if (!this.IsActive ())
+
+		public override void ModifyMesh(VertexHelper vh)
+		{
+			if (!this.IsActive())
 			{
 				return;
 			}
 
-	        m_Verts.Clear();
-            vh.GetUIVertexStream(m_Verts);
+			m_Verts.Clear();
+			vh.GetUIVertexStream(m_Verts);
 
-            Text foundtext = GetComponent<Text>();
+			Text foundtext = GetComponent<Text>();
 
 			float best_fit_adjustment = 1f;
 
 			if (foundtext && foundtext.resizeTextForBestFit)
 			{
-				best_fit_adjustment = (float)foundtext.cachedTextGenerator.fontSizeUsedForBestFit / (foundtext.resizeTextMaxSize-1); //max size seems to be exclusive
+				best_fit_adjustment = (float)foundtext.cachedTextGenerator.fontSizeUsedForBestFit / (foundtext.resizeTextMaxSize - 1); //max size seems to be exclusive
 
 			}
 
@@ -145,8 +132,8 @@ public override void ModifyMesh(VertexHelper vh)
 
 			// Apply self Text stuff
 			start += ApplyText(m_Verts, vh, start);
-        }
-        
+		}
+
 		private int ApplyOutlineNoGC(List<UIVertex> verts, Color32 color, float x, float y, VertexHelper vh, int startIndex)
 		{
 			int length = verts.Count;
@@ -165,12 +152,12 @@ private int ApplyOutlineNoGC(List<UIVertex> verts, Color32 color, float x, float
 
 				// Tips: Since two triangles share same two vertices, in theory vertices can reduce to 4 / 6
 				// But VertexHelper.FillMesh forbid, so leave it be.
-				
+
 				vh.AddVert(vt);
 			}
 
 			int triangleCount = length / 3;
-			for(int i=0; i<triangleCount; ++i)
+			for (int i = 0; i < triangleCount; ++i)
 			{
 				int start = startIndex + 3 * i;
 				vh.AddTriangle(start + 0, start + 1, start + 2);
@@ -178,7 +165,7 @@ private int ApplyOutlineNoGC(List<UIVertex> verts, Color32 color, float x, float
 
 			return length;
 		}
-		
+
 		private int ApplyText(List<UIVertex> verts, VertexHelper vh, int startIndex)
 		{
 			int length = verts.Count;
@@ -200,12 +187,11 @@ private int ApplyText(List<UIVertex> verts, VertexHelper vh, int startIndex)
 
 
 #if UNITY_EDITOR
-		protected override void OnValidate ()
+		protected override void OnValidate()
 		{
 			this.effectDistance = this.m_EffectDistance;
-			base.OnValidate ();
+			base.OnValidate();
 		}
 #endif
 	}
-#endif
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/SoftMaskScript.cs b/Runtime/Scripts/Effects/SoftMaskScript.cs
index 2fd650e6..fbd86476 100644
--- a/Runtime/Scripts/Effects/SoftMaskScript.cs
+++ b/Runtime/Scripts/Effects/SoftMaskScript.cs
@@ -47,11 +47,7 @@ void Start()
                 MaskArea = GetComponent<RectTransform>();
             }
 
-#if UNITY_2022_1_OR_NEWER
             var text = GetComponent<TMPro.TMP_Text>();
-#else
-            var text = GetComponent<Text>();
-#endif
             if (text != null)
             {
                 mat = new Material(ShaderLibrary.GetShaderInstance("UI Extensions/SoftMaskShader"));
diff --git a/Runtime/Scripts/Effects/UIParticleSystem.cs b/Runtime/Scripts/Effects/UIParticleSystem.cs
index a004b7b4..300d0e40 100644
--- a/Runtime/Scripts/Effects/UIParticleSystem.cs
+++ b/Runtime/Scripts/Effects/UIParticleSystem.cs
@@ -18,7 +18,7 @@ public class UIParticleSystem : MaskableGraphic
 
         [Tooltip("Enables using Renderer.lengthScale parameter")]
         public bool _useLengthScale = false;
-        
+
         private Transform _transform;
         private ParticleSystem pSystem;
         private ParticleSystem.Particle[] particles;
@@ -94,7 +94,7 @@ protected bool Initialize()
                 pRenderer = pSystem.GetComponent<ParticleSystemRenderer>();
                 if (pRenderer != null)
                     pRenderer.enabled = false;
-                
+
                 if (material == null)
                 {
                     var foundShader = ShaderLibrary.GetShaderInstance("UI Extensions/Particles/Additive");
@@ -235,11 +235,7 @@ protected override void OnPopulateMesh(VertexHelper vh)
                             frame = Mathf.FloorToInt(frameProgress * textureSheetAnimation.numTilesX);
 
                             int row = textureSheetAnimation.rowIndex;
-#if UNITY_2019_1_OR_NEWER
                             if (textureSheetAnimation.rowMode == ParticleSystemAnimationRowMode.Random)
-#else
-                            if (textureSheetAnimation.useRandomRow)
-#endif
                             { // FIXME - is this handled internally by rowIndex?
                                 row = Mathf.Abs((int)particle.randomSeed % textureSheetAnimation.numTilesY);
                             }
@@ -281,7 +277,7 @@ protected override void OnPopulateMesh(VertexHelper vh)
                 _quad[3].color = color;
                 _quad[3].uv0 = temp;
 
-                
+
                 float rotation = -particle.rotation * Mathf.Deg2Rad;
                 var lengthScale = pRenderer.lengthScale;
                 if (_useLengthScale)
@@ -294,7 +290,7 @@ protected override void OnPopulateMesh(VertexHelper vh)
                 {
                     lengthScale = 1f;
                 }
-                
+
                 float rotation90 = rotation + Mathf.PI / 2;
 
                 if (rotation == 0)
diff --git a/Runtime/Scripts/Layout/UIHorizontalScroller.cs b/Runtime/Scripts/Layout/UIHorizontalScroller.cs
index ed79ade5..1c1bfdd4 100644
--- a/Runtime/Scripts/Layout/UIHorizontalScroller.cs
+++ b/Runtime/Scripts/Layout/UIHorizontalScroller.cs
@@ -158,7 +158,7 @@ public void UpdateChildren(int startingIndex = -1, GameObject[] arrayOfElements
 
                 RectTransform r = this.arrayOfElements[i].GetComponent<RectTransform>();
                 r.anchorMax = r.anchorMin = r.pivot = new Vector2(0.5f, 0.5f);
-                r.localPosition = new Vector2(i * elementSize.rect.size.x,0);
+                r.localPosition = new Vector2(i * elementSize.rect.size.x, 0);
                 r.sizeDelta = elementSize.rect.size;
             }
 
@@ -209,19 +209,11 @@ public void Update()
                 if (minDistance == distance[i])
                 {
                     FocusedElementIndex = i;
-#if UNITY_2022_1_OR_NEWER
                     var textComponentTxtMeshPro = arrayOfElements[i].GetComponentInChildren<TMPro.TMP_Text>();
                     if (textComponentTxtMeshPro != null)
                     {
                         Result = textComponentTxtMeshPro.text;
                     }
-#else
-                    var textComponent = arrayOfElements[i].GetComponentInChildren<Text>();
-                    if (textComponent != null)
-                    {
-                        Result = textComponent.text;
-                    }
-#endif
                 }
             }
 
diff --git a/Runtime/Scripts/Layout/UIVerticalScroller.cs b/Runtime/Scripts/Layout/UIVerticalScroller.cs
index 167a8302..b9027915 100644
--- a/Runtime/Scripts/Layout/UIVerticalScroller.cs
+++ b/Runtime/Scripts/Layout/UIVerticalScroller.cs
@@ -72,7 +72,7 @@ public class UIVerticalScroller : MonoBehaviour
         public string Result { get; private set; }
 
         //Scrollable area (content of desired ScrollRect)
-        public RectTransform ScrollingPanel{ get { return scrollRect.content; } }
+        public RectTransform ScrollingPanel { get { return scrollRect.content; } }
 
         /// <summary>
         /// Constructor when not used as component but called from other script
@@ -212,19 +212,11 @@ public void Update()
                 if (minDistance == distance[i])
                 {
                     FocusedElementIndex = i;
-#if UNITY_2022_1_OR_NEWER
                     var textComponentTxtMeshPro = arrayOfElements[i].GetComponentInChildren<TMPro.TMP_Text>();
                     if (textComponentTxtMeshPro != null)
                     {
                         Result = textComponentTxtMeshPro.text;
                     }
-#else
-                    var textComponent = arrayOfElements[i].GetComponentInChildren<Text>();
-                    if (textComponent != null)
-                    {
-                        Result = textComponent.text;
-                    }
-#endif
                 }
             }
 
diff --git a/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs b/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs
index 409e7e0d..4f463da4 100644
--- a/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs
+++ b/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs
@@ -20,7 +20,7 @@ public bool IsActive
         void Awake()
         {
             instance = this;
-            if(!TooltipText) TooltipText = GetComponentInChildren<Text>();
+            if (!TooltipText) TooltipText = GetComponentInChildren<Text>();
             HideTooltip();
         }
 
@@ -47,11 +47,7 @@ public static BoundTooltipItem Instance
             {
                 if (instance == null)
                 {
-#if UNITY_2023_1_OR_NEWER
                     instance = GameObject.FindFirstObjectByType<BoundTooltipItem>();
-#else
-                    instance = GameObject.FindObjectOfType<BoundTooltipItem>();
-#endif
                 }
                 return instance;
             }
@@ -59,4 +55,4 @@ public static BoundTooltipItem Instance
     }
 }
 
- 
+
diff --git a/Runtime/Scripts/ToolTips/HoverTooltip.cs b/Runtime/Scripts/ToolTips/HoverTooltip.cs
index b1540725..c18c38e9 100644
--- a/Runtime/Scripts/ToolTips/HoverTooltip.cs
+++ b/Runtime/Scripts/ToolTips/HoverTooltip.cs
@@ -11,11 +11,7 @@ public class HoverTooltip : MonoBehaviour
         public int verticalPadding;
 
         //tooltip text
-#if UNITY_2022_1_OR_NEWER
         public TMPro.TMP_Text thisText;
-#else
-        public Text thisText;
-#endif
 
         //horizontal layout of the tooltip
         public HorizontalLayoutGroup hlG;
diff --git a/Runtime/Scripts/ToolTips/ToolTip.cs b/Runtime/Scripts/ToolTips/ToolTip.cs
index 87355dea..352bde1b 100644
--- a/Runtime/Scripts/ToolTips/ToolTip.cs
+++ b/Runtime/Scripts/ToolTips/ToolTip.cs
@@ -27,11 +27,8 @@ namespace UnityEngine.UI.Extensions
     public class ToolTip : MonoBehaviour
     {
         //text of the tooltip
-#if UNITY_2022_1_OR_NEWER
         private TMPro.TMP_Text _text;
-#else
-        private Text _text;
-#endif
+
         private RectTransform _rectTransform, canvasRectTransform;
 
         [Tooltip("The canvas used by the tooltip as positioning and scaling reference. Should usually be the root Canvas of the hierarchy this component is in")]
@@ -51,7 +48,7 @@ public class ToolTip : MonoBehaviour
 
         private float width, height;//, canvasWidth, canvasHeight;
 
-        public float YShift,xShift;
+        public float YShift, xShift;
 
         [HideInInspector]
         public RenderMode guiMode;
@@ -62,7 +59,8 @@ public Camera GuiCamera
         {
             get
             {
-                if (!_guiCamera) {
+                if (!_guiCamera)
+                {
                     _guiCamera = Camera.main;
                 }
 
@@ -86,25 +84,22 @@ public Camera GuiCamera
 
         // Standard Singleton Access
         private static ToolTip instance;
-        
+
         public static ToolTip Instance
         {
             get
             {
                 if (instance == null)
                 {
-#if UNITY_2023_1_OR_NEWER
                     instance = FindFirstObjectByType<ToolTip>();
-#else
-                    instance = FindObjectOfType<ToolTip>();
-#endif
                 }
                 return instance;
             }
         }
 
-        
-        void Reset() {
+
+        void Reset()
+        {
             canvas = GetComponentInParent<Canvas>();
             canvas = canvas.rootCanvas;
         }
@@ -113,7 +108,8 @@ void Reset() {
         public void Awake()
         {
             instance = this;
-            if (!canvas) {
+            if (!canvas)
+            {
                 canvas = GetComponentInParent<Canvas>();
                 canvas = canvas.rootCanvas;
             }
@@ -124,11 +120,7 @@ public void Awake()
             canvasRectTransform = canvas.GetComponent<RectTransform>();
             _layoutGroup = GetComponentInChildren<LayoutGroup>();
 
-#if UNITY_2022_1_OR_NEWER
             _text = GetComponentInChildren<TMPro.TMP_Text>();
-#else
-            _text = GetComponentInChildren<Text>();
-#endif
 
             _inside = false;
 
@@ -147,10 +139,12 @@ public void SetTooltip(string ttext, Vector3 basePos, bool refreshCanvasesBefore
             baseTooltipPos = basePos;
 
             //set the text
-            if (_text) {
+            if (_text)
+            {
                 _text.text = ttext;
             }
-            else {
+            else
+            {
                 Debug.LogWarning("[ToolTip] Couldn't set tooltip text, tooltip has no child Text component");
             }
 
@@ -179,25 +173,30 @@ void Update()
         /// Can prevent the tooltip from being visibly misplaced for one frame when being resized.
         /// Only runs if tooltipTriggersCanForceCanvasUpdate is true
         /// </summary>
-        public void RefreshTooltipSize() {
-            if (tooltipTriggersCanForceCanvasUpdate) {
+        public void RefreshTooltipSize()
+        {
+            if (tooltipTriggersCanForceCanvasUpdate)
+            {
                 Canvas.ForceUpdateCanvases();
 
-                if (_layoutGroup) {
+                if (_layoutGroup)
+                {
                     _layoutGroup.enabled = false;
                     _layoutGroup.enabled = true;
                 }
-                
+
             }
-            
+
         }
 
         /// <summary>
         /// Runs the appropriate tooltip placement method, according to the parent canvas's render mode
         /// </summary>
         /// <param name="refreshCanvasesBeforeGettingSize"></param>
-        public void ContextualTooltipUpdate(bool refreshCanvasesBeforeGettingSize = false) {
-            switch (guiMode) {
+        public void ContextualTooltipUpdate(bool refreshCanvasesBeforeGettingSize = false)
+        {
+            switch (guiMode)
+            {
                 case RenderMode.ScreenSpaceCamera:
                     OnScreenSpaceCamera(refreshCanvasesBeforeGettingSize);
                     break;
@@ -251,7 +250,8 @@ public void OnScreenSpaceCamera(bool refreshCanvasesBeforeGettingSize = false)
 
             //check for lower edge of the screen
             borderTest = (adjustedNewTTPos.y - height / 2);
-            if (borderTest < screenLowerLeft.y) {
+            if (borderTest < screenLowerLeft.y)
+            {
                 shifterForBorders.y = screenLowerLeft.y - borderTest;
                 adjustedNewTTPos.y += shifterForBorders.y;
             }
@@ -277,7 +277,8 @@ public void OnScreenSpaceCamera(bool refreshCanvasesBeforeGettingSize = false)
 
 
         //main tooltip edge of screen guard and movement - overlay
-        public void OnScreenSpaceOverlay(bool refreshCanvasesBeforeGettingSize = false) {
+        public void OnScreenSpaceOverlay(bool refreshCanvasesBeforeGettingSize = false)
+        {
             shiftingVector.x = xShift;
             shiftingVector.y = YShift;
             newTTPos = (baseTooltipPos - shiftingVector) / canvas.scaleFactor;
@@ -297,13 +298,15 @@ public void OnScreenSpaceOverlay(bool refreshCanvasesBeforeGettingSize = false)
 
             //check for right edge of screen
             borderTest = (newTTPos.x + width / 2);
-            if (borderTest > screenUpperRight.x) {
+            if (borderTest > screenUpperRight.x)
+            {
                 shifterForBorders.x = borderTest - screenUpperRight.x;
                 adjustedNewTTPos.x -= shifterForBorders.x;
             }
             //check for left edge of screen
             borderTest = (adjustedNewTTPos.x - width / 2);
-            if (borderTest < screenLowerLeft.x) {
+            if (borderTest < screenLowerLeft.x)
+            {
                 shifterForBorders.x = screenLowerLeft.x - borderTest;
                 adjustedNewTTPos.x += shifterForBorders.x;
             }
@@ -312,14 +315,16 @@ public void OnScreenSpaceOverlay(bool refreshCanvasesBeforeGettingSize = false)
 
             //check for lower edge of the screen
             borderTest = (adjustedNewTTPos.y - height / 2);
-            if (borderTest < screenLowerLeft.y) {
+            if (borderTest < screenLowerLeft.y)
+            {
                 shifterForBorders.y = screenLowerLeft.y - borderTest;
                 adjustedNewTTPos.y += shifterForBorders.y;
             }
 
             //check for upper edge of the screen
             borderTest = (adjustedNewTTPos.y + height / 2);
-            if (borderTest > screenUpperRight.y) {
+            if (borderTest > screenUpperRight.y)
+            {
                 shifterForBorders.y = borderTest - screenUpperRight.y;
                 adjustedNewTTPos.y -= shifterForBorders.y;
             }
diff --git a/Runtime/Scripts/Utilities/ExtensionsToggle.cs b/Runtime/Scripts/Utilities/ExtensionsToggle.cs
index 70653da0..8b3ee255 100644
--- a/Runtime/Scripts/Utilities/ExtensionsToggle.cs
+++ b/Runtime/Scripts/Utilities/ExtensionsToggle.cs
@@ -89,12 +89,7 @@ protected override void OnValidate()
             base.OnValidate();
             Set(m_IsOn, false);
             PlayEffect(toggleTransition == ToggleTransition.None);
-#if UNITY_2018_3_OR_NEWER
             if (!Application.isPlaying)
-#else
-            var prefabType = UnityEditor.PrefabUtility.GetPrefabType(this);
-            if (prefabType != UnityEditor.PrefabType.Prefab && !Application.isPlaying)
-#endif
             {
                 CanvasUpdateRegistry.RegisterCanvasElementForLayoutRebuild(this);
             }
diff --git a/Runtime/Scripts/Utilities/PPIViewer.cs b/Runtime/Scripts/Utilities/PPIViewer.cs
index e0880020..1fa6be51 100644
--- a/Runtime/Scripts/Utilities/PPIViewer.cs
+++ b/Runtime/Scripts/Utilities/PPIViewer.cs
@@ -6,27 +6,15 @@ Simply place the script on A Text control in the scene to display the current PP
 
 namespace UnityEngine.UI.Extensions
 {
-#if UNITY_2022_1_OR_NEWER
     [RequireComponent(typeof(TMPro.TMP_Text))]
-#else
-    [RequireComponent(typeof(Text))]
-#endif
     [AddComponentMenu("UI/Extensions/PPIViewer")]
     public class PPIViewer : MonoBehaviour
     {
-#if UNITY_2022_1_OR_NEWER
         private TMPro.TMP_Text label;
-#else
-        private Text label;
-#endif
 
         void Awake()
         {
-#if UNITY_2022_1_OR_NEWER
             label = GetComponentInChildren<TMPro.TMP_Text>();
-#else
-            label = GetComponentInChildren<Text>();
-#endif
         }
 
         void Start()
diff --git a/Runtime/Scripts/Utilities/UIExtensionsInputManager.cs b/Runtime/Scripts/Utilities/UIExtensionsInputManager.cs
index b82e292d..64a364c6 100644
--- a/Runtime/Scripts/Utilities/UIExtensionsInputManager.cs
+++ b/Runtime/Scripts/Utilities/UIExtensionsInputManager.cs
@@ -1,7 +1,7 @@
 /// Credit SimonDarksideJ
 /// Sourced from: https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/348/menu-manager-does-not-work-with-the-new
 
-#if UNITY_2019_1_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER
+#if !ENABLE_LEGACY_INPUT_MANAGER
 #define NEW_INPUT_SYSTEM
 #endif
 

From 74121886604aef2793148c05b6a67f44411eb3c3 Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 11:22:23 +0000
Subject: [PATCH 04/11] Update package definition for Unity 6 focus

---
 package.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ae04d038..85c3ca3b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.unity.uiextensions",
   "displayName": "Unity UI Extensions",
-  "version": "2.3.3-pre.1",
+  "version": "3.0.0-pre.1",
   "description": "An extension project for the Unity3D UI system, all crafted and contributed by the awesome Unity community",
   "author": "Simon darkside Jackson <@SimonDarksideJ>",
   "contributors": [
@@ -10,7 +10,7 @@
       "twitter": "@SimonDarksideJ"
     }
   ],
-  "unity": "2020.3",
+  "unity": "6000.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Unity-UI-Extensions/com.unity.uiextensions.git"
@@ -31,5 +31,8 @@
       "path": "Examples~"
     }
   ],
-  "license": "BSD3"
+  "license": "BSD3",
+  "dependencies": {
+    "com.unity.ugui": "2.0.0"
+  }
 }

From 70af1286c60b68c64522b577c70c3b88c2e6015b Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 11:22:37 +0000
Subject: [PATCH 05/11] Update examples checkout

---
 Examples~ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples~ b/Examples~
index befd8e9b..22934972 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit befd8e9b06224fbb2c225eacf52095070be40b37
+Subproject commit 22934972c3f8ab9d11c2fe609ba6cfa673b6613d

From e665951e421cd8cb8e7715d476585bfa985672ea Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 12:09:55 +0000
Subject: [PATCH 06/11] Updated Picker control and samples to latest

---
 Examples~                                     |  2 +-
 .../Controls/ColorPicker/ColorImage.cs        | 34 +++++++++----------
 .../Controls/ColorPicker/ColorLabel.cs        |  3 +-
 .../Controls/ColorPicker/ColorSampler.cs      |  6 ++--
 .../Controls/ColorPicker/HexColorField.cs     | 12 +++----
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/Examples~ b/Examples~
index 22934972..b2b49e11 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit 22934972c3f8ab9d11c2fe609ba6cfa673b6613d
+Subproject commit b2b49e11fff740ec37a5f1d0cd4e8455ac06f8f2
diff --git a/Runtime/Scripts/Controls/ColorPicker/ColorImage.cs b/Runtime/Scripts/Controls/ColorPicker/ColorImage.cs
index 99bd786d..138c02cf 100644
--- a/Runtime/Scripts/Controls/ColorPicker/ColorImage.cs
+++ b/Runtime/Scripts/Controls/ColorPicker/ColorImage.cs
@@ -5,26 +5,26 @@
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
     [RequireComponent(typeof(Image))]
-public class ColorImage : MonoBehaviour
-{
-    public ColorPickerControl picker;
+    public class ColorImage : MonoBehaviour
+    {
+        public ColorPickerControl picker;
 
-    private Image image;
+        private Image image;
 
-    private void Awake()
-    {
-        image = GetComponent<Image>();
-        picker.onValueChanged.AddListener(ColorChanged);
-    }
+        private void Awake()
+        {
+            image = GetComponent<Image>();
+            picker.onValueChanged.AddListener(ColorChanged);
+        }
 
-    private void OnDestroy()
-    {
-        picker.onValueChanged.RemoveListener(ColorChanged);
-    }
+        private void OnDestroy()
+        {
+            picker.onValueChanged.RemoveListener(ColorChanged);
+        }
 
-    private void ColorChanged(Color newColor)
-    {
-        image.color = newColor;
+        private void ColorChanged(Color newColor)
+        {
+            image.color = newColor;
+        }
     }
-}
 }
\ No newline at end of file
diff --git a/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs b/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs
index 919194be..20411a76 100644
--- a/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs
+++ b/Runtime/Scripts/Controls/ColorPicker/ColorLabel.cs
@@ -4,7 +4,6 @@
 
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
-
     [RequireComponent(typeof(TMPro.TMP_Text))]
     public class ColorLabel : MonoBehaviour
     {
@@ -51,7 +50,7 @@ private void ColorChanged(Color color)
             UpdateValue();
         }
 
-        private void HSVChanged(float hue, float sateration, float value)
+        private void HSVChanged(float hue, float saturation, float value)
         {
             UpdateValue();
         }
diff --git a/Runtime/Scripts/Controls/ColorPicker/ColorSampler.cs b/Runtime/Scripts/Controls/ColorPicker/ColorSampler.cs
index 2aeb1d64..24c6c439 100644
--- a/Runtime/Scripts/Controls/ColorPicker/ColorSampler.cs
+++ b/Runtime/Scripts/Controls/ColorPicker/ColorSampler.cs
@@ -27,7 +27,7 @@ public class ColorSampler : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
 
 		protected Texture2D screenCapture;
 
-		public ColorChangedEvent oncolorSelected = new ColorChangedEvent();
+		public ColorChangedEvent onColorSelected = new ColorChangedEvent();
 
 		protected Color color;
 
@@ -71,8 +71,8 @@ protected virtual void HandleSamplerColoring()
 
 		protected virtual void SelectColor()
 		{
-			if (oncolorSelected != null)
-				oncolorSelected.Invoke(color);
+			if (onColorSelected != null)
+				onColorSelected.Invoke(color);
 
 			enabled = false;
 		}
diff --git a/Runtime/Scripts/Controls/ColorPicker/HexColorField.cs b/Runtime/Scripts/Controls/ColorPicker/HexColorField.cs
index e21df396..a36ce50f 100644
--- a/Runtime/Scripts/Controls/ColorPicker/HexColorField.cs
+++ b/Runtime/Scripts/Controls/ColorPicker/HexColorField.cs
@@ -5,24 +5,23 @@
 
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
-
-    [RequireComponent(typeof(InputField))]
+    [RequireComponent(typeof(TMPro.TMP_InputField))]
     public class HexColorField : MonoBehaviour
     {
         public ColorPickerControl ColorPicker;
 
         public bool displayAlpha;
 
-        private InputField hexInputField;
+        private TMPro.TMP_InputField hexInputField;
 
         private const string hexRegex = "^#?(?:[0-9a-fA-F]{3,4}){1,2}$";
 
         private void Awake()
         {
-            hexInputField = GetComponent<InputField>();
+            hexInputField = GetComponent<TMPro.TMP_InputField>();
 
             // Add listeners to keep text (and color) up to date
-            hexInputField.onEndEdit.AddListener(UpdateColor);
+            hexInputField.onValueChanged.AddListener(UpdateColor);
             ColorPicker.onValueChanged.AddListener(UpdateHex);
         }
 
@@ -39,8 +38,7 @@ private void UpdateHex(Color newColor)
 
         private void UpdateColor(string newHex)
         {
-            Color32 color;
-            if (HexToColor(newHex, out color))
+            if (HexToColor(newHex, out Color32 color))
                 ColorPicker.CurrentColor = color;
             else
                 Debug.Log("hex value is in the wrong format, valid formats are: #RGB, #RGBA, #RRGGBB and #RRGGBBAA (# is optional)");

From 7da6948ee9986608afa4ce7c1da6fc19a8344b63 Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 13:00:03 +0000
Subject: [PATCH 07/11] Update UIVertical Scroller to be more efficient for U6
 and update example

---
 Examples~                                    |  2 +-
 Runtime/Scripts/Layout/UIVerticalScroller.cs | 50 +++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Examples~ b/Examples~
index b2b49e11..2cd1ad8a 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit b2b49e11fff740ec37a5f1d0cd4e8455ac06f8f2
+Subproject commit 2cd1ad8acd3a3da836b5728a52880491c0e1e34e
diff --git a/Runtime/Scripts/Layout/UIVerticalScroller.cs b/Runtime/Scripts/Layout/UIVerticalScroller.cs
index b9027915..030363c4 100644
--- a/Runtime/Scripts/Layout/UIVerticalScroller.cs
+++ b/Runtime/Scripts/Layout/UIVerticalScroller.cs
@@ -68,6 +68,9 @@ public class UIVerticalScroller : MonoBehaviour
         public int FocusedElementIndex { get; private set; }
 
         public RectTransform Center { get => center; set => center = value; }
+        public RectTransform ElementSize { get => elementSize; set => elementSize = value; }
+        public ScrollRect ScrollRectComponent { get => scrollRect; set => scrollRect = value; }
+        public GameObject[] ArrayOfElements { get => arrayOfElements; set => arrayOfElements = value; }
 
         public string Result { get; private set; }
 
@@ -94,29 +97,6 @@ public void Awake()
             {
                 scrollRect = GetComponent<ScrollRect>();
             }
-
-            if (!center)
-            {
-                Debug.LogError("Please define the RectTransform for the Center viewport of the scrollable area");
-            }
-
-            if (!elementSize)
-            {
-                elementSize = center;
-            }
-
-            if (arrayOfElements == null || arrayOfElements.Length == 0)
-            {
-                var childCount = ScrollingPanel.childCount;
-                if (childCount > 0)
-                {
-                    arrayOfElements = new GameObject[childCount];
-                    for (int i = 0; i < childCount; i++)
-                    {
-                        arrayOfElements[i] = ScrollingPanel.GetChild(i).gameObject;
-                    }
-                }
-            }
         }
 
         /// <summary>
@@ -172,6 +152,30 @@ private void AddListener(GameObject button, int index)
 
         public void Start()
         {
+            if (!center)
+            {
+                Debug.LogError("Please define the RectTransform for the Center viewport of the scrollable area");
+                return;
+            }
+
+            if (!elementSize)
+            {
+                elementSize = center;
+            }
+
+            if (arrayOfElements == null || arrayOfElements.Length == 0)
+            {
+                var childCount = ScrollingPanel.childCount;
+                if (childCount > 0)
+                {
+                    arrayOfElements = new GameObject[childCount];
+                    for (int i = 0; i < childCount; i++)
+                    {
+                        arrayOfElements[i] = ScrollingPanel.GetChild(i).gameObject;
+                    }
+                }
+            }
+
             if (scrollUpButton)
             {
                 scrollUpButton.GetComponent<Button>().onClick.AddListener(() => ScrollUp());

From 4db311fa09b9fbf1064b491b0abdad149d6d8948 Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 13:43:10 +0000
Subject: [PATCH 08/11] Clear out old text controls, no longer valid. Update
 combobox scripts

---
 Examples~                                     |   2 +-
 .../Controls/ComboBox/AutoCompleteComboBox.cs |   6 +-
 Runtime/Scripts/Controls/ComboBox/ComboBox.cs |   6 +-
 Runtime/Scripts/Effects/BestFitOutline.cs     |  65 ------
 .../Scripts/Effects/BestFitOutline.cs.meta    |   8 -
 Runtime/Scripts/Effects/CurvedText.cs         |  83 --------
 Runtime/Scripts/Effects/CurvedText.cs.meta    |   8 -
 Runtime/Scripts/Effects/CylinderText.cs       |  57 -----
 Runtime/Scripts/Effects/CylinderText.cs.meta  |   8 -
 Runtime/Scripts/Effects/LetterSpacing.cs      | 178 ----------------
 Runtime/Scripts/Effects/LetterSpacing.cs.meta |   8 -
 Runtime/Scripts/Effects/MonoSpacing.cs        | 196 -----------------
 Runtime/Scripts/Effects/MonoSpacing.cs.meta   |  12 --
 Runtime/Scripts/Effects/NicerOutline.cs       | 197 ------------------
 Runtime/Scripts/Effects/NicerOutline.cs.meta  |   8 -
 Runtime/Scripts/Layout/FlowLayoutGroup.cs     |   7 +-
 .../ToolTips/BoundTooltip/BoundTooltipItem.cs |   4 +-
 Runtime/Scripts/ToolTips/ToolTip.cs           |   2 +-
 .../Utilities/UI_ScrollRectOcclusion.cs       |   4 +-
 19 files changed, 15 insertions(+), 844 deletions(-)
 delete mode 100644 Runtime/Scripts/Effects/BestFitOutline.cs
 delete mode 100644 Runtime/Scripts/Effects/BestFitOutline.cs.meta
 delete mode 100644 Runtime/Scripts/Effects/CurvedText.cs
 delete mode 100644 Runtime/Scripts/Effects/CurvedText.cs.meta
 delete mode 100644 Runtime/Scripts/Effects/CylinderText.cs
 delete mode 100644 Runtime/Scripts/Effects/CylinderText.cs.meta
 delete mode 100644 Runtime/Scripts/Effects/LetterSpacing.cs
 delete mode 100644 Runtime/Scripts/Effects/LetterSpacing.cs.meta
 delete mode 100644 Runtime/Scripts/Effects/MonoSpacing.cs
 delete mode 100644 Runtime/Scripts/Effects/MonoSpacing.cs.meta
 delete mode 100644 Runtime/Scripts/Effects/NicerOutline.cs
 delete mode 100644 Runtime/Scripts/Effects/NicerOutline.cs.meta

diff --git a/Examples~ b/Examples~
index 2cd1ad8a..00803ad8 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit 2cd1ad8acd3a3da836b5728a52880491c0e1e34e
+Subproject commit 00803ad821af6147f54c763db0496bbd7d91fe05
diff --git a/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs b/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
index 39f9eca0..f363a2e9 100644
--- a/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
+++ b/Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
@@ -29,7 +29,7 @@ public class AutoCompleteComboBox : MonoBehaviour
         private bool _isPanelActive = false;
         private bool _hasDrawnOnce = false;
 
-        private InputField _mainInput;
+        private TMPro.TMP_InputField _mainInput;
         private RectTransform _inputRT;
 
         private RectTransform _rectTransform;
@@ -171,8 +171,8 @@ private bool Initialize()
             try
             {
                 _rectTransform = GetComponent<RectTransform>();
-                _inputRT = _rectTransform.Find("InputField").GetComponent<RectTransform>();
-                _mainInput = _inputRT.GetComponent<InputField>();
+                _mainInput = GetComponentInChildren<TMPro.TMP_InputField>();
+                _inputRT = _mainInput.GetComponent<RectTransform>();
 
                 _overlayRT = _rectTransform.Find("Overlay").GetComponent<RectTransform>();
                 _overlayRT.gameObject.SetActive(false);
diff --git a/Runtime/Scripts/Controls/ComboBox/ComboBox.cs b/Runtime/Scripts/Controls/ComboBox/ComboBox.cs
index 0302d8d8..719520a5 100644
--- a/Runtime/Scripts/Controls/ComboBox/ComboBox.cs
+++ b/Runtime/Scripts/Controls/ComboBox/ComboBox.cs
@@ -54,7 +54,7 @@ public class ControlDisabledEvent : Events.UnityEvent<bool> { }
         //private bool isInitialized = false;
         private bool _isPanelActive = false;
         private bool _hasDrawnOnce = false;
-        private InputField _mainInput;
+        private TMPro.TMP_InputField _mainInput;
         private RectTransform _inputRT;
         private RectTransform _rectTransform;
         private RectTransform _overlayRT;
@@ -115,8 +115,8 @@ private bool Initialize()
             try
             {
                 _rectTransform = GetComponent<RectTransform>();
-                _inputRT = _rectTransform.Find("InputField").GetComponent<RectTransform>();
-                _mainInput = _inputRT.GetComponent<InputField>();
+                _mainInput = GetComponentInChildren<TMPro.TMP_InputField>();
+                _inputRT = _mainInput.GetComponent<RectTransform>();
 
                 _overlayRT = _rectTransform.Find("Overlay").GetComponent<RectTransform>();
                 _overlayRT.gameObject.SetActive(false);
diff --git a/Runtime/Scripts/Effects/BestFitOutline.cs b/Runtime/Scripts/Effects/BestFitOutline.cs
deleted file mode 100644
index b03c139f..00000000
--- a/Runtime/Scripts/Effects/BestFitOutline.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/// Credit Melang
-/// Sourced from - http://forum.unity3d.com/members/melang.593409/
-/// NOT supported in Unity 2022
-
-using System;
-using System.Collections.Generic;
-
-namespace UnityEngine.UI.Extensions
-{
-	[AddComponentMenu("UI/Effects/Extensions/BestFit Outline")]
-	public class BestFitOutline : Shadow
-	{
-		//
-		// Constructors
-		//
-		protected BestFitOutline()
-		{
-		}
-
-		//
-		// Methods
-		//
-		public override void ModifyMesh(Mesh mesh)
-		{
-			if (!this.IsActive())
-			{
-				return;
-			}
-
-			List<UIVertex> verts = new List<UIVertex>();
-			using (var helper = new VertexHelper(mesh))
-			{
-				helper.GetUIVertexStream(verts);
-			}
-
-			Text foundtext = GetComponent<Text>();
-
-			float best_fit_adjustment = 1f;
-
-			if (foundtext && foundtext.resizeTextForBestFit)
-			{
-				best_fit_adjustment = (float)foundtext.cachedTextGenerator.fontSizeUsedForBestFit / (foundtext.resizeTextMaxSize - 1); //max size seems to be exclusive 
-			}
-
-			int start = 0;
-			int count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, base.effectDistance.x * best_fit_adjustment, base.effectDistance.y * best_fit_adjustment);
-			start = count;
-			count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, base.effectDistance.x * best_fit_adjustment, -base.effectDistance.y * best_fit_adjustment);
-			start = count;
-			count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, -base.effectDistance.x * best_fit_adjustment, base.effectDistance.y * best_fit_adjustment);
-			start = count;
-			count = verts.Count;
-			base.ApplyShadowZeroAlloc(verts, base.effectColor, start, verts.Count, -base.effectDistance.x * best_fit_adjustment, -base.effectDistance.y * best_fit_adjustment);
-
-			using (var helper = new VertexHelper())
-			{
-				helper.AddUIVertexTriangleStream(verts);
-				helper.FillMesh(mesh);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/BestFitOutline.cs.meta b/Runtime/Scripts/Effects/BestFitOutline.cs.meta
deleted file mode 100644
index 81e66f6a..00000000
--- a/Runtime/Scripts/Effects/BestFitOutline.cs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7b30dd83a12669d4f973ff5a79ca9842
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
diff --git a/Runtime/Scripts/Effects/CurvedText.cs b/Runtime/Scripts/Effects/CurvedText.cs
deleted file mode 100644
index ffdd25ec..00000000
--- a/Runtime/Scripts/Effects/CurvedText.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-
-namespace UnityEngine.UI.Extensions
-{
-    [RequireComponent(typeof(Text))]
-    [RequireComponent(typeof(RectTransform))]
-    [AddComponentMenu("UI/Effects/Extensions/Curved Text")]
-    public class CurvedText : BaseMeshEffect
-    {
-        [SerializeField]
-        private AnimationCurve _curveForText = AnimationCurve.Linear(0, 0, 1, 10);
-
-        public AnimationCurve CurveForText
-        {
-            get { return _curveForText; }
-            set { _curveForText = value; graphic.SetVerticesDirty(); }
-        }
-
-        [SerializeField]
-        private float _curveMultiplier = 1;
-
-        public float CurveMultiplier
-        {
-            get { return _curveMultiplier; }
-            set { _curveMultiplier = value; graphic.SetVerticesDirty(); }
-        }
-
-        private RectTransform rectTrans;
-
-
-#if UNITY_EDITOR
-        protected override void OnValidate()
-        {
-            base.OnValidate();
-            if (_curveForText[0].time != 0)
-            {
-                var tmpRect = _curveForText[0];
-                tmpRect.time = 0;
-                _curveForText.MoveKey(0, tmpRect);
-            }
-            if (rectTrans == null)
-                rectTrans = GetComponent<RectTransform>();
-            if (_curveForText[_curveForText.length - 1].time != rectTrans.rect.width)
-                OnRectTransformDimensionsChange();
-        }
-#endif
-        protected override void Awake()
-        {
-            base.Awake();
-            rectTrans = GetComponent<RectTransform>();
-            OnRectTransformDimensionsChange();
-        }
-        protected override void OnEnable()
-        {
-            base.OnEnable();
-            rectTrans = GetComponent<RectTransform>();
-            OnRectTransformDimensionsChange();
-        }
-        public override void ModifyMesh(VertexHelper vh)
-        {
-            int count = vh.currentVertCount;
-            if (!IsActive() || count == 0)
-            {
-                return;
-            }
-            for (int index = 0; index < vh.currentVertCount; index++)
-            {
-                UIVertex uiVertex = new UIVertex();
-                vh.PopulateUIVertex(ref uiVertex, index);
-                uiVertex.position.y += _curveForText.Evaluate(rectTrans.rect.width * rectTrans.pivot.x + uiVertex.position.x) * _curveMultiplier;
-                vh.SetUIVertex(uiVertex, index);
-            }
-        }
-        protected override void OnRectTransformDimensionsChange()
-        {
-            if (rectTrans)
-            {
-                Keyframe tmpRect = _curveForText[_curveForText.length - 1];
-                tmpRect.time = rectTrans.rect.width;
-                _curveForText.MoveKey(_curveForText.length - 1, tmpRect);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/CurvedText.cs.meta b/Runtime/Scripts/Effects/CurvedText.cs.meta
deleted file mode 100644
index eb4c1188..00000000
--- a/Runtime/Scripts/Effects/CurvedText.cs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c38666cb4d43a304588cf0b7e5f86db6
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
diff --git a/Runtime/Scripts/Effects/CylinderText.cs b/Runtime/Scripts/Effects/CylinderText.cs
deleted file mode 100644
index 83742eed..00000000
--- a/Runtime/Scripts/Effects/CylinderText.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-
-using System;
-
-/// adaption for cylindrical bending by herbst
-/// Credit Breyer
-/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/#post-1777407
-namespace UnityEngine.UI.Extensions
-{
-    [RequireComponent(typeof(Text))]
-    [RequireComponent(typeof(RectTransform))]
-    [AddComponentMenu("UI/Effects/Extensions/Cylinder Text")]
-    public class CylinderText : BaseMeshEffect
-    {
-        public float radius;
-
-#if UNITY_EDITOR
-        protected override void OnValidate()
-        {
-            base.OnValidate();
-        }
-#endif
-        protected override void Awake()
-        {
-            base.Awake();
-            OnRectTransformDimensionsChange();
-        }
-        protected override void OnEnable()
-        {
-            base.OnEnable();
-            OnRectTransformDimensionsChange();
-        }
-        public override void ModifyMesh(VertexHelper vh)
-        {
-            if (!IsActive()) return;
-
-            int count = vh.currentVertCount;
-            if (!IsActive() || count == 0)
-            {
-                return;
-            }
-            for (int index = 0; index < vh.currentVertCount; index++)
-            {
-                UIVertex uiVertex = new UIVertex();
-                vh.PopulateUIVertex(ref uiVertex, index);
-
-                // get x position
-                var x = uiVertex.position.x;
-
-                // calculate bend based on pivot and radius
-                uiVertex.position.z = -radius * Mathf.Cos(x / radius);
-                uiVertex.position.x = radius * Mathf.Sin(x / radius);
-
-                vh.SetUIVertex(uiVertex, index);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/CylinderText.cs.meta b/Runtime/Scripts/Effects/CylinderText.cs.meta
deleted file mode 100644
index 96a52817..00000000
--- a/Runtime/Scripts/Effects/CylinderText.cs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0ec526a95e7733b4396be80d3e1df80e
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
diff --git a/Runtime/Scripts/Effects/LetterSpacing.cs b/Runtime/Scripts/Effects/LetterSpacing.cs
deleted file mode 100644
index 567c4eda..00000000
--- a/Runtime/Scripts/Effects/LetterSpacing.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-
-Produces an simple tracking/letter-spacing effect on UI Text components.
-
-Set the spacing parameter to adjust letter spacing.
-  Negative values cuddle the text up tighter than normal. Go too far and it'll look odd.
-  Positive values spread the text out more than normal. This will NOT respect the text area you've defined.
-  Zero spacing will present the font with no changes.
-
-Relies on counting off characters in your Text component's text property and
-matching those against the quads passed in via the verts array. This is really
-rather primitive, but I can't see any better way at the moment. It means that
-all sorts of things can break the effect...
-
-This component should be placed higher in component list than any other vertex
-modifiers that alter the total number of vertices. EG, place this above Shadow
-or Outline effects. If you don't, the outline/shadow won't match the position
-of the letters properly. If you place the outline/shadow effect second however,
-it will just work on the altered vertices from this component, and function
-as expected.
-
-This component works best if you don't allow text to automatically wrap. It also
-blows up outside of the given text area. Basically, it's a cheap and dirty effect,
-not a clever text layout engine. It can't affect how Unity chooses to break up
-your lines. If you manually use line breaks however, it should detect those and
-function more or less as you'd expect.
-
-The spacing parameter is measured in pixels multiplied by the font size. This was
-chosen such that when you adjust the font size, it does not change the visual spacing
-that you've dialed in. There's also a scale factor of 1/100 in this number to
-bring it into a comfortable adjustable range. There's no limit on this parameter,
-but obviously some values will look quite strange.
-
-This component doesn't really work with Rich Text. You don't need to remember to
-turn off Rich Text via the checkbox, but because it can't see what makes a
-printable character and what doesn't, it will typically miscount characters when you
-use HTML-like tags in your text. Try it out, you'll see what I mean. It doesn't
-break down entirely, but it doesn't really do what you'd want either.
-
-*/
-#if !UNITY_2022_1_OR_NEWER
-using System.Collections.Generic;
-#endif
-
-using System;
-using System.Collections.Generic;
-
-/// Credit Deeperbeige
-/// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
-namespace UnityEngine.UI.Extensions
-{
-    [AddComponentMenu("UI/Effects/Extensions/Letter Spacing")]
-    ///Summary
-    /// Note, Vertex Count has changed in 5.2.1+, is now 6 (two tris) instead of 4 (tri strip).
-    public class LetterSpacing : BaseMeshEffect
-    {
-        [SerializeField]
-        private float m_spacing = 0f;
-
-        protected LetterSpacing() { }
-
-#if UNITY_EDITOR
-        protected override void OnValidate()
-        {
-            spacing = m_spacing;
-            base.OnValidate();
-        }
-#endif
-
-        public float spacing
-        {
-            get { return m_spacing; }
-            set
-            {
-                if (m_spacing == value) return;
-                m_spacing = value;
-                if (graphic != null) graphic.SetVerticesDirty();
-            }
-        }
-
-        protected override void Awake()
-        {
-            Debug.Log($"Awake, [{m_spacing}]");
-        }
-
-        public override void ModifyMesh(VertexHelper vh)
-        {
-            if (!IsActive()) return;
-
-            List<UIVertex> verts = new List<UIVertex>();
-            vh.GetUIVertexStream(verts);
-
-            var text = GetComponent<Text>();
-
-            if (text == null)
-            {
-                Debug.LogWarning("LetterSpacing: Missing Text component");
-                return;
-            }
-
-            string[] lines = text.text.Split('\n');
-            Vector3 pos;
-            float letterOffset = spacing * (float)text.fontSize / 100f;
-            float alignmentFactor = 0;
-            int glyphIdx = 0;
-
-            switch (text.alignment)
-            {
-                case TextAnchor.LowerLeft:
-                case TextAnchor.MiddleLeft:
-                case TextAnchor.UpperLeft:
-                    alignmentFactor = 0f;
-                    break;
-
-                case TextAnchor.LowerCenter:
-                case TextAnchor.MiddleCenter:
-                case TextAnchor.UpperCenter:
-                    alignmentFactor = 0.5f;
-                    break;
-
-                case TextAnchor.LowerRight:
-                case TextAnchor.MiddleRight:
-                case TextAnchor.UpperRight:
-                    alignmentFactor = 1f;
-                    break;
-            }
-
-            for (int lineIdx = 0; lineIdx < lines.Length; lineIdx++)
-            {
-                string line = lines[lineIdx];
-                float lineOffset = (line.Length - 1) * letterOffset * alignmentFactor;
-
-                for (int charIdx = 0; charIdx < line.Length; charIdx++)
-                {
-                    int idx1 = glyphIdx * 6 + 0;
-                    int idx2 = glyphIdx * 6 + 1;
-                    int idx3 = glyphIdx * 6 + 2;
-                    int idx4 = glyphIdx * 6 + 3;
-                    int idx5 = glyphIdx * 6 + 4;
-                    int idx6 = glyphIdx * 6 + 5;
-
-                    // Check for truncated text (doesn't generate verts for all characters)
-                    if (idx6 > verts.Count - 1) return;
-
-                    UIVertex vert1 = verts[idx1];
-                    UIVertex vert2 = verts[idx2];
-                    UIVertex vert3 = verts[idx3];
-                    UIVertex vert4 = verts[idx4];
-                    UIVertex vert5 = verts[idx5];
-                    UIVertex vert6 = verts[idx6];
-
-                    pos = Vector3.right * (letterOffset * charIdx - lineOffset);
-
-                    vert1.position += pos;
-                    vert2.position += pos;
-                    vert3.position += pos;
-                    vert4.position += pos;
-                    vert5.position += pos;
-                    vert6.position += pos;
-
-                    verts[idx1] = vert1;
-                    verts[idx2] = vert2;
-                    verts[idx3] = vert3;
-                    verts[idx4] = vert4;
-                    verts[idx5] = vert5;
-                    verts[idx6] = vert6;
-
-                    glyphIdx++;
-                }
-
-                // Offset for carriage return character that still generates verts
-                glyphIdx++;
-            }
-            vh.Clear();
-            vh.AddUIVertexTriangleStream(verts);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/LetterSpacing.cs.meta b/Runtime/Scripts/Effects/LetterSpacing.cs.meta
deleted file mode 100644
index 3de1972a..00000000
--- a/Runtime/Scripts/Effects/LetterSpacing.cs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ee10f5b9a0e16c40b25e079c03a17a2
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
diff --git a/Runtime/Scripts/Effects/MonoSpacing.cs b/Runtime/Scripts/Effects/MonoSpacing.cs
deleted file mode 100644
index 2749ce34..00000000
--- a/Runtime/Scripts/Effects/MonoSpacing.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-
-Produces an simple mono-spacing effect on UI Text components.
-
-Set the spacing parameter to adjust mono spacing.
-  Negative values cuddle the text up tighter than normal. Go too far and it'll look odd.
-  Positive values spread the text out more than normal. This will NOT respect the text area you've defined.
-  Zero spacing will present the font with no changes.
-
-Relies on counting off characters in your Text component's text property and
-matching those against the quads passed in via the verts array. This is really
-rather primitive, but I can't see any better way at the moment. It means that
-all sorts of things can break the effect...
-
-This component should be placed higher in component list than any other vertex
-modifiers that alter the total number of vertices. EG, place this above Shadow
-or Outline effects. If you don't, the outline/shadow won't match the position
-of the letters properly. If you place the outline/shadow effect second however,
-it will just work on the altered vertices from this component, and function
-as expected.
-
-This component works best if you don't allow text to automatically wrap. It also
-blows up outside of the given text area. Basically, it's a cheap and dirty effect,
-not a clever text layout engine. It can't affect how Unity chooses to break up
-your lines. If you manually use line breaks however, it should detect those and
-function more or less as you'd expect.
-
-The spacing parameter is measured in pixels multiplied by the font size. This was
-chosen such that when you adjust the font size, it does not change the visual spacing
-that you've dialed in. There's also a scale factor of 1/100 in this number to
-bring it into a comfortable adjustable range. There's no limit on this parameter,
-but obviously some values will look quite strange.
-
-This component doesn't really work with Rich Text. You don't need to remember to
-turn off Rich Text via the checkbox, but because it can't see what makes a
-printable character and what doesn't, it will typically miscount characters when you
-use HTML-like tags in your text. Try it out, you'll see what I mean. It doesn't
-break down entirely, but it doesn't really do what you'd want either.
-
-*/
-#if !UNITY_2022_1_OR_NEWER
-using System.Collections.Generic;
-#endif
-
-using System;
-using System.Collections.Generic;
-
-/// Credit herbst / derived from LetterSpacing by Deeperbeige
-/// Sourced from - http://forum.unity3d.com/threads/adjustable-character-spacing-free-script.288277/
-namespace UnityEngine.UI.Extensions
-{
-    [AddComponentMenu("UI/Effects/Extensions/Mono Spacing")]
-    [RequireComponent(typeof(Text))]
-    [RequireComponent(typeof(RectTransform))]
-    ///Summary
-    /// Note, Vertex Count has changed in 5.2.1+, is now 6 (two tris) instead of 4 (tri strip).
-    public class MonoSpacing : BaseMeshEffect
-    {
-        [SerializeField]
-        private float m_spacing = 0f;
-        public float HalfCharWidth = 1;
-        public bool UseHalfCharWidth = false;
-
-        private RectTransform rectTransform;
-
-        private Text text;
-
-        protected MonoSpacing() { }
-
-        protected override void Awake()
-        {
-            text = GetComponent<Text>();
-
-            if (text == null)
-            {
-                Debug.LogWarning("MonoSpacing: Missing Text component");
-                return;
-            }
-            rectTransform = text.GetComponent<RectTransform>();
-        }
-
-#if UNITY_EDITOR
-        protected override void OnValidate()
-        {
-            Spacing = m_spacing;
-            base.OnValidate();
-        }
-#endif
-
-        public float Spacing
-        {
-            get { return m_spacing; }
-            set
-            {
-                if (m_spacing == value) return;
-                m_spacing = value;
-                if (graphic != null) graphic.SetVerticesDirty();
-            }
-        }
-
-        public override void ModifyMesh(VertexHelper vh)
-        {
-            if (!IsActive()) return;
-
-            List<UIVertex> verts = new List<UIVertex>();
-            vh.GetUIVertexStream(verts);
-
-            string[] lines = text.text.Split('\n');
-            // Vector3  pos;
-            float letterOffset = Spacing * (float)text.fontSize / 100f;
-            float alignmentFactor = 0;
-            int glyphIdx = 0;
-
-            switch (text.alignment)
-            {
-                case TextAnchor.LowerLeft:
-                case TextAnchor.MiddleLeft:
-                case TextAnchor.UpperLeft:
-                    alignmentFactor = 0f;
-                    break;
-
-                case TextAnchor.LowerCenter:
-                case TextAnchor.MiddleCenter:
-                case TextAnchor.UpperCenter:
-                    alignmentFactor = 0.5f;
-                    break;
-
-                case TextAnchor.LowerRight:
-                case TextAnchor.MiddleRight:
-                case TextAnchor.UpperRight:
-                    alignmentFactor = 1f;
-                    break;
-            }
-
-            for (int lineIdx = 0; lineIdx < lines.Length; lineIdx++)
-            {
-                string line = lines[lineIdx];
-                float lineOffset = (line.Length - 1) * letterOffset * (alignmentFactor) - (alignmentFactor - 0.5f) * rectTransform.rect.width;
-
-                var offsetX = -lineOffset + letterOffset / 2 * (1 - alignmentFactor * 2);
-
-                for (int charIdx = 0; charIdx < line.Length; charIdx++)
-                {
-                    int idx1 = glyphIdx * 6 + 0;
-                    int idx2 = glyphIdx * 6 + 1;
-                    int idx3 = glyphIdx * 6 + 2;
-                    int idx4 = glyphIdx * 6 + 3;
-                    int idx5 = glyphIdx * 6 + 4;
-                    int idx6 = glyphIdx * 6 + 5;
-
-                    // Check for truncated text (doesn't generate verts for all characters)
-                    if (idx6 > verts.Count - 1) return;
-
-                    UIVertex vert1 = verts[idx1];
-                    UIVertex vert2 = verts[idx2];
-                    UIVertex vert3 = verts[idx3];
-                    UIVertex vert4 = verts[idx4];
-                    UIVertex vert5 = verts[idx5];
-                    UIVertex vert6 = verts[idx6];
-
-                    // pos = Vector3.right * (letterOffset * (charIdx) - lineOffset);
-                    float charWidth = (vert2.position - vert1.position).x;
-                    var smallChar = UseHalfCharWidth && (charWidth < HalfCharWidth);
-
-                    var smallCharOffset = smallChar ? -letterOffset / 4 : 0;
-
-                    vert1.position += new Vector3(-vert1.position.x + offsetX + -.5f * charWidth + smallCharOffset, 0, 0);
-                    vert2.position += new Vector3(-vert2.position.x + offsetX + .5f * charWidth + smallCharOffset, 0, 0);
-                    vert3.position += new Vector3(-vert3.position.x + offsetX + .5f * charWidth + smallCharOffset, 0, 0);
-                    vert4.position += new Vector3(-vert4.position.x + offsetX + .5f * charWidth + smallCharOffset, 0, 0);
-                    vert5.position += new Vector3(-vert5.position.x + offsetX + -.5f * charWidth + smallCharOffset, 0, 0);
-                    vert6.position += new Vector3(-vert6.position.x + offsetX + -.5f * charWidth + smallCharOffset, 0, 0);
-
-                    if (smallChar)
-                        offsetX += letterOffset / 2;
-                    else
-                        offsetX += letterOffset;
-
-                    verts[idx1] = vert1;
-                    verts[idx2] = vert2;
-                    verts[idx3] = vert3;
-                    verts[idx4] = vert4;
-                    verts[idx5] = vert5;
-                    verts[idx6] = vert6;
-
-                    glyphIdx++;
-                }
-
-                // Offset for carriage return character that still generates verts
-                glyphIdx++;
-            }
-            vh.Clear();
-            vh.AddUIVertexTriangleStream(verts);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/MonoSpacing.cs.meta b/Runtime/Scripts/Effects/MonoSpacing.cs.meta
deleted file mode 100644
index 775d928e..00000000
--- a/Runtime/Scripts/Effects/MonoSpacing.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 97a58789aa01843488ef44dc747ee8e8
-timeCreated: 1490183235
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Runtime/Scripts/Effects/NicerOutline.cs b/Runtime/Scripts/Effects/NicerOutline.cs
deleted file mode 100644
index 3415dd24..00000000
--- a/Runtime/Scripts/Effects/NicerOutline.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-
-using System.Collections.Generic;
-
-/// Credit Melang, Lee Hui
-/// Sourced from - http://forum.unity3d.com/members/melang.593409/
-/// GC Alloc fix - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/pull-requests/130
-/// NOT supported in Unity 2022
-namespace UnityEngine.UI.Extensions
-{
-	//An outline that looks a bit nicer than the default one. It has less "holes" in the outline by drawing more copies of the effect
-	[AddComponentMenu("UI/Effects/Extensions/Nicer Outline")]
-	public class NicerOutline : BaseMeshEffect
-	{
-		[SerializeField]
-		private Color m_EffectColor = new Color(0f, 0f, 0f, 0.5f);
-
-		[SerializeField]
-		private Vector2 m_EffectDistance = new Vector2(1f, -1f);
-
-		[SerializeField]
-		private bool m_UseGraphicAlpha = true;
-
-		private List<UIVertex> m_Verts = new List<UIVertex>();
-
-		//
-		// Properties
-		//
-		public Color effectColor
-		{
-			get
-			{
-				return this.m_EffectColor;
-			}
-			set
-			{
-				this.m_EffectColor = value;
-				if (base.graphic != null)
-				{
-					base.graphic.SetVerticesDirty();
-				}
-			}
-		}
-
-		public Vector2 effectDistance
-		{
-			get
-			{
-				return this.m_EffectDistance;
-			}
-			set
-			{
-				if (value.x > 600f)
-				{
-					value.x = 600f;
-				}
-				if (value.x < -600f)
-				{
-					value.x = -600f;
-				}
-				if (value.y > 600f)
-				{
-					value.y = 600f;
-				}
-				if (value.y < -600f)
-				{
-					value.y = -600f;
-				}
-				if (this.m_EffectDistance == value)
-				{
-					return;
-				}
-				this.m_EffectDistance = value;
-				if (base.graphic != null)
-				{
-					base.graphic.SetVerticesDirty();
-				}
-			}
-		}
-
-		public bool useGraphicAlpha
-		{
-			get
-			{
-				return this.m_UseGraphicAlpha;
-			}
-			set
-			{
-				this.m_UseGraphicAlpha = value;
-				if (base.graphic != null)
-				{
-					base.graphic.SetVerticesDirty();
-				}
-			}
-		}
-
-		public override void ModifyMesh(VertexHelper vh)
-		{
-			if (!this.IsActive())
-			{
-				return;
-			}
-
-			m_Verts.Clear();
-			vh.GetUIVertexStream(m_Verts);
-
-			Text foundtext = GetComponent<Text>();
-
-			float best_fit_adjustment = 1f;
-
-			if (foundtext && foundtext.resizeTextForBestFit)
-			{
-				best_fit_adjustment = (float)foundtext.cachedTextGenerator.fontSizeUsedForBestFit / (foundtext.resizeTextMaxSize - 1); //max size seems to be exclusive
-
-			}
-
-			float distanceX = this.effectDistance.x * best_fit_adjustment;
-			float distanceY = this.effectDistance.y * best_fit_adjustment;
-
-			vh.Clear();
-
-			int start = 0;
-
-			// Apply Outline
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, distanceX, distanceY, vh, start);
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, distanceX, -distanceY, vh, start);
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, -distanceX, distanceY, vh, start);
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, -distanceX, -distanceY, vh, start);
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, distanceX, 0, vh, start);
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, -distanceX, 0, vh, start);
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, 0, distanceY, vh, start);
-			start += this.ApplyOutlineNoGC(m_Verts, this.effectColor, 0, -distanceY, vh, start);
-
-			// Apply self Text stuff
-			start += ApplyText(m_Verts, vh, start);
-		}
-
-		private int ApplyOutlineNoGC(List<UIVertex> verts, Color32 color, float x, float y, VertexHelper vh, int startIndex)
-		{
-			int length = verts.Count;
-			for (int i = 0; i < length; ++i)
-			{
-				UIVertex vt = verts[i];
-
-				Vector3 v = vt.position;
-				v.x += x;
-				v.y += y;
-				vt.position = v;
-				var newColor = color;
-				if (m_UseGraphicAlpha)
-					newColor.a = (byte)((newColor.a * verts[i].color.a) / 255);
-				vt.color = newColor;
-
-				// Tips: Since two triangles share same two vertices, in theory vertices can reduce to 4 / 6
-				// But VertexHelper.FillMesh forbid, so leave it be.
-
-				vh.AddVert(vt);
-			}
-
-			int triangleCount = length / 3;
-			for (int i = 0; i < triangleCount; ++i)
-			{
-				int start = startIndex + 3 * i;
-				vh.AddTriangle(start + 0, start + 1, start + 2);
-			}
-
-			return length;
-		}
-
-		private int ApplyText(List<UIVertex> verts, VertexHelper vh, int startIndex)
-		{
-			int length = verts.Count;
-
-			for (int i = 0; i < length; ++i)
-			{
-				vh.AddVert(verts[i]);
-			}
-
-			int triangleCount = length / 3;
-			for (int i = 0; i < triangleCount; ++i)
-			{
-				int start = startIndex + 3 * i;
-				vh.AddTriangle(start + 0, start + 1, start + 2);
-			}
-
-			return length;
-		}
-
-
-#if UNITY_EDITOR
-		protected override void OnValidate()
-		{
-			this.effectDistance = this.m_EffectDistance;
-			base.OnValidate();
-		}
-#endif
-	}
-}
\ No newline at end of file
diff --git a/Runtime/Scripts/Effects/NicerOutline.cs.meta b/Runtime/Scripts/Effects/NicerOutline.cs.meta
deleted file mode 100644
index ff5558e2..00000000
--- a/Runtime/Scripts/Effects/NicerOutline.cs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: db125c7de00668f4e98849d0aaf366d7
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
diff --git a/Runtime/Scripts/Layout/FlowLayoutGroup.cs b/Runtime/Scripts/Layout/FlowLayoutGroup.cs
index fd16a25d..868c2b4c 100644
--- a/Runtime/Scripts/Layout/FlowLayoutGroup.cs
+++ b/Runtime/Scripts/Layout/FlowLayoutGroup.cs
@@ -6,7 +6,6 @@
 /// Vertical Flow by Ramon Molossi 
 
 using System.Collections.Generic;
-using System.Text;
 
 namespace UnityEngine.UI.Extensions
 {
@@ -18,10 +17,10 @@ public class FlowLayoutGroup : LayoutGroup
 	{
 		public enum Axis { Horizontal = 0, Vertical = 1 }
 
-        private float _layoutHeight;
-        private float _layoutWidth;
+		private float _layoutHeight;
+		private float _layoutWidth;
 
-        public float SpacingX = 0f;
+		public float SpacingX = 0f;
 		public float SpacingY = 0f;
 		public bool ExpandHorizontalSpacing = false;
 		public bool ChildForceExpandWidth = false;
diff --git a/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs b/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs
index 4f463da4..a9fbf960 100644
--- a/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs
+++ b/Runtime/Scripts/ToolTips/BoundTooltip/BoundTooltipItem.cs
@@ -14,13 +14,13 @@ public bool IsActive
             }
         }
 
-        public UnityEngine.UI.Text TooltipText;
+        public TMPro.TMP_Text TooltipText;
         public Vector3 ToolTipOffset;
 
         void Awake()
         {
             instance = this;
-            if (!TooltipText) TooltipText = GetComponentInChildren<Text>();
+            if (!TooltipText) TooltipText = GetComponentInChildren<TMPro.TMP_Text>();
             HideTooltip();
         }
 
diff --git a/Runtime/Scripts/ToolTips/ToolTip.cs b/Runtime/Scripts/ToolTips/ToolTip.cs
index 352bde1b..3c8e0e59 100644
--- a/Runtime/Scripts/ToolTips/ToolTip.cs
+++ b/Runtime/Scripts/ToolTips/ToolTip.cs
@@ -145,7 +145,7 @@ public void SetTooltip(string ttext, Vector3 basePos, bool refreshCanvasesBefore
             }
             else
             {
-                Debug.LogWarning("[ToolTip] Couldn't set tooltip text, tooltip has no child Text component");
+                Debug.LogWarning("[ToolTip] Couldn't set tooltip text, tooltip has no child  component");
             }
 
             ContextualTooltipUpdate(refreshCanvasesBeforeGetSize);
diff --git a/Runtime/Scripts/Utilities/UI_ScrollRectOcclusion.cs b/Runtime/Scripts/Utilities/UI_ScrollRectOcclusion.cs
index 189c84e5..e3b535b9 100644
--- a/Runtime/Scripts/Utilities/UI_ScrollRectOcclusion.cs
+++ b/Runtime/Scripts/Utilities/UI_ScrollRectOcclusion.cs
@@ -1,6 +1,6 @@
 /// Credit Tomasz Schelenz 
 /// Sourced from - https://bitbucket.org/SimonDarksideJ/unity-ui-extensions/issues/82/scrollrectocclusion
-/// Demo - https://youtu.be/uVTV7Udx78k?t=39s ScrollRectOcclusion - disables the objects outside of the scrollrect viewport. Useful for scrolls with lots of content, reduces geometry and drawcalls (if content is not batched) In some cases it might create a bit of spikes, especially if you have lots of UI.Text objects in the childs. In that case consider to Add CanvasGroup to your childs and instead of calling setActive on game object change CanvasGroup.alpha value. At 0 it is not being rendered hence will also optimize the performance. 
+/// Demo - https://youtu.be/uVTV7Udx78k?t=39s ScrollRectOcclusion - disables the objects outside of the scrollrect viewport. Useful for scrolls with lots of content, reduces geometry and drawcalls (if content is not batched) In some cases it might create a bit of spikes, especially if you have lots of UI. objects in the childs. In that case consider to Add CanvasGroup to your childs and instead of calling setActive on game object change CanvasGroup.alpha value. At 0 it is not being rendered hence will also optimize the performance. 
 
 using System.Collections.Generic;
 
@@ -15,7 +15,7 @@ namespace UnityEngine.UI.Extensions
     /// by calling Init() method
     /// 
     /// Notes
-    /// - In some cases it might create a bit of spikes, especially if you have lots of UI.Text objects in the child's. In that case consider to Add 
+    /// - In some cases it might create a bit of spikes, especially if you have lots of UI. objects in the child's. In that case consider to Add 
     /// CanvasGroup to your child's and instead of calling setActive on game object change CanvasGroup.alpha value. At 0 it is not being rendered hence will 
     /// also optimize the performance. 
     /// - works for both vertical and horizontal scrolls, even at the same time (grid layout)

From 42d4bd1d665e6f09e05fa3da7ec3ddeb3e504ae1 Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 13:52:52 +0000
Subject: [PATCH 09/11] Reverted Curly Text back to old Text component as it is
 not compatible with TextMeshPro - will investigate alternatives

---
 Examples~                                  | 2 +-
 Runtime/Scripts/Effects/CurlyUI/CUIText.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples~ b/Examples~
index 00803ad8..ad98da98 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit 00803ad821af6147f54c763db0496bbd7d91fe05
+Subproject commit ad98da98e5a545e9af52ac2dfb0163f72a8d655a
diff --git a/Runtime/Scripts/Effects/CurlyUI/CUIText.cs b/Runtime/Scripts/Effects/CurlyUI/CUIText.cs
index 8e46c7e2..382246fe 100644
--- a/Runtime/Scripts/Effects/CurlyUI/CUIText.cs
+++ b/Runtime/Scripts/Effects/CurlyUI/CUIText.cs
@@ -4,7 +4,7 @@
 namespace UnityEngine.UI.Extensions
 {
     [RequireComponent(typeof(RectTransform))]
-    [RequireComponent(typeof(TMPro.TMP_Text))]
+    [RequireComponent(typeof(Text))]
     [AddComponentMenu("UI/Effects/Extensions/Curly UI Text")]
     public class CUIText : CUIGraphic
     {
@@ -12,7 +12,7 @@ public override void ReportSet()
         {
             if (uiGraphic == null)
             {
-                uiGraphic = GetComponent<TMPro.TMP_Text>();
+                uiGraphic = GetComponent<Text>();
             }
 
             base.ReportSet();

From cedeaf34f3f2b32648c592f7a70a50a251702fc2 Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 14:04:28 +0000
Subject: [PATCH 10/11] All scenes tested, 2 issues remain, re-orderable list
 and selection box

---
 Examples~ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples~ b/Examples~
index ad98da98..d727db09 160000
--- a/Examples~
+++ b/Examples~
@@ -1 +1 @@
-Subproject commit ad98da98e5a545e9af52ac2dfb0163f72a8d655a
+Subproject commit d727db09a8b91a24c11e29ffd4958057ed0aab44

From c3935f0491253556907946ae3f6373a723277f9c Mon Sep 17 00:00:00 2001
From: "Simon (Darkside) Jackson" <darkside@zenithmoon.com>
Date: Sat, 6 Dec 2025 16:32:25 +0000
Subject: [PATCH 11/11] Pausing Linux testing until Unity sort their stuff out

---
 .github/workflows/development-buildandtestupmrelease.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/development-buildandtestupmrelease.yml b/.github/workflows/development-buildandtestupmrelease.yml
index 5d726a9f..7bdae5ca 100644
--- a/.github/workflows/development-buildandtestupmrelease.yml
+++ b/.github/workflows/development-buildandtestupmrelease.yml
@@ -35,10 +35,10 @@ jobs:
           - 6000.0.x
           - 6000
         include:
-          - os: ubuntu-latest
-            build-targets: StandaloneLinux64, Android
+          # - os: ubuntu-latest
+          #   build-targets: StandaloneLinux64, Android
           - os: windows-latest
-            build-targets: StandaloneWindows64
+            build-targets: StandaloneWindows64, Android
           - os: macos-latest
             build-targets: StandaloneOSX, iOS
     steps: