diff --git a/VoidLink.xcodeproj/project.pbxproj b/VoidLink.xcodeproj/project.pbxproj
index 428f5bd0..846753fc 100644
--- a/VoidLink.xcodeproj/project.pbxproj
+++ b/VoidLink.xcodeproj/project.pbxproj
@@ -39,13 +39,13 @@
 		2AAA4E842F7666EE001E20DC /* SwiftLocalizationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E1CDF92C4FE83400547904 /* SwiftLocalizationHelper.swift */; };
 		2AC1E3832F507D80004F76C0 /* GenericUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC1E3822F507D80004F76C0 /* GenericUtils.swift */; };
 		3A4A3A112F0C000100000001 /* OSCProfilesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A4A3A102F0C000100000001 /* OSCProfilesTableViewController.swift */; };
+		3A4A3A132F0C000100000003 /* LayoutOnScreenControlsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A4A3A122F0C000100000002 /* LayoutOnScreenControlsViewController.swift */; };
 		840751B32BF49C050096B657 /* CustomTapGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 840751B22BF49C050096B657 /* CustomTapGestureRecognizer.m */; };
 		84203F232C5F24C00032EEED /* OnScreenWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84203F222C5F24C00032EEED /* OnScreenWidgetView.swift */; };
 		84351B0E2C29ACCB00A77989 /* LayoutOnScreenControls.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B072C29ACCA00A77989 /* LayoutOnScreenControls.m */; };
 		84351B0F2C29ACCB00A77989 /* OnScreenButtonState.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B092C29ACCA00A77989 /* OnScreenButtonState.m */; };
 		84351B102C29ACCB00A77989 /* OSCProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B0A2C29ACCA00A77989 /* OSCProfile.m */; };
 		84351B112C29ACCB00A77989 /* OSCProfilesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B0B2C29ACCB00A77989 /* OSCProfilesManager.m */; };
-		84351B2B2C29AD6100A77989 /* LayoutOnScreenControlsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B252C29AD6000A77989 /* LayoutOnScreenControlsViewController.m */; };
 		84351B2D2C29AD6100A77989 /* ToolBarContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B292C29AD6000A77989 /* ToolBarContainerView.m */; };
 		84351B5D2C29ADBE00A77989 /* ProfileTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84351B5B2C29ADBE00A77989 /* ProfileTableViewCell.xib */; };
 		843667F02D9D7173004A7D7F /* widgetTemplates.bin in Resources */ = {isa = PBXBuildFile; fileRef = 843667EF2D9D7173004A7D7F /* widgetTemplates.bin */; };
@@ -204,6 +204,7 @@
 		2A7113FC2F5A6C65001D852D /* ThemeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = "<group>"; };
 		2AC1E3822F507D80004F76C0 /* GenericUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericUtils.swift; sourceTree = "<group>"; };
 		3A4A3A102F0C000100000001 /* OSCProfilesTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSCProfilesTableViewController.swift; sourceTree = "<group>"; };
+		3A4A3A122F0C000100000002 /* LayoutOnScreenControlsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutOnScreenControlsViewController.swift; sourceTree = "<group>"; };
 		693B3A9A218638CD00982F7B /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		840751B12BF49B5A0096B657 /* CustomTapGestureRecognizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomTapGestureRecognizer.h; sourceTree = "<group>"; };
 		840751B22BF49C050096B657 /* CustomTapGestureRecognizer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomTapGestureRecognizer.m; sourceTree = "<group>"; };
@@ -216,8 +217,6 @@
 		84351B0B2C29ACCB00A77989 /* OSCProfilesManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OSCProfilesManager.m; sourceTree = "<group>"; };
 		84351B0C2C29ACCB00A77989 /* LayoutOnScreenControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutOnScreenControls.h; sourceTree = "<group>"; };
 		84351B0D2C29ACCB00A77989 /* OSCProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSCProfile.h; sourceTree = "<group>"; };
-		84351B252C29AD6000A77989 /* LayoutOnScreenControlsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LayoutOnScreenControlsViewController.m; sourceTree = "<group>"; };
-		84351B282C29AD6000A77989 /* LayoutOnScreenControlsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutOnScreenControlsViewController.h; sourceTree = "<group>"; };
 		84351B292C29AD6000A77989 /* ToolBarContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToolBarContainerView.m; sourceTree = "<group>"; };
 		84351B2A2C29AD6000A77989 /* ToolBarContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToolBarContainerView.h; sourceTree = "<group>"; };
 		84351B5B2C29ADBE00A77989 /* ProfileTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProfileTableViewCell.xib; sourceTree = "<group>"; };
@@ -496,8 +495,7 @@
 			isa = PBXGroup;
 			children = (
 				84351B2E2C29AD6600A77989 /* Table */,
-				84351B282C29AD6000A77989 /* LayoutOnScreenControlsViewController.h */,
-				84351B252C29AD6000A77989 /* LayoutOnScreenControlsViewController.m */,
+				3A4A3A122F0C000100000002 /* LayoutOnScreenControlsViewController.swift */,
 				187F4B232E04633100EECC59 /* WidgetPanelStackView.h */,
 				187F4B272E04658A00EECC59 /* WidgetPanelStackView.m */,
 				84351B2A2C29AD6000A77989 /* ToolBarContainerView.h */,
@@ -1214,7 +1212,7 @@
 				18B317032EE67A3A009B62C2 /* InertialScroller.swift in Sources */,
 				FB4A23B81A9D3637004D2EF2 /* LoadingFrameViewController.m in Sources */,
 				FB9AFD3A1A7E05CE00872C98 /* ServerInfoResponse.m in Sources */,
-				84351B2B2C29AD6100A77989 /* LayoutOnScreenControlsViewController.m in Sources */,
+				3A4A3A132F0C000100000003 /* LayoutOnScreenControlsViewController.swift in Sources */,
 				18341A042DEB662C0094E5F2 /* FixedTintImageView.m in Sources */,
 				18416EA42EBB3DCE00AE0124 /* UITouchUtil.swift in Sources */,
 				FB89463119F646E200339C8A /* StreamManager.m in Sources */,
diff --git a/VoidLink/Base.lproj/iPad.storyboard b/VoidLink/Base.lproj/iPad.storyboard
index 35a3c376..80e17d88 100644
--- a/VoidLink/Base.lproj/iPad.storyboard
+++ b/VoidLink/Base.lproj/iPad.storyboard
@@ -2443,13 +2443,13 @@
         <!--Layout On Screen Controls View Controller-->
         <scene sceneID="b1i-Hg-s86">
             <objects>
-                <viewController storyboardIdentifier="LayoutOnScreenControlsViewController" id="xSZ-i2-Jts" customClass="LayoutOnScreenControlsViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="LayoutOnScreenControlsViewController" id="xSZ-i2-Jts" customClass="LayoutOnScreenControlsViewController" customModule="VoidLink" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="O1f-cu-KVo"/>
                         <viewControllerLayoutGuide type="bottom" id="eaS-aj-VtA"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Acw-S4-f8a">
-                        <rect key="frame" x="0.0" y="0.0" width="1300" height="1194"/>
+                        <rect key="frame" x="0.0" y="0.0" width="1300" height="1500"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fZU-G0-fgM" userLabel="Toolbar Root View" customClass="ToolBarContainerView">
@@ -2626,7 +2626,7 @@
                                 </constraints>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="z5Q-bW-WQ8" userLabel="widgetPanelStack" customClass="WidgetPanelStackView">
-                                <rect key="frame" x="325" y="156" width="650" height="926"/>
+                                <rect key="frame" x="325" y="156" width="650" height="1135"/>
                                 <subviews>
                                     <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Profile:" textAlignment="center" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iel-xl-xd9">
                                         <rect key="frame" x="0.0" y="0.0" width="650" height="37"/>
@@ -2742,7 +2742,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="9ZS-28-txW" userLabel="borderWidthAlphaStack">
                                         <rect key="frame" x="0.0" y="358" width="650" height="34"/>
                                         <subviews>
-                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pwa-YK-6Q2" userLabel="widgetAlphaLabel">
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="Pwa-YK-6Q2" userLabel="widgetAlphaLabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="101" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="101" id="1ru-Nd-cf4"/>
@@ -2778,7 +2778,7 @@
                                     <stackView contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="zfD-bd-GEN" userLabel="stickIndicatorOffsetStack">
                                         <rect key="frame" x="0.0" y="397" width="650" height="34"/>
                                         <subviews>
-                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Stick Indicator" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tG7-oX-P9b" userLabel="stickIndicatorOffsetLabel">
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Stick Indicator" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.29999999999999999" translatesAutoresizingMaskIntoConstraints="NO" id="tG7-oX-P9b" userLabel="stickIndicatorOffsetLabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="160" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="160" id="Am2-6L-a26"/>
@@ -2806,7 +2806,7 @@
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="8" translatesAutoresizingMaskIntoConstraints="NO" id="DiG-XX-r8c">
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="16" translatesAutoresizingMaskIntoConstraints="NO" id="DiG-XX-r8c">
                                                 <rect key="frame" x="160" y="0.0" width="490" height="34"/>
                                                 <color key="tintColor" red="0.18823529410000001" green="0.69019607839999997" blue="0.78039215689999997" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -2825,7 +2825,7 @@
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="8" translatesAutoresizingMaskIntoConstraints="NO" id="2Wo-9z-DtK">
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="16" translatesAutoresizingMaskIntoConstraints="NO" id="2Wo-9z-DtK">
                                                 <rect key="frame" x="160" y="0.0" width="490" height="34"/>
                                                 <color key="tintColor" red="0.18823529410000001" green="0.69019607839999997" blue="0.78039215689999997" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -2965,8 +2965,145 @@
                                             </slider>
                                         </subviews>
                                     </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="hW2-nl-EK3" userLabel="bulkEditStacks">
+                                        <rect key="frame" x="0.0" y="787" width="650" height="204"/>
+                                        <subviews>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KSh-xS-xfD">
+                                                <rect key="frame" x="0.0" y="0.0" width="650" height="34"/>
+                                                <subviews>
+                                                    <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yF0-Tu-L8X">
+                                                        <rect key="frame" x="0.0" y="0.0" width="160" height="34"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="160" id="ofw-9E-Plc"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="-1" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="fjz-Ou-buw">
+                                                        <rect key="frame" x="160" y="0.0" width="490" height="34"/>
+                                                        <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                        <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </slider>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="34" id="Awz-Nl-ofZ"/>
+                                                </constraints>
+                                            </stackView>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wxc-0O-tca">
+                                                <rect key="frame" x="0.0" y="34" width="650" height="34"/>
+                                                <subviews>
+                                                    <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Border width" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wTH-1Z-Fgh">
+                                                        <rect key="frame" x="0.0" y="0.0" width="160" height="34"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="160" id="OyF-eF-9ag"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="8" translatesAutoresizingMaskIntoConstraints="NO" id="s98-EU-FWC">
+                                                        <rect key="frame" x="160" y="0.0" width="490" height="34"/>
+                                                        <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                        <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </slider>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="34" id="EMS-PU-ywQ"/>
+                                                </constraints>
+                                            </stackView>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O0O-pZ-URe" userLabel="Bulk Label Alpha Stack">
+                                                <rect key="frame" x="0.0" y="68" width="650" height="34"/>
+                                                <subviews>
+                                                    <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kSX-ci-kx5">
+                                                        <rect key="frame" x="0.0" y="0.0" width="160" height="34"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="160" id="L3D-Ej-6ZS"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.69999999999999996" minValue="-1" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="X0I-ZZ-ZGT">
+                                                        <rect key="frame" x="160" y="0.0" width="490" height="34"/>
+                                                        <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                        <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </slider>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="34" id="a7b-Tm-z5c"/>
+                                                </constraints>
+                                            </stackView>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rfr-nL-OCc">
+                                                <rect key="frame" x="0.0" y="102" width="650" height="34"/>
+                                                <subviews>
+                                                    <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Border alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sAF-Vy-ZzK">
+                                                        <rect key="frame" x="0.0" y="0.0" width="160" height="34"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="160" id="cWO-t5-t5M"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="-1" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="3YT-BO-4Pr">
+                                                        <rect key="frame" x="160" y="0.0" width="490" height="34"/>
+                                                        <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                        <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </slider>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="34" id="1Qz-2x-yz5"/>
+                                                </constraints>
+                                            </stackView>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X7d-dV-lHa">
+                                                <rect key="frame" x="0.0" y="136" width="650" height="34"/>
+                                                <subviews>
+                                                    <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Highlight alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1sF-08-aCr">
+                                                        <rect key="frame" x="0.0" y="0.0" width="160" height="34"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="160" id="ZUf-9R-Smf"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="UW7-u0-8Sb">
+                                                        <rect key="frame" x="160" y="0.0" width="490" height="34"/>
+                                                        <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                        <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </slider>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="34" id="nQk-5N-V2J"/>
+                                                </constraints>
+                                            </stackView>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nBA-Ii-jNy">
+                                                <rect key="frame" x="0.0" y="170" width="650" height="34"/>
+                                                <subviews>
+                                                    <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Highlight size" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hKK-ro-C5E">
+                                                        <rect key="frame" x="0.0" y="0.0" width="160" height="34"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="160" id="C4Q-cb-ZXx"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.5" maxValue="2" translatesAutoresizingMaskIntoConstraints="NO" id="w9M-2J-uIu">
+                                                        <rect key="frame" x="160" y="0.0" width="490" height="34"/>
+                                                        <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                        <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </slider>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="34" id="cnY-K5-kcZ"/>
+                                                </constraints>
+                                            </stackView>
+                                        </subviews>
+                                    </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GMQ-EQ-Hum" userLabel="mouseDownButtonStack">
-                                        <rect key="frame" x="0.0" y="787" width="650" height="31"/>
+                                        <rect key="frame" x="0.0" y="996" width="650" height="31"/>
                                         <subviews>
                                             <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Down button" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c1r-Hf-b7t" userLabel="mouseDownButtonLabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="130" height="31"/>
@@ -2993,7 +3130,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LGW-oJ-5Zf" userLabel="triggerModeStack">
-                                        <rect key="frame" x="0.0" y="823" width="650" height="31"/>
+                                        <rect key="frame" x="0.0" y="1032" width="650" height="31"/>
                                         <subviews>
                                             <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Button mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qNQ-fB-jhY" userLabel="uiLabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="130" height="31"/>
@@ -3029,7 +3166,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FEI-wQ-Q3w">
-                                        <rect key="frame" x="0.0" y="859" width="650" height="31"/>
+                                        <rect key="frame" x="0.0" y="1068" width="650" height="31"/>
                                         <subviews>
                                             <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Collected widgets   " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.20000000000000001" translatesAutoresizingMaskIntoConstraints="NO" id="WLg-7a-5wu" userLabel="uiLabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="130" height="31"/>
@@ -3078,29 +3215,166 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K9t-Ky-bWg">
-                                        <rect key="frame" x="0.0" y="895" width="650" height="31"/>
+                                        <rect key="frame" x="0.0" y="1104" width="650" height="31"/>
                                         <subviews>
-                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="       " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.20000000298023224" translatesAutoresizingMaskIntoConstraints="NO" id="wrg-n4-F5w" userLabel="uiLabel">
-                                                <rect key="frame" x="0.0" y="0.0" width="335" height="31"/>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aBW-x7-cFd">
+                                                <rect key="frame" x="0.0" y="0.0" width="330" height="31"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lar-2o-R7c">
+                                                        <rect key="frame" x="0.0" y="0.0" width="35" height="31"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="35" id="Uly-QK-Ss9"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2TR-Kd-ro4">
+                                                        <rect key="frame" x="35" y="0.0" width="90" height="31"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="90" id="QKh-al-ndE"/>
+                                                        </constraints>
+                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                        <state key="normal" title="Button">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Clear">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="12" name="Helvetica"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="titleColor" red="0.22216352249999999" green="0.88940765550000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </state>
+                                                        <buttonConfiguration key="configuration" style="tinted">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Clear">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="12" name="Helvetica"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="baseForegroundColor" red="0.22216352249999999" green="0.88940765550000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <color key="baseBackgroundColor" red="0.1468960597" green="0.58808250149999997" blue="0.66120692569999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="clearFolderButtonTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="yND-M5-3lu"/>
+                                                        </connections>
+                                                    </button>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BlQ-y7-iDS">
+                                                        <rect key="frame" x="125" y="0.0" width="5" height="31"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="5" id="WKZ-kW-aww"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cyH-Fh-vW6">
+                                                        <rect key="frame" x="130" y="0.0" width="90" height="31"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="90" id="UeY-vl-Bq1"/>
+                                                        </constraints>
+                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                        <state key="normal" title="Button">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Import">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="11" name="Helvetica"/>
+                                                                        <font key="NSOriginalFont" size="12" name="Helvetica"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="titleColor" red="0.22216352245551219" green="0.88940765545333844" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </state>
+                                                        <buttonConfiguration key="configuration" style="tinted">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Import">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="11" name="Helvetica"/>
+                                                                        <font key="NSOriginalFont" size="12" name="Helvetica"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="baseForegroundColor" red="0.22216352245551219" green="0.88940765545333844" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <color key="baseBackgroundColor" red="0.1468960597" green="0.58808250149999997" blue="0.66120692569999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="importFromOtherButtonTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="4qp-jo-KkV"/>
+                                                        </connections>
+                                                    </button>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ocb-R1-UYc">
+                                                        <rect key="frame" x="220" y="0.0" width="5" height="31"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="5" id="xI6-7Y-omo"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aGh-QR-gBW">
+                                                        <rect key="frame" x="225" y="0.0" width="100" height="31"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="90" id="Osk-FF-3gf"/>
+                                                        </constraints>
+                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                        <state key="normal" title="Button">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Import">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="11" name="Helvetica"/>
+                                                                        <font key="NSOriginalFont" size="12" name="Helvetica"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="titleColor" red="0.22216352249999999" green="0.88940765550000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </state>
+                                                        <buttonConfiguration key="configuration" style="tinted">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Bulk edit">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="12" name="Helvetica"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="baseForegroundColor" red="0.22216352249999999" green="0.88940765550000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <color key="baseBackgroundColor" red="0.1468960597" green="0.58808250149999997" blue="0.66120692569999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="bulkEditButtonTapped:" destination="xSZ-i2-Jts" eventType="touchUpInside" id="lSc-Nf-vaN"/>
+                                                        </connections>
+                                                    </button>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jcq-LI-15e">
+                                                        <rect key="frame" x="325" y="0.0" width="5" height="31"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="5" id="Jha-La-jBR"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                </subviews>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="335" id="ffw-BR-Bg6" userLabel="width = 270"/>
+                                                    <constraint firstAttribute="width" constant="256" id="gr0-vH-hFu"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="   Bulk move    " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.20000000298023224" translatesAutoresizingMaskIntoConstraints="NO" id="Jeb-fE-sCm" userLabel="uiLabel">
-                                                <rect key="frame" x="335" y="0.0" width="105" height="31"/>
+                                            </stackView>
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="         Batch move    " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.20000000298023224" translatesAutoresizingMaskIntoConstraints="NO" id="Jeb-fE-sCm" userLabel="uiLabel">
+                                                <rect key="frame" x="330" y="0.0" width="130" height="31"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="105" id="45p-45-AdA"/>
+                                                    <constraint firstAttribute="width" constant="130" id="45p-45-AdA"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <segmentedControl opaque="NO" alpha="0.76999998092651367" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="bNW-R2-UuH">
-                                                <rect key="frame" x="440" y="0.0" width="210" height="32"/>
+                                                <rect key="frame" x="460" y="0.0" width="190" height="32"/>
                                                 <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="190" id="ymS-OA-pFH"/>
+                                                </constraints>
                                                 <segments>
                                                     <segment title="disabled"/>
                                                     <segment title="enabled"/>
@@ -3126,19 +3400,39 @@
                     </view>
                     <toolbarItems/>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
-                    <size key="freeformSize" width="1300" height="1194"/>
+                    <size key="freeformSize" width="1300" height="1500"/>
                     <connections>
                         <outlet property="addButton" destination="fKN-ja-TRi" id="R2n-QF-aSj"/>
                         <outlet property="autoTapField" destination="yLM-jp-jMl" id="t0v-tj-IZ3"/>
                         <outlet property="autoTapLabel" destination="And-W9-9NR" id="r5A-4a-XZP"/>
                         <outlet property="autoTapStack" destination="e4b-0v-36Z" id="PZd-KE-lPb"/>
                         <outlet property="borderWidthAlphaStack" destination="9ZS-28-txW" id="qxV-2E-g8m"/>
+                        <outlet property="bulkAlphaLabel" destination="yF0-Tu-L8X" id="Z1J-vy-z4i"/>
+                        <outlet property="bulkAlphaSlider" destination="fjz-Ou-buw" id="DI7-fp-Q0e"/>
+                        <outlet property="bulkAlphaStack" destination="KSh-xS-xfD" id="zeb-H1-d8V"/>
+                        <outlet property="bulkBorderAlphaLabel" destination="sAF-Vy-ZzK" id="KJP-Dh-Bld"/>
+                        <outlet property="bulkBorderAlphaSlider" destination="3YT-BO-4Pr" id="12x-dK-bNQ"/>
+                        <outlet property="bulkBorderAlphaStack" destination="rfr-nL-OCc" id="oa3-vi-2fq"/>
+                        <outlet property="bulkBorderWidthLabel" destination="wTH-1Z-Fgh" id="eQA-Xn-PfW"/>
+                        <outlet property="bulkBorderWidthSlider" destination="s98-EU-FWC" id="zUO-jg-zdp"/>
+                        <outlet property="bulkBorderWidthStack" destination="Wxc-0O-tca" id="Z9c-qo-vsE"/>
+                        <outlet property="bulkEditButton" destination="aGh-QR-gBW" id="abq-ig-GXd"/>
+                        <outlet property="bulkHighlightAlphaLabel" destination="1sF-08-aCr" id="Sqr-40-9T0"/>
+                        <outlet property="bulkHighlightAlphaSlider" destination="UW7-u0-8Sb" id="lWa-BB-gwc"/>
+                        <outlet property="bulkHighlightAlphaStack" destination="X7d-dV-lHa" id="D2E-cK-Jce"/>
+                        <outlet property="bulkHighlightSizeLabel" destination="hKK-ro-C5E" id="w8O-pf-h4c"/>
+                        <outlet property="bulkHighlightSizeSlider" destination="w9M-2J-uIu" id="YoZ-T6-qpa"/>
+                        <outlet property="bulkHighlightSizeStack" destination="nBA-Ii-jNy" id="7ra-H7-9mO"/>
+                        <outlet property="bulkLabelAlphaLabel" destination="kSX-ci-kx5" id="GhN-ug-don"/>
+                        <outlet property="bulkLabelAlphaSlider" destination="X0I-ZZ-ZGT" id="5Cv-RU-Pfv"/>
+                        <outlet property="bulkLabelAlphaStack" destination="O0O-pZ-URe" id="x4u-Yh-fJI"/>
                         <outlet property="bulkMoveSelector" destination="bNW-R2-UuH" id="gM7-Me-Ycg"/>
