diff --git a/Editor/AccordionElementEditor.cs b/Editor/AccordionElementEditor.cs
index 92e53f4..6bccf1c 100644
--- a/Editor/AccordionElementEditor.cs
+++ b/Editor/AccordionElementEditor.cs
@@ -5,7 +5,7 @@ using UnityEngine.UI.Extensions;
 
 namespace UnityEditor.UI
 {
-	[CustomEditor(typeof(AccordionElement), true)]
+    [CustomEditor(typeof(AccordionElement), true)]
 	public class AccordionElementEditor : ToggleEditor {
 	
 		public override void OnInspectorGUI()
diff --git a/Editor/BezierLineRendererEditor.cs b/Editor/BezierLineRendererEditor.cs
index 471d281..d3ab130 100644
--- a/Editor/BezierLineRendererEditor.cs
+++ b/Editor/BezierLineRendererEditor.cs
@@ -1,9 +1,7 @@
 ///Credit Jason Horsburgh
 ///Sourced from - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/127/uilinerenderer-mesh-not-updating-in-editor
 
-    using UnityEditor;
-using UnityEngine;
-using UnityEngine.UI.Extensions;
+using UnityEditor;
 
 namespace UnityEngine.UI.Extensions
 {
diff --git a/Editor/UIExtensionsMenuOptions.cs b/Editor/UIExtensionsMenuOptions.cs
index abc65db..f38b687 100644
--- a/Editor/UIExtensionsMenuOptions.cs
+++ b/Editor/UIExtensionsMenuOptions.cs
@@ -5,11 +5,11 @@ using UnityEngine.UI.Extensions;
 
 namespace UnityEditor.UI
 {
-	/// <summary>
-	/// This script adds the Extensions UI menu options to the Unity Editor.
-	/// </summary>
+    /// <summary>
+    /// This script adds the Extensions UI menu options to the Unity Editor.
+    /// </summary>
 
-	static internal class ExtensionMenuOptions
+    static internal class ExtensionMenuOptions
 	{
 		#region Unity Builder section  - Do not change unless UI Source (Editor\MenuOptions) changes
 		#region Unity Builder properties  - Do not change unless UI Source (Editor\MenuOptions) changes
diff --git a/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs b/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs
index eb6c2ef..acd5d25 100644
--- a/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs
+++ b/Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs
@@ -7,7 +7,6 @@
 
 using UnityEngine;
 using UnityEngine.UI;
-using System;
 using UnityEngine.UI.Extensions;
 
 
diff --git a/Scripts/Controls/Accordion/Accordion.cs b/Scripts/Controls/Accordion/Accordion.cs
index 7eb3dc4..88b43f7 100644
--- a/Scripts/Controls/Accordion/Accordion.cs
+++ b/Scripts/Controls/Accordion/Accordion.cs
@@ -4,7 +4,7 @@
 
 namespace UnityEngine.UI.Extensions
 {
-	[RequireComponent(typeof(VerticalLayoutGroup), typeof(ContentSizeFitter), typeof(ToggleGroup))]
+    [RequireComponent(typeof(VerticalLayoutGroup), typeof(ContentSizeFitter), typeof(ToggleGroup))]
 	[AddComponentMenu("UI/Extensions/Accordion/Accordion Group")]
 	public class Accordion : MonoBehaviour
 	{
diff --git a/Scripts/Controls/Accordion/AccordionElement.cs b/Scripts/Controls/Accordion/AccordionElement.cs
index a2f7055..64f20e2 100644
--- a/Scripts/Controls/Accordion/AccordionElement.cs
+++ b/Scripts/Controls/Accordion/AccordionElement.cs
@@ -6,7 +6,7 @@ using UnityEngine.UI.Extensions.Tweens;
 
 namespace UnityEngine.UI.Extensions
 {
-	[RequireComponent(typeof(RectTransform), typeof(LayoutElement))]
+    [RequireComponent(typeof(RectTransform), typeof(LayoutElement))]
 	[AddComponentMenu("UI/Extensions/Accordion/Accordion Element")]
 	public class AccordionElement : Toggle
 	{
diff --git a/Scripts/Controls/Accordion/Tweening/FloatTween.cs b/Scripts/Controls/Accordion/Tweening/FloatTween.cs
index 0378300..9ebf83a 100644
--- a/Scripts/Controls/Accordion/Tweening/FloatTween.cs
+++ b/Scripts/Controls/Accordion/Tweening/FloatTween.cs
@@ -1,12 +1,11 @@
 ///Credit ChoMPHi
 ///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/
 
-using System.Collections;
 using UnityEngine.Events;
 
 namespace UnityEngine.UI.Extensions.Tweens
 {
-	public struct FloatTween : ITweenValue
+    public struct FloatTween : ITweenValue
 	{
 		public class FloatTweenCallback : UnityEvent<float> {}
 		public class FloatFinishCallback : UnityEvent {}
diff --git a/Scripts/Controls/Accordion/Tweening/ITweenValue.cs b/Scripts/Controls/Accordion/Tweening/ITweenValue.cs
index 25d135b..ab20ec4 100644
--- a/Scripts/Controls/Accordion/Tweening/ITweenValue.cs
+++ b/Scripts/Controls/Accordion/Tweening/ITweenValue.cs
@@ -1,11 +1,10 @@
 ///Credit ChoMPHi
 ///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/
 
-using System.Collections;
 
 namespace UnityEngine.UI.Extensions.Tweens
 {
-	internal interface ITweenValue
+    internal interface ITweenValue
 	{
 		void TweenValue(float floatPercentage);
 		bool ignoreTimeScale { get; }
diff --git a/Scripts/Controls/Accordion/Tweening/TweenRunner.cs b/Scripts/Controls/Accordion/Tweening/TweenRunner.cs
index 8a3a8e3..d07b3d2 100644
--- a/Scripts/Controls/Accordion/Tweening/TweenRunner.cs
+++ b/Scripts/Controls/Accordion/Tweening/TweenRunner.cs
@@ -5,10 +5,10 @@ using System.Collections;
 
 namespace UnityEngine.UI.Extensions.Tweens
 {
-	// Tween runner, executes the given tween.
-	// The coroutine will live within the given 
-	// behaviour container.
-	internal class TweenRunner<T> where T : struct, ITweenValue
+    // Tween runner, executes the given tween.
+    // The coroutine will live within the given 
+    // behaviour container.
+    internal class TweenRunner<T> where T : struct, ITweenValue
 	{
 		protected MonoBehaviour m_CoroutineContainer;
 		protected IEnumerator m_Tween;
diff --git a/Scripts/Controls/ColorPicker/ColorImage.cs b/Scripts/Controls/ColorPicker/ColorImage.cs
index f066873..99bd786 100644
--- a/Scripts/Controls/ColorPicker/ColorImage.cs
+++ b/Scripts/Controls/ColorPicker/ColorImage.cs
@@ -1,11 +1,10 @@
 ///Credit judah4
 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
 
-using System.Globalization;
 
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
-[RequireComponent(typeof(Image))]
+    [RequireComponent(typeof(Image))]
 public class ColorImage : MonoBehaviour
 {
     public ColorPickerControl picker;
diff --git a/Scripts/Controls/ColorPicker/ColorLabel.cs b/Scripts/Controls/ColorPicker/ColorLabel.cs
index babeb81..adbb806 100644
--- a/Scripts/Controls/ColorPicker/ColorLabel.cs
+++ b/Scripts/Controls/ColorPicker/ColorLabel.cs
@@ -1,12 +1,11 @@
 ///Credit judah4
 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
 
-using System.Globalization;
 
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
 
-[RequireComponent(typeof(Text))]
+    [RequireComponent(typeof(Text))]
 public class ColorLabel : MonoBehaviour
 {
     public ColorPickerControl picker;
diff --git a/Scripts/Controls/ColorPicker/ColorPickerPresets.cs b/Scripts/Controls/ColorPicker/ColorPickerPresets.cs
index 28ac24e..3511741 100644
--- a/Scripts/Controls/ColorPicker/ColorPickerPresets.cs
+++ b/Scripts/Controls/ColorPicker/ColorPickerPresets.cs
@@ -1,7 +1,6 @@
 ///Credit judah4
 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
 
-using System.Globalization;
 
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
diff --git a/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs b/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs
index 0138920..537a86d 100644
--- a/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs
+++ b/Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs
@@ -1,5 +1,5 @@
-using UnityEngine;
-using System;
+using System;
+using UnityEngine;
 using UnityEngine.Events;
 
 [Serializable]
diff --git a/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs b/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs
index 7a393c1..b7a90d6 100644
--- a/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs
+++ b/Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs
@@ -1,5 +1,4 @@
-using UnityEngine;
-using UnityEngine.Events;
+using UnityEngine.Events;
 
 public class HSVChangedEvent : UnityEvent<float, float, float>
 {
diff --git a/Scripts/Controls/ColorPicker/HexColorField.cs b/Scripts/Controls/ColorPicker/HexColorField.cs
index 403ca63..ba43ac5 100644
--- a/Scripts/Controls/ColorPicker/HexColorField.cs
+++ b/Scripts/Controls/ColorPicker/HexColorField.cs
@@ -6,7 +6,7 @@ using System.Globalization;
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
 
-[RequireComponent(typeof(InputField))]
+    [RequireComponent(typeof(InputField))]
 public class HexColorField : MonoBehaviour
 {
     public ColorPickerControl ColorPicker;
diff --git a/Scripts/Controls/ColorPicker/SVBoxSlider.cs b/Scripts/Controls/ColorPicker/SVBoxSlider.cs
index 7ae0a08..3c26ac8 100644
--- a/Scripts/Controls/ColorPicker/SVBoxSlider.cs
+++ b/Scripts/Controls/ColorPicker/SVBoxSlider.cs
@@ -1,7 +1,6 @@
 ///Credit judah4
 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
 
-using System.Globalization;
 
 namespace UnityEngine.UI.Extensions.ColorPicker
 {
diff --git a/Scripts/Controls/ColorPicker/TiltWindow.cs b/Scripts/Controls/ColorPicker/TiltWindow.cs
index e28fa0e..98f6d8a 100644
--- a/Scripts/Controls/ColorPicker/TiltWindow.cs
+++ b/Scripts/Controls/ColorPicker/TiltWindow.cs
@@ -1,11 +1,10 @@
 ///Credit judah4
 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
 
-using System.Globalization;
 
 namespace UnityEngine.UI.Extensions
 {
-public class TiltWindow : MonoBehaviour
+    public class TiltWindow : MonoBehaviour
 {
 	public Vector2 range = new Vector2(5f, 3f);
 
diff --git a/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs b/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
index 323e731..98f2379 100644
--- a/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
+++ b/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
@@ -22,7 +22,7 @@ namespace UnityEngine.UI.Extensions
         private InputField _mainInput;
         private RectTransform _inputRT;
 
-		private Button _arrow_Button;
+		//private Button _arrow_Button;
 
         private RectTransform _rectTransform;
 
@@ -136,7 +136,7 @@ namespace UnityEngine.UI.Extensions
                 _inputRT = _rectTransform.FindChild("InputField").GetComponent<RectTransform>();
                 _mainInput = _inputRT.GetComponent<InputField>();
 
-				_arrow_Button = _rectTransform.FindChild ("ArrowBtn").GetComponent<Button> ();
+				//_arrow_Button = _rectTransform.FindChild ("ArrowBtn").GetComponent<Button> ();
 
                 _overlayRT = _rectTransform.FindChild("Overlay").GetComponent<RectTransform>();
                 _overlayRT.gameObject.SetActive(false);
diff --git a/Scripts/Controls/ComboBox/DropDownList.cs b/Scripts/Controls/ComboBox/DropDownList.cs
index 7f04146..243f225 100644
--- a/Scripts/Controls/ComboBox/DropDownList.cs
+++ b/Scripts/Controls/ComboBox/DropDownList.cs
@@ -6,10 +6,10 @@ using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
-	/// <summary>
-	///  Extension to the UI class which creates a dropdown list 
-	/// </summary>
-	[RequireComponent(typeof(RectTransform))]
+    /// <summary>
+    ///  Extension to the UI class which creates a dropdown list 
+    /// </summary>
+    [RequireComponent(typeof(RectTransform))]
 	[AddComponentMenu("UI/Extensions/Dropdown List")]
 	public class DropDownList : MonoBehaviour
 	{
diff --git a/Scripts/Controls/ReorderableList/ReorderableList.cs b/Scripts/Controls/ReorderableList/ReorderableList.cs
index 1876bed..02b7252 100644
--- a/Scripts/Controls/ReorderableList/ReorderableList.cs
+++ b/Scripts/Controls/ReorderableList/ReorderableList.cs
@@ -2,8 +2,6 @@
 /// Sourced from - http://forum.unity3d.com/threads/free-reorderable-list.364600/
 
 using System;
-using System.Collections;
-using System.Linq;
 using UnityEngine.Events;
 
 namespace UnityEngine.UI.Extensions
diff --git a/Scripts/Controls/ReorderableList/ReorderableListElement.cs b/Scripts/Controls/ReorderableList/ReorderableListElement.cs
index 3b34815..474e480 100644
--- a/Scripts/Controls/ReorderableList/ReorderableListElement.cs
+++ b/Scripts/Controls/ReorderableList/ReorderableListElement.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
diff --git a/Scripts/Controls/RescalingPanels/RescaleDragPanel.cs b/Scripts/Controls/RescalingPanels/RescaleDragPanel.cs
index d8bbcaf..bf45db3 100644
--- a/Scripts/Controls/RescalingPanels/RescaleDragPanel.cs
+++ b/Scripts/Controls/RescalingPanels/RescaleDragPanel.cs
@@ -5,7 +5,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Extensions/RescalePanels/RescaleDragPanel")]
+    [AddComponentMenu("UI/Extensions/RescalePanels/RescaleDragPanel")]
     public class RescaleDragPanel : MonoBehaviour, IPointerDownHandler, IDragHandler
     {
         private Vector2 pointerOffset;
diff --git a/Scripts/Controls/RescalingPanels/RescalePanel.cs b/Scripts/Controls/RescalingPanels/RescalePanel.cs
index 917356c..3b58018 100644
--- a/Scripts/Controls/RescalingPanels/RescalePanel.cs
+++ b/Scripts/Controls/RescalingPanels/RescalePanel.cs
@@ -5,7 +5,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Extensions/RescalePanels/RescalePanel")]
+    [AddComponentMenu("UI/Extensions/RescalePanels/RescalePanel")]
     public class RescalePanel : MonoBehaviour, IPointerDownHandler, IDragHandler
     {
         public Vector2 minSize;
diff --git a/Scripts/Controls/RescalingPanels/ResizePanel.cs b/Scripts/Controls/RescalingPanels/ResizePanel.cs
index 1b7c523..b63d673 100644
--- a/Scripts/Controls/RescalingPanels/ResizePanel.cs
+++ b/Scripts/Controls/RescalingPanels/ResizePanel.cs
@@ -5,7 +5,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Extensions/RescalePanels/ResizePanel")]
+    [AddComponentMenu("UI/Extensions/RescalePanels/ResizePanel")]
     public class ResizePanel : MonoBehaviour, IPointerDownHandler, IDragHandler
     {
         public Vector2 minSize;
diff --git a/Scripts/Controls/SelectionBox/IBoxSelectable.cs b/Scripts/Controls/SelectionBox/IBoxSelectable.cs
index 4a0b490..bf8a45f 100644
--- a/Scripts/Controls/SelectionBox/IBoxSelectable.cs
+++ b/Scripts/Controls/SelectionBox/IBoxSelectable.cs
@@ -4,13 +4,13 @@
 ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
 
 
-namespace UnityEngine.UI.Extensions 
+namespace UnityEngine.UI.Extensions
 {
 
-	/*
+    /*
 	 * Implement this interface on any MonoBehaviour that you'd like to be considered selectable.
 	 */
-	public interface IBoxSelectable {
+    public interface IBoxSelectable {
 		bool selected {
 			get; 
 			set;
diff --git a/Scripts/Controls/SelectionBox/SelectionBox.cs b/Scripts/Controls/SelectionBox/SelectionBox.cs
index 1169beb..3d73cf0 100644
--- a/Scripts/Controls/SelectionBox/SelectionBox.cs
+++ b/Scripts/Controls/SelectionBox/SelectionBox.cs
@@ -29,9 +29,9 @@
 using System.Collections.Generic;
 using UnityEngine.Events;
 
-namespace UnityEngine.UI.Extensions 
+namespace UnityEngine.UI.Extensions
 {
-	[RequireComponent(typeof(Canvas))]
+    [RequireComponent(typeof(Canvas))]
 	[AddComponentMenu("UI/Extensions/Selection Box")]
 	public class SelectionBox : MonoBehaviour
 	{
diff --git a/Scripts/Effects/Gradient2.cs b/Scripts/Effects/Gradient2.cs
index 6eec2d6..86ffdc3 100644
--- a/Scripts/Effects/Gradient2.cs
+++ b/Scripts/Effects/Gradient2.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Effects/Extensions/Gradient2")]
+    [AddComponentMenu("UI/Effects/Extensions/Gradient2")]
 	public class Gradient2 : BaseMeshEffect {
 	 [SerializeField]
 	 Type _gradientType;
diff --git a/Scripts/Effects/LetterSpacing.cs b/Scripts/Effects/LetterSpacing.cs
index 112116f..3fc7e44 100644
--- a/Scripts/Effects/LetterSpacing.cs
+++ b/Scripts/Effects/LetterSpacing.cs
@@ -45,7 +45,7 @@ using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Effects/Extensions/Letter Spacing")]
+    [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
diff --git a/Scripts/Effects/MonoSpacing.cs b/Scripts/Effects/MonoSpacing.cs
index 8ae4362..4b7dc0e 100644
--- a/Scripts/Effects/MonoSpacing.cs
+++ b/Scripts/Effects/MonoSpacing.cs
@@ -45,7 +45,7 @@ using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Effects/Extensions/Mono Spacing")]
+    [AddComponentMenu("UI/Effects/Extensions/Mono Spacing")]
     [RequireComponent(typeof(Text))]
     [RequireComponent(typeof(RectTransform))]
     ///Summary
diff --git a/Scripts/Effects/NicerOutline.cs b/Scripts/Effects/NicerOutline.cs
index 044cbf1..8f3cd88 100644
--- a/Scripts/Effects/NicerOutline.cs
+++ b/Scripts/Effects/NicerOutline.cs
@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 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")]
+    //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]
diff --git a/Scripts/Effects/UIFlippable.cs b/Scripts/Effects/UIFlippable.cs
index 2b2879f..f2294a4 100644
--- a/Scripts/Effects/UIFlippable.cs
+++ b/Scripts/Effects/UIFlippable.cs
@@ -1,8 +1,5 @@
-
-using System;
 /// Credit ChoMPHi
 /// Sourced from - http://forum.unity3d.com/threads/script-flippable-for-ui-graphics.291711/
-using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
diff --git a/Scripts/Layout/CurvedLayout.cs b/Scripts/Layout/CurvedLayout.cs
index ead8c13..a02e9fc 100644
--- a/Scripts/Layout/CurvedLayout.cs
+++ b/Scripts/Layout/CurvedLayout.cs
@@ -7,7 +7,8 @@
 /// 
 /// </summary>
 
-namespace UnityEngine.UI.Extensions {
+namespace UnityEngine.UI.Extensions
+{
     /// <summary>
     /// TODO:
     /// - add automatic child sizing, like in the HorizontalOrVerticalLayoutGroup.cs
diff --git a/Scripts/Layout/FlowLayoutGroup.cs b/Scripts/Layout/FlowLayoutGroup.cs
index 62886fd..f8dbac5 100644
--- a/Scripts/Layout/FlowLayoutGroup.cs
+++ b/Scripts/Layout/FlowLayoutGroup.cs
@@ -8,10 +8,10 @@ using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
-	/// <summary>
-	/// Layout Group controller that arranges children in rows, fitting as many on a line until total width exceeds parent bounds
-	/// </summary>
-	[AddComponentMenu("Layout/Extensions/Flow Layout Group")]
+    /// <summary>
+    /// Layout Group controller that arranges children in rows, fitting as many on a line until total width exceeds parent bounds
+    /// </summary>
+    [AddComponentMenu("Layout/Extensions/Flow Layout Group")]
 	public class FlowLayoutGroup : LayoutGroup
 	{
 		public float SpacingX = 0f;
diff --git a/Scripts/Layout/ScrollSnapBase.cs b/Scripts/Layout/ScrollSnapBase.cs
index f4e1581..377dc96 100644
--- a/Scripts/Layout/ScrollSnapBase.cs
+++ b/Scripts/Layout/ScrollSnapBase.cs
@@ -4,7 +4,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
-	public class ScrollSnapBase : MonoBehaviour, IBeginDragHandler, IDragHandler
+    public class ScrollSnapBase : MonoBehaviour, IBeginDragHandler, IDragHandler
 	{
 		internal RectTransform _screensContainer;
 		internal bool _isVertical;
diff --git a/Scripts/Layout/TileSizeFitter.cs b/Scripts/Layout/TileSizeFitter.cs
index 0d7f674..10a65b7 100644
--- a/Scripts/Layout/TileSizeFitter.cs
+++ b/Scripts/Layout/TileSizeFitter.cs
@@ -1,7 +1,6 @@
 /// Credit Ges
 /// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-3#post-2280109
 
-using System.Collections;
 using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
diff --git a/Scripts/Primitives/UICornerCut.cs b/Scripts/Primitives/UICornerCut.cs
index c5fe498..d590044 100644
--- a/Scripts/Primitives/UICornerCut.cs
+++ b/Scripts/Primitives/UICornerCut.cs
@@ -16,7 +16,8 @@
 ///
 /// </summary>
 
-namespace UnityEngine.UI.Extensions {
+namespace UnityEngine.UI.Extensions
+{
     [AddComponentMenu("UI/Extensions/Primitives/Cut Corners")]
     public class UICornerCut : UIPrimitiveBase
     {
diff --git a/Scripts/Primitives/UIGridRenderer.cs b/Scripts/Primitives/UIGridRenderer.cs
index d8b2583..e3ddf19 100644
--- a/Scripts/Primitives/UIGridRenderer.cs
+++ b/Scripts/Primitives/UIGridRenderer.cs
@@ -1,11 +1,10 @@
 /// Credit John Hattan (http://thecodezone.com/)
 /// Sourced from - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/117/uigridrenderer
 
-using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Extensions/Primitives/UIGridRenderer")]
+    [AddComponentMenu("UI/Extensions/Primitives/UIGridRenderer")]
 	public class UIGridRenderer : UILineRenderer
 	{
 		[SerializeField]
diff --git a/Scripts/Primitives/UILineRenderer.cs b/Scripts/Primitives/UILineRenderer.cs
index c5c7bf0..bc5ce32 100644
--- a/Scripts/Primitives/UILineRenderer.cs
+++ b/Scripts/Primitives/UILineRenderer.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Extensions/Primitives/UILineRenderer")]
+    [AddComponentMenu("UI/Extensions/Primitives/UILineRenderer")]
 	public class UILineRenderer : UIPrimitiveBase
 	{
 		private enum SegmentType
diff --git a/Scripts/Primitives/UILineTextureRenderer.cs b/Scripts/Primitives/UILineTextureRenderer.cs
index f80bbab..bf7053b 100644
--- a/Scripts/Primitives/UILineTextureRenderer.cs
+++ b/Scripts/Primitives/UILineTextureRenderer.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
- 	[AddComponentMenu("UI/Extensions/Primitives/UILineTextureRenderer")]
+    [AddComponentMenu("UI/Extensions/Primitives/UILineTextureRenderer")]
     public class UILineTextureRenderer : UIPrimitiveBase
     {
         [SerializeField]
diff --git a/Scripts/ToolTips/BoundTooltip/BoundTooltipTrigger.cs b/Scripts/ToolTips/BoundTooltip/BoundTooltipTrigger.cs
index 415d70e..e91de24 100644
--- a/Scripts/ToolTips/BoundTooltip/BoundTooltipTrigger.cs
+++ b/Scripts/ToolTips/BoundTooltip/BoundTooltipTrigger.cs
@@ -4,7 +4,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Extensions/Bound Tooltip/Tooltip Trigger")]
+    [AddComponentMenu("UI/Extensions/Bound Tooltip/Tooltip Trigger")]
 	public class BoundTooltipTrigger : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, ISelectHandler, IDeselectHandler
 	{
 		[TextAreaAttribute]
diff --git a/Scripts/Utilities/ExtensionsToggleGroup.cs b/Scripts/Utilities/ExtensionsToggleGroup.cs
index 6feb5b6..b47b72f 100644
--- a/Scripts/Utilities/ExtensionsToggleGroup.cs
+++ b/Scripts/Utilities/ExtensionsToggleGroup.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using UnityEngine.EventSystems;
+using System.Linq;
 using UnityEngine.Events;
+using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI
 {
diff --git a/Scripts/Utilities/ScrollRectEx.cs b/Scripts/Utilities/ScrollRectEx.cs
index 0cea497..9795839 100644
--- a/Scripts/Utilities/ScrollRectEx.cs
+++ b/Scripts/Utilities/ScrollRectEx.cs
@@ -11,7 +11,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
-	[AddComponentMenu("UI/Extensions/ScrollRectEx")]
+    [AddComponentMenu("UI/Extensions/ScrollRectEx")]
     public class ScrollRectEx : ScrollRect
     {
         private bool routeToParent = false;
diff --git a/Scripts/Utilities/Serialization/Surrogates/GameObjectSurrogate.cs b/Scripts/Utilities/Serialization/Surrogates/GameObjectSurrogate.cs
index 452e161..17cd50c 100644
--- a/Scripts/Utilities/Serialization/Surrogates/GameObjectSurrogate.cs
+++ b/Scripts/Utilities/Serialization/Surrogates/GameObjectSurrogate.cs
@@ -1,5 +1,3 @@
-using System.Runtime.Serialization;
-
 namespace UnityEngine.UI.Extensions
 {
     /// <summary>
diff --git a/Scripts/Utilities/Serialization/Surrogates/Texture2DSurrogate.cs b/Scripts/Utilities/Serialization/Surrogates/Texture2DSurrogate.cs
index 56ab750..1ec1fb5 100644
--- a/Scripts/Utilities/Serialization/Surrogates/Texture2DSurrogate.cs
+++ b/Scripts/Utilities/Serialization/Surrogates/Texture2DSurrogate.cs
@@ -1,5 +1,3 @@
-using System.Runtime.Serialization;
-
 namespace UnityEngine.UI.Extensions
 {
     /// <summary>
diff --git a/Scripts/Utilities/Serialization/Surrogates/TransformSurrogate.cs b/Scripts/Utilities/Serialization/Surrogates/TransformSurrogate.cs
index 5e0e053..173e4d7 100644
--- a/Scripts/Utilities/Serialization/Surrogates/TransformSurrogate.cs
+++ b/Scripts/Utilities/Serialization/Surrogates/TransformSurrogate.cs
@@ -1,5 +1,3 @@
-using System.Runtime.Serialization;
-
 namespace UnityEngine.UI.Extensions
 {
     /// <summary>
diff --git a/Scripts/Utilities/TestCompression.cs b/Scripts/Utilities/TestCompression.cs
index 752ef43..6411dfc 100644
--- a/Scripts/Utilities/TestCompression.cs
+++ b/Scripts/Utilities/TestCompression.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-using System.Collections;
 
 public class TestCompression : MonoBehaviour {
 
diff --git a/Scripts/Utilities/UIScrollToSelection.cs b/Scripts/Utilities/UIScrollToSelection.cs
index d563931..5849f5b 100644
--- a/Scripts/Utilities/UIScrollToSelection.cs
+++ b/Scripts/Utilities/UIScrollToSelection.cs
@@ -1,4 +1,5 @@
-/// Credit zero3growlithe
+using System.Collections.Generic;
+/// Credit zero3growlithe
 /// sourced from: http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-2#post-2011648
 
 /*USAGE:
@@ -6,7 +7,6 @@ Simply place the script on the ScrollRect that contains the selectable children
 and drag'n'drop the RectTransform of the options "container" that we'll be scrolling.*/
 
 using UnityEngine.EventSystems;
-using System.Collections.Generic;
 
 namespace UnityEngine.UI.Extensions
 {
diff --git a/Scripts/VR Extensions/VRCursor.cs b/Scripts/VR Extensions/VRCursor.cs
index c563deb..3edad87 100644
--- a/Scripts/VR Extensions/VRCursor.cs	
+++ b/Scripts/VR Extensions/VRCursor.cs	
@@ -1,7 +1,6 @@
 /// Credit Ralph Barbagallo (www.flarb.com /www.ralphbarbagallo.com / @flarb)
 /// Sourced from - http://forum.unity3d.com/threads/vr-cursor-possible-unity-4-6-gui-bug-or-is-it-me
 
-using System.Collections;
 namespace UnityEngine.UI.Extensions
 {
     [AddComponentMenu("UI/Extensions/VR Cursor")]
diff --git a/Shaders/SoftMaskShader.shader b/Shaders/SoftMaskShader.shader
index 0accab5..5d63ee3 100644
--- a/Shaders/SoftMaskShader.shader
+++ b/Shaders/SoftMaskShader.shader
@@ -1,4 +1,6 @@
-Shader "UI Extensions/SoftMaskShader"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "UI Extensions/SoftMaskShader"
 {
 	Properties
 	{
@@ -92,7 +94,7 @@
 				v2f OUT;
 				float4 wolrdPos = IN.vertex;
 				OUT.maskTexcoord = TRANSFORM_TEX(wolrdPos.xy, _AlphaMask);
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
 
 				#ifdef UNITY_HALF_TEXEL_OFFSET
diff --git a/Shaders/UIAdditive.shader b/Shaders/UIAdditive.shader
index bd729aa..59b1401 100644
--- a/Shaders/UIAdditive.shader
+++ b/Shaders/UIAdditive.shader
@@ -1,4 +1,6 @@
-Shader "UI Extensions/UIAdditive"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "UI Extensions/UIAdditive"
 {
 	Properties
 	{
@@ -68,7 +70,7 @@
 			v2f vert(appdata_t IN)
 			{
 				v2f OUT;
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
 #ifdef UNITY_HALF_TEXEL_OFFSET
 				OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
diff --git a/Shaders/UIImageCrop.shader b/Shaders/UIImageCrop.shader
index c225403..eba929c 100644
--- a/Shaders/UIImageCrop.shader
+++ b/Shaders/UIImageCrop.shader
@@ -1,4 +1,6 @@
-/// Credit 00christian00
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+/// Credit 00christian00
 /// Sourced from - http://forum.unity3d.com/threads/any-way-to-show-part-of-an-image-without-using-mask.360085/#post-2332030
 
 Shader "UI Extensions/UI Image Crop" {
@@ -46,7 +48,7 @@ Shader "UI Extensions/UI Image Crop" {
           v2f o;
 		  o.color=v.color;
 		  o.color.a=0.1;
-		  o.pos = mul (UNITY_MATRIX_MVP, v.pos);
+		  o.pos = UnityObjectToClipPos (v.pos);
 		  
 		  o.uv=TRANSFORM_TEX(v.uv, _MainTex); 
 		 
diff --git a/Shaders/UILinearDodge.shader b/Shaders/UILinearDodge.shader
index f73c1ae..3294ff5 100644
--- a/Shaders/UILinearDodge.shader
+++ b/Shaders/UILinearDodge.shader
@@ -1,4 +1,6 @@
-Shader "UI Extensions/UILinearDodge"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "UI Extensions/UILinearDodge"
 {
 	Properties
 	{
@@ -69,7 +71,7 @@
 			v2f vert(appdata_t IN)
 			{
 				v2f OUT;
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
 #ifdef UNITY_HALF_TEXEL_OFFSET
 				OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
diff --git a/Shaders/UIMultiply.shader b/Shaders/UIMultiply.shader
index 099e783..fd4a102 100644
--- a/Shaders/UIMultiply.shader
+++ b/Shaders/UIMultiply.shader
@@ -1,4 +1,6 @@
-Shader "UI Extensions/UIMultiply"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "UI Extensions/UIMultiply"
 {
 	Properties
 	{
@@ -68,7 +70,7 @@
 			v2f vert(appdata_t IN)
 			{
 				v2f OUT;
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
 #ifdef UNITY_HALF_TEXEL_OFFSET
 				OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
diff --git a/Shaders/UIScreen.shader b/Shaders/UIScreen.shader
index 038bd1e..dd8ce2e 100644
--- a/Shaders/UIScreen.shader
+++ b/Shaders/UIScreen.shader
@@ -1,4 +1,6 @@
-Shader "UI Extensions/UIScreen"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "UI Extensions/UIScreen"
 {
 	Properties
 	{
@@ -69,7 +71,7 @@
 			v2f vert(appdata_t IN)
 			{
 				v2f OUT;
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
 #ifdef UNITY_HALF_TEXEL_OFFSET
 				OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
diff --git a/Shaders/UISoftAdditive.shader b/Shaders/UISoftAdditive.shader
index a5bb004..59084d2 100644
--- a/Shaders/UISoftAdditive.shader
+++ b/Shaders/UISoftAdditive.shader
@@ -1,4 +1,6 @@
-Shader "UI Extensions/UISoftAdditive"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "UI Extensions/UISoftAdditive"
 {
 	Properties
 	{
@@ -68,7 +70,7 @@
 			v2f vert(appdata_t IN)
 			{
 				v2f OUT;
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
 #ifdef UNITY_HALF_TEXEL_OFFSET
 				OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);