diff --git a/Editor/UIExtensionsMenuOptions.cs b/Editor/UIExtensionsMenuOptions.cs
index 43a333f..ac4bbe4 100644
--- a/Editor/UIExtensionsMenuOptions.cs
+++ b/Editor/UIExtensionsMenuOptions.cs
@@ -163,7 +163,7 @@ namespace UnityEditor.UI
 			var esys = Object.FindFirstObjectByType<EventSystem>();
 #else
 			var esys = Object.FindObjectOfType<EventSystem>();
-#endif
+#endif     			
 			if (esys == null)
 			{
 				var eventSystem = new GameObject("EventSystem");
@@ -677,91 +677,91 @@ namespace UnityEditor.UI
 
 			Selection.activeGameObject = uiVerticalScrollerRoot;
 		}
-		#endregion
+        #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);
+        #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 uiScrollerCenter = CreateUIObject("Center", uiHorizontalScrollerRoot);
 
-			GameObject childContent = CreateUIObject("Content", 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);
+            // 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>();
+            // 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;
+            //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>();
+            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;
+            //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;
+            sr.content = rectTransformContent;
 
-			// Add sample children
-			for (int i = 0; i < 10; i++)
-			{
-				GameObject childPage = CreateUIObject("Page_" + i, childContent);
+            // Add sample children
+            for (int i = 0; i < 10; i++)
+            {
+                GameObject childPage = CreateUIObject("Page_" + i, childContent);
 
-				GameObject childText = CreateUIObject("Text", childPage);
+                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;
+                //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>();
+                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;
+                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
+                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);
-			}
+                //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
+            Selection.activeGameObject = uiHorizontalScrollerRoot;
+        }
+        #endregion
 
-		#region UI Button
-		[MenuItem("GameObject/UI/Extensions/Controls/UI Button", false)]
+        #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);
@@ -1370,14 +1370,6 @@ namespace UnityEditor.UI
 			Selection.activeGameObject = go;
 		}
 
-		[MenuItem("GameObject/UI/Extensions/Primitives/UI SquircleBorder", false)]
-		static public void AddUISquircleBorder(MenuCommand menuCommand)
-		{
-			GameObject go = CreateUIElementRoot("UI SquircleBorder", menuCommand, s_ImageGUIElementSize);
-			go.AddComponent<UISquircleBorder>();
-			Selection.activeGameObject = go;
-		}
-
 		[MenuItem("GameObject/UI/Extensions/Primitives/UI Circle", false)]
 		static public void AddUICircle(MenuCommand menuCommand)
 		{
diff --git a/Runtime/Scripts/Primitives/UISquircleBorder.cs b/Runtime/Scripts/Primitives/UISquircleBorder.cs
index 3a1ba70..d3b98bc 100644
--- a/Runtime/Scripts/Primitives/UISquircleBorder.cs
+++ b/Runtime/Scripts/Primitives/UISquircleBorder.cs
@@ -11,6 +11,12 @@ namespace UnityEngine.UI.Extensions
     public class UISquircleBorder : UIPrimitiveBase
     {
         const float C = 1.0f;
+        public enum Type
+        {
+            Classic,
+            Scaled
+        }
+
         [Space]
         public Type squircleType = Type.Scaled;
         [Range(1, 40)]