-                        <outlet property="bulkMoveStack" destination="K9t-Ky-bWg" id="rvL-7o-67b"/>
+                        <outlet property="bulkMoveStack" destination="K9t-Ky-bWg" id="1q0-wM-EuB"/>
                         <outlet property="buttonModeSelector" destination="cKS-fy-Zpg" id="uIq-60-t7E"/>
                         <outlet property="buttonModeStack" destination="LGW-oJ-5Zf" id="Jn6-Mu-XYp"/>
                         <outlet property="chevronImageView" destination="iVZ-Fd-dY7" id="403-Nj-wRx"/>
                         <outlet property="chevronView" destination="hKp-ds-86I" id="Og9-aT-zNH"/>
+                        <outlet property="clearFolderButton" destination="2TR-Kd-ro4" id="U68-O5-frv"/>
                         <outlet property="collectedWidgetsSelector" destination="sch-0e-nfa" id="ApS-gt-9Wq"/>
                         <outlet property="collectedWidgetsStack" destination="FEI-wQ-Q3w" id="o17-RT-wJJ"/>
                         <outlet property="componentSizeLabel" destination="XMg-F0-m2y" id="pQ6-MN-dcV"/>
@@ -3150,6 +3444,7 @@
                         <outlet property="decelerationRateStack" destination="KXB-uJ-onx" id="Xn7-gp-Ztt"/>
                         <outlet property="editButton" destination="R45-lM-YPl" id="DNS-7N-3Kh"/>
                         <outlet property="exitButton" destination="7bp-Wn-j9n" id="Kku-3T-RSO"/>
+                        <outlet property="importFromOtherButton" destination="cyH-Fh-vW6" id="Jpb-qI-5LQ"/>
                         <outlet property="loadButton" destination="OId-gk-Wkg" id="adP-54-1ir"/>
                         <outlet property="minStickOffsetLabel" destination="F1n-T2-jX6" id="WBo-P5-xs2"/>
                         <outlet property="minStickOffsetSlider" destination="YBB-sq-fpO" id="Lwk-r4-rKh"/>
@@ -3314,22 +3609,22 @@
         <image name="tray.full.fill" catalog="system" width="128" height="88"/>
         <image name="video.and.waveform" catalog="system" width="128" height="94"/>
         <systemColor name="linkColor">
-            <color red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemBrownColor">
-            <color red="0.63529411759999999" green="0.51764705879999995" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.67450980392156867" green="0.49803921568627452" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemGray3Color">
-            <color red="0.78039215689999997" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.7803921568627451" green="0.7803921568627451" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemGray5Color">
-            <color red="0.8980392157" green="0.8980392157" blue="0.91764705879999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemTealColor">
-            <color red="0.18823529410000001" green="0.69019607839999997" blue="0.78039215689999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.76470588235294112" blue="0.81568627450980391" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/VoidLink/Base.lproj/iPhone.storyboard b/VoidLink/Base.lproj/iPhone.storyboard
index c7457fa0..c96fefcc 100644
--- a/VoidLink/Base.lproj/iPhone.storyboard
+++ b/VoidLink/Base.lproj/iPhone.storyboard
@@ -150,7 +150,7 @@
         <!--Layout On Screen Controls View Controller-->
         <scene sceneID="0t8-OY-y9y">
             <objects>
-                <viewController storyboardIdentifier="LayoutOnScreenControlsViewController" id="ZYS-Zm-PJs" customClass="LayoutOnScreenControlsViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="LayoutOnScreenControlsViewController" id="ZYS-Zm-PJs" customClass="LayoutOnScreenControlsViewController" customModule="VoidLink" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="OEV-LT-On1"/>
                         <viewControllerLayoutGuide type="bottom" id="TWA-bF-hnk"/>
@@ -315,7 +315,7 @@
                                 </constraints>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="7" translatesAutoresizingMaskIntoConstraints="NO" id="BVp-3O-vZ7" userLabel="widgetPanelStack" customClass="WidgetPanelStackView">
-                                <rect key="frame" x="375" y="132" width="550" height="840"/>
+                                <rect key="frame" x="375" y="132" width="550" height="1002"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Profile:" textAlignment="center" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f46-Pt-0Pv">
                                         <rect key="frame" x="0.0" y="0.0" width="550" height="28"/>
@@ -443,7 +443,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="50p-sC-ObU" userLabel="borderWidthAlphaStack">
                                         <rect key="frame" x="0.0" y="415" width="550" height="20"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qPQ-U2-aSg" userLabel="widgetAlphaLabel">
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.29999999999999999" translatesAutoresizingMaskIntoConstraints="NO" id="qPQ-U2-aSg" userLabel="widgetAlphaLabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="101" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="101" id="F3F-cO-OPA"/>
@@ -699,8 +699,140 @@
                                             <constraint firstAttribute="height" constant="20" id="Aio-nO-nHA"/>
                                         </constraints>
                                     </stackView>
-                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gsG-6n-BAb" userLabel="vibrationStyleStack">
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t6L-J9-AMW">
                                         <rect key="frame" x="0.0" y="712" width="550" height="20"/>
+                                        <subviews>
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MgK-KI-3y7">
+                                                <rect key="frame" x="0.0" y="0.0" width="160" height="20"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="160" id="7vj-2n-waQ"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="-1" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="mNe-bA-Lgu">
+                                                <rect key="frame" x="160" y="0.0" width="390" height="20"/>
+                                                <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </slider>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="siC-KY-R1s"/>
+                                        </constraints>
+                                    </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eem-2H-ekN">
+                                        <rect key="frame" x="0.0" y="739" width="550" height="20"/>
+                                        <subviews>
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Border width" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TFq-Un-O3H">
+                                                <rect key="frame" x="0.0" y="0.0" width="160" height="20"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="160" id="AkI-ZP-qfD"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="8" translatesAutoresizingMaskIntoConstraints="NO" id="3Yx-vO-052">
+                                                <rect key="frame" x="160" y="0.0" width="390" height="20"/>
+                                                <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </slider>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="CbF-4C-SeB"/>
+                                        </constraints>
+                                    </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YB4-fc-lM6">
+                                        <rect key="frame" x="0.0" y="766" width="550" height="20"/>
+                                        <subviews>
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Dr-3c-z61">
+                                                <rect key="frame" x="0.0" y="0.0" width="160" height="20"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="160" id="sSo-xR-0nl"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.69999998807907104" minValue="-1" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="XdO-Zu-fWB">
+                                                <rect key="frame" x="160" y="0.0" width="390" height="20"/>
+                                                <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </slider>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="3ZR-vO-NU9"/>
+                                        </constraints>
+                                    </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8tb-mS-WEu">
+                                        <rect key="frame" x="0.0" y="793" width="550" height="20"/>
+                                        <subviews>
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Border alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eRy-My-vvU">
+                                                <rect key="frame" x="0.0" y="0.0" width="160" height="20"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="160" id="ZBl-sM-khB"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="-1" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ogu-Fz-BTs">
+                                                <rect key="frame" x="160" y="0.0" width="390" height="20"/>
+                                                <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </slider>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="XCL-5v-ofF"/>
+                                        </constraints>
+                                    </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cJk-PA-Lp0">
+                                        <rect key="frame" x="0.0" y="820" width="550" height="20"/>
+                                        <subviews>
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Highlight alpha" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Kd-Cc-aYN">
+                                                <rect key="frame" x="0.0" y="0.0" width="160" height="20"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="160" id="kDG-5Z-TXN"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="HMa-bt-1iD">
+                                                <rect key="frame" x="160" y="0.0" width="390" height="20"/>
+                                                <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </slider>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="FkW-CW-K74"/>
+                                        </constraints>
+                                    </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sxm-3C-Jlo">
+                                        <rect key="frame" x="0.0" y="847" width="550" height="20"/>
+                                        <subviews>
+                                            <label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Highlight size" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hme-2d-8d6">
+                                                <rect key="frame" x="0.0" y="0.0" width="160" height="20"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="160" id="YJW-yE-OC7"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <slider verifyAmbiguity="off" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.5" maxValue="2" translatesAutoresizingMaskIntoConstraints="NO" id="OiU-Ae-cEn">
+                                                <rect key="frame" x="160" y="0.0" width="390" height="20"/>
+                                                <color key="tintColor" red="0.34534250659999999" green="0.68327885720000003" blue="0.76859849690000004" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
+                                                <color key="maximumTrackTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </slider>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="zGB-Zd-F1t"/>
+                                        </constraints>
+                                    </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gsG-6n-BAb" userLabel="vibrationStyleStack">
+                                        <rect key="frame" x="0.0" y="874" width="550" height="20"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Vibration style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u3w-Se-xzH" userLabel="sensitivityFactorLabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="130" height="20"/>
@@ -731,7 +863,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lEZ-1a-89J" userLabel="mouseButtonDownStack">
-                                        <rect key="frame" x="0.0" y="739" width="550" height="20"/>
+                                        <rect key="frame" x="0.0" y="901" width="550" height="20"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Button down" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ozU-7C-qKE" userLabel="uilabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="120" height="20"/>
@@ -761,7 +893,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jE7-IB-GTS" userLabel="slidableStack">
-                                        <rect key="frame" x="0.0" y="766" width="550" height="20"/>
+                                        <rect key="frame" x="0.0" y="928" width="550" height="20"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Button mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o9I-Gt-YRd" userLabel="uilabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="120" height="20"/>
@@ -800,7 +932,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="weV-Li-Itz">
-                                        <rect key="frame" x="0.0" y="793" width="550" height="20"/>
+                                        <rect key="frame" x="0.0" y="955" width="550" height="20"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Collected Widgets   " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.10000000000000001" translatesAutoresizingMaskIntoConstraints="NO" id="kek-77-Kmg" userLabel="uilabel">
                                                 <rect key="frame" x="0.0" y="0.0" width="120" height="20"/>
@@ -849,19 +981,111 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IWg-XO-cff">
-                                        <rect key="frame" x="0.0" y="820" width="550" height="20"/>
+                                        <rect key="frame" x="0.0" y="982" width="550" height="20"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="275" verticalHuggingPriority="251" text="      " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.10000000149011612" translatesAutoresizingMaskIntoConstraints="NO" id="QtA-AD-aJw" userLabel="uilabel">
-                                                <rect key="frame" x="0.0" y="0.0" width="280" height="20"/>
+                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MZj-th-E9Z">
+                                                <rect key="frame" x="0.0" y="0.0" width="284" height="20"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KbX-bp-pYg">
+                                                        <rect key="frame" x="0.0" y="0.0" width="45" height="20"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="45" id="x7V-EZ-lpc"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RqY-mm-5dD">
+                                                        <rect key="frame" x="45" y="0.0" width="70" height="20"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="70" id="6yS-M3-f6B"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="tinted">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Clear">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="12" name="Helvetica"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="baseForegroundColor" red="0.22216352249999999" green="0.88940765550000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <color key="baseBackgroundColor" red="0.1161463808" green="0.46497948480000001" blue="0.52279680969999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="clearFolderButtonTapped:" destination="ZYS-Zm-PJs" eventType="touchUpInside" id="K2t-Mf-tpd"/>
+                                                        </connections>
+                                                    </button>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wxw-Q8-aqN">
+                                                        <rect key="frame" x="115" y="0.0" width="5" height="20"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="5" id="rsB-v3-oBC"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b63-Pp-oPM">
+                                                        <rect key="frame" x="120" y="0.0" width="70" height="20"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="70" id="KtY-7k-UAR"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="tinted">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Import">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="11" name="Helvetica"/>
+                                                                        <font key="NSOriginalFont" size="12" name="Helvetica"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="baseForegroundColor" red="0.22216352249999999" green="0.88940765550000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <color key="baseBackgroundColor" red="0.1161463808" green="0.46497948480000001" blue="0.52279680969999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="importFromOtherButtonTapped:" destination="ZYS-Zm-PJs" eventType="touchUpInside" id="UxK-Zm-N0o"/>
+                                                        </connections>
+                                                    </button>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kMi-oG-eDT">
+                                                        <rect key="frame" x="190" y="0.0" width="5" height="20"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="5" id="uRp-KS-U4J"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wrY-O9-BeU">
+                                                        <rect key="frame" x="195" y="0.0" width="89" height="20"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="82" id="wK9-li-5RT"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="tinted">
+                                                            <attributedString key="attributedTitle">
+                                                                <fragment content="Batch edit">
+                                                                    <attributes>
+                                                                        <font key="NSFont" size="12" name="Helvetica"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                                                    </attributes>
+                                                                </fragment>
+                                                            </attributedString>
+                                                            <color key="baseForegroundColor" red="0.22216352249999999" green="0.88940765550000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <color key="baseBackgroundColor" red="0.1161463808" green="0.46497948480000001" blue="0.52279680969999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="bulkEditButtonTapped:" destination="ZYS-Zm-PJs" eventType="touchUpInside" id="Kk7-U3-x0a"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="280" id="I4n-79-duL"/>
+                                                    <constraint firstAttribute="width" constant="256" id="vXe-Cm-HVQ"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="      Bulk move     " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.10000000149011612" translatesAutoresizingMaskIntoConstraints="NO" id="P9b-Th-Ybc" userLabel="uilabel">
-                                                <rect key="frame" x="280" y="0.0" width="117" height="20"/>
+                                            </stackView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="      Batch move     " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.10000000149011612" translatesAutoresizingMaskIntoConstraints="NO" id="P9b-Th-Ybc" userLabel="uilabel">
+                                                <rect key="frame" x="284" y="0.0" width="117" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="117" id="RaW-fh-0bt"/>
                                                 </constraints>
@@ -870,8 +1094,11 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <segmentedControl opaque="NO" alpha="0.69999998807907104" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="ful-j0-kgc">
-                                                <rect key="frame" x="397" y="0.0" width="153" height="21"/>
+                                                <rect key="frame" x="401" y="0.0" width="149" height="21"/>
                                                 <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="149" id="AxS-cq-cMU"/>
+                                                </constraints>
                                                 <segments>
                                                     <segment title="disabled"/>
                                                     <segment title="enabled"/>
@@ -904,12 +1131,32 @@
                         <outlet property="autoTapLabel" destination="IuG-44-1Je" id="YWb-0d-zbB"/>
                         <outlet property="autoTapStack" destination="tDJ-cy-BYU" id="moT-DJ-jwF"/>
                         <outlet property="borderWidthAlphaStack" destination="50p-sC-ObU" id="2Xq-p7-31z"/>
+                        <outlet property="bulkAlphaLabel" destination="MgK-KI-3y7" id="CV9-VA-K3K"/>
+                        <outlet property="bulkAlphaSlider" destination="mNe-bA-Lgu" id="hAZ-Kk-yoP"/>
+                        <outlet property="bulkAlphaStack" destination="t6L-J9-AMW" id="dfs-YA-Gbe"/>
+                        <outlet property="bulkBorderAlphaLabel" destination="eRy-My-vvU" id="JVL-ks-pdb"/>
+                        <outlet property="bulkBorderAlphaSlider" destination="Ogu-Fz-BTs" id="gbw-hf-Xl3"/>
+                        <outlet property="bulkBorderAlphaStack" destination="8tb-mS-WEu" id="bUJ-WU-fJW"/>
+                        <outlet property="bulkBorderWidthLabel" destination="TFq-Un-O3H" id="DlD-ma-Ki3"/>
+                        <outlet property="bulkBorderWidthSlider" destination="3Yx-vO-052" id="XiD-tg-hVc"/>
+                        <outlet property="bulkBorderWidthStack" destination="eem-2H-ekN" id="Nat-jo-EOK"/>
+                        <outlet property="bulkEditButton" destination="wrY-O9-BeU" id="7fw-YL-lFT"/>
+                        <outlet property="bulkHighlightAlphaLabel" destination="4Kd-Cc-aYN" id="Ezc-o2-PhK"/>
+                        <outlet property="bulkHighlightAlphaSlider" destination="HMa-bt-1iD" id="Onw-la-6yA"/>
+                        <outlet property="bulkHighlightAlphaStack" destination="cJk-PA-Lp0" id="RMb-qQ-rWO"/>
+                        <outlet property="bulkHighlightSizeLabel" destination="hme-2d-8d6" id="u6u-pg-Owp"/>
+                        <outlet property="bulkHighlightSizeSlider" destination="OiU-Ae-cEn" id="4l7-RD-Lu0"/>
+                        <outlet property="bulkHighlightSizeStack" destination="Sxm-3C-Jlo" id="O00-es-nfj"/>
+                        <outlet property="bulkLabelAlphaLabel" destination="9Dr-3c-z61" id="Jms-OL-Qjj"/>
+                        <outlet property="bulkLabelAlphaSlider" destination="XdO-Zu-fWB" id="QdE-oJ-YlI"/>
+                        <outlet property="bulkLabelAlphaStack" destination="YB4-fc-lM6" id="PaG-vg-jbb"/>
                         <outlet property="bulkMoveSelector" destination="ful-j0-kgc" id="drA-sU-jM7"/>
                         <outlet property="bulkMoveStack" destination="IWg-XO-cff" id="ppC-Ov-AfV"/>
                         <outlet property="buttonModeSelector" destination="ojp-aS-m8w" id="ACc-Sd-Edq"/>
                         <outlet property="buttonModeStack" destination="jE7-IB-GTS" id="hKb-gp-eem"/>
                         <outlet property="chevronImageView" destination="76O-3K-aa8" id="yGv-fM-Ohf"/>
                         <outlet property="chevronView" destination="Zll-IP-PFt" id="MGR-C0-h57"/>
+                        <outlet property="clearFolderButton" destination="RqY-mm-5dD" id="mvP-BY-xDx"/>
                         <outlet property="collectedWidgetsSelector" destination="Oo7-lI-LXT" id="ufg-er-4aZ"/>
                         <outlet property="collectedWidgetsStack" destination="weV-Li-Itz" id="SII-3v-ylG"/>
                         <outlet property="componentSizeLabel" destination="kcX-kR-3gl" id="FTP-ar-6Uh"/>
@@ -919,6 +1166,7 @@
                         <outlet property="decelerationRateLabel" destination="znE-Lv-uWV" id="2Ud-O4-DD8"/>
                         <outlet property="decelerationRateSlider" destination="MFc-8O-wdZ" id="8Sh-vO-fqQ"/>
                         <outlet property="decelerationRateStack" destination="3Bf-uN-nLa" id="WaW-YW-Q7p"/>
+                        <outlet property="importFromOtherButton" destination="b63-Pp-oPM" id="QqI-Mw-KNq"/>
                         <outlet property="minStickOffsetLabel" destination="Mxv-HT-xeB" id="B9H-LZ-g3A"/>
                         <outlet property="minStickOffsetSlider" destination="w5M-fB-8rI" id="CVk-p9-IAn"/>
                         <outlet property="minStickOffsetStack" destination="mZ2-SU-Aj2" id="GsV-Uz-xVV"/>
diff --git a/VoidLink/Input/CommandManager.swift b/VoidLink/Input/CommandManager.swift
index 1f6292a5..92d9a318 100644
--- a/VoidLink/Input/CommandManager.swift
+++ b/VoidLink/Input/CommandManager.swift
@@ -120,7 +120,7 @@ import UIKit
     
     @objc public static let touchPadCmds: [String] = ["LSVPAD", "RSVPAD", "LSPAD", "RSPAD", "LSWHEEL", "RSWHEEL", "LTPAD", "RTPAD", "DS4TOUCH", "MOUSEPAD", "ABSMOUSE", "MOUSEWHEEL", "WHEEL", "DISCRETEWHEEL", "DSWHEEL", "DPAD", "TRACKBALL", "WASDPAD", "ARROWPAD"]
     @objc public static let mousePadWithButtonActions: [String] = ["MOUSEPAD", "ABSMOUSE"]
-    @objc public static let mousePad: [String] = ["MOUSEPAD", "ABSMOUSE", "TRACKBALL"]
+    @objc public static let mousePads: [String] = ["MOUSEPAD", "ABSMOUSE", "TRACKBALL"]
     @objc public static let directionPads: [String] = ["DPAD", "WASDPAD", "ARROWPAD"]
     @objc public static let stickTouchPads: [String] = ["LSVPAD", "RSVPAD", "LSPAD", "RSPAD"]
     @objc public static let nonVectorStickPads: [String] = ["LSPAD", "RSPAD"]
diff --git a/VoidLink/Input/CustomOSC/LayoutOnScreenControls.h b/VoidLink/Input/CustomOSC/LayoutOnScreenControls.h
index 0df9dfb8..f1f916d7 100644
--- a/VoidLink/Input/CustomOSC/LayoutOnScreenControls.h
+++ b/VoidLink/Input/CustomOSC/LayoutOnScreenControls.h
@@ -11,7 +11,8 @@
 
 #import <UIKit/UIKit.h>
 #import "OnScreenControls.h"
-#import "VoidLink-Swift.h"
+
+@class OnScreenWidgetView;
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -22,13 +23,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property UIView* _view;
 @property NSMutableArray *layoutChanges;
-@property CALayer *layerBeingDragged;
+@property (nullable) CALayer *layerBeingDragged;
 @property (nonatomic, weak) UIViewController *layoutToolVC;
 
-- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport
-       streamConfig:(StreamConfiguration*)streamConfig oscLevel:(int)oscLevel;
+- (id) initWithView:(UIView*)view controllerSup:(nullable ControllerSupport*)controllerSupport
+       streamConfig:(nullable StreamConfiguration*)streamConfig oscLevel:(int)oscLevel;
 
-- (CALayer*) controllerLayerFromName:(NSString*)name;
+- (nullable CALayer*) controllerLayerFromName:(NSString*)name;
 - (BOOL) isLayer:(CALayer*)layer hoveringOverButton:(UIButton*)button;
 
 - (void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
diff --git a/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m b/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m
index 5eca5ab5..352103ca 100644
--- a/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m
+++ b/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m
@@ -12,6 +12,7 @@
 #import "LayoutOnScreenControls.h"
 #import "OnScreenButtonState.h"
 #import "OSCProfilesManager.h"
+#import "VoidLink-Swift.h"
 
 
 @interface LayoutOnScreenControls ()
diff --git a/VoidLink/Input/CustomOSC/OSCProfilesManager.m b/VoidLink/Input/CustomOSC/OSCProfilesManager.m
index 1259c117..72507260 100644
--- a/VoidLink/Input/CustomOSC/OSCProfilesManager.m
+++ b/VoidLink/Input/CustomOSC/OSCProfilesManager.m
@@ -12,7 +12,6 @@
 #import "OSCProfilesManager.h"
 #import "OnScreenButtonState.h"
 #import "VoidLink-Swift.h"
-#import "LayoutOnScreenControlsViewController.h"
 #import "OnScreenControls.h"
 
 @implementation OSCProfilesManager
@@ -441,7 +440,7 @@ static CGRect layoutViewBounds;
     
     // save on-screen widget views (keyboard & mouse command) as buttonstate:
     _widgetSizeTransition = keepWidgetSize;
-    for(OnScreenWidgetView* widgetView in OnScreenWidgetViews){
+    for(OnScreenWidgetView* widgetView in OnScreenWidgetView.mapping.allValues){
         CGPoint normalizedPosition = [self normalizeWidgetPosition:widgetView.storedCenter];
         OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:widgetView.cmdString buttonType:CustomOnScreenWidget andPosition:normalizedPosition];
         buttonState.alias = widgetView.widgetLabel;
diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift
index ef722de9..21ee5004 100644
--- a/VoidLink/Input/OnScreenWidgetView.swift
+++ b/VoidLink/Input/OnScreenWidgetView.swift
@@ -447,12 +447,19 @@ import SVGKit
         self.hasStickIndicator = CommandManager.nonVectorStickPads.contains(self.touchPadString) && widgetType == WidgetTypeEnum.touchPad
         self.hasSensitivityX = CommandManager.touchPadCmds.contains(self.touchPadString) && !CommandManager.verticalTouchPads.contains(self.touchPadString)
         self.hasSensitivityY = CommandManager.touchPadCmds.contains(self.touchPadString) && !CommandManager.stickWheels.contains(self.touchPadString)
-        self.hasSlideThreshold = CommandManager.mousePad.contains(self.touchPadString)
+        self.hasSlideThreshold = CommandManager.mousePads.contains(self.touchPadString)
         
         if CommandManager.bidirectionalVerticalTouchPads.contains(self.touchPadString){
             self.sensitivityYMin = -4.0
             self.sensitivityYMax = 4.0
         }
+        
+        if CommandManager.mousePads.contains(self.touchPadString){
+            self.sensitivityXMin = 0
+            self.sensitivityXMax = 16.0
+            self.sensitivityYMin = 0
+            self.sensitivityYMax = 16.0
+        }
 
         self.hasYawFactor = self.motionControlButtonString == "GYRO" && (oscProfile.mapGyroTo == MapGyroTo.mapGyroToMouse || oscProfile.yawPitchToRightStick)
         self.hasPitchFactor = self.hasYawFactor
@@ -570,9 +577,14 @@ import SVGKit
     
     @objc public func adjustBorder(width: CGFloat){
         self.borderWidth = width
-        // self.layer.borderWidth = borderWidth
+        self.layer.borderWidth = borderWidth
         // if CommandManager.touchPadCmds.contains(self.keyString) && width == 0 {self.layer.borderWidth = 1}
-        setupView()
+        if self.shape == "round" {
+            //setup round buttons
+            self.layer.cornerRadius = self.frame.width/2
+            // self.layer.borderWidth = self.borderWidth
+            label.minimumScaleFactor = 0.15  // Adjust the scale factor for oscButtons
+        }
     }
     
     @objc public func resizeWidgetView(){
@@ -641,7 +653,7 @@ import SVGKit
         self.rightIndicator.borderColor = self.buttonDownVisualEffectLayer.borderColor
     }
 
-    private func tweakAlpha(tweakBorderAlpha:Bool){
+    private func tweakAlpha(tweakBorderAlpha:Bool, tweakLabelAlpha:Bool = true){
         // setup default border from self.backgroundAlpha
         let realBackgroundAlpha = abs(self.backgroundAlpha) - 0.18 // offset to be consistent with legacy onScreen controller layer opacity
         self.backgroundColor = UIColor(white:self.backgroundAlpha>0 ? 0.1 : 0.9, alpha: realBackgroundAlpha) // offset to be consistent with legacy onScreen controller layer opacity
@@ -652,6 +664,8 @@ import SVGKit
             self.layer.borderColor = defaultBorderColor
         }
         
+        if tweakLabelAlpha {self.tweakLabelAlpha(alpha: backgroundAlpha > 0 ? 0.4 : -0.4)}
+        
         if widgetType == WidgetTypeEnum.touchPad {
             self.backgroundColor = UIColor.clear // make touchPad transparent
         }
@@ -714,8 +728,8 @@ import SVGKit
     }
     
     private func getLargeRecSize(widthFactor:CGFloat, heightFactor:CGFloat) -> CGSize {
-        let isNormalizedSizeFactor = self.widthFactor > 6;
-        let isNormalizedHeightFactor = self.heightFactor > 6;
+        let isNormalizedSizeFactor = self.widthFactor > 10;
+        let isNormalizedHeightFactor = self.heightFactor > 10;
     
         self.getBaselineLenths()
         
@@ -836,7 +850,7 @@ import SVGKit
         self.setSquareWidgetCornerRadius()
         self.layer.borderWidth = self.borderWidth
         
-        self.tweakAlpha(tweakBorderAlpha: false)
+        self.tweakAlpha(tweakBorderAlpha: false, tweakLabelAlpha: false)
         
         if self.shape == "default" || self.shape.isEmpty {
             if CommandManager.oscButtonMappings.keys.contains(self.buttonString) && !CommandManager.oscRectangleButtonCmds.contains(self.buttonString){ //make oscButtons round
@@ -2975,7 +2989,11 @@ import SVGKit
                 guard let rootFolder = rootFolder else {return}
                 offshootRootFolders.insert(rootFolder)
             }
+            
             offshootRootFolders.remove(currentRootFolder)
+            for folder in offshootRootFolders {
+                print("offshootRootFolder \(CACurrentMediaTime()) \(folder.label.text ?? "")")
+            }
             
             guard !folder.sequenceSet.isEmpty else {return}
             for folder in offshootRootFolders {
@@ -3037,6 +3055,7 @@ import SVGKit
             parentFolder?.sequenceSet.remove(widget.sequence)
         }
         widget.parentSequence = -1
+        widget.sequenceSet.removeAll()
     }
     
     @objc static func restoreFoldedStates(){
@@ -3066,6 +3085,10 @@ import SVGKit
         isRestoring = false
     }
     
+    @objc static func getMaxSequence() -> Int16{
+        return OnScreenWidgetView.mapping.keys.max() ?? -1
+    }
+
     override func didMoveToSuperview() {
         super.didMoveToSuperview()
         if superview == nil {
diff --git a/VoidLink/Localization/Localizable.xcstrings b/VoidLink/Localization/Localizable.xcstrings
index 029e2492..e11df41e 100644
--- a/VoidLink/Localization/Localizable.xcstrings
+++ b/VoidLink/Localization/Localizable.xcstrings
@@ -162,25 +162,25 @@
         }
       }
     },
-    "  Profile: %@    Alias: %@    Command: %@" : {
+    "  Profile: %@    Alias: %@    Cmd: %@    Parent:%@" : {
       "extractionState" : "manual",
       "localizations" : {
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "  当前布局: %@    别名: %@    命令: %@"
+            "value" : "  当前布局: %@    别名: %@    命令: %@    收纳于: %@"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "  版面配置: %@    别名: %@    命令: %@"
+            "value" : "  版面配置: %@    别名: %@    命令: %@    收納於: %@"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "  版面配置: %@    别名: %@    命令: %@"
+            "value" : "  版面配置: %@    别名: %@    命令: %@    收納於: %@"
           }
         }
       }
@@ -1829,6 +1829,52 @@
         }
       }
     },
+    "Batch edit" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "批量修改"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "批次修改"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "批次修改"
+          }
+        }
+      }
+    },
+    "Batch updated" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "单控件修改"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "單控件修改"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "單控件修改"
+          }
+        }
+      }
+    },
     "betterPerformanceLink" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -1933,6 +1979,29 @@
         }
       }
     },
+    "Border alpha" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "边界透明度"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "邊界透明度"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "邊界透明度"
+          }
+        }
+      }
+    },
     "Border alpha: %.2f" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -2232,6 +2301,29 @@
         }
       }
     },
+    "Clear" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "清空"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "清空"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "清空"
+          }
+        }
+      }
+    },
     "Collapse" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -5210,6 +5302,29 @@
         }
       }
     },
+    "Highlight alpha" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高亮透明度"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高亮透明度"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高亮透明度"
+          }
+        }
+      }
+    },
     "Highlight alpha: %.2f" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -5233,6 +5348,29 @@
         }
       }
     },
+    "Highlight size" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高亮尺寸"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高亮尺寸"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高亮尺寸"
+          }
+        }
+      }
+    },
     "Highlight size: %.2f" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -5360,6 +5498,29 @@
         }
       }
     },
+    "Import" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "导入"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "匯入"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "匯入"
+          }
+        }
+      }
+    },
     "Important Tips" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -5475,6 +5636,29 @@
         }
       }
     },
+    "Label alpha" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "标签透明度"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "標籤透明度"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "標籤透明度"
+          }
+        }
+      }
+    },
     "Label alpha: %.2f" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -6881,6 +7065,29 @@
         }
       }
     },
+    "null" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "无"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "無"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "無"
+          }
+        }
+      }
+    },
     "Null" : {
       "extractionState" : "manual",
       "localizations" : {
diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.h b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.h
index 39241396..e03a1881 100644
--- a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.h
+++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.h
@@ -1,145 +1,18 @@
-//
-//  LayoutOnScreenControlsViewController.h
-//  Moonlight
-//
-//  Created by Long Le on 9/27/22.
-//  Copyright © 2022 Moonlight Game Streaming Project. All rights reserved.
-//
-//  Modified by True砖家 since 2024.6.24
-//  Copyright © 2024 True砖家 @ Bilibili. All rights reserved.
-//
-
 #import <UIKit/UIKit.h>
-#import "LayoutOnScreenControls.h"
 #import "ToolBarContainerView.h"
-#import "OSCProfilesManager.h"
-#import "VoidLink-Swift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-/**
- This view controller provides the user interface which allows the user to position on screen controller buttons anywhere they'd like on the screen. It also provides the user with the abilities to undo a change, save the on screen controller layout for later retrieval, and load previously saved controller layouts
- */
-@interface LayoutOnScreenControlsViewController : UIViewController <OnScreenWidgetGuidelineUpdateDelegate,UITextFieldDelegate, WidgetPickerViewControllerDelegate>
+@interface LayoutOnScreenControlsViewController : UIViewController <UITextFieldDelegate>
+
+@property (nonatomic, assign) BOOL quickSwitchEnabled;
+@property (weak, nonatomic) IBOutlet ToolBarContainerView *toolbarRootView;
+@property (weak, nonatomic) IBOutlet UIStackView *toolbarStackView;
+
 - (void)profileRefresh;
 - (void)reloadOnScreenWidgetViews;
-- (void)presentProfilesTableViewWithPickProfile:(bool)pickProfile;
-
-@property LayoutOnScreenControls *layoutOSC;    // object that contains a view which contains the on screen controller buttons that allows the user to drag and positions each button on the screen using touch
-@property (nonatomic) NSMutableSet* onScreenWidgetViews;
-
-@property int OSCSegmentSelected;
-@property (nonatomic, assign) bool quickSwitchEnabled;
-
-@property (weak, nonatomic) IBOutlet UIButton *trashCanButton;
-@property (weak, nonatomic) IBOutlet UIButton *undoButton;
-
-@property (weak, nonatomic) IBOutlet ToolBarContainerView *toolbarRootView;
-@property (weak, nonatomic) IBOutlet UIView *chevronView;
-@property (weak, nonatomic) IBOutlet UIImageView *chevronImageView;
-@property (weak, nonatomic) IBOutlet UIStackView *toolbarStackView;
-@property (strong, nonatomic) OSCProfilesTableViewController *oscProfilesTableViewController;
-
-@property (nonatomic, assign) NSString *currentProfileName;
-@property (strong, nonatomic) IBOutlet UILabel *currentProfileLabel;
-
-@property (weak, nonatomic) IBOutlet UILabel *widgetSizeLabel;
-@property (weak, nonatomic) IBOutlet UISlider *widgetSizeSlider;
-@property (weak, nonatomic) IBOutlet UIStackView *widgetSizeStack;
-
-@property (weak, nonatomic) IBOutlet UILabel *widgetHeightLabel;
-@property (weak, nonatomic) IBOutlet UISlider *widgetHeightSlider;
-
-@property (weak, nonatomic) IBOutlet UIStackView *widgetHeightStack;
-
-@property (weak, nonatomic) IBOutlet UILabel *widgetBorderWidthLabel;
-@property (weak, nonatomic) IBOutlet UISlider *widgetBorderWidthSlider;
-@property (weak, nonatomic) IBOutlet UILabel *widgetAlphaLabel;
-@property (weak, nonatomic) IBOutlet UISlider *widgetAlphaSlider;
-@property (weak, nonatomic) IBOutlet UIStackView *borderWidthAlphaStack;
-@property (weak, nonatomic) IBOutlet UIButton *saveButton;
-@property (weak, nonatomic) IBOutlet UIButton *exitButton;
-@property (weak, nonatomic) IBOutlet UIButton *loadButton;
-@property (weak, nonatomic) IBOutlet UIButton *addButton;
-@property (weak, nonatomic) IBOutlet UIButton *editButton;
-
-
-
-
-@property (weak, nonatomic) IBOutlet UILabel *stickIndicatorOffsetLabel;
-@property (weak, nonatomic) IBOutlet UISlider *stickIndicatorOffsetSlider;
-@property (weak, nonatomic) IBOutlet UIStackView *stickIndicatorOffsetStack;
-
-@property (weak, nonatomic) IBOutlet UILabel *sensitivityXLabel;
-@property (weak, nonatomic) IBOutlet UISlider *sensitivityXSlider;
-@property (weak, nonatomic) IBOutlet UIStackView *sensitivityXStack;
-@property (strong, nonatomic) IBOutlet UILabel *sensitivityYLabel;
-@property (strong, nonatomic) IBOutlet UISlider *sensitivityYSlider;
-@property (strong, nonatomic) IBOutlet UIStackView *sensitivityYStack;
-
-@property (strong, nonatomic) IBOutlet UILabel *yawFactorLabel;
-@property (strong, nonatomic) IBOutlet UISlider *yawFactorSlider;
-@property (strong, nonatomic) IBOutlet UIStackView *yawFactorStack;
-@property (strong, nonatomic) IBOutlet UILabel *pitchFactorLabel;
-@property (strong, nonatomic) IBOutlet UISlider *pitchFactorSlider;
-@property (strong, nonatomic) IBOutlet UIStackView *pitchFactorStack;
-@property (strong, nonatomic) IBOutlet UILabel *rollFactorLabel;
-@property (strong, nonatomic) IBOutlet UISlider *rollFactorSlider;
-@property (strong, nonatomic) IBOutlet UIStackView *rollFactorStack;
-
-
-@property (strong, nonatomic) IBOutlet UIStackView *decelerationRateStack;
-@property (strong, nonatomic) IBOutlet UILabel *decelerationRateLabel;
-@property (strong, nonatomic) IBOutlet UISlider *decelerationRateSlider;
-
-
-
-
-@property (strong, nonatomic) IBOutlet UISegmentedControl *vibrationStyleSelector;
-@property (strong, nonatomic) IBOutlet UIStackView *vibrationStyleStack;
-
-@property (strong, nonatomic) IBOutlet UILabel *tipContentLabel;
-@property (strong, nonatomic) IBOutlet UILabel *tipTitleLabel;
-
-@property (strong, nonatomic) IBOutlet UIStackView *mouseDownButtonStack;
-@property (strong, nonatomic) IBOutlet UISegmentedControl *mouseButtonDownSelector;
-
-@property (strong, nonatomic) IBOutlet UIStackView *buttonModeStack;
-@property (strong, nonatomic) IBOutlet UISegmentedControl *buttonModeSelector;
-
-@property (strong, nonatomic) IBOutlet UIStackView *autoTapStack;
-@property (strong, nonatomic) IBOutlet UILabel *autoTapLabel;
-// @property (strong, nonatomic) IBOutlet UISlider *autoTapSlider;
-@property (strong, nonatomic) IBOutlet UITextField *autoTapField;
-
-@property (strong, nonatomic) IBOutlet UIStackView *slideThresholdStack;
-@property (strong, nonatomic) IBOutlet UILabel *slideThresholdLabel;
-@property (strong, nonatomic) IBOutlet UISlider *slideThresholdSlider;
-
-@property (strong, nonatomic) IBOutlet UIStackView *minStickOffsetStack;
-@property (strong, nonatomic) IBOutlet UILabel *minStickOffsetLabel;
-@property (strong, nonatomic) IBOutlet UISlider *minStickOffsetSlider;
-
-@property (strong, nonatomic) IBOutlet UIStackView *componentSizeStack;
-@property (strong, nonatomic) IBOutlet UILabel *componentSizeLabel;
-@property (strong, nonatomic) IBOutlet UISlider *componentSizeSlider;
-
-@property (strong, nonatomic) IBOutlet UIStackView *walkModeThresholdStack;
-@property (strong, nonatomic) IBOutlet UILabel *walkModeThresholdLabel;
-@property (strong, nonatomic) IBOutlet UISlider *walkModeThresholdSlider;
-
-@property (weak, nonatomic) IBOutlet UIStackView *collectedWidgetsStack;
-@property (weak, nonatomic) IBOutlet UISegmentedControl *collectedWidgetsSelector;
-@property (weak, nonatomic) IBOutlet UISegmentedControl *revealModeSelector;
-
-@property (weak, nonatomic) IBOutlet UIStackView *bulkMoveStack;
-@property (weak, nonatomic) IBOutlet UISegmentedControl *bulkMoveSelector;
-
-
-@property (weak, nonatomic) IBOutlet UIStackView *widgetPanelStack;
-
+- (void)presentProfilesTableViewWithLoadingMode:(NSInteger)loadingMode;
 
 @end
 
-
 NS_ASSUME_NONNULL_END
diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift
new file mode 100644
index 00000000..f339a183
--- /dev/null
+++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift
@@ -0,0 +1,1941 @@
+//
+//  LayoutOnScreenControlsViewController.m -> LayoutOnScreenControlsViewController.swift
+//  Moonlight
+//
+//  Created by Long Le on 9/27/22.
+//  Copyright © 2022 Moonlight Game Streaming Project. All rights reserved.
+//
+//  Modified by True砖家 since 2024.6.24
+//  Copyright © 2024 True砖家 @ Bilibili. All rights reserved.
+//
+
+import UIKit
+
+private extension LocalizationHelper {
+    static func localizedString(forKey key: String, _ args: CVarArg...) -> String {
+        let format = NSLocalizedString(key, tableName: "Localizable", bundle: .main, value: "", comment: "")
+        return String(format: format, arguments: args)
+    }
+}
+
+@objcMembers
+@objc(LayoutOnScreenControlsViewController)
+final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidgetView.OnScreenWidgetGuidelineUpdateDelegate, UITextFieldDelegate {
+    private enum AlphaSliderMode: Int {
+        case widgetAlpha
+        case labelAlpha
+        case borderAlpha
+        case highlightAlpha
+    }
+
+    private enum BorderWidthSliderMode: Int {
+        case widgetBorderWidth
+        case highlightSize
+    }
+
+    private enum DecelerationRateSliderMode: Int {
+        case decelerationRateX
+        case decelerationRateY
+    }
+
+    var layoutOSC: LayoutOnScreenControls!
+    var onScreenWidgetViews = NSMutableSet()
+    var OSCSegmentSelected: Int = 0
+    dynamic var quickSwitchEnabled = false
+
+    @IBOutlet weak var trashCanButton: UIButton!
+    @IBOutlet weak var undoButton: UIButton!
+
+    @IBOutlet weak var toolbarRootView: ToolBarContainerView!
+    @IBOutlet weak var chevronView: UIView!
+    @IBOutlet weak var chevronImageView: UIImageView!
+    @IBOutlet weak var toolbarStackView: UIStackView!
+
+    @IBOutlet weak var currentProfileLabel: UILabel!
+    @IBOutlet weak var widgetSizeLabel: UILabel!
+    @IBOutlet weak var widgetSizeSlider: UISlider!
+    @IBOutlet weak var widgetSizeStack: UIStackView!
+    @IBOutlet weak var widgetHeightLabel: UILabel!
+    @IBOutlet weak var widgetHeightSlider: UISlider!
+    @IBOutlet weak var widgetHeightStack: UIStackView!
+    @IBOutlet weak var widgetBorderWidthLabel: UILabel!
+    @IBOutlet weak var widgetBorderWidthSlider: UISlider!
+    @IBOutlet weak var widgetAlphaLabel: UILabel!
+    @IBOutlet weak var widgetAlphaSlider: UISlider!
+    @IBOutlet weak var borderWidthAlphaStack: UIStackView!
+    @IBOutlet weak var saveButton: UIButton!
+    @IBOutlet weak var exitButton: UIButton!
+    @IBOutlet weak var loadButton: UIButton!
+    @IBOutlet weak var addButton: UIButton!
+    @IBOutlet weak var editButton: UIButton!
+
+    @IBOutlet weak var stickIndicatorOffsetLabel: UILabel!
+    @IBOutlet weak var stickIndicatorOffsetSlider: UISlider!
+    @IBOutlet weak var stickIndicatorOffsetStack: UIStackView!
+
+    @IBOutlet weak var sensitivityXLabel: UILabel!
+    @IBOutlet weak var sensitivityXSlider: UISlider!
+    @IBOutlet weak var sensitivityXStack: UIStackView!
+    @IBOutlet weak var sensitivityYLabel: UILabel!
+    @IBOutlet weak var sensitivityYSlider: UISlider!
+    @IBOutlet weak var sensitivityYStack: UIStackView!
+
+    @IBOutlet weak var yawFactorLabel: UILabel!
+    @IBOutlet weak var yawFactorSlider: UISlider!
+    @IBOutlet weak var yawFactorStack: UIStackView!
+    @IBOutlet weak var pitchFactorLabel: UILabel!
+    @IBOutlet weak var pitchFactorSlider: UISlider!
+    @IBOutlet weak var pitchFactorStack: UIStackView!
+    @IBOutlet weak var rollFactorLabel: UILabel!
+    @IBOutlet weak var rollFactorSlider: UISlider!
+    @IBOutlet weak var rollFactorStack: UIStackView!
+
+    @IBOutlet weak var decelerationRateStack: UIStackView!
+    @IBOutlet weak var decelerationRateLabel: UILabel!
+    @IBOutlet weak var decelerationRateSlider: UISlider!
+
+    @IBOutlet weak var vibrationStyleSelector: UISegmentedControl!
+    @IBOutlet weak var vibrationStyleStack: UIStackView!
+    @IBOutlet weak var tipContentLabel: UILabel!
+    @IBOutlet weak var tipTitleLabel: UILabel!
+    @IBOutlet weak var mouseDownButtonStack: UIStackView!
+    @IBOutlet weak var mouseButtonDownSelector: UISegmentedControl!
+    @IBOutlet weak var buttonModeStack: UIStackView!
+    @IBOutlet weak var buttonModeSelector: UISegmentedControl!
+    @IBOutlet weak var autoTapStack: UIStackView!
+    @IBOutlet weak var autoTapLabel: UILabel!
+    @IBOutlet weak var autoTapField: UITextField!
+    @IBOutlet weak var slideThresholdStack: UIStackView!
+    @IBOutlet weak var slideThresholdLabel: UILabel!
+    @IBOutlet weak var slideThresholdSlider: UISlider!
+    @IBOutlet weak var minStickOffsetStack: UIStackView!
+    @IBOutlet weak var minStickOffsetLabel: UILabel!
+    @IBOutlet weak var minStickOffsetSlider: UISlider!
+    @IBOutlet weak var componentSizeStack: UIStackView!
+    @IBOutlet weak var componentSizeLabel: UILabel!
+    @IBOutlet weak var componentSizeSlider: UISlider!
+    @IBOutlet weak var walkModeThresholdStack: UIStackView!
+    @IBOutlet weak var walkModeThresholdLabel: UILabel!
+    @IBOutlet weak var walkModeThresholdSlider: UISlider!
+    @IBOutlet weak var collectedWidgetsStack: UIStackView!
+    @IBOutlet weak var collectedWidgetsSelector: UISegmentedControl!
+    @IBOutlet weak var revealModeSelector: UISegmentedControl!
+    @IBOutlet weak var bulkMoveStack: UIStackView!
+    @IBOutlet weak var bulkMoveSelector: UISegmentedControl!
+    @IBOutlet weak var importFromOtherButton: UIButton!
+    @IBOutlet weak var clearFolderButton: UIButton!
+    @IBOutlet weak var bulkEditButton: UIButton!
+    @IBOutlet weak var placeHolderLabel1: UILabel!
+    
+    
+    @IBOutlet weak var bulkEditStack: UIStackView!
+    private var bulkEditStacks: [UIStackView]? = []
+    private var preBulkEditStacks: [UIStackView] = []
+
+    
+    @IBOutlet weak var bulkAlphaStack: UIStackView!
+    @IBOutlet weak var bulkAlphaLabel: UILabel!
+    @IBOutlet weak var bulkAlphaSlider: UISlider!
+    
+    
+    @IBOutlet weak var bulkBorderWidthStack: UIStackView!
+    @IBOutlet weak var bulkBorderWidthSlider: UISlider!
+    @IBOutlet weak var bulkBorderWidthLabel: UILabel!
+    
+    
+    @IBOutlet weak var bulkLabelAlphaStack: UIStackView!
+    @IBOutlet weak var bulkLabelAlphaLabel: UILabel!
+    @IBOutlet weak var bulkLabelAlphaSlider: UISlider!
+    
+    
+    @IBOutlet weak var bulkBorderAlphaStack: UIStackView!
+    @IBOutlet weak var bulkBorderAlphaLabel: UILabel!
+    @IBOutlet weak var bulkBorderAlphaSlider: UISlider!
+    
+    
+    @IBOutlet weak var bulkHighlightAlphaStack: UIStackView!
+    @IBOutlet weak var bulkHighlightAlphaLabel: UILabel!
+    @IBOutlet weak var bulkHighlightAlphaSlider: UISlider!
+    
+    @IBOutlet weak var bulkHighlightSizeStack: UIStackView!
+    @IBOutlet weak var bulkHighlightSizeLabel: UILabel!
+    @IBOutlet weak var bulkHighlightSizeSlider: UISlider!
+    
+    @IBOutlet weak var widgetPanelStack: UIStackView!
+
+    @IBOutlet private weak var toolbarTopConstraintiPhone: NSLayoutConstraint!
+    @IBOutlet private weak var toolbarTopConstraintiPad: NSLayoutConstraint!
+
+    private var oscProfilesTableViewController: OSCProfilesTableViewController?
+    private var profilesManager: OSCProfilesManager!
+    private var bulkEditEnabled: Bool = false
+    private var selectedWidgetView: OnScreenWidgetView?
+    private var alphaSliderMode: AlphaSliderMode = .widgetAlpha
+    private var borderWidthSliderMode: BorderWidthSliderMode = .widgetBorderWidth
+    private var decelerationRateSliderMode: DecelerationRateSliderMode = .decelerationRateX
+    private var selectedControllerLayer: CALayer?
+    private var controllerLoadedBounds: CGRect = .zero
+    private var widgetViewSelected = false
+    private var controllerLayerSelected = false
+    private var viewWillBeResized = false
+    private var originalTrackPointEnabled = false
+    private var isToolbarHidden = false
+    private var trashCanStoryBoardColor: UIColor?
+    private var widgetPanelMovedByTouch = false
+    private var widgetPanelStoredCenter: CGPoint = .zero
+    private var latestTouchLocation: CGPoint = .zero
+    private var vibrationGenerator = UIImpactFeedbackGenerator(style: .medium)
+    private var widgetSizeTransition: WidgetSizeTransition = .keepWidgetSize
+
+    override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+        getCurrentOrientation()
+    }
+
+    private func getCurrentOrientation() -> UIInterfaceOrientationMask {
+        let bounds = UIScreen.main.bounds
+        return bounds.width > bounds.height ? .landscape : [.portrait, .portraitUpsideDown]
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        profilesManager = OSCProfilesManager.sharedManager(view.bounds)
+        onScreenWidgetViews = NSMutableSet()
+        OSCProfilesManager.setOnScreenWidgetViewsSet(onScreenWidgetViews)
+        quickSwitchEnabled = false
+        viewWillBeResized = false
+
+        let maskPath = UIBezierPath(
+            roundedRect: chevronView.bounds,
+            byRoundingCorners: [.bottomLeft, .bottomRight],
+            cornerRadii: CGSize(width: 10, height: 10)
+        )
+        let maskLayer = CAShapeLayer()
+        maskLayer.frame = view.bounds
+        maskLayer.path = maskPath.cgPath
+        chevronView.layer.mask = maskLayer
+
+        let swipeUp = UISwipeGestureRecognizer(target: self, action: #selector(moveToolbar(_:)))
+        swipeUp.direction = .up
+        toolbarRootView.addGestureRecognizer(swipeUp)
+
+        let tap = UITapGestureRecognizer(target: self, action: #selector(moveToolbar(_:)))
+        chevronView.addGestureRecognizer(tap)
+
+        layoutOSC = LayoutOnScreenControls(view: view, controllerSup: nil, streamConfig: nil, oscLevel: Int32(OSCSegmentSelected))
+        layoutOSC._level = .custom
+        layoutOSC.layoutToolVC = self
+        addInnerAnalogSticksToOuterAnalogLayers()
+
+        undoButton.alpha = 0.3
+        trashCanStoryBoardColor = trashCanButton.tintColor
+        toolbarRootView.layer.shadowColor = UIColor.black.cgColor
+        toolbarRootView.layer.shadowOffset = .zero
+        toolbarRootView.layer.shadowOpacity = 0.5
+        toolbarRootView.layer.shadowRadius = 7
+        vibrationGenerator = UIImpactFeedbackGenerator(style: .medium)
+        widgetSizeTransition = .keepWidgetSize
+        
+        bulkEditStacks = [bulkAlphaStack, bulkBorderAlphaStack, bulkLabelAlphaStack, bulkBorderWidthStack, bulkHighlightAlphaStack, bulkHighlightSizeStack]
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
+            guard let self else { return }
+            UIView.animate(
+                withDuration: 0.2,
+                delay: 0.25,
+                usingSpringWithDamping: 0.9,
+                initialSpringVelocity: 0.5,
+                options: .curveEaseInOut
+            ) {
+                self.toolbarRootView.frame = CGRect(
+                    x: self.toolbarRootView.frame.origin.x,
+                    y: self.toolbarRootView.frame.origin.y,
+                    width: self.toolbarRootView.frame.width,
+                    height: self.toolbarRootView.frame.height
+                )
+            }
+        }
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        NotificationCenter.default.addObserver(self, selector: #selector(legacyOscLayerTapped(_:)), name: Notification.Name("LegacyOscCALayerSelectedNotification"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleProfileTablViewDismiss), name: Notification.Name("OscLayoutTableViewCloseNotification"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(dummytest), name: Notification.Name("OscLayoutProfileSelctedInTableView"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(widgetViewTapped(_:)), name: Notification.Name("OnScreenWidgetViewSelected"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(OSCLayoutChanged), name: Notification.Name("OSCLayoutChanged"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleReturnToForeground), name: UIApplication.didBecomeActiveNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleEnterBackground), name: UIApplication.willResignActiveNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(deviceOrientationDidChange), name: UIDevice.orientationDidChangeNotification, object: nil)
+        OnScreenWidgetView.editMode = true
+        handleMissingToolBarIcon(toolbarRootView)
+        widgetPanelStack.isHidden = true
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        OnScreenWidgetView.editMode = true
+        selectedWidgetView = nil
+        widgetPanelStoredCenter = widgetPanelStack.center
+        profileRefresh()
+        setupWidgetPanel()
+    }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        NotificationCenter.default.removeObserver(self)
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        OnScreenWidgetView.editMode = false
+        OnScreenWidgetView.isTweakingHighlight = false
+        super.viewWillDisappear(animated)
+        NotificationCenter.default.post(name: Notification.Name("OscLayoutCloseNotification"), object: self)
+    }
+
+    @objc func dummytest() {}
+
+    private func denormalizeWidgetPosition(_ position: CGPoint) -> CGPoint {
+        guard position.x < 1.0, position.y < 1.0 else { return position }
+        return CGPoint(x: position.x * view.bounds.width, y: position.y * view.bounds.height)
+    }
+
+    private func getCurrentWidgetSizeReference() -> WidgetSizeReference {
+        if widgetSizeTransition == .keepWidgetSize { return .longSide }
+        if widgetSizeTransition == .transitionWithOrientation {
+            return view.bounds.width > view.bounds.height ? .longSide : .shortSide
+        }
+        return .longSide
+    }
+
+    private func clearOnScreenWidgets() {
+        OnScreenWidgetView.clearMappings()
+        for subview in view.subviews where subview is OnScreenWidgetView {
+            subview.removeFromSuperview()
+        }
+        onScreenWidgetViews.removeAllObjects()
+    }
+
+    private func reloadLegacyOnScreenControls(_ profile: OSCProfile) {
+        layoutOSC.updateLegacyWidgets(with: profile)
+        addInnerAnalogSticksToOuterAnalogLayers()
+        layoutOSC.layoutChanges.removeAllObjects()
+        OSCLayoutChanged()
+    }
+
+    @objc func reloadOnScreenWidgetViews() {
+        OnScreenWidgetView.isTweakingHighlight = false
+        OnScreenWidgetView.editMode = true
+
+        DispatchQueue.main.async {
+            self.hideStickIndicators()
+            self.clearOnScreenWidgets()
+
+            guard let oscProfile = self.profilesManager?.getSelectedProfile() else { return }
+            
+            self.loadWidgets(from: oscProfile)
+
+            if !self.quickSwitchEnabled {
+                self.originalTrackPointEnabled = OnScreenWidgetView.trackPointEnabled
+                OnScreenWidgetView.trackPointEnabled = true
+            }
+        }
+    }
+
+    private func loadWidgets(from oscProfile: OSCProfile, to folder: OnScreenWidgetView? = nil) {
+        var sequence: Int16 = folder == nil ? -1 : (folder?.getAvailableSequence() ?? -1)
+        var hasLegacyWidget = false
+        for case let encoded as Data in oscProfile.buttonStatesEncoded {
+            guard let buttonState = self.profilesManager?.unarchiveButtonStateEncoded(encoded) else { continue }
+            if buttonState.widgetType == 1 {
+                let widgetView = OnScreenWidgetView(cmdString: buttonState.name, buttonLabel: buttonState.alias, shape: buttonState.widgetShape, profile: oscProfile)
+                widgetView.sequence = (buttonState.sequence == -1 || folder != nil) ? {
+                    sequence += 1
+                    return sequence
+                }() : buttonState.sequence
+                
+                OnScreenWidgetView.set(widget: widgetView, for: widgetView.sequence)
+                widgetView.sequenceSet = buttonState.sequenceSet as? Set<Int16> ?? Set()
+                widgetView.parentSequence = buttonState.parentSequence
+                widgetView.folded = buttonState.folded
+                widgetView.revealMode = RevealMode(rawValue: Int(buttonState.revealMode)) ?? .coexist
+                widgetView.bulkMoveEnabled = buttonState.bulkMoveEnabled
+                widgetView.guidelineDelegate = self
+                widgetView.translatesAutoresizingMaskIntoConstraints = false
+                widgetView.widthFactor = buttonState.widthFactor
+                widgetView.heightFactor = buttonState.heightFactor
+                widgetView.componentSizeFactor = buttonState.componentSizeFactor
+                widgetView.borderWidth = buttonState.borderWidth
+                widgetView.highlightSizeFactor = buttonState.highlightSizeFactor
+                widgetView.autoTapInterval = Int(buttonState.autoTapInterval)
+                widgetView.setVibration(style: Int(buttonState.vibrationStyle))
+                widgetView.mouseButtonAction = MouseButtonAction(rawValue: Int(buttonState.mouseButtonAction)) ?? .hovering
+                widgetView.sensitivityFactorX = buttonState.sensitivityFactorX
+                widgetView.sensitivityFactorY = buttonState.sensitivityFactorY
+                widgetView.slideThreshold = buttonState.slideThreshold
+                widgetView.yawFactor = buttonState.yawFactor
+                widgetView.pitchFactor = buttonState.pitchFactor
+                widgetView.rollFactor = buttonState.rollFactor
+                widgetView.decelerationRateX = buttonState.decelerationRateX
+                widgetView.decelerationRateY = buttonState.decelerationRateY
+                widgetView.stickIndicatorOffset = buttonState.stickIndicatorOffset
+                widgetView.dWheelWalkModeThreshold = buttonState.walkModeThreshold
+                widgetView.minStickOffset = buttonState.minStickOffset
+                widgetView.buttonMode = ButtonMode(rawValue: Int(buttonState.buttonMode)) ?? .slideToToggle
+                self.view.insertSubview(widgetView, belowSubview: self.widgetPanelStack)
+                buttonState.position = self.denormalizeWidgetPosition(buttonState.position)
+                widgetView.setLocation(position: buttonState.position)
+                widgetView.sizeReference = self.getCurrentWidgetSizeReference().rawValue
+                widgetView.resizeWidgetView()
+                widgetView.adjustTransparency(alpha: buttonState.backgroundAlpha, tweakBorderAlpha: false)
+                widgetView.tweakLabelAlpha(alpha: buttonState.labelAlpha)
+                widgetView.tweakBorderAlpha(alpha: buttonState.borderAlpha)
+                widgetView.tweakHighlightAlpha(alpha: buttonState.highlightAlpha)
+                widgetView.adjustBorder(width: buttonState.borderWidth)
+                self.onScreenWidgetViews.add(widgetView)
+                
+                guard let folder = folder else { continue }
+                if !folder.folded {
+                    folder.sequenceSet.insert(widgetView.sequence)
+                    widgetView.parentSequence = folder.sequence
+                }
+                
+            } else if buttonState.widgetType == 0 {
+                hasLegacyWidget = true
+            }
+        }
+
+        for case let widget as OnScreenWidgetView in self.onScreenWidgetViews {
+            widget.accessWidgetAttributes()
+        }
+
+        OnScreenWidgetView.unfoldedExclusiveFolderSequence = oscProfile.unfoldedExclusiveFolderSequence
+        OnScreenWidgetView.setPostExclusiveUnfoldeds(oscProfile.postExclusiveUnfoldedSequences as NSSet)
+        OnScreenWidgetView.restoreFoldedStates()
+        
+        if hasLegacyWidget {
+            self.reloadLegacyOnScreenControls(oscProfile)
+        } else {
+            for case let layer as CALayer in self.layoutOSC.oscButtonLayerPool {
+                layer.removeFromSuperlayer()
+            }
+            self.layoutOSC.oscButtonLayerPool.removeAllObjects()
+        }
+    }
+    
+    @objc func profileRefresh() {
+        let storyboardName = UIDevice.current.userInterfaceIdiom == .phone ? "iPhone" : "iPad"
+        let storyboard = UIStoryboard(name: storyboardName, bundle: nil)
+        oscProfilesTableViewController = storyboard.instantiateViewController(withIdentifier: "OSCProfilesTableViewController") as? OSCProfilesTableViewController
+        oscProfilesTableViewController?.needToUpdateOscLayoutTVC = { [weak self] in
+            guard let self else { return }
+            self.reloadOnScreenWidgetViews()
+            self.oscProfilesTableViewController?.currentOSCButtonLayers = self.layoutOSC.oscButtonLayerPool
+        }
+        oscProfilesTableViewController?.tableView?.reloadData()
+        reloadOnScreenWidgetViews()
+    }
+
+    @objc(presentProfilesTableViewWithLoadingMode:)
+    func presentProfilesTableView(with loadingMode: OSCProfilesTableViewLoadingMode) {
+        presentProfilesTableView(with: loadingMode, pickedProfileDataHandler: nil)
+    }
+
+    private func presentProfilesTableView(
+        with loadingMode: OSCProfilesTableViewLoadingMode,
+        pickedProfileDataHandler: ((OSCProfile) -> Void)? = nil
+    ) {
+        hideStickIndicators()
+        if loadingMode != .pickProfileData {selectedWidgetView = nil}
+        let storyboardName = UIDevice.current.userInterfaceIdiom == .phone ? "iPhone" : "iPad"
+        let storyboard = UIStoryboard(name: storyboardName, bundle: nil)
+        let controller = storyboard.instantiateViewController(withIdentifier: "OSCProfilesTableViewController") as? OSCProfilesTableViewController
+        controller?.layoutViewBounds = view.bounds
+        controller?.needToUpdateOscLayoutTVC = { [weak self] in
+            guard let self else { return }
+            if loadingMode == .selectProfile {
+                self.reloadOnScreenWidgetViews()
+            }
+        }
+        controller?.currentOSCButtonLayers = layoutOSC.oscButtonLayerPool
+        controller?.modalPresentationStyle = .overCurrentContext
+        controller?.loadingMode = loadingMode
+        controller?.pickedProfileDataHandler = pickedProfileDataHandler
+        widgetPanelStack.isHidden = true
+        oscProfilesTableViewController = controller
+        if let controller {
+            present(controller, animated: false)
+        }
+    }
+
+    @IBAction func loadTapped(_ sender: Any?) {
+        saveTapped(nil)
+        presentProfilesTableView(with: .selectProfile)
+    }
+
+    @IBAction func importFromOtherButtonTapped(_ sender: Any?) {
+        // importFromOtherButton.setTitle(SwiftLocalizationHelper.localizedString(forKey: "Import"), for: .normal)
+        presentProfilesTableView(with: .pickProfileData) { [weak self] profile in
+            if profile.name == self?.profilesManager.getSelectedProfile().name {return}
+            self?.loadWidgets(from: profile, to: self?.selectedWidgetView)
+        }
+    }
+
+    @IBAction func clearFolderButtonTapped(_ sender: Any?) {
+        for widget in OnScreenWidgetView.mapping.values {
+            if widget.parentSequence == selectedWidgetView?.sequence, widget.sequenceSet.isEmpty {
+                OnScreenWidgetView.mapping.removeValue(forKey: widget.sequence)
+                widget.removeFromSuperview()
+            }
+        }
+                
+        selectedWidgetView?.sequenceSet = Set()
+    }
+    
+    private func setBulkEditStackHidden(_ hidden:Bool) {
+        // bulkEditStack.isHidden = hidden
+        let bulkEditStacks = bulkEditStacks ?? []
+       
+        if !hidden {
+            for stack in widgetPanelStack.arrangedSubviews where stack is UIStackView {
+                if !stack.isHidden {
+                    preBulkEditStacks.append(stack as! UIStackView)
+                    if stack == bulkMoveStack {continue}
+                    stack.isHidden = true
+                }
+            }
+        }
+        else {
+            for stack in preBulkEditStacks {
+                stack.isHidden = false
+            }
+            preBulkEditStacks = []
+        }
+       
+        for stack in bulkEditStacks {
+            stack.isHidden = hidden
+        }
+        
+        buttonModeStack.isHidden = !hidden || (selectedWidgetView?.widgetType != .button)
+        collectedWidgetsStack.isHidden = selectedWidgetView?.isFolder != true
+        
+        if GenericUtils.isIPhone() {
+            vibrationStyleStack.isHidden = false
+        }
+        
+        autoFitStack(widgetPanelStack)
+    }
+    
+    @IBAction func bulkEditButtonTapped(_ sender: Any?) {
+        guard let selectedWidgetView = selectedWidgetView else {return}
+        if !bulkEditEnabled {applyTitle("Batch updated", for: sender as! UIButton)}
+        else {applyTitle("Batch edit", for: sender as! UIButton)}
+        bulkEditEnabled = !bulkEditEnabled
+        
+        setBulkEditStackHidden(!bulkEditEnabled)
+        refreshPanelForSelectedWidget(selectedWidgetView)
+    }
+
+    @objc private func handleEnterBackground() {
+        saveTapped(nil)
+    }
+
+    @objc private func handleReturnToForeground() {
+        setupWidgetPanel()
+        updateViewBounds()
+    }
+
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+        if UIApplication.shared.applicationState != .active { return }
+        viewWillBeResized = true
+        hideStickIndicators()
+        if !quickSwitchEnabled {
+            saveTapped(nil)
+        }
+    }
+
+    @objc private func deviceOrientationDidChange() {
+        perform(#selector(handleOrientationChangeForOnScreenWidgets), with: self, afterDelay: 0)
+    }
+
+    @objc private func handleOrientationChangeForOnScreenWidgets() {
+        if !viewWillBeResized { return }
+        setupWidgetPanel()
+        updateViewBounds()
+    }
+
+    private func updateViewBounds() {
+        viewWillBeResized = false
+        selectedWidgetView = nil
+        selectedControllerLayer = nil
+        oscProfilesTableViewController?.layoutViewBounds = view.bounds
+        OSCProfilesManager.setLayoutViewBounds(view.bounds)
+        OSCProfilesManager.setOnScreenWidgetViewsSet(onScreenWidgetViews)
+        reloadOnScreenWidgetViews()
+    }
+
+    @objc func OSCLayoutChanged() {
+        undoButton.alpha = layoutOSC.layoutChanges.count > 0 ? 1.0 : 0.3
+    }
+
+    private func enableCommonWidgetTools() {
+        tipTitleLabel.isHidden = true
+        tipContentLabel.isHidden = true
+        widgetSizeStack.isHidden = false
+        widgetHeightStack.isHidden = false
+        borderWidthAlphaStack.isHidden = false
+        if isIPhone() { vibrationStyleStack.isHidden = false }
+    }
+
+    private func autoFitLabel(_ label: UILabel) {
+        label.adjustsFontSizeToFitWidth = true
+        label.minimumScaleFactor = 0.3
+        label.numberOfLines = 1
+    }
+
+    private func autoFitStack(_ stack: UIStackView) {
+        let fittingSize = stack.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
+        var newFrame = stack.frame
+        newFrame.size = fittingSize
+        stack.frame = newFrame
+        updateClippedMask(for: stack)
+        if #available(iOS 14, *) {
+        } else {
+            applyShadowForiOS13(stack)
+        }
+    }
+
+    private func hideStickIndicators() {
+        for case let widget as OnScreenWidgetView in view.subviews {
+            widget.crossMarkLayer.isHidden = true
+            widget.lrudIndicatorBall.isHidden = true
+        }
+    }
+
+    @objc private func switchAlphaSlider(_ sender: UITapGestureRecognizer) {
+        guard widgetViewSelected else { return }
+        alphaSliderMode = AlphaSliderMode(rawValue: (alphaSliderMode.rawValue + 1) % 4) ?? .widgetAlpha
+        OnScreenWidgetView.isTweakingHighlight = alphaSliderMode == .highlightAlpha || borderWidthSliderMode == .highlightSize
+        loadWidgetAlphas()
+    }
+
+    @objc private func switchBorderWidthSlider(_ sender: UITapGestureRecognizer) {
+        guard widgetViewSelected else { return }
+        borderWidthSliderMode = BorderWidthSliderMode(rawValue: (borderWidthSliderMode.rawValue + 1) % 2) ?? .widgetBorderWidth
+        OnScreenWidgetView.isTweakingHighlight = alphaSliderMode == .highlightAlpha || borderWidthSliderMode == .highlightSize
+        loadWidgetWidths()
+    }
+
+    @objc private func switchDecelerationRateSlider(_ sender: UITapGestureRecognizer) {
+        guard widgetViewSelected else { return }
+        decelerationRateSliderMode = DecelerationRateSliderMode(rawValue: (decelerationRateSliderMode.rawValue + 1) % 2) ?? .decelerationRateX
+        loadDecelerationRates()
+    }
+
+    private func setHiddenForWidgetHighlights(_ widget:OnScreenWidgetView) {
+        widget.buttonDownVisualEffectLayer.isHidden = !OnScreenWidgetView.isTweakingHighlight
+        widget.l3r3Indicator.isHidden = !widget.hasL3R3Indicator || !OnScreenWidgetView.isTweakingHighlight
+        let hidden = !widget.isDirectionPad && !OnScreenWidgetView.isTweakingHighlight
+        widget.lrudIndicatorBall.isHidden = hidden
+        widget.upIndicator.isHidden = hidden
+        widget.downIndicator.isHidden = hidden
+        widget.leftIndicator.isHidden = hidden
+        widget.rightIndicator.isHidden = hidden
+    }
+
+    private func loadWidgetAlphas() {
+        guard let selectedWidgetView, widgetViewSelected else { return }
+        setHiddenForWidgetHighlights(selectedWidgetView)
+        switch alphaSliderMode {
+        case .widgetAlpha:
+            widgetAlphaSlider.maximumValue = 1
+            widgetAlphaSlider.minimumValue = -1
+            widgetAlphaSlider.value = Float(selectedWidgetView.backgroundAlpha)
+            widgetAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Alpha: %.2f", widgetAlphaSlider.value)
+        case .labelAlpha:
+            widgetAlphaSlider.maximumValue = 1
+            widgetAlphaSlider.minimumValue = -1
+            widgetAlphaSlider.value = Float(selectedWidgetView.labelAlpha)
+            widgetAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Label alpha: %.2f", widgetAlphaSlider.value)
+        case .borderAlpha:
+            widgetAlphaSlider.maximumValue = 1
+            widgetAlphaSlider.minimumValue = -1
+            widgetAlphaSlider.value = Float(selectedWidgetView.borderAlpha)
+            widgetAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Border alpha: %.2f", widgetAlphaSlider.value)
+        case .highlightAlpha:
+            widgetAlphaSlider.maximumValue = 1
+            widgetAlphaSlider.minimumValue = 0
+            widgetAlphaSlider.value = Float(selectedWidgetView.highlightAlpha)
+            widgetAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Highlight alpha: %.2f", widgetAlphaSlider.value)
+        }
+    }
+
+    private func loadWidgetWidths() {
+        guard let selectedWidgetView, widgetViewSelected else { return }
+        setHiddenForWidgetHighlights(selectedWidgetView)
+        switch borderWidthSliderMode {
+        case .widgetBorderWidth:
+            widgetBorderWidthSlider.minimumValue = 0
+            widgetBorderWidthSlider.maximumValue = 8
+            widgetBorderWidthSlider.setValue(Float(selectedWidgetView.borderWidth), animated: false)
+            widgetBorderWidthLabel.text = LocalizationHelper.localizedString(forKey: "Border width: %.2f", widgetBorderWidthSlider.value)
+        case .highlightSize:
+            widgetBorderWidthSlider.minimumValue = 0.01
+            widgetBorderWidthSlider.maximumValue = 2
+            widgetBorderWidthSlider.setValue(Float(selectedWidgetView.highlightSizeFactor), animated: false)
+            widgetBorderWidthLabel.text = LocalizationHelper.localizedString(forKey: "Highlight size: %.2f", widgetBorderWidthSlider.value)
+        }
+    }
+
+    private func loadDecelerationRates() {
+        guard let selectedWidgetView else { return }
+        let value = decelerationRateSliderMode == .decelerationRateX ? selectedWidgetView.decelerationRateX : selectedWidgetView.decelerationRateY
+        decelerationRateSlider.value = Float(value)
+        let key = decelerationRateSliderMode == .decelerationRateX ? "DecelerationRateX: %.3f  " : "DecelerationRateY: %.3f  "
+        decelerationRateLabel.text = LocalizationHelper.localizedString(forKey: key, decelerationRateSlider.value)
+    }
+
+    private func refreshPanelForSelectedWidget(_ widgetView: OnScreenWidgetView) {
+        hideStickIndicators()
+        clearSickInput()
+        enableCommonWidgetTools()
+        widgetViewSelected = true
+        controllerLayerSelected = false
+
+        if widgetView !== selectedWidgetView {
+            selectedWidgetView?.setAutoTapIntervalByText(str: autoTapField.text ?? "")
+        }
+        selectedWidgetView = widgetView
+        widgetView.hideAllHighlightLayersOfAllWidgets(selfIncluded: true)
+
+        autoFitLabel(currentProfileLabel)
+        currentProfileLabel.textAlignment = .left
+        currentProfileLabel.text = LocalizationHelper.localizedString(forKey: "  Profile: %@    Alias: %@    Cmd: %@    Parent:%@", profilesManager.getSelectedProfile().name, widgetView.widgetLabel, widgetView.cmdString,           LocalizationHelper.localizedString(forKey:OnScreenWidgetView.mapping[widgetView.parentSequence]?.widgetLabel ?? "null"))
+        undoButton.alpha = widgetView.layoutChanges.count > 1 ? 1.0 : 0.3
+
+        widgetView.accessWidgetAttributes()
+
+        sensitivityXStack.isHidden = !widgetView.hasSensitivityX
+        if widgetView.hasSensitivityX {
+            sensitivityXSlider.minimumValue = Float(widgetView.sensitivityXMin)
+            sensitivityXSlider.maximumValue = Float(widgetView.sensitivityXMax)
+            sensitivityXSlider.value = Float(widgetView.sensitivityFactorX)
+            let key = widgetView.hasSensitivityY ? "SensitivityX: %.2f" : "Sensitivity: %.2f"
+            sensitivityXLabel.text = LocalizationHelper.localizedString(forKey: key, widgetView.sensitivityFactorX)
+            autoFitLabel(sensitivityXLabel)
+        }
+
+        sensitivityYStack.isHidden = !widgetView.hasSensitivityY
+        if widgetView.hasSensitivityY {
+            sensitivityYSlider.minimumValue = Float(widgetView.sensitivityYMin)
+            sensitivityYSlider.maximumValue = Float(widgetView.sensitivityYMax)
+            sensitivityYSlider.value = Float(widgetView.sensitivityFactorY)
+            sensitivityYLabel.text = LocalizationHelper.localizedString(forKey: "SensitivityY: %.2f", widgetView.sensitivityFactorY)
+            autoFitLabel(sensitivityYLabel)
+        }
+
+        minStickOffsetStack.isHidden = !widgetView.hasMinStickOffset
+        if widgetView.hasMinStickOffset {
+            minStickOffsetSlider.value = Float(widgetView.minStickOffset)
+            minStickOffsetLabel.text = LocalizationHelper.localizedString(forKey: "Minimum offset: %.0f", widgetView.minStickOffset)
+            autoFitLabel(minStickOffsetLabel)
+        }
+
+        walkModeThresholdStack.isHidden = !widgetView.isStickWheel
+        if widgetView.isStickWheel {
+            walkModeThresholdSlider.value = Float(widgetView.dWheelWalkModeThreshold)
+            walkModeThresholdLabel.text = LocalizationHelper.localizedString(forKey: "Walkmode threshold: %.0f   ", widgetView.dWheelWalkModeThreshold)
+            autoFitLabel(walkModeThresholdLabel)
+        }
+
+        slideThresholdStack.isHidden = !widgetView.hasSlideThreshold
+        if widgetView.hasSlideThreshold {
+            slideThresholdSlider.minimumValue = Float(widgetView.slideThresholdMin)
+            slideThresholdSlider.maximumValue = Float(widgetView.slideThresholdMax)
+            slideThresholdSlider.value = Float(widgetView.slideThreshold)
+            slideThresholdLabel.text = LocalizationHelper.localizedString(forKey: "Slide threshold: %.1f", widgetView.slideThreshold)
+            autoFitLabel(slideThresholdLabel)
+        }
+
+        yawFactorStack.isHidden = !widgetView.hasYawFactor
+        if widgetView.hasYawFactor {
+            yawFactorSlider.minimumValue = Float(widgetView.yawFactorMin)
+            yawFactorSlider.maximumValue = Float(widgetView.yawFactorMax)
+            yawFactorSlider.value = Float(widgetView.yawFactor)
+            yawFactorLabel.text = LocalizationHelper.localizedString(forKey: "Yaw factor: %.2f", widgetView.yawFactor)
+            autoFitLabel(yawFactorLabel)
+        }
+
+        pitchFactorStack.isHidden = !widgetView.hasPitchFactor
+        if widgetView.hasPitchFactor {
+            pitchFactorSlider.minimumValue = Float(widgetView.pitchFactorMin)
+            pitchFactorSlider.maximumValue = Float(widgetView.pitchFactorMax)
+            pitchFactorSlider.value = Float(widgetView.pitchFactor)
+            pitchFactorLabel.text = LocalizationHelper.localizedString(forKey: "Pitch factor: %.2f", widgetView.pitchFactor)
+            autoFitLabel(pitchFactorLabel)
+        }
+
+        rollFactorStack.isHidden = !widgetView.hasRollFactor
+        if widgetView.hasRollFactor {
+            rollFactorSlider.minimumValue = Float(widgetView.rollFactorMin)
+            rollFactorSlider.maximumValue = Float(widgetView.rollFactorMax)
+            rollFactorSlider.value = Float(widgetView.rollFactor)
+            rollFactorLabel.text = LocalizationHelper.localizedString(forKey: "Roll factor: %.2f", widgetView.rollFactor)
+            autoFitLabel(rollFactorLabel)
+        }
+
+        stickIndicatorOffsetStack.isHidden = !widgetView.hasStickIndicator
+        if widgetView.hasStickIndicator {
+            hideStickIndicators()
+            widgetView.touchBeganLocation = CGPoint(x: widgetView.frame.width / 2, y: widgetView.frame.height / 4)
+            widgetView.showStickIndicator()
+            stickIndicatorOffsetSlider.value = Float(widgetView.stickIndicatorOffset)
+            stickIndicatorOffsetSliderMoved(stickIndicatorOffsetSlider)
+            autoFitLabel(stickIndicatorOffsetLabel)
+        }
+
+        widgetSizeSlider.value = Float(widgetView.denormalizedWidthFactor)
+        widgetSizeLabel.text = LocalizationHelper.localizedString(forKey: "Size: %.2f", widgetView.denormalizedWidthFactor)
+        autoFitLabel(widgetSizeLabel)
+
+        widgetHeightSlider.value = Float(widgetView.denormalizedHeightFactor)
+        widgetHeightLabel.text = LocalizationHelper.localizedString(forKey: "Height: %.2f", widgetView.denormalizedHeightFactor)
+        autoFitLabel(widgetHeightLabel)
+
+        componentSizeStack.isHidden = !widgetView.hasComponent
+        componentSizeSlider.value = Float(widgetView.denormalizedComponentSizeFactor)
+        componentSizeLabel.text = LocalizationHelper.localizedString(forKey: "Component size: %.2f   ", widgetView.denormalizedComponentSizeFactor)
+        autoFitLabel(componentSizeLabel)
+
+        loadWidgetAlphas()
+        loadWidgetWidths()
+        autoTapStack.isHidden = !widgetView.hasAutoTap
+        autoTapField.text = widgetView.getAutoTapIntervalStr()
+        autoTapField.textColor = .white
+        autoTapField.keyboardType = .numbersAndPunctuation
+        autoTapField.attributedPlaceholder = NSAttributedString(
+            string: LocalizationHelper.localizedString(forKey: "Minimum: 50ms. 0 to disable. ms(milliSec),s(sec),m(min). ⏎ to save"),
+            attributes: [.foregroundColor: UIColor.white.withAlphaComponent(0.77)]
+        )
+        autoFitLabel(autoTapLabel)
+
+        decelerationRateStack.isHidden = !widgetView.hasInertia
+        decelerationRateSlider.value = Float(widgetView.decelerationRateX)
+        loadDecelerationRates()
+        autoFitLabel(decelerationRateLabel)
+
+        mouseDownButtonStack.isHidden = !widgetView.isMousePadWithButtonActions
+        mouseButtonDownSelector.selectedSegmentIndex = Int(widgetView.mouseButtonAction.rawValue)
+
+        buttonModeStack.isHidden = widgetView.widgetType != .button
+        buttonModeSelector.setEnabled(!widgetView.isFunctionalButton, forSegmentAt: Int(ButtonMode.slideToToggle.rawValue))
+        buttonModeSelector.setEnabled(!widgetView.isFunctionalButton || widgetView.isFolder, forSegmentAt: Int(ButtonMode.slideAndHold.rawValue))
+        buttonModeSelector.setEnabled(!widgetView.isFolder, forSegmentAt: Int(ButtonMode.regular.rawValue))
+        buttonModeSelector.setEnabled(!widgetView.isFunctionalButton || widgetView.isTapToToggleException, forSegmentAt: Int(ButtonMode.tapToToggle.rawValue))
+        buttonModeSelector.selectedSegmentIndex = Int(widgetView.buttonMode.rawValue)
+
+        collectedWidgetsStack.isHidden = !widgetView.isFolder
+        collectedWidgetsSelector.selectedSegmentIndex = widgetView.folded ? 1 : 0
+        revealModeSelector.selectedSegmentIndex = Int(widgetView.revealMode.rawValue)
+        OnScreenWidgetView.set(folded: widgetView.folded, for: widgetView)
+        
+        self.bulkEditButton.isEnabled = collectedWidgetsSelector.selectedSegmentIndex == 0
+        self.importFromOtherButton.isEnabled = collectedWidgetsSelector.selectedSegmentIndex == 0
+        self.clearFolderButton.isEnabled = collectedWidgetsSelector.selectedSegmentIndex  == 0
+        // self.placeHolderLabel1.isHidden = collectedWidgetsSelector.selectedSegmentIndex == 0
+        
+        // bulkMoveStack.isHidden = !widgetView.isFolder
+        bulkMoveStack.isHidden = !(widgetView.isFolder || widgetView.parentSequence == -1)
+        bulkMoveSelector.isEnabled = widgetView.isFolder
+        clearFolderButton.isEnabled = widgetView.isFolder && !widgetView.folded
+        importFromOtherButton.isEnabled = widgetView.isFolder && !widgetView.folded
+        bulkMoveSelector.selectedSegmentIndex = widgetView.bulkMoveEnabled ? 1 : 0
+        if !widgetView.isFolder {
+            bulkMoveSelector.selectedSegmentIndex = 0
+        }
+
+        setBulkEditStackHidden(!bulkEditEnabled)
+                
+        if isIPhone() {
+            vibrationStyleStack.isHidden = !widgetView.hasHapticFeedback
+            vibrationStyleSelector.selectedSegmentIndex = widgetView.vibrationStyle
+        }
+        autoFitStack(widgetPanelStack)
+    }
+
+    @objc private func widgetViewTapped(_ notification: Notification) {
+        guard let widgetView = notification.object as? OnScreenWidgetView else { return }
+        layoutOSC.updateGuidelinesFor(onScreenWidget: widgetView)
+        refreshPanelForSelectedWidget(widgetView)
+    }
+
+    @objc private func legacyOscLayerTapped(_ notification: Notification) {
+        guard let controllerLayer = notification.object as? CALayer else { return }
+        enableCommonWidgetTools()
+        hideStickIndicators()
+        widgetViewSelected = false
+        selectedWidgetView = nil
+        autoTapStack.isHidden = true
+        stickIndicatorOffsetStack.isHidden = true
+        sensitivityXStack.isHidden = true
+        sensitivityYStack.isHidden = true
+        mouseDownButtonStack.isHidden = true
+        decelerationRateStack.isHidden = true
+
+        controllerLayerSelected = true
+        selectedControllerLayer = controllerLayer
+        controllerLoadedBounds = controllerLayer.bounds
+
+        autoFitLabel(currentProfileLabel)
+        currentProfileLabel.textAlignment = .left
+        currentProfileLabel.text = LocalizationHelper.localizedString(forKey: "  Profile: %@    Widget: %@", profilesManager.getSelectedProfile().name, selectedControllerLayer?.name ?? "")
+
+        let sizeFactor = OnScreenControls.getControllerLayerSizeFactor(controllerLayer)
+        widgetSizeSlider.value = Float(sizeFactor)
+        widgetHeightSlider.value = Float(sizeFactor)
+        let alpha = layoutOSC.getControllerLayerOpacity(controllerLayer)
+        widgetAlphaSlider.value = Float(alpha)
+        widgetSizeLabel.text = LocalizationHelper.localizedString(forKey: "Size: %.2f", sizeFactor)
+        widgetHeightLabel.text = LocalizationHelper.localizedString(forKey: "Height: %.2f", sizeFactor)
+        widgetAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Alpha: %.2f", alpha)
+        if isIPhone() {
+            vibrationStyleStack.isHidden = false
+            if let style = OnScreenControls.layerVibrationStyleDic()?.object(forKey: controllerLayer.name ?? "") as? NSNumber {
+                vibrationStyleSelector.selectedSegmentIndex = style.intValue
+            }
+        }
+        autoFitStack(widgetPanelStack)
+    }
+
+    @IBAction func closeTapped(_ sender: Any?) {
+        clearSickInput()
+        dismiss(animated: true) {
+            OnScreenWidgetView.trackPointEnabled = self.originalTrackPointEnabled
+        }
+    }
+
+    @IBAction func trashCanTapped(_ sender: Any?) {
+        let alert = UIAlertController(
+            title: LocalizationHelper.localizedString(forKey: "Delete Buttons Here"),
+            message: LocalizationHelper.localizedString(forKey: "Drag and drop buttons onto this trash can to remove them from the interface"),
+            preferredStyle: .alert
+        )
+        alert.addAction(UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Ok"), style: .default))
+        present(alert, animated: true)
+    }
+
+    @IBAction func undoTapped(_ sender: Any?) {
+        let alert = UIAlertController(
+            title: LocalizationHelper.localizedString(forKey: "Nothing to Undo"),
+            message: LocalizationHelper.localizedString(forKey: "There are no changes to undo"),
+            preferredStyle: .alert
+        )
+        alert.addAction(UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Ok"), style: .default))
+
+        if !widgetViewSelected {
+            if layoutOSC.layoutChanges.count > 0,
+               let buttonState = layoutOSC.layoutChanges.lastObject as? OnScreenButtonState,
+               let buttonLayer = layoutOSC.controllerLayer(fromName: buttonState.name) {
+                buttonLayer.position = buttonState.position
+                buttonLayer.isHidden = buttonState.isHidden
+                if buttonLayer.name == "dPad" {
+                    layoutOSC._upButton.isHidden = buttonState.isHidden
+                    layoutOSC._rightButton.isHidden = buttonState.isHidden
+                    layoutOSC._downButton.isHidden = buttonState.isHidden
+                    layoutOSC._leftButton.isHidden = buttonState.isHidden
+                }
+                if buttonLayer.name == "leftStickBackground" {
+                    layoutOSC._leftStick.isHidden = buttonState.isHidden
+                }
+                if buttonLayer.name == "rightStickBackground" {
+                    layoutOSC._rightStick.isHidden = buttonState.isHidden
+                }
+                layoutOSC.layoutChanges.removeLastObject()
+                OSCLayoutChanged()
+            } else {
+                present(alert, animated: true)
+            }
+        } else if let selectedWidgetView {
+            if selectedWidgetView.layoutChanges.count > 1 {
+                selectedWidgetView.undoRelocation()
+            } else {
+                present(alert, animated: true)
+            }
+            undoButton.alpha = selectedWidgetView.layoutChanges.count > 1 ? 1.0 : 0.3
+        }
+    }
+
+    private func presentInvalidWidgetCommandAlert() {
+        let alert = UIAlertController(
+            title: LocalizationHelper.localizedString(forKey: "Invalid Input"),
+            message: LocalizationHelper.localizedString(forKey: "Check the command and parameter."),
+            preferredStyle: .alert
+        )
+        alert.addAction(UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Read Widget Instruction"), style: .default) { _ in
+            guard let url = URL(string: LocalizationHelper.localizedString(forKey: "onScreenWidgetStackDoc")),
+                  UIApplication.shared.canOpenURL(url) else { return }
+            UIApplication.shared.open(url)
+        })
+        alert.addAction(UIAlertAction(title: LocalizationHelper.localizedString(forKey: "OK"), style: .default))
+        present(alert, animated: true)
+    }
+
+    private func isWidgetParamsValid(_ params: NSMutableDictionary) -> Bool {
+        let cmdString = (params["cmdString"] as? String ?? "").uppercased()
+        let buttonLabel = params["buttonLabel"] as? String ?? ""
+        var widgetShape = (params["shape"] as? String ?? "").lowercased()
+
+        params["cmdString"] = cmdString
+        let noValidKeyboardString = CommandManager.shared.extractAutoReleaseButtonStrings(from: cmdString) == nil
+        let noValidSuperCombo = CommandManager.shared.extractCmdStrings(from: cmdString) == nil
+        let noValidMouse = !CommandManager.mouseButtonMappings.keys.contains(cmdString)
+        let noValidTouchPad = !CommandManager.touchPadCmds.contains(cmdString)
+        let noValidOsc = !CommandManager.oscButtonMappings.keys.contains(cmdString)
+        let noValidFunctional = !CommandManager.functionalButtonCmds.contains(cmdString)
+        let noValidMotion = !CommandManager.motionControlButtonCmds.contains(cmdString)
+        var invalid = noValidKeyboardString && noValidMouse && noValidTouchPad && noValidOsc && noValidFunctional && noValidSuperCombo && noValidMotion
+
+        if buttonLabel.isEmpty {
+            params["buttonLabel"] = cmdString.lowercased().capitalized
+        }
+
+        let validShapes: Set<String> = ["round", "square", "largesquare"]
+        if widgetShape == "r" { widgetShape = "round" }
+        else if widgetShape == "s" { widgetShape = "square" }
+        else if widgetShape.isEmpty { widgetShape = "default" }
+        else if !validShapes.contains(widgetShape) { invalid = true }
+        params["shape"] = widgetShape
+
+        if invalid { presentInvalidWidgetCommandAlert() }
+        return !invalid
+    }
+
+    private func updateWidget(_ widget: OnScreenWidgetView, params: NSMutableDictionary, createNew: Bool) {
+        guard isWidgetParamsValid(params) else { return }
+        let profile = OSCProfilesManager.sharedManager(.zero).getSelectedProfile()
+        guard let newWidget = OnScreenWidgetView(
+            cmdString: params["cmdString"] as? String ?? "",
+            buttonLabel: params["buttonLabel"] as? String ?? "",
+            shape: params["shape"] as? String ?? "",
+            profile: profile
+        ) as OnScreenWidgetView? else { return }
+
+        newWidget.sequence = widget.sequence
+        newWidget.revealMode = widget.revealMode
+        newWidget.bulkMoveEnabled = widget.bulkMoveEnabled
+        newWidget.guidelineDelegate = self
+        newWidget.translatesAutoresizingMaskIntoConstraints = false
+        newWidget.widthFactor = widget.widthFactor
+        newWidget.heightFactor = widget.heightFactor
+        newWidget.componentSizeFactor = widget.componentSizeFactor
+        newWidget.borderWidth = widget.borderWidth
+        newWidget.highlightSizeFactor = widget.highlightSizeFactor
+        newWidget.autoTapInterval = widget.autoTapInterval
+        newWidget.sensitivityFactorX = widget.sensitivityFactorX
+        newWidget.sensitivityFactorY = widget.sensitivityFactorY
+        newWidget.slideThreshold = widget.slideThreshold
+        newWidget.yawFactor = widget.yawFactor
+        newWidget.pitchFactor = widget.pitchFactor
+        newWidget.rollFactor = widget.rollFactor
+        newWidget.decelerationRateX = widget.decelerationRateX
+        newWidget.decelerationRateY = widget.decelerationRateY
+        newWidget.stickIndicatorOffset = widget.stickIndicatorOffset
+        newWidget.dWheelWalkModeThreshold = widget.dWheelWalkModeThreshold
+        newWidget.minStickOffset = widget.minStickOffset
+        newWidget.setVibration(style: Int(widget.vibrationStyle))
+        newWidget.mouseButtonAction = widget.mouseButtonAction
+        newWidget.buttonMode = widget.buttonMode
+
+        guard newWidget.widgetType == widget.widgetType else { return }
+        view.insertSubview(newWidget, belowSubview: widgetPanelStack)
+        newWidget.accessWidgetAttributes()
+
+        if createNew {
+            newWidget.setLocation(position: CGPoint(x: 90, y: 130))
+            newWidget.sequence = newWidget.getAvailableSequence()
+        } else {
+            newWidget.setLocation(position: widget.center)
+            newWidget.sequenceSet = widget.sequenceSet
+            newWidget.parentSequence = widget.parentSequence
+        }
+
+        OnScreenWidgetView.set(widget: newWidget, for: newWidget.sequence)
+        newWidget.sizeReference = widget.sizeReference
+        newWidget.resizeWidgetView()
+        newWidget.adjustTransparency(alpha: widget.backgroundAlpha, tweakBorderAlpha: false)
+        newWidget.tweakLabelAlpha(alpha: widget.labelAlpha)
+        newWidget.tweakBorderAlpha(alpha: widget.borderAlpha)
+        newWidget.tweakHighlightAlpha(alpha: widget.highlightAlpha)
+        newWidget.adjustBorder(width: widget.borderWidth)
+        onScreenWidgetViews.add(newWidget)
+        selectedWidgetView = newWidget
+        if !createNew {
+            onScreenWidgetViews.remove(widget)
+            widget.removeFromSuperview()
+        }
+    }
+
+    private func createWidgetFromParams(_ params: NSMutableDictionary) {
+        guard isWidgetParamsValid(params) else { return }
+        let profile = OSCProfilesManager.sharedManager(.zero).getSelectedProfile()
+        let widgetView = OnScreenWidgetView(
+            cmdString: params["cmdString"] as? String ?? "",
+            buttonLabel: params["buttonLabel"] as? String ?? "",
+            shape: params["shape"] as? String ?? "",
+            profile: profile
+        )
+        view.insertSubview(widgetView, belowSubview: widgetPanelStack)
+        widgetView.isHidden = true
+        widgetView.sequence = widgetView.getAvailableSequence()
+        OnScreenWidgetView.set(widget: widgetView, for: widgetView.sequence)
+        widgetView.guidelineDelegate = self
+        widgetView.translatesAutoresizingMaskIntoConstraints = false
+        onScreenWidgetViews.add(widgetView)
+        widgetView.setLocation(position: CGPoint(x: 90, y: 130))
+        widgetView.isHidden = false
+        widgetView.resizeWidgetView()
+        widgetView.setVibration(style: Int(UIImpactFeedbackGenerator.FeedbackStyle.light.rawValue))
+    }
+
+    @IBAction func addTapped(_ sender: Any?) {
+        GenericUtils.autoPopSoftKeyboard = false
+        if #available(iOS 13.0, *) {
+            let pickerViewController = WidgetPickerViewController()
+            pickerViewController.delegate = self
+            pickerViewController.tabIdentifiers = ["gamepad", "keyboard", "functional"]
+            pickerViewController.initialTabIdentifier = "gamepad"
+            let nav = UINavigationController(rootViewController: pickerViewController)
+            nav.modalPresentationStyle = .overFullScreen
+            present(nav, animated: true)
+            return
+        }
+    }
+
+    @available(iOS 13.0, *)
+    func widgetPickerViewController(_ controller: WidgetPickerViewController, didCreateWidget payload: NSDictionary) {
+        let params = payload.mutableCopy() as? NSMutableDictionary ?? NSMutableDictionary()
+        let pickerAction = ((params["pickerAction"] as? String) ?? "").lowercased()
+        params.removeObject(forKey: "pickerAction")
+        if pickerAction == "modify", let selectedWidgetView {
+            updateWidget(selectedWidgetView, params: params, createNew: false)
+            return
+        }
+        if pickerAction == "create", controller.isEditMode, let selectedWidgetView {
+            updateWidget(selectedWidgetView, params: params, createNew: true)
+            return
+        }
+        createWidgetFromParams(params)
+    }
+
+    @IBAction func editTapped(_ sender: Any?) {
+        GenericUtils.autoPopSoftKeyboard = false
+        guard let selectedWidgetView else {
+            AlertControllerUtil.autoCompletion = true
+            AlertControllerUtil.showAlert(in: self, title: "", message: LocalizationHelper.localizedString(forKey: "No widget selected"), withCancel: false, buttonTitle: "", countdown: 1, action: {}, completion: {})
+            return
+        }
+        if #available(iOS 13.0, *) {
+            let pickerViewController = WidgetPickerViewController()
+            pickerViewController.delegate = self
+            pickerViewController.tabIdentifiers = ["gamepad", "keyboard", "functional"]
+            pickerViewController.initialTabIdentifier = "gamepad"
+            pickerViewController.isEditMode = true
+            pickerViewController.initialCmdString = selectedWidgetView.cmdString
+            pickerViewController.initialButtonLabel = selectedWidgetView.widgetLabel
+            pickerViewController.initialShape = selectedWidgetView.shape
+            let nav = UINavigationController(rootViewController: pickerViewController)
+            nav.modalPresentationStyle = .overFullScreen
+            present(nav, animated: true)
+        }
+    }
+
+    @IBAction func saveTapped(_ sender: Any?) {
+        clearSickInput()
+        OSCProfilesManager.setLayoutViewBounds(view.bounds)
+        let success = profilesManager.updateSelectedProfile(layoutOSC.oscButtonLayerPool)
+        guard sender != nil else { return }
+        let message = success
+            ? LocalizationHelper.localizedString(forKey: "Current profile updated successfully")
+            : LocalizationHelper.localizedString(forKey: "Profile Default can not be overwritten")
+        let alert = UIAlertController(title: "", message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Ok"), style: .default) { _ in
+            if !success {
+                self.oscProfilesTableViewController?.profileViewRefresh()
+            }
+        })
+        present(alert, animated: true)
+    }
+
+    @objc func updateGuidelinesForOnScreenWidget(_ sender: Any) {
+        guard let widget = sender as? OnScreenWidgetView else { return }
+        layoutOSC.updateGuidelinesFor(onScreenWidget: widget)
+        view.bringSubviewToFront(widget)
+        let overlapping = layerIsOverlappingWithTrashcanButton(widget.layer)
+        let color = overlapping ? UIColor.red : trashCanStoryBoardColor ?? UIColor.systemTeal
+        trashCanButton.tintColor = color
+        trashCanButton.titleLabel?.textColor = color
+        if overlapping, let selectedWidgetView {
+            OnScreenWidgetView.setFree(widget: selectedWidgetView)
+        }
+        undoButton.alpha = 1.0
+    }
+
+    private func isIPhone() -> Bool {
+        UIDevice.current.userInterfaceIdiom == .phone
+    }
+
+    private func clearSickInput() {
+        if selectedWidgetView != nil && widgetViewSelected {
+            OnScreenControls.shared()?.clearLeftStickTouchPadFlag()
+            OnScreenControls.shared()?.clearRightStickTouchPadFlag()
+        }
+    }
+
+    private func updateClippedMask(for view: UIView) {
+        if isIPhone() {
+            let maskLayer = CAShapeLayer()
+            view.layer.mask = nil
+            let visibleRect = view.bounds.insetBy(dx: 40, dy: 0)
+            maskLayer.path = UIBezierPath(roundedRect: visibleRect, cornerRadius: 12).cgPath
+            view.layer.mask = maskLayer
+        }
+    }
+
+    private func applyShadowForiOS13(_ stack: UIStackView) {
+        stack.backgroundColor = .clear
+        for view in stack.arrangedSubviews {
+            if let subStack = view as? UIStackView {
+                for subview in subStack.arrangedSubviews {
+                    if let label = subview as? UILabel {
+                        label.backgroundColor = UIColor.black.withAlphaComponent(0.5)
+                        label.layer.cornerRadius = 6
+                        label.clipsToBounds = true
+                        label.textAlignment = .center
+                    } else {
+                        subview.tintColor = .systemTeal
+                        subview.layer.shadowColor = UIColor.black.withAlphaComponent(0.9).cgColor
+                        subview.layer.shadowOffset = CGSize(width: 1, height: 1)
+                        subview.layer.shadowOpacity = 1
+                        subview.layer.shadowRadius = 5
+                    }
+                }
+            } else {
+                view.layer.cornerRadius = 10
+                view.clipsToBounds = true
+                view.backgroundColor = UIColor.black.withAlphaComponent(0.5)
+            }
+        }
+    }
+
+    @objc private func handleProfileTablViewDismiss() {
+        if quickSwitchEnabled {
+            clearOnScreenWidgets()
+            dismiss(animated: false)
+        } else {
+            if oscProfilesTableViewController?.loadingMode != .pickProfileData {
+                setupWidgetPanel()
+            }
+            else {widgetPanelStack.isHidden = false}
+        }
+    }
+
+    private func addInnerAnalogSticksToOuterAnalogLayers() {
+        layoutOSC._rightStickBackground.addSublayer(layoutOSC._rightStick)
+        layoutOSC._rightStick.position = CGPoint(x: layoutOSC._rightStickBackground.frame.width / 2, y: layoutOSC._rightStickBackground.frame.height / 2)
+        layoutOSC._leftStickBackground.addSublayer(layoutOSC._leftStick)
+        layoutOSC._leftStick.position = CGPoint(x: layoutOSC._leftStickBackground.frame.width / 2, y: layoutOSC._leftStickBackground.frame.height / 2)
+    }
+
+    @objc private func moveToolbar(_ sender: UIGestureRecognizer) {
+        let toolbarTopConstraint = UIDevice.current.model.hasPrefix("iPad") ? toolbarTopConstraintiPad! : toolbarTopConstraintiPhone!
+        if !isToolbarHidden {
+            UIView.animate(withDuration: 0.2, animations: {
+                toolbarTopConstraint.constant -= self.toolbarRootView.frame.height
+                self.view.layoutIfNeeded()
+            }, completion: { finished in
+                if finished {
+                    self.isToolbarHidden = true
+                    self.chevronImageView.image = UIImage(named: "ChevronCompactDown")
+                }
+            })
+        } else {
+            UIView.animate(withDuration: 0.2, animations: {
+                toolbarTopConstraint.constant += self.toolbarRootView.frame.height
+                self.view.layoutIfNeeded()
+            }, completion: { finished in
+                if finished {
+                    self.isToolbarHidden = false
+                    self.chevronImageView.image = UIImage(named: "ChevronCompactUp")
+                }
+            })
+        }
+    }
+
+    private func handleMissingToolBarIcon(_ view: UIView) {
+        for subview in view.subviews {
+            if let button = subview as? UIButton {
+                button.imageView?.image = button.imageView?.image?.withRenderingMode(.alwaysTemplate)
+                button.tintColor = .systemTeal
+                if #available(iOS 13.0, *) {
+                } else {
+                    button.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
+                }
+            }
+            handleMissingToolBarIcon(subview)
+        }
+    }
+
+    private func setupWidgetPanel() {        
+        widgetPanelStack.isHidden = quickSwitchEnabled
+        tipTitleLabel.textAlignment = .left
+        tipTitleLabel.contentMode = .top
+        tipTitleLabel.lineBreakMode = .byWordWrapping
+        tipTitleLabel.numberOfLines = 0
+        tipTitleLabel.font = .systemFont(ofSize: 23, weight: .bold)
+        tipTitleLabel.text = LocalizationHelper.localizedString(forKey: "Important Tips")
+        tipTitleLabel.isHidden = isIPhone()
+
+        tipContentLabel.textAlignment = .left
+        tipContentLabel.lineBreakMode = .byWordWrapping
+        tipContentLabel.contentMode = .top
+        tipContentLabel.numberOfLines = 0
+        tipContentLabel.accessibilityIdentifier = "tipContent"
+        tipContentLabel.font = .systemFont(ofSize: 15)
+        tipContentLabel.text = LocalizationHelper.localizedString(forKey: "loadOswConfigTip")
+        tipContentLabel.isHidden = false
+
+        widgetPanelStack.layoutMargins = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+        widgetPanelStack.isLayoutMarginsRelativeArrangement = true
+        widgetPanelStack.layer.cornerRadius = 16
+        widgetPanelStack.clipsToBounds = true
+        widgetPanelStack.backgroundColor = UIColor.black.withAlphaComponent(0.5)
+
+        currentProfileLabel.text = LocalizationHelper.localizedString(forKey: "Profile: %@", profilesManager.getSelectedProfile().name)
+        currentProfileLabel.layer.cornerRadius = isIPhone() ? 9 : 12
+        currentProfileLabel.clipsToBounds = true
+        currentProfileLabel.textAlignment = .center
+
+        widgetSizeStack.isUserInteractionEnabled = true
+        for view in widgetPanelStack.subviews {
+            view.isUserInteractionEnabled = true
+            if let label = view as? UILabel, view.accessibilityIdentifier == nil {
+                label.font = .systemFont(ofSize: 18)
+                label.textColor = .white
+            }
+        }
+
+        widgetSizeSlider.addTarget(self, action: #selector(widgetSizeSliderMoved(_:)), for: .valueChanged)
+        widgetSizeLabel.text = LocalizationHelper.localizedString(forKey: "Size")
+        widgetSizeStack.isHidden = true
+        widgetHeightSlider.addTarget(self, action: #selector(widgetHeightSliderMoved(_:)), for: .valueChanged)
+        widgetHeightLabel.text = LocalizationHelper.localizedString(forKey: "Height")
+        widgetHeightStack.isHidden = true
+        componentSizeSlider.addTarget(self, action: #selector(componentSizeSliderMoved(_:)), for: .valueChanged)
+        componentSizeLabel.text = LocalizationHelper.localizedString(forKey: "Component size")
+        componentSizeStack.isHidden = true
+        alphaSliderMode = .widgetAlpha
+        widgetAlphaSlider.addTarget(self, action: #selector(widgetAlphaSliderMoved(_:)), for: .valueChanged)
+        widgetAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Alpha")
+        widgetAlphaLabel.isUserInteractionEnabled = true
+        widgetAlphaLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(switchAlphaSlider(_:))))
+        borderWidthSliderMode = .widgetBorderWidth
+        widgetBorderWidthSlider.addTarget(self, action: #selector(widgetBorderWidthSliderMoved(_:)), for: .valueChanged)
+        widgetBorderWidthLabel.text = LocalizationHelper.localizedString(forKey: "Border width")
+        widgetBorderWidthLabel.isUserInteractionEnabled = true
+        widgetBorderWidthLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(switchBorderWidthSlider(_:))))
+        borderWidthAlphaStack.isHidden = true
+        autoTapLabel.text = LocalizationHelper.localizedString(forKey: "Autotap timer   ")
+        autoTapField.delegate = self
+        autoTapStack.isHidden = true
+        sensitivityXSlider.addTarget(self, action: #selector(sensitivityXSliderMoved(_:)), for: .valueChanged)
+        sensitivityXLabel.text = LocalizationHelper.localizedString(forKey: "SensitivityX")
+        sensitivityXStack.isHidden = true
+        sensitivityYSlider.addTarget(self, action: #selector(sensitivityYSliderMoved(_:)), for: .valueChanged)
+        sensitivityYLabel.text = LocalizationHelper.localizedString(forKey: "SensitivityY")
+        sensitivityYStack.isHidden = true
+        walkModeThresholdSlider.addTarget(self, action: #selector(walkModeThresholdSliderMoved(_:)), for: .valueChanged)
+        walkModeThresholdLabel.text = LocalizationHelper.localizedString(forKey: "Walkmode threshold")
+        walkModeThresholdStack.isHidden = true
+        minStickOffsetSlider.addTarget(self, action: #selector(minStickOffsetSliderMoved(_:)), for: .valueChanged)
+        minStickOffsetLabel.text = LocalizationHelper.localizedString(forKey: "Minimum offset")
+        minStickOffsetStack.isHidden = true
+        slideThresholdSlider.addTarget(self, action: #selector(slideThresholdSliderMoved(_:)), for: .valueChanged)
+        slideThresholdLabel.text = LocalizationHelper.localizedString(forKey: "Slide threshold")
+        slideThresholdStack.isHidden = true
+        yawFactorSlider.addTarget(self, action: #selector(yawFactorSliderMoved(_:)), for: .valueChanged)
+        yawFactorLabel.text = LocalizationHelper.localizedString(forKey: "Yaw Factor")
+        yawFactorStack.isHidden = true
+        pitchFactorSlider.addTarget(self, action: #selector(pitchFactorSliderMoved(_:)), for: .valueChanged)
+        pitchFactorLabel.text = LocalizationHelper.localizedString(forKey: "Pitch Factor")
+        pitchFactorStack.isHidden = true
+        rollFactorSlider.addTarget(self, action: #selector(rollFactorSliderMoved(_:)), for: .valueChanged)
+        rollFactorLabel.text = LocalizationHelper.localizedString(forKey: "Roll Factor")
+        rollFactorStack.isHidden = true
+        decelerationRateLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(switchDecelerationRateSlider(_:))))
+        decelerationRateLabel.isUserInteractionEnabled = true
+        decelerationRateSlider.addTarget(self, action: #selector(decelerationRateSliderMoved(_:)), for: .valueChanged)
+        decelerationRateLabel.text = LocalizationHelper.localizedString(forKey: "Deceleration Rate")
+        decelerationRateStack.isHidden = true
+        stickIndicatorOffsetSlider.addTarget(self, action: #selector(stickIndicatorOffsetSliderMoved(_:)), for: .valueChanged)
+        stickIndicatorOffsetLabel.text = LocalizationHelper.localizedString(forKey: "Indicator offset")
+        stickIndicatorOffsetStack.isHidden = true
+
+        let whiteAttrs: [NSAttributedString.Key: Any] = [.foregroundColor: UIColor.white]
+        mouseButtonDownSelector.addTarget(self, action: #selector(mouseDownButtonChanged(_:)), for: .valueChanged)
+        mouseButtonDownSelector.setTitleTextAttributes(whiteAttrs, for: .normal)
+        mouseDownButtonStack.isHidden = true
+        buttonModeSelector.addTarget(self, action: #selector(buttonModeChanged(_:)), for: .valueChanged)
+        buttonModeSelector.setTitleTextAttributes(whiteAttrs, for: .normal)
+        buttonModeStack.isHidden = true
+        collectedWidgetsSelector.addTarget(self, action: #selector(collectionHiddenChanged(_:)), for: .valueChanged)
+        collectedWidgetsSelector.setTitleTextAttributes(whiteAttrs, for: .normal)
+        revealModeSelector.addTarget(self, action: #selector(revealModeChanged(_:)), for: .valueChanged)
+        revealModeSelector.setTitleTextAttributes(whiteAttrs, for: .normal)
+        collectedWidgetsStack.isHidden = true
+        bulkMoveSelector.addTarget(self, action: #selector(bulkMoveChanged(_:)), for: .valueChanged)
+        bulkMoveSelector.setTitleTextAttributes(whiteAttrs, for: .normal)
+        bulkMoveStack.isHidden = true
+        
+        applyTitle("Clear", for: clearFolderButton)
+        applyTitle("Import", for: importFromOtherButton)
+        applyTitle("Batch edit", for: bulkEditButton, state: .normal)
+        
+        
+        
+        bulkBorderWidthSlider.addTarget(self, action: #selector(bulkBorderWidthSliderMoved(_:)), for: .valueChanged)
+        bulkBorderWidthLabel.text = LocalizationHelper.localizedString(forKey: "Border width")
+        
+        bulkAlphaSlider.addTarget(self, action: #selector(bulkAlphaSliderMoved(_:)), for: .valueChanged)
+        bulkAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Alpha")
+        
+        bulkLabelAlphaSlider.addTarget(self, action: #selector(bulkLabelAlphaSliderMoved(_:)), for: .valueChanged)
+        bulkLabelAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Label alpha")
+        
+        bulkBorderAlphaSlider.addTarget(self, action: #selector(bulkBorderAlphaSliderMoved(_:)), for: .valueChanged)
+        bulkBorderAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Border alpha")
+
+        bulkHighlightAlphaSlider.addTarget(self, action: #selector(bulkHighlightAlphaSliderMoved(_:)), for: .valueChanged)
+        bulkHighlightAlphaSlider.addTarget(self, action: #selector(bulkHighlightAlphaSliderMoveStopped(_:)), for: [.touchUpInside, .touchUpOutside])
+        bulkHighlightAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Highlight alpha")
+
+        bulkHighlightSizeSlider.minimumValue = 0.01
+        bulkHighlightSizeSlider.maximumValue = 2
+        bulkHighlightSizeSlider.addTarget(self, action: #selector(bulkHighlightSizeSliderMoved(_:)), for: .valueChanged)
+        bulkHighlightSizeSlider.addTarget(self, action: #selector(bulkHighlightSizeSliderMoveStopped(_:)), for: [.touchUpInside, .touchUpOutside])
+        bulkHighlightSizeLabel.text = LocalizationHelper.localizedString(forKey: "Highlight size")
+
+        
+        for stack in bulkEditStacks ?? [] {
+            stack.isHidden = true
+        }
+
+        if isIPhone() {
+            vibrationStyleSelector.addTarget(self, action: #selector(vibrationStyleChanged(_:)), for: .valueChanged)
+            vibrationStyleSelector.setTitleTextAttributes(whiteAttrs, for: .normal)
+            vibrationStyleStack.isHidden = true
+        }
+
+        view.bringSubviewToFront(toolbarRootView)
+        view.insertSubview(widgetPanelStack, belowSubview: toolbarRootView)
+        widgetPanelStack.translatesAutoresizingMaskIntoConstraints = true
+        widgetPanelStack.frame = CGRect(x: view.bounds.width / 2 - widgetPanelStack.frame.width / 2, y: 100, width: widgetPanelStack.frame.width, height: widgetPanelStack.frame.height)
+        autoFitStack(widgetPanelStack)
+
+        if isIPhone() {
+            for view in widgetPanelStack.arrangedSubviews {
+                view.transform = CGAffineTransform(scaleX: 0.83, y: 0.83)
+            }
+            widgetPanelStack.layoutMargins = UIEdgeInsets(top: 3, left: 2, bottom: 7, right: 2)
+            let maskLayer = CAShapeLayer()
+            let visibleRect = widgetPanelStack.bounds.insetBy(dx: 40, dy: 0)
+            maskLayer.path = UIBezierPath(roundedRect: visibleRect, cornerRadius: 12).cgPath
+            widgetPanelStack.layer.mask = maskLayer
+            let shouldTrimVibrationSegments: Bool
+            if #available(iOS 13.0, *) {
+                shouldTrimVibrationSegments = vibrationStyleSelector.numberOfSegments != 6
+            } else {
+                shouldTrimVibrationSegments = true
+            }
+            if shouldTrimVibrationSegments {
+                vibrationStyleSelector.removeSegment(at: 3, animated: false)
+                vibrationStyleSelector.removeSegment(at: 3, animated: false)
+            }
+        }
+    }
+
+    private func applyTitle(_ title:String, for button: UIButton, state: UIControl.State = .normal) {
+        let title = SwiftLocalizationHelper.localizedString(forKey: title)
+        let attr: [NSAttributedString.Key: Any] = [
+            .foregroundColor: UIColor(red: 115/255.0, green: 224/255.0, blue: 251/255.0, alpha: 1.0),
+            .font: UIFont.systemFont(ofSize: 11, weight: .medium)
+        ]
+        button.setAttributedTitle(NSAttributedString(string: title, attributes: attr), for: state)
+    }
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        if textField == autoTapField {
+            textField.resignFirstResponder()
+            selectedWidgetView?.setAutoTapIntervalByText(str: textField.text ?? "")
+        }
+        return true
+    }
+
+    func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
+        if GenericUtils.autoPopSoftKeyboard {
+            return true
+        }
+        GenericUtils.autoPopSoftKeyboard = true
+        return false
+    }
+
+    @objc private func widgetSizeSliderMoved(_ sender: UISlider) {
+        widgetSizeLabel.text = LocalizationHelper.localizedString(forKey: "Size: %.2f", sender.value)
+        widgetHeightLabel.text = LocalizationHelper.localizedString(forKey: "Height: %.2f", sender.value)
+        widgetHeightSlider.value = sender.value
+        if let selectedWidgetView, widgetViewSelected {
+            selectedWidgetView.translatesAutoresizingMaskIntoConstraints = true
+            selectedWidgetView.widthFactor = CGFloat(sender.value)
+            selectedWidgetView.heightFactor = CGFloat(sender.value)
+            selectedWidgetView.resizeWidgetView()
+        }
+        if let selectedControllerLayer, controllerLayerSelected {
+            layoutOSC.resizeControllerLayer(with: selectedControllerLayer, and: CGFloat(sender.value))
+        }
+    }
+
+    @objc private func widgetHeightSliderMoved(_ sender: UISlider) {
+        widgetHeightLabel.text = LocalizationHelper.localizedString(forKey: "Height: %.2f", sender.value)
+        if let selectedWidgetView, widgetViewSelected {
+            selectedWidgetView.translatesAutoresizingMaskIntoConstraints = true
+            if selectedWidgetView.shape == "round" { return }
+            selectedWidgetView.heightFactor = CGFloat(sender.value)
+            selectedWidgetView.resizeWidgetView()
+        }
+    }
+
+    @objc private func componentSizeSliderMoved(_ sender: UISlider) {
+        componentSizeLabel.text = LocalizationHelper.localizedString(forKey: "Component size: %.2f   ", sender.value)
+        if let selectedWidgetView, widgetViewSelected {
+            selectedWidgetView.translatesAutoresizingMaskIntoConstraints = true
+            selectedWidgetView.componentSizeFactor = CGFloat(sender.value)
+            selectedWidgetView.resizeWidgetView()
+        }
+    }
+
+    @objc private func widgetAlphaSliderMoved(_ sender: UISlider) {
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        if let selectedWidgetView, widgetViewSelected {
+            switch alphaSliderMode {
+            case .widgetAlpha: selectedWidgetView.adjustTransparency(alpha: CGFloat(sender.value), tweakBorderAlpha: true)
+            case .labelAlpha: selectedWidgetView.tweakLabelAlpha(alpha: CGFloat(sender.value))
+            case .borderAlpha: selectedWidgetView.tweakBorderAlpha(alpha: CGFloat(sender.value))
+            case .highlightAlpha: selectedWidgetView.tweakHighlightAlpha(alpha: CGFloat(sender.value))
+            }
+            loadWidgetAlphas()
+        }
+        if let selectedControllerLayer, controllerLayerSelected {
+            layoutOSC.adjustControllerLayerOpacity(with: selectedControllerLayer, and: CGFloat(sender.value))
+        }
+        CATransaction.commit()
+    }
+
+    @objc private func widgetBorderWidthSliderMoved(_ sender: UISlider) {
+        if let selectedWidgetView, widgetViewSelected {
+            switch borderWidthSliderMode {
+            case .widgetBorderWidth:
+                selectedWidgetView.adjustBorder(width: CGFloat(sender.value))
+            case .highlightSize:
+                selectedWidgetView.highlightSizeFactor = CGFloat(sender.value)
+                if selectedWidgetView.widgetType == .button { selectedWidgetView.setupButtonDownVisualEffectLayer() }
+                if selectedWidgetView.hasL3R3Indicator { selectedWidgetView.setupL3R3Indicator() }
+                if selectedWidgetView.isDirectionPad { selectedWidgetView.setupLrudDirectionIndicatorlayers() }
+            }
+        }
+        loadWidgetWidths()
+    }
+    
+    
+    @objc private func bulkBorderWidthSliderMoved(_ sender: UISlider) {
+        guard let selectedWidget = selectedWidgetView else {return}
+        bulkBorderWidthLabel.text = LocalizationHelper.localizedString(forKey: "Border width: %.2f", sender.value)
+        if selectedWidget.isFolder {
+            for sequence in selectedWidget.sequenceSet {
+                OnScreenWidgetView.mapping[sequence]?.adjustBorder(width: CGFloat(sender.value))
+            }
+        }
+        else if selectedWidget.parentSequence == -1 {
+            for widget in OnScreenWidgetView.mapping.values where widget.parentSequence == -1 {
+                widget.adjustBorder(width: CGFloat(sender.value))
+            }
+        }
+    }
+    
+    @objc private func bulkAlphaSliderMoved(_ sender: UISlider) {
+        guard let selectedWidget = selectedWidgetView else {return}
+        bulkAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Alpha: %.2f", sender.value)
+        if selectedWidget.isFolder {
+            for sequence in selectedWidget.sequenceSet {
+                let widget = OnScreenWidgetView.mapping[sequence];
+                if widget?.widgetType == .touchPad { continue }
+                widget?.adjustTransparency(alpha: CGFloat(sender.value), tweakBorderAlpha: false)
+            }
+        }
+        else if selectedWidget.parentSequence == -1 {
+            for widget in OnScreenWidgetView.mapping.values where widget.parentSequence == -1 {
+                if widget.widgetType == .touchPad { continue }
+                widget.adjustTransparency(alpha: CGFloat(sender.value), tweakBorderAlpha: false)
+            }
+        }
+    }
+    
+    @objc private func bulkLabelAlphaSliderMoved(_ sender: UISlider) {
+        guard let selectedWidget = selectedWidgetView else {return}
+        bulkLabelAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Label alpha: %.2f", sender.value)
+        if selectedWidget.isFolder {
+            for sequence in selectedWidget.sequenceSet {
+                OnScreenWidgetView.mapping[sequence]?.tweakLabelAlpha(alpha: CGFloat(sender.value))
+            }
+        }
+        else if selectedWidget.parentSequence == -1 {
+             for widget in OnScreenWidgetView.mapping.values where widget.parentSequence == -1 {
+                 widget.tweakLabelAlpha(alpha: CGFloat(sender.value))
+             }
+         }
+    }
+
+    @objc private func bulkBorderAlphaSliderMoved(_ sender: UISlider) {
+        guard let selectedWidget = selectedWidgetView else {return}
+        bulkBorderAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Border alpha: %.2f", sender.value)
+        if selectedWidget.isFolder {
+            for sequence in selectedWidget.sequenceSet {
+                OnScreenWidgetView.mapping[sequence]?.tweakBorderAlpha(alpha: CGFloat(sender.value))
+            }
+        }
+        else if selectedWidget.parentSequence == -1 {
+            for widget in OnScreenWidgetView.mapping.values where widget.parentSequence == -1 {
+                widget.tweakBorderAlpha(alpha: CGFloat(sender.value))
+            }
+        }
+    }
+    
+    @objc private func bulkHighlightAlphaSliderMoved(_ sender: UISlider) {
+        guard let selectedWidget = selectedWidgetView else {return}
+        bulkHighlightAlphaLabel.text = LocalizationHelper.localizedString(forKey: "Highlight alpha: %.2f", sender.value)
+        OnScreenWidgetView.isTweakingHighlight = true
+        if selectedWidget.isFolder {
+            for sequence in selectedWidget.sequenceSet {
+                let widget = OnScreenWidgetView.mapping[sequence]
+                widget?.tweakHighlightAlpha(alpha: CGFloat(sender.value))
+                guard let widget = widget else {continue}
+                setHiddenForWidgetHighlights(widget)
+            }
+        }
+        else if selectedWidget.parentSequence == -1 {
+            for widget in OnScreenWidgetView.mapping.values where widget.parentSequence == -1 {
+                widget.tweakHighlightAlpha(alpha: CGFloat(sender.value))
+                setHiddenForWidgetHighlights(widget)
+            }
+        }
+    }
+    
+    @objc private func bulkHighlightAlphaSliderMoveStopped(_ sender: UISlider) {
+        guard let selectedWidget = selectedWidgetView else {return}
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            OnScreenWidgetView.isTweakingHighlight = false
+            if selectedWidget.isFolder {
+                for sequence in selectedWidget.sequenceSet {
+                    let widget = OnScreenWidgetView.mapping[sequence]
+                    guard let widget = widget else {continue}
+                    self.setHiddenForWidgetHighlights(widget)
+                }
+            }
+            else if selectedWidget.parentSequence == -1 {
+                for widget in OnScreenWidgetView.mapping.values where widget.parentSequence == -1 {
+                    self.setHiddenForWidgetHighlights(widget)
+                }
+            }
+        }
+    }
+    
+    @objc private func bulkHighlightSizeSliderMoved(_ sender: UISlider) {
+        guard let selectedWidget = selectedWidgetView else {return}
+        bulkHighlightSizeLabel.text = LocalizationHelper.localizedString(forKey: "Highlight size: %.2f", sender.value)
+        OnScreenWidgetView.isTweakingHighlight = true
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        if selectedWidget.isFolder {
+            for sequence in selectedWidget.sequenceSet {
+                let widget = OnScreenWidgetView.mapping[sequence]
+                if widget?.widgetType == .button {
+                    widget?.highlightSizeFactor = CGFloat(sender.value)
+                    widget?.setupButtonDownVisualEffectLayer()
+                }
+                // if widget?.hasL3R3Indicator == true { widget?.setupL3R3Indicator() }
+                guard let widget = widget else {continue}
+                setHiddenForWidgetHighlights(widget)
+            }
+        }
+        else if selectedWidget.parentSequence == -1 {
+            for widget in OnScreenWidgetView.mapping.values where widget.parentSequence == -1 {
+                if widget.widgetType == .button {
+                    widget.highlightSizeFactor = CGFloat(sender.value)
+                    widget.setupButtonDownVisualEffectLayer()
+                }
+                self.setHiddenForWidgetHighlights(widget)
+            }
+        }
+        CATransaction.commit()
+    }
+    
+    @objc private func bulkHighlightSizeSliderMoveStopped(_ sender: UISlider) {
+        bulkHighlightAlphaSliderMoveStopped(sender)
+        return
+    }
+    
+    @objc private func mouseDownButtonChanged(_ sender: UISegmentedControl) {
+        selectedWidgetView?.mouseButtonAction = MouseButtonAction(rawValue: sender.selectedSegmentIndex) ?? .hovering
+    }
+
+    @objc private func buttonModeChanged(_ sender: UISegmentedControl) {
+        selectedWidgetView?.buttonMode = ButtonMode(rawValue: sender.selectedSegmentIndex) ?? .slideToToggle
+    }
+
+    @objc private func collectionHiddenChanged(_ sender: UISegmentedControl) {
+        if let selectedWidgetView {
+            OnScreenWidgetView.set(folded: sender.selectedSegmentIndex == 1, for: selectedWidgetView)
+        }
+        self.bulkEditButton.isEnabled = sender.selectedSegmentIndex == 0
+        self.importFromOtherButton.isEnabled = sender.selectedSegmentIndex == 0
+        self.clearFolderButton.isEnabled = sender.selectedSegmentIndex  == 0
+        // self.placeHolderLabel1.isHidden = sender.selectedSegmentIndex == 0
+    }
+
+    @objc private func bulkMoveChanged(_ sender: UISegmentedControl) {
+        selectedWidgetView?.bulkMoveEnabled = sender.selectedSegmentIndex == 1
+    }
+
+    @objc private func revealModeChanged(_ sender: UISegmentedControl) {
+        if let selectedWidgetView {
+            selectedWidgetView.revealMode = RevealMode(rawValue: sender.selectedSegmentIndex) ?? .coexist
+            OnScreenWidgetView.set(folded: selectedWidgetView.folded, for: selectedWidgetView)
+        }
+    }
+
+    @objc private func vibrationStyleChanged(_ sender: UISegmentedControl) {
+        guard let selectedWidgetView = selectedWidgetView else {return}
+        
+        if #available(iOS 13.0, *) {
+            if sender.selectedSegmentIndex <= UIImpactFeedbackGenerator.FeedbackStyle.rigid.rawValue {
+                vibrationGenerator = UIImpactFeedbackGenerator(style: UIImpactFeedbackGenerator.FeedbackStyle(rawValue: sender.selectedSegmentIndex) ?? .light)
+                vibrationGenerator.prepare()
+                vibrationGenerator.impactOccurred()
+            }
+        }
+        selectedWidgetView.setVibration(style: sender.selectedSegmentIndex)
+        
+        if bulkEditEnabled, selectedWidgetView.isFolder {
+            let folder = selectedWidgetView
+            for sequence in folder.sequenceSet {
+                OnScreenWidgetView.mapping[sequence]?.setVibration(style: sender.selectedSegmentIndex)
+            }
+        }
+        
+        if let selectedControllerLayer, controllerLayerSelected {
+            OnScreenControls.layerVibrationStyleDic()?.setObject(NSNumber(value: sender.selectedSegmentIndex), forKey: (selectedControllerLayer.name ?? "") as NSString)
+        }
+    }
+
+    @objc private func sensitivityXSliderMoved(_ sender: UISlider) {
+        let key = selectedWidgetView?.hasSensitivityY == true ? "SensitivityX: %.2f" : "Sensitivity: %.2f"
+        sensitivityXLabel.text = LocalizationHelper.localizedString(forKey: key, sender.value)
+        sensitivityYLabel.text = LocalizationHelper.localizedString(forKey: "SensitivityY: %.2f", sender.value)
+        sensitivityYSlider.value = sender.value
+        selectedWidgetView?.sensitivityFactorX = CGFloat(sender.value)
+        selectedWidgetView?.sensitivityFactorY = CGFloat(sender.value)
+    }
+
+    @objc private func sensitivityYSliderMoved(_ sender: UISlider) {
+        sensitivityYLabel.text = LocalizationHelper.localizedString(forKey: "SensitivityY: %.2f", sender.value)
+        selectedWidgetView?.sensitivityFactorY = CGFloat(sender.value)
+    }
+
+    @objc private func walkModeThresholdSliderMoved(_ sender: UISlider) {
+        walkModeThresholdLabel.text = LocalizationHelper.localizedString(forKey: "Walkmode threshold: %.0f   ", sender.value)
+        if let selectedWidgetView, widgetViewSelected {
+            selectedWidgetView.dWheelWalkModeThreshold = CGFloat(sender.value)
+            guard let onScreenControls = OnScreenControls.shared() else { return }
+            if selectedWidgetView.touchPadString == "LSWHEEL" {
+                onScreenControls.sendLeftStickTouchPadEvent(0, CGFloat(sender.value))
+            }
+            if selectedWidgetView.touchPadString == "RSWHEEL" {
+                onScreenControls.sendRightStickTouchPadEvent(0, CGFloat(sender.value))
+            }
+        }
+    }
+
+    @objc private func minStickOffsetSliderMoved(_ sender: UISlider) {
+        minStickOffsetLabel.text = LocalizationHelper.localizedString(forKey: "Minimum offset: %.0f", sender.value)
+        if let selectedWidgetView, widgetViewSelected {
+            selectedWidgetView.minStickOffset = CGFloat(sender.value)
+            guard let onScreenControls = OnScreenControls.shared() else { return }
+            if selectedWidgetView.touchPadString == "LSPAD"
+                || selectedWidgetView.touchPadString == "LSVPAD"
+                || selectedWidgetView.touchPadString == "LSWHEEL" {
+                onScreenControls.sendLeftStickTouchPadEvent(CGFloat(sender.value), 0)
+            }
+            if selectedWidgetView.touchPadString == "RSPAD"
+                || selectedWidgetView.touchPadString == "RSVPAD"
+                || selectedWidgetView.touchPadString == "RSWHEEL" {
+                onScreenControls.sendRightStickTouchPadEvent(CGFloat(sender.value), 0)
+            }
+        }
+    }
+
+    @objc private func slideThresholdSliderMoved(_ sender: UISlider) {
+        slideThresholdLabel.text = LocalizationHelper.localizedString(forKey: "Slide threshold: %.1f", sender.value)
+        selectedWidgetView?.slideThreshold = CGFloat(sender.value)
+    }
+
+    @objc private func yawFactorSliderMoved(_ sender: UISlider) {
+        yawFactorLabel.text = LocalizationHelper.localizedString(forKey: "Yaw factor: %.2f", sender.value)
+        pitchFactorLabel.text = LocalizationHelper.localizedString(forKey: "Pitch factor: %.2f", sender.value)
+        pitchFactorSlider.value = sender.value
+        selectedWidgetView?.yawFactor = CGFloat(sender.value)
+        selectedWidgetView?.pitchFactor = CGFloat(sender.value)
+    }
+
+    @objc private func pitchFactorSliderMoved(_ sender: UISlider) {
+        pitchFactorLabel.text = LocalizationHelper.localizedString(forKey: "Pitch factor: %.2f", sender.value)
+        selectedWidgetView?.pitchFactor = CGFloat(sender.value)
+    }
+
+    @objc private func rollFactorSliderMoved(_ sender: UISlider) {
+        rollFactorLabel.text = LocalizationHelper.localizedString(forKey: "Roll factor: %.2f", sender.value)
+        selectedWidgetView?.rollFactor = CGFloat(sender.value)
+    }
+
+    @objc private func decelerationRateSliderMoved(_ sender: UISlider) {
+        if let selectedWidgetView {
+            switch decelerationRateSliderMode {
+            case .decelerationRateX: selectedWidgetView.decelerationRateX = CGFloat(sender.value)
+            case .decelerationRateY: selectedWidgetView.decelerationRateY = CGFloat(sender.value)
+            }
+        }
+        loadDecelerationRates()
+    }
+
+    @objc private func stickIndicatorOffsetSliderMoved(_ sender: UISlider) {
+        stickIndicatorOffsetLabel.text = LocalizationHelper.localizedString(forKey: "Indicator offset: %.0f", sender.value)
+        if let selectedWidgetView {
+            selectedWidgetView.stickIndicatorOffset = CGFloat(sender.value)
+            selectedWidgetView.updateStickIndicator()
+        }
+    }
+
+    private func widgetPanelTouched(_ touch: UITouch) -> Bool {
+        let point = touch.location(in: widgetPanelStack)
+        return widgetPanelStack.hitTest(point, with: nil) != nil
+    }
+
+    private func handleWidgetPanelMove(_ touch: UITouch) {
+        guard widgetPanelMovedByTouch else { return }
+        let currentLocation = touch.location(in: view)
+        let offsetX = currentLocation.x - latestTouchLocation.x
+        let offsetY = currentLocation.y - latestTouchLocation.y
+        widgetPanelStack.center = CGPoint(x: widgetPanelStack.center.x + offsetX, y: widgetPanelStack.center.y + offsetY)
+        latestTouchLocation = currentLocation
+        widgetPanelStoredCenter = widgetPanelStack.center
+    }
+
+    private func layerIsOverlappingWithTrashcanButton(_ layer: CALayer) -> Bool {
+        let commonLayer = view.layer
+        let rect1 = layer.convert(layer.bounds, to: commonLayer)
+        let rect2 = trashCanButton.layer.convert(trashCanButton.layer.bounds, to: commonLayer)
+        return rect1.intersects(rect2)
+    }
+
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+        if let touch = touches.first {
+            widgetPanelMovedByTouch = widgetPanelTouched(touch)
+            if widgetPanelMovedByTouch {
+                latestTouchLocation = touch.location(in: view)
+            }
+        }
+        for touch in touches {
+            var touchLocation = touch.location(in: view)
+            touchLocation = touch.view?.convert(touchLocation, to: nil) ?? touchLocation
+            guard let layer = view.layer.hitTest(touchLocation) else { continue }
+            if layer == toolbarRootView.layer || layer == chevronView.layer || layer == chevronImageView.layer || layer == toolbarStackView.layer || layer == view.layer {
+                return
+            }
+        }
+        if let event {
+            let bridgedTouches = Set(touches.map { AnyHashable($0) })
+            layoutOSC.touchesBegan(bridgedTouches, with: event)
+        }
+    }
+
+    override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
+        if let touch = touches.first {
+            handleWidgetPanelMove(touch)
+        }
+        if let event {
+            let bridgedTouches = Set(touches.map { AnyHashable($0) })
+            layoutOSC.touchesMoved(bridgedTouches, with: event)
+        }
+        let color = (layoutOSC.layerBeingDragged != nil && layerIsOverlappingWithTrashcanButton(layoutOSC.layerBeingDragged!)) ? UIColor.red : (trashCanStoryBoardColor ?? .systemTeal)
+        trashCanButton.tintColor = color
+        trashCanButton.titleLabel?.textColor = color
+    }
+
+    override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
+        widgetPanelStack.isUserInteractionEnabled = true
+        if let selectedWidgetView {
+            view.insertSubview(selectedWidgetView, belowSubview: widgetPanelStack)
+            if selectedWidgetView.widgetType == .touchPad {
+                view.sendSubviewToBack(selectedWidgetView)
+            }
+        }
+        if !isToolbarHidden, let selectedWidgetView, layerIsOverlappingWithTrashcanButton(selectedWidgetView.layer) {
+            OnScreenWidgetView.setFree(widget: selectedWidgetView)
+            OnScreenWidgetView.removeWidgetFromMappings(key: selectedWidgetView.sequence)
+            selectedWidgetView.removeFromSuperview()
+            onScreenWidgetViews.remove(selectedWidgetView)
+        }
+        if !isToolbarHidden, let draggedLayer = layoutOSC.layerBeingDragged, layerIsOverlappingWithTrashcanButton(draggedLayer) {
+            draggedLayer.isHidden = true
+            if draggedLayer.name == "dPad" {
+                layoutOSC._upButton.isHidden = true
+                layoutOSC._rightButton.isHidden = true
+                layoutOSC._downButton.isHidden = true
+                layoutOSC._leftButton.isHidden = true
+            }
+            if draggedLayer.name == "leftStickBackground" { layoutOSC._leftStick.isHidden = true }
+            if draggedLayer.name == "rightStickBackground" { layoutOSC._rightStick.isHidden = true }
+        }
+        if let event {
+            let bridgedTouches = Set(touches.map { AnyHashable($0) })
+            layoutOSC.touchesEnded(bridgedTouches, with: event)
+        }
+        if profilesManager.getIndexOfSelectedProfile() == 0, layoutOSC.layoutChanges.count > 0 {
+            let alert = UIAlertController(title: "", message: LocalizationHelper.localizedString(forKey: "Layout of the Default profile can not be changed"), preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Ok"), style: .default) { _ in
+                self.oscProfilesTableViewController?.profileViewRefresh()
+            })
+            present(alert, animated: true)
+        }
+        let color = trashCanStoryBoardColor ?? .systemTeal
+        trashCanButton.tintColor = color
+        trashCanButton.titleLabel?.textColor = color
+        widgetPanelMovedByTouch = false
+    }
+    
+    deinit {
+        bulkEditStacks = nil
+    }
+}
+
+@available(iOS 13.0, *)
+extension LayoutOnScreenControlsViewController: WidgetPickerViewControllerDelegate {}
diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/Table/OSCProfilesTableViewController.swift b/VoidLink/ViewControllers/CustomOSCViewControl/Table/OSCProfilesTableViewController.swift
index 88599ae2..bf28da7a 100644
--- a/VoidLink/ViewControllers/CustomOSCViewControl/Table/OSCProfilesTableViewController.swift
+++ b/VoidLink/ViewControllers/CustomOSCViewControl/Table/OSCProfilesTableViewController.swift
@@ -22,6 +22,12 @@ enum FileOperation: Int {
     case exportOperation = 1
 }
 
+@objc enum OSCProfilesTableViewLoadingMode: Int {
+    case selectProfile
+    case pickProfile
+    case pickProfileData
+}
+
 @objcMembers
 @objc(OSCProfilesTableViewController)
 final class OSCProfilesTableViewController: UIViewController, UITableViewDelegate, UITableViewDataSource, UIDocumentPickerDelegate, UIGestureRecognizerDelegate {
@@ -31,9 +37,10 @@ final class OSCProfilesTableViewController: UIViewController, UITableViewDelegat
 
     var currentFileOperation: FileOperation = .importOperation
     var needToUpdateOscLayoutTVC: (() -> Void)?
+    var loadingMode: OSCProfilesTableViewLoadingMode = .selectProfile
+    @nonobjc var pickedProfileDataHandler: ((OSCProfile) -> Void)?
     weak var currentOSCButtonLayers: NSMutableSet?
     var layoutViewBounds: CGRect = .zero
-    var pickProfileEnabled: Bool = false
 
     private var profilesManager: OSCProfilesManager!
 
@@ -322,7 +329,8 @@ final class OSCProfilesTableViewController: UIViewController, UITableViewDelegat
         cell.backgroundColor = UIColor.clear
         cell.contentView.backgroundColor = UIColor.clear
 
-        if indexPath.row == profilesManager.getIndexOfSelectedProfile() {
+        if loadingMode != .pickProfileData,
+           indexPath.row == profilesManager.getIndexOfSelectedProfile() {
             cell.accessoryType = UITableViewCell.AccessoryType.checkmark
             let checkmarkLabel = UILabel(frame: CGRect(x: 0, y: 0, width: 20, height: 20))
             checkmarkLabel.text = "✓"
@@ -383,6 +391,13 @@ final class OSCProfilesTableViewController: UIViewController, UITableViewDelegat
     }
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if loadingMode == .pickProfileData,
+           let pickedProfile = profilesManager.getAllProfiles().object(at: indexPath.row) as? OSCProfile {
+            pickedProfileDataHandler?(pickedProfile)
+            dismiss(animated: false)
+            return
+        }
+
         let selectedIndexPath = IndexPath(row: indexPath.row, section: 0)
         let lastSelectedIndexPath = IndexPath(row: profilesManager.getIndexOfSelectedProfile(), section: 0)
 
@@ -401,7 +416,9 @@ final class OSCProfilesTableViewController: UIViewController, UITableViewDelegat
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
-        if pickProfileEnabled, let touchView = touch.view, touchView.isDescendant(of: tableView) {
+        if loadingMode != .selectProfile,
+           let touchView = touch.view,
+           touchView.isDescendant(of: tableView) {
             return true
         }
         return touch.view == view
diff --git a/VoidLink/ViewControllers/SettingsViewController.h b/VoidLink/ViewControllers/SettingsViewController.h
index ef5e9179..d10b1b93 100644
--- a/VoidLink/ViewControllers/SettingsViewController.h
+++ b/VoidLink/ViewControllers/SettingsViewController.h
@@ -11,11 +11,14 @@
 
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
-#import "CustomOSCViewControl/LayoutOnScreenControlsViewController.h"
 #import "MainFrameViewController.h"
 #import "CustomEdgeSlideGestureRecognizer.h"
 #import "MenuSectionView.h"
 
+@class LayoutOnScreenControlsViewController;
+@class MicHandler;
+@protocol MicHandlerDelegate;
+
 @interface SettingsViewController : UIViewController <RearNavigationBarMenuDelegate, MenuSectionDelegate, MicHandlerDelegate, UITextFieldDelegate>
 
 @property (strong, nonatomic) IBOutlet UINavigationBar *navigationBar;
diff --git a/VoidLink/ViewControllers/StreamFrameViewController.h b/VoidLink/ViewControllers/StreamFrameViewController.h
index 974664f4..774a874d 100644
--- a/VoidLink/ViewControllers/StreamFrameViewController.h
+++ b/VoidLink/ViewControllers/StreamFrameViewController.h
@@ -15,13 +15,14 @@
 #import "MetalViewController.h"
 #import "StreamConfiguration.h"
 #import "StreamView.h"
-#import "LayoutOnScreenControlsViewController.h"
 #import "MainFrameViewController.h"
 #import "StreamManager.h"
 
 #import <AVKit/AVKit.h>
 #import <UIKit/UIKit.h>
 
+@class LayoutOnScreenControlsViewController;
+
 #if TARGET_OS_TV
 @import GameController;
 
diff --git a/VoidLink/ViewControllers/StreamFrameViewController.m b/VoidLink/ViewControllers/StreamFrameViewController.m
index 804fe10b..4c822c4c 100644
--- a/VoidLink/ViewControllers/StreamFrameViewController.m
+++ b/VoidLink/ViewControllers/StreamFrameViewController.m
@@ -785,8 +785,9 @@
     _layoutOnScreenControlsVC.quickSwitchEnabled = true;
     _layoutOnScreenControlsVC.toolbarStackView.hidden = true;
     _layoutOnScreenControlsVC.toolbarRootView.hidden = true;
+    OSCProfilesTableViewLoadingMode loadingMode = pickProfile ? OSCProfilesTableViewLoadingModePickProfile : OSCProfilesTableViewLoadingModeSelectProfile;
     [self presentViewController:_layoutOnScreenControlsVC animated:NO completion:^{
-        [self->_layoutOnScreenControlsVC presentProfilesTableViewWithPickProfile:pickProfile];
+        [self->_layoutOnScreenControlsVC presentProfilesTableViewWithLoadingMode:loadingMode];
     }];
 }
 
diff --git a/VoidLink/VoidLink-Bridging-Header.h b/VoidLink/VoidLink-Bridging-Header.h
index 278a38e7..d8202fd2 100644
--- a/VoidLink/VoidLink-Bridging-Header.h
+++ b/VoidLink/VoidLink-Bridging-Header.h
@@ -5,8 +5,12 @@
 #include <Limelight.h>
 #import "OnScreenControls.h"
 #import "OnScreenButtonState.h"
+#import "DataManager.h"
+#import "LocalizationHelper.h"
 #import "OSCProfile.h"
 #import "OSCProfilesManager.h"
+#import "LayoutOnScreenControls.h"
+#import "ToolBarContainerView.h"
 #import "opus.h"
 #import "opus_defines.h"
 // #import "RelativeTouchHandler.h"
diff --git a/VoidLink/mul.lproj/iPad.xcstrings b/VoidLink/mul.lproj/iPad.xcstrings
index 121f086b..90a2f20b 100644
--- a/VoidLink/mul.lproj/iPad.xcstrings
+++ b/VoidLink/mul.lproj/iPad.xcstrings
@@ -1,6 +1,48 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "1sF-08-aCr.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Highlight alpha\"; ObjectID = \"1sF-08-aCr\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Highlight alpha"
+          }
+        }
+      }
+    },
+    "1th-bc-im2.configuration.title" : {
+      "comment" : "Class = \"UIButton\"; configuration.title = \"77777\"; ObjectID = \"1th-bc-im2\";",
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "77777"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "uyfhgcghfhjg"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "sdafasd"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "asdfasdfasdf"
+          }
+        }
+      }
+    },
     "2Bp-XZ-cCw.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Async Native Touch\"; ObjectID = \"2Bp-XZ-cCw\";",
       "extractionState" : "extracted_with_value",
@@ -121,6 +163,18 @@
         }
       }
     },
+    "2TR-Kd-ro4.normalTitle" : {
+      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"2TR-Kd-ro4\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Button"
+          }
+        }
+      }
+    },
     "2w1-Vw-GVy.text" : {
       "comment" : "Class = \"UILabel\"; text = \"HDR\"; ObjectID = \"2w1-Vw-GVy\";",
       "extractionState" : "extracted_with_value",
@@ -1075,6 +1129,18 @@
         }
       }
     },
+    "aGh-QR-gBW.normalTitle" : {
+      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"aGh-QR-gBW\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Button"
+          }
+        }
+      }
+    },
     "Aiv-r8-9k2.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Frame Rate\"; ObjectID = \"Aiv-r8-9k2\";",
       "extractionState" : "extracted_with_value",
@@ -1597,6 +1663,18 @@
         }
       }
     },
+    "BlQ-y7-iDS.text" : {
+      "comment" : "Class = \"UILabel\"; text = \" \"; ObjectID = \"BlQ-y7-iDS\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : " "
+          }
+        }
+      }
+    },
     "bNW-R2-UuH.segmentTitles[0]" : {
       "comment" : "Class = \"UISegmentedControl\"; bNW-R2-UuH.segmentTitles[0] = \"disabled\"; ObjectID = \"bNW-R2-UuH\";",
       "extractionState" : "extracted_with_value",
@@ -2227,6 +2305,24 @@
         }
       }
     },
+    "cyH-Fh-vW6.normalTitle" : {
+      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"cyH-Fh-vW6\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Button"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "导入"
+          }
+        }
+      }
+    },
     "czn-mj-8d1.title" : {
       "comment" : "Class = \"UIBarButtonItem\"; title = \"Restore\"; ObjectID = \"czn-mj-8d1\";",
       "extractionState" : "extracted_with_value",
@@ -2576,6 +2672,24 @@
         }
       }
     },
+    "eTT-y7-oTM.configuration.title" : {
+      "comment" : "Class = \"UIButton\"; configuration.title = \"9999999\"; ObjectID = \"eTT-y7-oTM\";",
+      "extractionState" : "stale",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "9999999"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "0000000"
+          }
+        }
+      }
+    },
     "Evh-LH-rdh.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Pinch Gesture\"; ObjectID = \"Evh-LH-rdh\";",
       "extractionState" : "extracted_with_value",
@@ -3128,6 +3242,18 @@
         }
       }
     },
+    "hKK-ro-C5E.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Highlight size\"; ObjectID = \"hKK-ro-C5E\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Highlight size"
+          }
+        }
+      }
+    },
     "hPX-cJ-dgH.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Mute in Background\"; ObjectID = \"hPX-cJ-dgH\";",
       "extractionState" : "extracted_with_value",
@@ -3584,32 +3710,44 @@
         }
       }
     },
-    "Jeb-fE-sCm.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"   Bulk move    \"; ObjectID = \"Jeb-fE-sCm\";",
+    "jcq-LI-15e.text" : {
+      "comment" : "Class = \"UILabel\"; text = \" \"; ObjectID = \"jcq-LI-15e\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "   Bulk move    "
+            "value" : " "
+          }
+        }
+      }
+    },
+    "Jeb-fE-sCm.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"         Batch move    \"; ObjectID = \"Jeb-fE-sCm\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "         Batch move    "
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "  批量移动"
+            "value" : "        批量移动"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "  批次移動"
+            "value" : "        批次移動"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "  批次移動"
+            "value" : "        批次移動"
           }
         }
       }
@@ -3914,6 +4052,30 @@
         }
       }
     },
+    "kSX-ci-kx5.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Label alpha\"; ObjectID = \"kSX-ci-kx5\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Label alpha"
+          }
+        }
+      }
+    },
+    "Lar-2o-R7c.text" : {
+      "comment" : "Class = \"UILabel\"; text = \" \"; ObjectID = \"Lar-2o-R7c\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : " "
+          }
+        }
+      }
+    },
     "LGV-5y-piG.text" : {
       "comment" : "Class = \"UILabel\"; text = \"On-Screen Widgets   \"; ObjectID = \"LGV-5y-piG\";",
       "extractionState" : "extracted_with_value",
@@ -4538,6 +4700,18 @@
         }
       }
     },
+    "Ocb-R1-UYc.text" : {
+      "comment" : "Class = \"UILabel\"; text = \" \"; ObjectID = \"Ocb-R1-UYc\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : " "
+          }
+        }
+      }
+    },
     "oPM-G6-u5O.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Mouse Pointer Velocity\"; ObjectID = \"oPM-G6-u5O\";",
       "extractionState" : "extracted_with_value",
@@ -5248,6 +5422,18 @@
         }
       }
     },
+    "sAF-Vy-ZzK.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Border alpha\"; ObjectID = \"sAF-Vy-ZzK\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Border alpha"
+          }
+        }
+      }
+    },
     "SAQ-04-n4h.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Multi-Controller Mode\"; ObjectID = \"SAQ-04-n4h\";",
       "extractionState" : "extracted_with_value",
@@ -5968,14 +6154,14 @@
         }
       }
     },
-    "wrg-n4-F5w.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"       \"; ObjectID = \"wrg-n4-F5w\";",
+    "wTH-1Z-Fgh.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Border width\"; ObjectID = \"wTH-1Z-Fgh\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "       "
+            "value" : "Border width"
           }
         }
       }
@@ -6184,6 +6370,18 @@
         }
       }
     },
+    "yF0-Tu-L8X.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Alpha\"; ObjectID = \"yF0-Tu-L8X\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Alpha"
+          }
+        }
+      }
+    },
     "YM8-us-6sh.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Haptic Engine\"; ObjectID = \"YM8-us-6sh\";",
       "extractionState" : "extracted_with_value",
diff --git a/VoidLink/mul.lproj/iPhone.xcstrings b/VoidLink/mul.lproj/iPhone.xcstrings
index 682b66a1..3d5fab12 100644
--- a/VoidLink/mul.lproj/iPhone.xcstrings
+++ b/VoidLink/mul.lproj/iPhone.xcstrings
@@ -271,6 +271,18 @@
         }
       }
     },
+    "4Kd-Cc-aYN.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Highlight alpha\"; ObjectID = \"4Kd-Cc-aYN\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Highlight alpha"
+          }
+        }
+      }
+    },
     "4Ul-P6-eUk.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Enable PiP\"; ObjectID = \"4Ul-P6-eUk\";",
       "extractionState" : "extracted_with_value",
@@ -799,6 +811,18 @@
         }
       }
     },
+    "9Dr-3c-z61.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Label alpha\"; ObjectID = \"9Dr-3c-z61\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Label alpha"
+          }
+        }
+      }
+    },
     "9dX-RB-Fpa.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Optimize Game Settings\"; ObjectID = \"9dX-RB-Fpa\";",
       "extractionState" : "extracted_with_value",
@@ -1291,6 +1315,18 @@
         }
       }
     },
+    "b63-Pp-oPM.normalTitle" : {
+      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"b63-Pp-oPM\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Button"
+          }
+        }
+      }
+    },
     "bAZ-bm-h3I.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Switch Gyro by Controller\"; ObjectID = \"bAZ-bm-h3I\";",
       "extractionState" : "extracted_with_value",
@@ -2185,6 +2221,18 @@
         }
       }
     },
+    "eRy-My-vvU.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Border alpha\"; ObjectID = \"eRy-My-vvU\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Border alpha"
+          }
+        }
+      }
+    },
     "F0O-Ht-fW5.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Controller → Mouse\"; ObjectID = \"F0O-Ht-fW5\";",
       "extractionState" : "extracted_with_value",
@@ -2629,6 +2677,18 @@
         }
       }
     },
+    "hme-2d-8d6.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Highlight size\"; ObjectID = \"hme-2d-8d6\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Highlight size"
+          }
+        }
+      }
+    },
     "hn6-X9-TaI.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Mouse Pointer Velocity\"; ObjectID = \"hn6-X9-TaI\";",
       "extractionState" : "extracted_with_value",
@@ -2923,6 +2983,18 @@
         }
       }
     },
+    "KbX-bp-pYg.text" : {
+      "comment" : "Class = \"UILabel\"; text = \" \"; ObjectID = \"KbX-bp-pYg\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : " "
+          }
+        }
+      }
+    },
     "kcX-kR-3gl.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Component size\"; ObjectID = \"kcX-kR-3gl\";",
       "extractionState" : "extracted_with_value",
@@ -2965,6 +3037,18 @@
         }
       }
     },
+    "kMi-oG-eDT.text" : {
+      "comment" : "Class = \"UILabel\"; text = \" \"; ObjectID = \"kMi-oG-eDT\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : " "
+          }
+        }
+      }
+    },
     "kva-gQ-CZh.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Size\"; ObjectID = \"kva-gQ-CZh\";",
       "extractionState" : "extracted_with_value",
@@ -3151,6 +3235,18 @@
         }
       }
     },
+    "MgK-KI-3y7.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Alpha\"; ObjectID = \"MgK-KI-3y7\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Alpha"
+          }
+        }
+      }
+    },
     "Mhe-jU-8hh.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Designate Soft Keyboard Height\"; ObjectID = \"Mhe-jU-8hh\";",
       "extractionState" : "extracted_with_value",
@@ -4118,13 +4214,13 @@
       }
     },
     "P9b-Th-Ybc.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"      Bulk move     \"; ObjectID = \"P9b-Th-Ybc\";",
+      "comment" : "Class = \"UILabel\"; text = \"      Batch move     \"; ObjectID = \"P9b-Th-Ybc\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "      Bulk move     "
+            "value" : "      Batch move     "
           }
         },
         "zh-Hans" : {
@@ -4825,18 +4921,6 @@
         }
       }
     },
-    "QtA-AD-aJw.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"      \"; ObjectID = \"QtA-AD-aJw\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "      "
-          }
-        }
-      }
-    },
     "r8X-jt-JfH.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Frames to Buffer\"; ObjectID = \"r8X-jt-JfH\";",
       "extractionState" : "extracted_with_value",
@@ -4879,6 +4963,18 @@
         }
       }
     },
+    "RqY-mm-5dD.normalTitle" : {
+      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"RqY-mm-5dD\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Button"
+          }
+        }
+      }
+    },
     "S7X-Kt-2jd.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Show Local Keyboard Toolbar                                                      \"; ObjectID = \"S7X-Kt-2jd\";",
       "extractionState" : "extracted_with_value",
@@ -5179,6 +5275,18 @@
         }
       }
     },
+    "TFq-Un-O3H.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Border width\"; ObjectID = \"TFq-Un-O3H\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Border width"
+          }
+        }
+      }
+    },
     "TJx-6E-kgr.segmentTitles[0]" : {
       "comment" : "Class = \"UISegmentedControl\"; TJx-6E-kgr.segmentTitles[0] = \"No\"; ObjectID = \"TJx-6E-kgr\";",
       "extractionState" : "extracted_with_value",
@@ -5701,6 +5809,30 @@
         }
       }
     },
+    "wrY-O9-BeU.normalTitle" : {
+      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"wrY-O9-BeU\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Button"
+          }
+        }
+      }
+    },
+    "Wxw-Q8-aqN.text" : {
+      "comment" : "Class = \"UILabel\"; text = \" \"; ObjectID = \"Wxw-Q8-aqN\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : " "
+          }
+        }
+      }
+    },
     "WzD-wo-Wum.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Single Tap Sensitivity\"; ObjectID = \"WzD-wo-Wum\";",
       "extractionState" : "extracted_with_value",