diff --git a/VoidLink/Base.lproj/iPad.storyboard b/VoidLink/Base.lproj/iPad.storyboard
index 613c07d9..e2c5a6fe 100644
--- a/VoidLink/Base.lproj/iPad.storyboard
+++ b/VoidLink/Base.lproj/iPad.storyboard
@@ -154,7 +154,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="gWg-BF-yDI" userLabel="codec Stack">
-                                <rect key="frame" x="16" y="1554" width="380" height="56.5"/>
+                                <rect key="frame" x="21" y="1835" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Preferred Codec" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6w5-Md-NpV" userLabel="Preferred Codec">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -179,7 +179,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="dH7-Sy-EdJ" userLabel="HDRStack">
-                                <rect key="frame" x="18" y="1618" width="280" height="31"/>
+                                <rect key="frame" x="23" y="1899" width="280" height="31"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HDR" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2w1-Vw-GVy">
                                         <rect key="frame" x="0.0" y="0.0" width="130" height="31"/>
@@ -199,7 +199,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="9C2-td-rMV" userLabel="framepacing Stack">
-                                <rect key="frame" x="15" y="1712" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="1993" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Frame Pacing Preference" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZWC-Gw-pSq">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -400,7 +400,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2GS-cX-u4i" userLabel="swapABXYButtons Stack">
-                                <rect key="frame" x="15" y="1471" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="1752" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Swap A/B and X/Y Buttons" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dll-7x-18l">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -450,8 +450,57 @@
                                     <constraint firstAttribute="width" constant="380" id="1bX-IR-Vkj"/>
                                 </constraints>
                             </stackView>
+                            <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="kAD-mK-aP8" userLabel="gyroModeStack">
+                                <rect key="frame" x="15" y="973" width="380" height="56.5"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Gyro Mode" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7tq-jU-C6l">
+                                        <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="aa5-3y-I4d" userLabel="gyroModeSelector">
+                                        <rect key="frame" x="0.0" y="25.5" width="380" height="32"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <segments>
+                                            <segment title="Off"/>
+                                            <segment title="Auto"/>
+                                            <segment title="Device"/>
+                                            <segment title="Controller"/>
+                                        </segments>
+                                        <color key="tintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="selectedSegmentTintColor" systemColor="linkColor"/>
+                                    </segmentedControl>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="380" id="Lb7-hi-xph"/>
+                                </constraints>
+                            </stackView>
+                            <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="T3L-Kz-2yA" userLabel="gyroSensitivityStack">
+                                <rect key="frame" x="15" y="1051" width="380" height="56.5"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Gyro Sensitivity" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9XL-xt-Q57">
+                                        <rect key="frame" x="0.0" y="0.0" width="380" height="18.5"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="100" minValue="0.0" maxValue="300" id="3Ge-IB-PBj" userLabel="mousePointerVelocityFactor">
+                                        <rect key="frame" x="-2" y="23.5" width="384" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="tintColor" systemColor="linkColor"/>
+                                    </slider>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="380" id="W3Y-QW-piG"/>
+                                </constraints>
+                            </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="mes-so-dfK" userLabel="liftStreamViewForKeyboard Stack">
-                                <rect key="frame" x="17" y="958" width="380" height="56.5"/>
+                                <rect key="frame" x="22" y="1239" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Lift Stream View for Local Keyboard                                          " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QYJ-84-bvc">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -475,7 +524,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="tgA-05-vWV" userLabel="slideToSettingsScreenEdge Stack">
-                                <rect key="frame" x="15" y="1113" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="1394" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Open Settings in Streaming" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IvI-tw-APj">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -499,7 +548,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="msN-pa-Kn3" userLabel="slideToToolboxScreenEdge Stack">
-                                <rect key="frame" x="15" y="1189" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="1470" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Open Toolbox in Streaming" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zp4-fA-IeL">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -524,7 +573,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="pN7-bs-8yu" userLabel="slideToSettingsDistance Stack">
-                                <rect key="frame" x="16" y="1263" width="380" height="55.5"/>
+                                <rect key="frame" x="21" y="1544" width="380" height="55.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Gesture Slide Distance" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pMN-6T-aYE" userLabel="Slide To Settings Distance UI Label">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -543,7 +592,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="YBu-VX-wpN" userLabel="externalDisplayMode Stack">
-                                <rect key="frame" x="15" y="2216" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="2497" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="External Display Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Qy-hB-oa5">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -566,7 +615,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="nE1-Al-qRc" userLabel="localMousePointerMode Stack">
-                                <rect key="frame" x="15" y="2291" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="2572" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Local Mouse Pointer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tAd-bm-2IO">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -590,7 +639,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2P0-Tg-zWd" userLabel="reverseMouseWheelDirection Stack">
-                                <rect key="frame" x="15" y="1784" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="2065" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Physical Mouse Wheel Scroll" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FwK-oG-vuz">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -613,7 +662,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" id="gjX-s1-k61" userLabel="CitrixX1MouseStack">
-                                <rect key="frame" x="20" y="1973" width="280" height="31"/>
+                                <rect key="frame" x="25" y="2254" width="280" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Citrix X1 Mouse" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5aI-Zx-dNf">
@@ -634,7 +683,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="UcP-0b-nJD" userLabel="statsOverlay Stack">
-                                <rect key="frame" x="15" y="2063" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="2344" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Statistics Overlay" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s2i-ZL-Gz4" userLabel="Statistics Overlay">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -658,7 +707,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="90g-DY-GKi" userLabel="showKeyboardToolbar Stack">
-                                <rect key="frame" x="15" y="1037" width="380" height="56.5"/>
+                                <rect key="frame" x="20" y="1318" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Show Local Keyboard Toolbar                                                      " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aup-5k-z6P">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -682,7 +731,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="5dA-cw-gOa" userLabel="unlockDisplayOrientation Stack">
-                                <rect key="frame" x="16" y="2140" width="380" height="56.5"/>
+                                <rect key="frame" x="21" y="2421" width="380" height="56.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="90° Display Rotation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAo-1k-oYF" userLabel="Lock Display Orientation">
                                         <rect key="frame" x="0.0" y="0.0" width="380" height="20.5"/>
@@ -705,7 +754,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" id="Qfd-bG-FSa" userLabel="yuv444Stack">
-                                <rect key="frame" x="15" y="1673" width="280" height="31"/>
+                                <rect key="frame" x="20" y="1954" width="280" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="YUV 4:4:4" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MNm-86-RGl" userLabel="yuv444Label">
@@ -726,7 +775,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" id="TvS-69-vcF" userLabel="optimizeGameSettingStack">
-                                <rect key="frame" x="20" y="2012" width="280" height="31"/>
+                                <rect key="frame" x="25" y="2293" width="280" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Optimize Game Settings" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.65000000000000002" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d1N-HH-Aq9" userLabel="Optimize Game Settings">
@@ -744,7 +793,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" id="Bbr-Wj-Z75" userLabel="audioOnPCStack">
-                                <rect key="frame" x="20" y="1934" width="280" height="31"/>
+                                <rect key="frame" x="25" y="2215" width="280" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Play Audio on PC" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.64999997615814209" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8wW-Sq-EOE" userLabel="Optimize Game Settings">
@@ -762,7 +811,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" id="RrU-mx-9jP" userLabel="multiControllerStack">
-                                <rect key="frame" x="16" y="1330" width="280" height="31"/>
+                                <rect key="frame" x="21" y="1611" width="280" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Multi-Controller Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.64999997615814209" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SAQ-04-n4h" userLabel="Multi-Controller Mode">
@@ -780,7 +829,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" id="EKY-6m-OBd" userLabel="softKeyboardToolbarStack">
-                                <rect key="frame" x="16" y="1369" width="280" height="31"/>
+                                <rect key="frame" x="21" y="1650" width="280" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Soft Keyboard Toolbar" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.64999997615814209" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QdG-9a-5AZ" userLabel="softKeyboardToolbarStack">
@@ -821,6 +870,10 @@
                         <outlet property="framePacingSelector" destination="OOg-A3-DdM" id="XJL-lk-f5K"/>
                         <outlet property="framepacingStack" destination="9C2-td-rMV" id="5wc-qn-fo5"/>
                         <outlet property="framerateSelector" destination="8hF-kb-2uV" id="dfT-hb-csE"/>
+                        <outlet property="gyroModeSelector" destination="aa5-3y-I4d" id="FsX-kH-h7w"/>
+                        <outlet property="gyroModeStack" destination="kAD-mK-aP8" id="GvL-Yx-S2t"/>
+                        <outlet property="gyroSensitivitySlider" destination="3Ge-IB-PBj" id="Pdg-ke-KG3"/>
+                        <outlet property="gyroSensitivityStack" destination="T3L-Kz-2yA" id="iQS-ce-h0z"/>
                         <outlet property="hdrSwitch" destination="wIq-fF-X8l" id="Ozz-h0-nJL"/>
                         <outlet property="liftStreamViewForKeyboardSelector" destination="MM5-O0-vK3" id="tSC-Rp-Qfg"/>
                         <outlet property="liftStreamViewForKeyboardStack" destination="mes-so-dfK" id="nXR-Ot-Ydf"/>
@@ -1470,19 +1523,19 @@
         <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.63529411764705879" green="0.51764705882352946" 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="systemTealColor">
-            <color red="0.18823529410000001" green="0.69019607839999997" blue="0.78039215689999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.18823529411764706" green="0.69019607843137254" blue="0.7803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/VoidLink/Database/DataManager.h b/VoidLink/Database/DataManager.h
index d02e049c..f5a1ee8e 100644
--- a/VoidLink/Database/DataManager.h
+++ b/VoidLink/Database/DataManager.h
@@ -35,6 +35,14 @@ typedef NS_ENUM(NSInteger, TouchEventPriorityEnum) {
     TouchMovePriority// deprecated by GUI
 };
 
+typedef NS_ENUM(NSInteger, GyroMode) {
+    GyroModeOff,
+    GyroModeAuto,
+    AlwaysDevice,
+    AlwaysController
+};
+
+
 typedef NS_ENUM(NSInteger, SettingsMenuMode) {
     AllSettings,
     FavoriteSettings,
@@ -47,7 +55,7 @@ typedef NS_ENUM(NSInteger, SettingsMenuMode) {
                            width:(NSInteger)width
                      audioConfig:(NSInteger)audioConfig
                 onscreenControls:(NSInteger)onscreenControls
-                      motionMode:(NSInteger)motionMode
+                      gyroMode:(NSInteger)gyroMode
            keyboardToggleFingers:(NSInteger)keyboardToggleFingers
             oscLayoutToolFingers:(NSInteger)oscLayoutToolFingers
        slideToSettingsScreenEdge:(NSInteger)slideToSettingsScreenEdge
diff --git a/VoidLink/Database/DataManager.m b/VoidLink/Database/DataManager.m
index 70ad8d60..383a5122 100644
--- a/VoidLink/Database/DataManager.m
+++ b/VoidLink/Database/DataManager.m
@@ -61,7 +61,7 @@
                            width:(NSInteger)width
                      audioConfig:(NSInteger)audioConfig
                 onscreenControls:(NSInteger)onscreenControls
-                      motionMode:(NSInteger)motionMode
+                      gyroMode:(NSInteger)gyroMode
            keyboardToggleFingers:(NSInteger)keyboardToggleFingers
             oscLayoutToolFingers:(NSInteger)oscLayoutToolFingers
        slideToSettingsScreenEdge:(NSInteger)slideToSettingsScreenEdge
@@ -100,7 +100,7 @@
         settingsToSave.width = [NSNumber numberWithInteger:width];
         settingsToSave.audioConfig = [NSNumber numberWithInteger:audioConfig];
         settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
-        settingsToSave.motionMode = [NSNumber numberWithInteger:motionMode];
+        settingsToSave.gyroMode = [NSNumber numberWithInteger:gyroMode];
         settingsToSave.keyboardToggleFingers = [NSNumber numberWithInteger:(uint16_t)keyboardToggleFingers];
         settingsToSave.oscLayoutToolFingers = [NSNumber numberWithInteger:(uint16_t)oscLayoutToolFingers];
         settingsToSave.slideToSettingsScreenEdge = [NSNumber numberWithInteger:(uint32_t)slideToSettingsScreenEdge];
diff --git a/VoidLink/Database/TemporarySettings.h b/VoidLink/Database/TemporarySettings.h
index 015884ca..c3e7a9b2 100644
--- a/VoidLink/Database/TemporarySettings.h
+++ b/VoidLink/Database/TemporarySettings.h
@@ -25,7 +25,7 @@
 @property (nonatomic, retain) NSNumber * width;
 @property (nonatomic, retain) NSNumber * audioConfig;
 @property (nonatomic, retain) NSNumber * onscreenControls;
-@property (nonatomic, retain) NSNumber * motionMode;
+@property (nonatomic, retain) NSNumber * gyroMode;
 @property (nonatomic, retain) NSNumber * keyboardToggleFingers;
 @property (nonatomic, retain) NSNumber * oscLayoutToolFingers;
 @property (nonatomic, retain) NSNumber * slideToSettingsScreenEdge;
diff --git a/VoidLink/Database/TemporarySettings.m b/VoidLink/Database/TemporarySettings.m
index 03d70d9e..cd8ac009 100644
--- a/VoidLink/Database/TemporarySettings.m
+++ b/VoidLink/Database/TemporarySettings.m
@@ -89,7 +89,7 @@
     self.multiController = settings.multiController;
     self.swapABXYButtons = settings.swapABXYButtons;
     self.onscreenControls = settings.onscreenControls;
-    self.motionMode = settings.motionMode;
+    self.gyroMode = settings.gyroMode;
     self.reverseMouseWheelDirection = settings.reverseMouseWheelDirection;
     self.asyncNativeTouchPriority = settings.asyncNativeTouchPriority;
     self.btMouseSupport = settings.btMouseSupport;
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/1024x icon.png b/VoidLink/Images.xcassets/AppIcon.appiconset/1024x icon.png
new file mode 100644
index 00000000..8b405022
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/1024x icon.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Contents.json b/VoidLink/Images.xcassets/AppIcon.appiconset/Contents.json
index 634df308..452a6b4f 100644
--- a/VoidLink/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/VoidLink/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,11 +1,13 @@
 {
   "images" : [
     {
+      "filename" : "Icon-App-40x40@1x 2.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-App-20x20@3x 1.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
@@ -47,11 +49,13 @@
       "size" : "60x60"
     },
     {
+      "filename" : "Icon-App-20x20@1x 1.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-App-40x40@1x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x 1.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x 1.png
new file mode 100644
index 00000000..42cf3804
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x 1.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x 1.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x 1.png
new file mode 100644
index 00000000..8ca59ce2
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x 1.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 00000000..2a37de03
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
new file mode 100644
index 00000000..a8f9ae7e
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 00000000..a8f9ae7e
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 00000000..463b4208
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png
new file mode 100644
index 00000000..190440f1
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 2.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 2.png
new file mode 100644
index 00000000..190440f1
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 2.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 00000000..190440f1
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
new file mode 100644
index 00000000..5f11f252
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 00000000..5f11f252
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 00000000..4e4d6e7a
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 00000000..4e4d6e7a
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 00000000..219780cd
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 00000000..9400619f
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-1.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-1.png
deleted file mode 100644
index 86930220..00000000
Binary files a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-1.png and /dev/null differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-6.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-6.png
deleted file mode 100644
index cf7f81b3..00000000
Binary files a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-6.png and /dev/null differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-66.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-66.png
deleted file mode 100644
index ad79ac06..00000000
Binary files a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-66.png and /dev/null differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-grad.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-grad.png
deleted file mode 100644
index bd0a38a7..00000000
Binary files a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x-grad.png and /dev/null differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 13ce4929..4ef76fe4 100644
Binary files a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 00000000..44d9330f
Binary files /dev/null and b/VoidLink/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/VoidLink/Input/Controller.h b/VoidLink/Input/Controller.h
index acbbf9f7..c6035b1d 100644
--- a/VoidLink/Input/Controller.h
+++ b/VoidLink/Input/Controller.h
@@ -59,4 +59,9 @@ typedef struct {
 @property (nonatomic)                   BOOL reportedArrival;
 @property (nonatomic)                   Controller* _Nullable mergedWithController;
 
+@property(nonatomic, assign) uint8_t motionType;
+@property(nonatomic, assign) uint16_t reportRateHz;
+@property(nonatomic, assign) uint16_t controllerNumber;
+
+
 @end
diff --git a/VoidLink/Input/ControllerSupport.h b/VoidLink/Input/ControllerSupport.h
index 2dc3fb21..39739dad 100644
--- a/VoidLink/Input/ControllerSupport.h
+++ b/VoidLink/Input/ControllerSupport.h
@@ -52,4 +52,6 @@
 
 -(NSUInteger) getConnectedGamepadCount;
 
+-(void)updateConfig:(StreamConfiguration*)streamConfig delegate:(id<ControllerSupportDelegate>)delegate;
+
 @end
diff --git a/VoidLink/Input/ControllerSupport.m b/VoidLink/Input/ControllerSupport.m
index c2e1ac9c..587fc2d5 100644
--- a/VoidLink/Input/ControllerSupport.m
+++ b/VoidLink/Input/ControllerSupport.m
@@ -52,7 +52,7 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
     char _controllerNumbers;
     bool _multiController;
     bool _swapABXYButtons;
-    int _motionMode;
+    int _gyroMode;
     bool _captureMouse;
 }
 
@@ -92,189 +92,206 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
     [controller.rightTriggerMotor setMotorAmplitude:rightTrigger];
 }
 
-- (void) setMotionEventState:(uint16_t)controllerNumber motionType:(uint8_t)motionType reportRateHz:(uint16_t)reportRateHz
-{
-
+-(void)updateTimerStateForController:(Controller* )controller{
     if (@available(iOS 14.0, tvOS 14.0, *)) {
-        Controller* controller = [_controllers objectForKey:[NSNumber numberWithInteger:controllerNumber]];
-        #if !TARGET_OS_TV //tvOS has no device motion
-            NSInteger motionMode = _motionMode; //motionMode 0 = auto | 1 = always device | 2 = always controller
-        NSLog(@"motionMode: %ld", (long)motionMode);
-            if(motionMode !=2 && controllerNumber < 2){
-                if(controller == nil || controller.gamepad.motion == nil || motionMode == 1){
-                    //Player has no controller *or* no motion for controller 1 *or* wants to override controller 1 motion with device motion
-                    //using device motion
-                    if (controller == nil) {
-                        // No connected controller for this player, use the _oscController instead
-                        controller = _oscController;
-                    }
-                    if(!controller.motionManager) {
-                        controller.motionManager = [[CMMotionManager alloc] init];
-                    }
+        
+        NSLog(@"device gyro codes, gyroMode: %d", _gyroMode);
 
-                    switch (motionType) {
-                        case LI_MOTION_TYPE_ACCEL:
-                            [controller.accelTimer invalidate];
-                            controller.accelTimer = nil;
-
-                            // Reset the last motion sample
-                            CMAcceleration emptyDeviceAccelSample = {};
-                            controller.lastDeviceAccelSample = emptyDeviceAccelSample;
-
-                            {dispatch_sync(dispatch_get_main_queue(), ^{
-                                controller.accelTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / reportRateHz repeats:YES block:^(NSTimer *timer) {
-                                    // Don't send duplicate samples
-                                    CMAcceleration lastDeviceAccelSample = controller.lastDeviceAccelSample;
-                                    CMAcceleration deviceAccelSample = controller.motionManager.deviceMotion.userAcceleration;
-                                    //userAcceleration does not contain gravity, add gravity to x, y and z values:
-                                    deviceAccelSample.x += controller.motionManager.deviceMotion.gravity.x;
-                                    deviceAccelSample.y += controller.motionManager.deviceMotion.gravity.y;
-                                    deviceAccelSample.z += controller.motionManager.deviceMotion.gravity.z;
-
-                                    if (memcmp(&deviceAccelSample, &lastDeviceAccelSample, sizeof(deviceAccelSample)) == 0) {
-                                        return;
-                                    }
-                                    controller.lastDeviceAccelSample = deviceAccelSample;
-
-                                    // Convert g to m/s^2
-                                    NSLog(@"gyro input no.1 %f", CACurrentMediaTime());
-                                    if(UIApplication.sharedApplication.windows.firstObject.windowScene.interfaceOrientation == 4){ //check for landscape left or landscape right
-                                        LiSendControllerMotionEvent((uint8_t)controllerNumber,
-                                                                    LI_MOTION_TYPE_ACCEL,
-                                                                    deviceAccelSample.y * -9.80665f,
-                                                                    deviceAccelSample.z * -9.80665f,
-                                                                    deviceAccelSample.x * -9.80665f);
-                                    }
-                                    else{
-                                        LiSendControllerMotionEvent((uint8_t)controllerNumber,
-                                                                    LI_MOTION_TYPE_ACCEL,
-                                                                    deviceAccelSample.y * +9.80665f,
-                                                                    deviceAccelSample.z * -9.80665f,
-                                                                    deviceAccelSample.x * +9.80665f);
-                                    }
-                                }];
-                            });}
-                            break;
-                        case LI_MOTION_TYPE_GYRO:
-                            [controller.gyroTimer invalidate];
-                            controller.gyroTimer = nil;
-
-                            // Reset the last motion sample
-                            CMRotationRate emptyDeviceGyroSample = {};
-                            controller.lastDeviceGyroSample = emptyDeviceGyroSample;
-
-                            [controller.motionManager startDeviceMotionUpdates];
-
-                            dispatch_sync(dispatch_get_main_queue(), ^{
-                                controller.gyroTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / reportRateHz repeats:YES block:^(NSTimer *timer) {
-
-                                    // Don't send duplicate samples
-                                    CMRotationRate lastDeviceGyroSample = controller.lastDeviceGyroSample;
-                                    CMRotationRate deviceGyroSample = controller.motionManager.deviceMotion.rotationRate;
-                                    if (memcmp(&deviceGyroSample, &lastDeviceGyroSample, sizeof(deviceGyroSample)) == 0) {
-                                        return;
-                                    }
-                                    controller.lastDeviceGyroSample = deviceGyroSample;
-
-                                    // Convert rad/s to deg/s
-                                    NSLog(@"gyro input no.2 %f", CACurrentMediaTime());
-                                    if(UIApplication.sharedApplication.windows.firstObject.windowScene.interfaceOrientation == 4){//check for landscape left or landscape right
-                                        LiSendControllerMotionEvent((uint8_t)controllerNumber,
-                                                                    LI_MOTION_TYPE_GYRO,
-                                                                    deviceGyroSample.y * 57.2957795f,
-                                                                    deviceGyroSample.z * 57.2957795f,
-                                                                    deviceGyroSample.x * 57.2957795f);
-                                    }
-                                    else{
-                                        LiSendControllerMotionEvent((uint8_t)controllerNumber,
-                                                                    LI_MOTION_TYPE_GYRO,
-                                                                    deviceGyroSample.y * -57.2957795f,
-                                                                    deviceGyroSample.z * 57.2957795f,
-                                                                    deviceGyroSample.x * -57.2957795f);
-                                    }
-
-                                }];
-                            });
-                            break;
-                    }
-                    return;
-                }
-            }
-    #endif
-
-        switch (motionType) {
-            case LI_MOTION_TYPE_ACCEL:
-                [controller.accelTimer invalidate];
-                controller.accelTimer = nil;
-                                                                
-                if (reportRateHz && controller.gamepad.motion.hasGravityAndUserAcceleration) {
-                    // Reset the last motion sample
-                    GCAcceleration emptyAccelSample = {};
-                    controller.lastAccelSample = emptyAccelSample;
-                    
-                    dispatch_sync(dispatch_get_main_queue(), ^{
-                        controller.accelTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / reportRateHz repeats:YES block:^(NSTimer *timer) {
-                            // Don't send duplicate samples
-                            GCAcceleration lastAccelSample = controller.lastAccelSample;
-                            GCAcceleration accelSample = controller.gamepad.motion.acceleration;
-                            if (memcmp(&accelSample, &lastAccelSample, sizeof(accelSample)) == 0) {
-                                return;
-                            }
-                            controller.lastAccelSample = accelSample;
-                            
-                            // Convert g to m/s^2
-                            NSLog(@"gyro input no.3 %f", CACurrentMediaTime());
-                            LiSendControllerMotionEvent((uint8_t)controllerNumber,
-                                                        LI_MOTION_TYPE_ACCEL,
-                                                        accelSample.x * -9.80665f,
-                                                        accelSample.y * -9.80665f,
-                                                        accelSample.z * -9.80665f);
-                        }];
-                    });
-                }
-                break;
-                
-            case LI_MOTION_TYPE_GYRO:
-                [controller.gyroTimer invalidate];
-                controller.gyroTimer = nil;
-                
-                if (reportRateHz && controller.gamepad.motion.hasRotationRate) {
-                    // Reset the last motion sample
-                    GCRotationRate emptyGyroSample = {};
-                    controller.lastGyroSample = emptyGyroSample;
-                    
-                    dispatch_sync(dispatch_get_main_queue(), ^{
-                        controller.gyroTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / reportRateHz repeats:YES block:^(NSTimer *timer) {
-                            // Don't send duplicate samples
-                            GCRotationRate lastGyroSample = controller.lastGyroSample;
-                            GCRotationRate gyroSample = controller.gamepad.motion.rotationRate;
-                            if (memcmp(&gyroSample, &lastGyroSample, sizeof(gyroSample)) == 0) {
-                                return;
-                            }
-                            controller.lastGyroSample = gyroSample;
-                            
-                            // Convert rad/s to deg/s
-                            NSLog(@"gyro input no.4 %f", CACurrentMediaTime());
-                            LiSendControllerMotionEvent((uint8_t)controllerNumber,
-                                                        LI_MOTION_TYPE_GYRO,
-                                                        gyroSample.x * 57.2957795f,
-                                                        gyroSample.z * 57.2957795f,
-                                                        gyroSample.y * -57.2957795f);
-                        }];
-                    });
-                }
-                break;
+        
+        if(_gyroMode == GyroModeOff){
+            [self stopTimerForController:controller];
+            return;
         }
         
-        // Set the motion sensor state if they require manual activation
-        if (controller.gamepad.motion.sensorsRequireManualActivation) {
-            if (controller.gyroTimer || controller.accelTimer) {
-                controller.gamepad.motion.sensorsActive = YES;
-            }
-            else {
-                controller.gamepad.motion.sensorsActive = NO;
+        if(_gyroMode != AlwaysController && controller.controllerNumber < 2){
+            NSLog(@"device gyro codes");
+
+        #if !TARGET_OS_TV //tvOS has no device motion
+            if(controller.gamepad.motion == nil || _gyroMode == AlwaysDevice){
+                //Player has no controller *or* no motion for controller 1 *or* wants to override controller 1 motion with device motion
+                if(!controller.motionManager) {
+                    controller.motionManager = [[CMMotionManager alloc] init];
+                }
+                
+                NSLog(@"device gyro codes 2, motionType: %d", controller.motionType);
+                
+                switch (controller.motionType) {
+                    case LI_MOTION_TYPE_ACCEL:
+                        [controller.accelTimer invalidate];
+                        controller.accelTimer = nil;
+                        
+                        // Reset the last motion sample
+                        CMAcceleration emptyDeviceAccelSample = {};
+                        controller.lastDeviceAccelSample = emptyDeviceAccelSample;
+
+                    {dispatch_sync(dispatch_get_main_queue(), ^{
+                        NSLog(@"device gyro codes 3");
+
+                        controller.accelTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / controller.reportRateHz repeats:YES block:^(NSTimer *timer) {
+                            // Don't send duplicate samples
+                            CMAcceleration lastDeviceAccelSample = controller.lastDeviceAccelSample;
+                            CMAcceleration deviceAccelSample = controller.motionManager.deviceMotion.userAcceleration;
+                            //userAcceleration does not contain gravity, add gravity to x, y and z values:
+                            deviceAccelSample.x += controller.motionManager.deviceMotion.gravity.x;
+                            deviceAccelSample.y += controller.motionManager.deviceMotion.gravity.y;
+                            deviceAccelSample.z += controller.motionManager.deviceMotion.gravity.z;
+                            
+                            if (memcmp(&deviceAccelSample, &lastDeviceAccelSample, sizeof(deviceAccelSample)) == 0) {
+                                return;
+                            }
+                            controller.lastDeviceAccelSample = deviceAccelSample;
+                            
+                            // Convert g to m/s^2
+                            NSLog(@"gyro input no.1 %f", CACurrentMediaTime());
+                            if(UIApplication.sharedApplication.windows.firstObject.windowScene.interfaceOrientation == 4){ //check for landscape left or landscape right
+                                LiSendControllerMotionEvent((uint8_t)controller.controllerNumber,
+                                                            LI_MOTION_TYPE_ACCEL,
+                                                            deviceAccelSample.y * -9.80665f,
+                                                            deviceAccelSample.z * -9.80665f,
+                                                            deviceAccelSample.x * -9.80665f);
+                            }
+                            else{
+                                LiSendControllerMotionEvent((uint8_t)controller.controllerNumber,
+                                                            LI_MOTION_TYPE_ACCEL,
+                                                            deviceAccelSample.y * +9.80665f,
+                                                            deviceAccelSample.z * -9.80665f,
+                                                            deviceAccelSample.x * +9.80665f);
+                            }
+                        }];
+                    });}
+                        break;
+                    case LI_MOTION_TYPE_GYRO:
+                        [controller.gyroTimer invalidate];
+                        controller.gyroTimer = nil;
+                        
+                        // Reset the last motion sample
+                        CMRotationRate emptyDeviceGyroSample = {};
+                        controller.lastDeviceGyroSample = emptyDeviceGyroSample;
+                        
+                        [controller.motionManager startDeviceMotionUpdates];
+                        
+                        dispatch_sync(dispatch_get_main_queue(), ^{
+                            controller.gyroTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / controller.reportRateHz repeats:YES block:^(NSTimer *timer) {
+                                
+                                // Don't send duplicate samples
+                                CMRotationRate lastDeviceGyroSample = controller.lastDeviceGyroSample;
+                                CMRotationRate deviceGyroSample = controller.motionManager.deviceMotion.rotationRate;
+                                if (memcmp(&deviceGyroSample, &lastDeviceGyroSample, sizeof(deviceGyroSample)) == 0) {
+                                    return;
+                                }
+                                controller.lastDeviceGyroSample = deviceGyroSample;
+                                
+                                // Convert rad/s to deg/s
+                                NSLog(@"gyro input no.2 %f", CACurrentMediaTime());
+                                if(UIApplication.sharedApplication.windows.firstObject.windowScene.interfaceOrientation == 4){//check for landscape left or landscape right
+                                    LiSendControllerMotionEvent((uint8_t)controller.controllerNumber,
+                                                                LI_MOTION_TYPE_GYRO,
+                                                                deviceGyroSample.y * 57.2957795f,
+                                                                deviceGyroSample.z * 57.2957795f,
+                                                                deviceGyroSample.x * 57.2957795f);
+                                }
+                                else{
+                                    LiSendControllerMotionEvent((uint8_t)controller.controllerNumber,
+                                                                LI_MOTION_TYPE_GYRO,
+                                                                deviceGyroSample.y * -57.2957795f,
+                                                                deviceGyroSample.z * 57.2957795f,
+                                                                deviceGyroSample.x * -57.2957795f);
+                                }
+                                
+                            }];
+                        });
+                        break;
+                }
+                
             }
         }
+        #endif
+        else{
+            switch (controller.motionType) {
+                case LI_MOTION_TYPE_ACCEL:
+                    [controller.accelTimer invalidate];
+                    controller.accelTimer = nil;
+                                                                    
+                    if (controller.reportRateHz && controller.gamepad.motion.hasGravityAndUserAcceleration) {
+                        // Reset the last motion sample
+                        GCAcceleration emptyAccelSample = {};
+                        controller.lastAccelSample = emptyAccelSample;
+                        
+                        dispatch_sync(dispatch_get_main_queue(), ^{
+                            controller.accelTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / controller.reportRateHz repeats:YES block:^(NSTimer *timer) {
+                                // Don't send duplicate samples
+                                GCAcceleration lastAccelSample = controller.lastAccelSample;
+                                GCAcceleration accelSample = controller.gamepad.motion.acceleration;
+                                if (memcmp(&accelSample, &lastAccelSample, sizeof(accelSample)) == 0) {
+                                    return;
+                                }
+                                controller.lastAccelSample = accelSample;
+                                
+                                // Convert g to m/s^2
+                                NSLog(@"gyro input no.3 %f", CACurrentMediaTime());
+                                LiSendControllerMotionEvent((uint8_t)controller.controllerNumber,
+                                                            LI_MOTION_TYPE_ACCEL,
+                                                            accelSample.x * -9.80665f,
+                                                            accelSample.y * -9.80665f,
+                                                            accelSample.z * -9.80665f);
+                            }];
+                        });
+                    }
+                    break;
+                    
+                case LI_MOTION_TYPE_GYRO:
+                    [controller.gyroTimer invalidate];
+                    controller.gyroTimer = nil;
+                    
+                    if (controller.reportRateHz && controller.gamepad.motion.hasRotationRate) {
+                        // Reset the last motion sample
+                        GCRotationRate emptyGyroSample = {};
+                        controller.lastGyroSample = emptyGyroSample;
+                        
+                        dispatch_sync(dispatch_get_main_queue(), ^{
+                            controller.gyroTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 / controller.reportRateHz repeats:YES block:^(NSTimer *timer) {
+                                // Don't send duplicate samples
+                                GCRotationRate lastGyroSample = controller.lastGyroSample;
+                                GCRotationRate gyroSample = controller.gamepad.motion.rotationRate;
+                                if (memcmp(&gyroSample, &lastGyroSample, sizeof(gyroSample)) == 0) {
+                                    return;
+                                }
+                                controller.lastGyroSample = gyroSample;
+                                
+                                // Convert rad/s to deg/s
+                                NSLog(@"gyro input no.4 %f", CACurrentMediaTime());
+                                LiSendControllerMotionEvent((uint8_t)controller.controllerNumber,
+                                                            LI_MOTION_TYPE_GYRO,
+                                                            gyroSample.x * 57.2957795f,
+                                                            gyroSample.z * 57.2957795f,
+                                                            gyroSample.y * -57.2957795f);
+                            }];
+                        });
+                    }
+                    break;
+            }
+        }
+    }
+}
+
+
+- (void) setMotionEventState:(uint16_t)controllerNumber motionType:(uint8_t)motionType reportRateHz:(uint16_t)reportRateHz {
+    if (@available(iOS 14.0, tvOS 14.0, *)) {
+        NSLog(@"gyroMode: %ld", (long)_gyroMode);
+        
+        Controller* controller = [_controllers objectForKey:[NSNumber numberWithInteger:controllerNumber]];
+        //using device motion
+        if (controller == nil) {
+            // No connected controller for this player, use the _oscController instead
+            controller = _oscController;
+        }
+
+        controller.motionType = motionType;
+        controller.reportRateHz = reportRateHz;
+        controller.controllerNumber = controllerNumber;
+        NSLog(@"device gyro codes 0, %d, og: %d, %@", controller.motionType, motionType, controller);
+
+        [self updateTimerStateForController:controller];
     }
 }
 
@@ -1201,16 +1218,11 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
     return _controllers.count;
 }
 
--(id) initWithConfig:(StreamConfiguration*)streamConfig delegate:(id<ControllerSupportDelegate>)delegate
-{
-    self = [super init];
-    
-    _controllerStreamLock = [[NSLock alloc] init];
-    _controllers = [[NSMutableDictionary alloc] init];
-    _controllerNumbers = 0;
+-(void)updateConfig:(StreamConfiguration*)streamConfig delegate:(id<ControllerSupportDelegate>)delegate {
+
     _multiController = streamConfig.multiController;
     _swapABXYButtons = streamConfig.swapABXYButtons;
-    _motionMode = streamConfig.motionMode;
+    _gyroMode = streamConfig.gyroMode;
     _delegate = delegate;
 
     _oscController = [[Controller alloc] init];
@@ -1222,16 +1234,6 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
     Log(LOG_I, @"Number of supported controllers connected: %d", [ControllerSupport getGamepadCount]);
     Log(LOG_I, @"Multi-controller: %d", _multiController);
     
-    for (GCController* controller in [GCController controllers]) {
-        if ([ControllerSupport isSupportedGamepad:controller]) {
-            [self assignController:controller];
-            [self registerControllerCallbacks:controller];
-            
-            // Note: We cannot report controller arrival to the host here,
-            // because the connection has not been established yet.
-        }
-    }
-    
     _captureMouse = (streamConfig.localMousePointerMode == 0);
     if (@available(iOS 14.0, tvOS 14.0, *)) {
         for (GCMouse* mouse in [GCMouse mice]) {
@@ -1239,73 +1241,6 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
         }
     }
     
-    _controllerConnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:GCControllerDidConnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        Log(LOG_I, @"Controller connected!");
-        
-        GCController* controller = note.object;
-        
-        if (![ControllerSupport isSupportedGamepad:controller]) {
-            // Ignore micro gamepads and motion controllers
-            return;
-        }
-        
-        Controller* limeController = [self assignController:controller];
-        if (limeController) {
-            // Register callbacks on the new controller
-            [self registerControllerCallbacks:controller];
-            
-            // Report the controller arrival to the host if we're connected
-            [self reportControllerArrival:limeController];
-            
-            // Re-evaluate the on-screen control mode
-            [self updateAutoOnScreenControlMode];
-            
-            // Notify the delegate
-            [self->_delegate gamepadPresenceChanged];
-        }
-    }];
-    _controllerDisconnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:GCControllerDidDisconnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        Log(LOG_I, @"Controller disconnected!");
-        
-        GCController* controller = note.object;
-        
-        if (![ControllerSupport isSupportedGamepad:controller]) {
-            // Ignore micro gamepads and motion controllers
-            return;
-        }
-        
-        [self unregisterControllerCallbacks:controller];
-        self->_controllerNumbers &= ~(1 << controller.playerIndex);
-        Log(LOG_I, @"Unassigning controller index: %ld", (long)controller.playerIndex);
-        
-        Controller* limeController = [self->_controllers objectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
-        if (limeController) {
-            // Stop haptics on this controller
-            [self cleanupControllerHaptics:limeController];
-            
-            // Stop motion reports on this controller
-            [self cleanupControllerMotion:limeController];
-            
-            // Stop battery reports on this controller
-            [self cleanupControllerBattery:limeController];
-            
-            // Disassociate this controller from any controllers merged with it
-            if (limeController.mergedWithController) {
-                assert(limeController.mergedWithController.mergedWithController == limeController);
-                limeController.mergedWithController.mergedWithController = nil;
-            }
-            
-            // Inform the server of the updated active gamepads before removing this controller
-            [self updateFinished:limeController];
-            [self->_controllers removeObjectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
-            
-            // Re-evaluate the on-screen control mode
-            [self updateAutoOnScreenControlMode];
-            
-            // Notify the delegate
-            [self->_delegate gamepadPresenceChanged];
-        }
-    }];
     
     if (@available(iOS 14.0, tvOS 14.0, *)) {
         _mouseConnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:GCMouseDidConnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
@@ -1348,8 +1283,99 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
             // Re-evaluate the on-screen control mode
             [self updateAutoOnScreenControlMode];
         }];
+        NSLog(@"device gyro codes,update gyroMode: %d, controller count: %lu", _gyroMode, (unsigned long)_controllers.count);
+       for(Controller* controller in _controllers) [self updateTimerStateForController:controller];
+    }
+}
+
+-(id)initWithConfig:(StreamConfiguration*)streamConfig delegate:(id<ControllerSupportDelegate>)delegate
+{
+    self = [super init];
+    
+    _controllerNumbers = 0;
+
+    _controllerStreamLock = [[NSLock alloc] init];
+    _controllers = [[NSMutableDictionary alloc] init];
+
+    for (GCController* controller in [GCController controllers]) {
+        if ([ControllerSupport isSupportedGamepad:controller]) {
+            [self assignController:controller];
+            [self registerControllerCallbacks:controller];
+            
+            // Note: We cannot report controller arrival to the host here,
+            // because the connection has not been established yet.
+        }
     }
     
+    _controllerConnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:GCControllerDidConnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+        Log(LOG_I, @"Controller connected!");
+        
+        GCController* controller = note.object;
+        
+        if (![ControllerSupport isSupportedGamepad:controller]) {
+            // Ignore micro gamepads and motion controllers
+            return;
+        }
+        
+        Controller* limeController = [self assignController:controller];
+        if (limeController) {
+            // Register callbacks on the new controller
+            [self registerControllerCallbacks:controller];
+            
+            // Report the controller arrival to the host if we're connected
+            [self reportControllerArrival:limeController];
+            
+            // Re-evaluate the on-screen control mode
+            [self updateAutoOnScreenControlMode];
+            
+            // Notify the delegate
+            [self->_delegate gamepadPresenceChanged];
+        }
+    }];
+    
+    _controllerDisconnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:GCControllerDidDisconnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+        Log(LOG_I, @"Controller disconnected!");
+        
+        GCController* controller = note.object;
+        
+        if (![ControllerSupport isSupportedGamepad:controller]) {
+            // Ignore micro gamepads and motion controllers
+            return;
+        }
+        
+        [self unregisterControllerCallbacks:controller];
+        self->_controllerNumbers &= ~(1 << controller.playerIndex);
+        Log(LOG_I, @"Unassigning controller index: %ld", (long)controller.playerIndex);
+        
+        Controller* limeController = [self->_controllers objectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
+        if (limeController) {
+            // Stop haptics on this controller
+            [self cleanupControllerHaptics:limeController];
+            
+            // Stop motion reports on this controller
+            [self cleanupControllerMotion:limeController];
+            
+            // Stop battery reports on this controller
+            [self cleanupControllerBattery:limeController];
+            
+            // Disassociate this controller from any controllers merged with it
+            if (limeController.mergedWithController) {
+                assert(limeController.mergedWithController.mergedWithController == limeController);
+                limeController.mergedWithController.mergedWithController = nil;
+            }
+            
+            // Inform the server of the updated active gamepads before removing this controller
+            [self updateFinished:limeController];
+            
+            // Re-evaluate the on-screen control mode
+            [self updateAutoOnScreenControlMode];
+            
+            // Notify the delegate
+            [self->_delegate gamepadPresenceChanged];
+        }
+    }];
+    
+    [self updateConfig:streamConfig delegate:delegate];
     return self;
 }
 
@@ -1361,6 +1387,13 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
     }
 }
 
+-(void)stopTimerForController:(Controller* )controller{
+    [controller.accelTimer invalidate];
+    controller.accelTimer = nil;
+    [controller.gyroTimer invalidate];
+    controller.gyroTimer = nil;
+}
+
 -(void) cleanup
 {
     [[NSNotificationCenter defaultCenter] removeObserver:_controllerConnectObserver];
@@ -1380,6 +1413,7 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
     _controllerNumbers = 0;
     
     for (Controller* controller in [_controllers allValues]) {
+        [self stopTimerForController:controller];
         [self cleanupControllerHaptics:controller];
         [self cleanupControllerMotion:controller];
         [self cleanupControllerBattery:controller];
diff --git a/VoidLink/Limelight.xcdatamodeld/VoidLink v1.0.xcdatamodel/contents b/VoidLink/Limelight.xcdatamodeld/VoidLink v1.0.xcdatamodel/contents
index 24f3f953..14629f52 100644
--- a/VoidLink/Limelight.xcdatamodeld/VoidLink v1.0.xcdatamodel/contents	
+++ b/VoidLink/Limelight.xcdatamodeld/VoidLink v1.0.xcdatamodel/contents	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23602" systemVersion="24C5089c" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23788.4" systemVersion="24F74" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
         <attribute name="hdrSupported" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="hidden" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
@@ -21,18 +21,18 @@
         <relationship name="appList" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="App" inverseName="host" inverseEntity="App" syncable="YES"/>
     </entity>
     <entity name="Settings" representedClassName="Settings" syncable="YES" codeGenerationType="class">
+        <attribute name="asyncNativeTouchPriority" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="audioConfig" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="deviceGyroMode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="enableYUV444" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
-        <attribute name="externalDisplayMode" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="externalDisplayMode" optional="YES" attributeType="Integer 16" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="gyroMode" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="motionMode" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="keyboardToggleFingers" optional="YES" attributeType="Integer 16" defaultValueString="3" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="largerStickLR1" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="liftStreamViewForKeyboard" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="localMousePointerMode" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="mousePointerVelocityFactor" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
@@ -40,23 +40,25 @@
         <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="optimizeGames" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="oscLayoutToolFingers" optional="YES" attributeType="Integer 16" defaultValueString="4" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="oscTapExlusionAreaSize" optional="YES" attributeType="Float" defaultValueString="1.03" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="pointerVelocityModeDivider" optional="YES" attributeType="Float" defaultValueString="0.5" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="preferredCodec" attributeType="Integer 32" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="resolutionSelected" optional="YES" attributeType="Integer 16" defaultValueString="5" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="reverseMouseWheelDirection" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="settingsMenuMode" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="settingsMenuWidth" attributeType="Float" defaultValueString="370" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="showKeyboardToolbar" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
-        <attribute name="slideToSettingsDistance" optional="YES" attributeType="Float" defaultValueString="0.5" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="slideToSettingsDistance" optional="YES" attributeType="Float" defaultValueString="0.25" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="slideToSettingsScreenEdge" optional="YES" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="statsOverlayEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="statsOverlayLevel" optional="YES" attributeType="Integer 16" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="swapABXYButtons" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="touchMode" optional="YES" attributeType="Integer 16" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="touchMoveEventInterval" optional="YES" attributeType="Integer 16" defaultValueString="320" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="touchPointerVelocityFactor" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="uniqueId" attributeType="String" syncable="YES"/>
         <attribute name="unlockDisplayOrientation" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="useFramePacing" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" syncable="YES"/>
     </entity>
-</model>
+</model>
\ No newline at end of file
diff --git a/VoidLink/Localization/Localizable.xcstrings b/VoidLink/Localization/Localizable.xcstrings
index 09a518fd..2e5fa086 100644
--- a/VoidLink/Localization/Localizable.xcstrings
+++ b/VoidLink/Localization/Localizable.xcstrings
@@ -703,6 +703,35 @@
         }
       }
     },
+    "bitrateStackTip" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Only increase the bitrate if your network is capable, be particularly careful above 50 Mbps."
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "调高码率, 尤其是超过50Mbps时, 请确保具备相应网络条件."
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "调高码率, 尤其是超过50Mbps时, 请确保具备相应网络条件."
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "调高码率, 尤其是超过50Mbps时, 请确保具备相应网络条件."
+          }
+        }
+      }
+    },
     "Border Width" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -2717,6 +2746,64 @@
         }
       }
     },
+    "pointerVelocityDividerStackTip" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sensitivity divider line: used to separate the pass-through zone from the adjustment zone for touch-point movement speed in multi-touch games (e.g. Genshin Impact, Honkai: Star Rail). For details, see the online documentation."
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "灵敏度分割线, 用于划分多点触控游戏(原神/崩坏星穹铁道)中触点移速的透传区域和调整区域. 详见在线文档."
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "灵敏度分割线, 用于划分多点触控游戏(原神/崩坏星穹铁道)中触点移速的透传区域和调整区域. 详见在线文档."
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "灵敏度分割线, 用于划分多点触控游戏(原神/崩坏星穹铁道)中触点移速的透传区域和调整区域. 详见在线文档."
+          }
+        }
+      }
+    },
+    "pointerVelocityFactorStackTip" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Touch Sensitivity: Adjusts the movement speed of touch points on the right half of the screen, allowing you to control in-game camera sensitivity (for Genshin Impact & Honkai: Star Rail). See the online documentation for details."
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "触点灵敏度,  用于调节右半屏触点的移速, 进而实现(原神/崩坏星穹铁道)游戏内视角转动的灵敏度调节.详见在线文档."
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "触点灵敏度,  用于调节右半屏触点的移速, 进而实现(原神/崩坏星穹铁道)游戏内视角转动的灵敏度调节.详见在线文档."
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "触点灵敏度,  用于调节右半屏触点的移速, 进而实现(原神/崩坏星穹铁道)游戏内视角转动的灵敏度调节.详见在线文档."
+          }
+        }
+      }
+    },
     "Poor connection to PC" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -3672,6 +3759,29 @@
         }
       }
     },
+    "Tips" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "提示"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "提示"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "提示"
+          }
+        }
+      }
+    },
     "To Toggle Local Keyboard: Tap %d Fingers" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -3701,25 +3811,25 @@
         }
       }
     },
-    "Touch Control" : {
+    "Touch & Control" : {
       "extractionState" : "manual",
       "localizations" : {
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控"
+            "value" : "触屏与控制"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控"
+            "value" : "触屏与控制"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控"
+            "value" : "触屏与控制"
           }
         }
       }
@@ -3862,6 +3972,35 @@
         }
       }
     },
+    "touchModeStackTip" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- Touchpad: Dragging works exactly like on Windows laptop touchpad. A quick double-tap, starting from the second tap, enters drag mode.\n\n- Native Touch: Aka multi-touch passthrough, not supported on macOS.\n\n- Absolute Touch: Provides a touchscreen-like experience on macOS."
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- 触控板: 拖移方式与Windows笔记本电脑触控板相同, 快速双击的第2下开始进入拖动状态.\n\n- 多点触控: 不支持macOS.\n\n- 单点鼠标: 可为macOS提供类触屏体验."
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- 触控板: 拖移方式与Windows笔记本电脑触控板相同, 快速双击的第2下开始进入拖动状态.\n\n- 多点触控: 不支持macOS.\n\n- 单点鼠标: 可为macOS提供类触屏体验."
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- 触控板: 拖移方式与Windows笔记本电脑触控板相同, 快速双击的第2下开始进入拖动状态.\n\n- 多点触控: 不支持macOS.\n\n- 单点鼠标: 可为macOS提供类触屏体验."
+          }
+        }
+      }
+    },
     "Unsupported on this device" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -4074,6 +4213,35 @@
           }
         }
       }
+    },
+    "yuv444StackTip" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- Enabling the YUV 4:4:4 option provides higher color fidelity but also requires greater bandwidth.\n\n- Since Apple does not provide an API to determine whether a device supports hardware decoding of YUV 4:4:4 video, you will need to enable this option manually to verify compatibility. On some devices, this may cause issues such as loss of video brightness."
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- 开启YUV 4:4:4 选项可提供更高色彩保真度, 但对带宽要求也更高. \n\n- 由于Apple并未提供API判断设备是否支持YUV 4:4:4视频硬解码, 您需要自行打开该选项确认是否可用. 某些设备会因此产生视频亮度丢失的问题."
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- 开启YUV 4:4:4 选项可提供更高色彩保真度, 但对带宽要求也更高. \n\n- 由于Apple并未提供API判断设备是否支持YUV 4:4:4视频硬解码, 您需要自行打开该选项确认是否可用. 某些设备会因此产生视频亮度丢失的问题."
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "- 开启YUV 4:4:4 选项可提供更高色彩保真度, 但对带宽要求也更高. \n\n- 由于Apple并未提供API判断设备是否支持YUV 4:4:4视频硬解码, 您需要自行打开该选项确认是否可用. 某些设备会因此产生视频亮度丢失的问题."
+          }
+        }
+      }
     }
   },
   "version" : "1.0"
diff --git a/VoidLink/Stream/StreamConfiguration.h b/VoidLink/Stream/StreamConfiguration.h
index effdc62c..b65db70e 100644
--- a/VoidLink/Stream/StreamConfiguration.h
+++ b/VoidLink/Stream/StreamConfiguration.h
@@ -5,6 +5,9 @@
 //  Created by Diego Waxemberg on 10/20/14.
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
+//  Modified by True砖家 since 2024.8.10
+//  Copyright © 2024 True砖家 @ Bilibili. All rights reserved.
+//
 
 @interface StreamConfiguration : NSObject
 
@@ -27,8 +30,8 @@
 @property BOOL optimizeGameSettings;
 @property BOOL playAudioOnPC;
 @property BOOL swapABXYButtons;
-@property int motionMode;
-@property BOOL largerStickLR1;
+@property BOOL asyncNativeTouchPriority;
+@property int gyroMode;
 @property int audioConfiguration;
 @property int supportedVideoFormats;
 @property BOOL multiController;
diff --git a/VoidLink/Stream/StreamConfiguration.m b/VoidLink/Stream/StreamConfiguration.m
index 11089f26..ec4d1cd5 100644
--- a/VoidLink/Stream/StreamConfiguration.m
+++ b/VoidLink/Stream/StreamConfiguration.m
@@ -9,5 +9,5 @@
 #import "StreamConfiguration.h"
 
 @implementation StreamConfiguration
-@synthesize host, httpsPort, appID, width, height, frameRate, bitRate, riKeyId, riKey, gamepadMask, appName, optimizeGameSettings, playAudioOnPC, swapABXYButtons, motionMode, audioConfiguration, supportedVideoFormats, multiController, serverCert, rtspSessionUrl, serverCodecModeSupport, enableYUV444;
+@synthesize host, httpsPort, appID, width, height, frameRate, bitRate, riKeyId, riKey, gamepadMask, appName, optimizeGameSettings, playAudioOnPC, swapABXYButtons, gyroMode, audioConfiguration, supportedVideoFormats, multiController, serverCert, rtspSessionUrl, serverCodecModeSupport, enableYUV444;
 @end
diff --git a/VoidLink/ViewControllers/MainFrameViewController.m b/VoidLink/ViewControllers/MainFrameViewController.m
index 0ba86f85..eb1ee456 100644
--- a/VoidLink/ViewControllers/MainFrameViewController.m
+++ b/VoidLink/ViewControllers/MainFrameViewController.m
@@ -4,6 +4,9 @@
 //  Created by Diego Waxemberg on 1/17/14.
 //  Copyright (c) 2014 Moonlight Stream. All rights reserved.
 //
+//  Modified by True砖家 since 2024.6.29
+//  Copyright © 2024 True砖家 @ Bilibili. All rights reserved.
+//
 
 @import ImageIO;
 
@@ -29,7 +32,9 @@
 #import "LocalizationHelper.h"
 #import "CustomEdgeSlideGestureRecognizer.h"
 #import "DataManager.h"
-#import "Moonlight-Swift.h" // not used yet.
+#import "ThemeManager.h"
+#import "FixedTintImageView.h"
+#import "VoidLink-Swift.h" // not used yet.
 
 #if !TARGET_OS_TV
 #import "SettingsViewController.h"
@@ -43,6 +48,11 @@
 
 @implementation MainFrameViewController {
     UILabel* waterMark;
+    UIBarButtonItem* _addHostButton;
+    UIBarButtonItem* _helpButton;
+    UIBarButtonItem* _upButton;
+
+    UILabel* hostViewTitleLabel;
     //CGFloat recordedScreenWidth;
     NSOperationQueue* _opQueue;
     TemporaryHost* _selectedHost;
@@ -54,11 +64,15 @@
     StreamConfiguration* _streamConfig;
     UIAlertController* _pairAlert;
     LoadingFrameViewController* _loadingFrame;
-    UIScrollView* hostScrollView;
     FrontViewPosition currentPosition;
     NSArray* _sortedAppList;
     NSCache* _boxArtCache;
     bool _background;
+    UIView* menuSeparator;
+    UIView* snapshot;
+    SettingsViewController* settingsViewController;
+    id navBarAppearanceStandard;
+
 #if TARGET_OS_TV
     UITapGestureRecognizer* _menuRecognizer;
 #endif
@@ -76,7 +90,7 @@ static NSMutableSet* hostList;
             self->_pairAlert = nil;
             [self->_discMan startDiscovery];
             [self hideLoadingFrame: ^{
-                [self showHostSelectionView];
+                [self switchToHostView];
             }];
         }]];
         [[self activeViewController] presentViewController:self->_pairAlert animated:YES completion:nil];
@@ -93,7 +107,7 @@ static NSMutableSet* hostList;
     [_discMan startDiscovery];
     
     [self hideLoadingFrame: ^{
-        [self showHostSelectionView];
+        [self switchToHostView];
         [[self activeViewController] presentViewController:failedDialog animated:YES completion:nil];
     }];
 }
@@ -122,32 +136,40 @@ static NSMutableSet* hostList;
     });
 }
 
-- (void)disableUpButton {
-#if !TARGET_OS_TV
-    [self->_upButton setTitle:nil];
-    self.revealViewController.mainFrameIsInHostView = true;  // to allow orientation change only in app view, tell top view controller the mainframe is not in host view
-    [self setNeedsUpdateAllowedOrientation];
-#endif
-}
-
-- (void)enableUpButton {
-#if !TARGET_OS_TV
-    [self->_upButton setTitle: [LocalizationHelper localizedStringForKey: @"Select New Host"]];
-    self.revealViewController.mainFrameIsInHostView = false; // to allow orientation change only in app view, tell top view controller the mainframe is not in host view
-    [self setNeedsUpdateAllowedOrientation];
-#endif
-}
-
 - (void)updateTitle {
+
+    if (@available(iOS 13.0, *)) {
+        NSDictionary* titleTextAttributes = @{
+            NSFontAttributeName: [UIFont systemFontOfSize:20 weight:UIFontWeightMedium],
+            NSForegroundColorAttributeName: [ThemeManager textColor] // 可选，设置标题颜色
+        };
+        [navBarAppearanceStandard setValue:titleTextAttributes forKey:@"titleTextAttributes"];
+    }
+
     if (_selectedHost != nil) {
         self.title = _selectedHost.name;
     }
     else if ([hostList count] == 0) {
+
         self.title = [LocalizationHelper localizedStringForKey: @"Searching for PCs on your network..."] ;
     }
     else {
-        self.title = [LocalizationHelper localizedStringForKey: @"Select Host" ];
+        if (@available(iOS 13.0, *)) {
+            NSDictionary* titleTextAttributes = @{
+                NSFontAttributeName: [UIFont systemFontOfSize:22 weight:UIFontWeightMedium],
+                NSForegroundColorAttributeName: [ThemeManager textColor] // 可选，设置标题颜色
+            };
+            [navBarAppearanceStandard setValue:titleTextAttributes forKey:@"titleTextAttributes"];
+        }
+        /*
+        self.navigationController.navigationBar.titleTextAttributes = @{
+            NSFontAttributeName: [UIFont systemFontOfSize:24 weight:UIFontWeightSemibold],
+            NSForegroundColorAttributeName: [ThemeManager textColor] // 可选，设置标题颜色
+        };*/
+        self.title = [LocalizationHelper localizedStringForKey: @"Hosts" ];
+        //self.title = nil;
     }
+    [self applyNavBarAppearance];
 }
 
 - (void)alreadyPaired {
@@ -196,7 +218,7 @@ static NSMutableSet* hostList;
                 [Utils addHelpOptionToDialog:applistAlert];
                 [applistAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Ok"] style:UIAlertActionStyleDefault handler:nil]];
                 [self hideLoadingFrame: ^{
-                    [self showHostSelectionView];
+                    [self switchToHostView];
                     [[self activeViewController] presentViewController:applistAlert animated:YES completion:nil];
                 }];
                 host.state = StateOffline;
@@ -297,7 +319,7 @@ static NSMutableSet* hostList;
     [self updateHostShortcuts];
 }
 
-- (void)showHostSelectionView {
+- (void)switchToHostView {
 #if TARGET_OS_TV
     // Remove the menu button intercept to allow the app to exit
     // when at the host selection view.
@@ -308,11 +330,12 @@ static NSMutableSet* hostList;
     _selectedHost = nil;
     _sortedAppList = nil;
     
+    // [self.collectionView removeFromSuperview]; // necessary for new scroll host view reloading mechanism
+    self.hostCollectionVC.view.hidden = NO;
+    self.collectionView.hidden = YES;
     [self updateTitle];
-    [self disableUpButton];
-    [self.collectionView removeFromSuperview]; // necessary for new scroll host view reloading mechanism
-    [self.view setBackgroundColor:[UIColor darkGrayColor]];
-    [self reloadScrollHostView]; // host view must be reloaded here
+    self.navigationItem.rightBarButtonItems = @[_helpButton, _addHostButton];
+    self.revealViewController.mainFrameIsInHostView = true;  // to allow orientation change only in app view, tell top view controller the mainframe is not in host view
 }
 
 - (void) receivedAssetForApp:(TemporaryApp*)app {
@@ -334,42 +357,66 @@ static NSMutableSet* hostList;
     [[self activeViewController] presentViewController:alert animated:YES completion:nil];
 }
 
-- (void) hostClicked:(TemporaryHost *)host view:(UIView *)view {
-    // Treat clicks on offline hosts to be long clicks
-    // This shows the context menu with wake, delete, etc. rather
-    // than just hanging for a while and failing as we would in this
-    // code path.
-    if (host.state != StateOnline && view != nil) {
-        [self hostLongClicked:host view:view];
-        return;
-    }
-    
-    Log(LOG_D, @"Clicked host: %@", host.name);
-    _selectedHost = host;
-    [self updateTitle];
+- (void)switchToAppView{
     //_appManager = [[AppAssetManager alloc] initWithCallback:self];
     [self.collectionView setCollectionViewLayout:self.collectionViewLayout];
     [self.collectionView reloadData]; //for new scroll host view reloading mechanism
-    [self.view addSubview:self.collectionView]; //for new scroll host view reloading mechanism
+    // [self.view bringSubviewToFront:self.collectionView];
+    self.hostCollectionVC.view.hidden = YES;
+    self.collectionView.hidden = NO;
+    self.collectionView.backgroundColor = [ThemeManager appBackgroundColor];
+    //self.view.backgroundColor = [ThemeManager appBackgroundColor];
+
     [self attachWaterMark];
-    [self enableUpButton];
-    [self disableNavigation];
-    
-#if TARGET_OS_TV
-    // Intercept the menu key to go back to the host page
-    [self.navigationController.view addGestureRecognizer:_menuRecognizer];
-#endif
-    
-    // If we are online, paired, and have a cached app list, skip straight
-    // to the app grid without a loading frame. This is the fast path that users
-    // should hit most. Check for a valid view because we don't want to hit the fast
-    // path after coming back from streaming, since we need to fetch serverinfo too
-    // so that our active game data is correct.
-    if (host.state == StateOnline && host.pairState == PairStatePaired && host.appList.count > 0 && view != nil) {
-        [self alreadyPaired];
+    self.navigationItem.rightBarButtonItems = @[_upButton];
+    self.revealViewController.mainFrameIsInHostView = false;
+    // [self disableNavigation];
+    [self updateTitle];
+    [self alreadyPaired];
+    // self.navigationController.navigationBar.backgroundColor = [ThemeManager appBackgroundColor];
+    // self.navigationController.navigationBar.translucent = NO;
+    //[self applyNavBarAppearance:navBarAppearance];
+}
+
+- (void)appButtonTappedForHost:(TemporaryHost *)host {
+    if (host.state != StateOnline) return;
+    _selectedHost = host;
+    if (host.state == StateOnline && host.pairState == PairStatePaired && host.appList.count > 0) {
+        [self switchToAppView];
+    }
+}
+
+- (void)launchButtonTappedForHost:(TemporaryHost *)host {
+    _selectedHost = host;
+    if (host.state == StateOnline && host.pairState == PairStatePaired && host.appList.count > 0) {
+        [self closeSettingViewAnimated:NO];
+        [self switchToAppView];
+        [self updateAppsForHost:_selectedHost];
+        [self prepareToStreamApp:_sortedAppList.firstObject];
+        [self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
         return;
     }
-    
+}
+
+- (void)wakeupButtonTappedForHost:(TemporaryHost *)host{
+    _selectedHost = host;
+    if (host.state == StateOffline && host.pairState == PairStatePaired) {
+        UIAlertController* wolAlert = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Wake-On-LAN"] message:@"" preferredStyle:UIAlertControllerStyleAlert];
+        [wolAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Ok"] style:UIAlertActionStyleDefault handler:nil]];
+        if (host.mac == nil || [host.mac isEqualToString:@"00:00:00:00:00:00"]) {
+            wolAlert.message = [LocalizationHelper localizedStringForKey: @"Host MAC unknown, unable to send WOL Packet"];
+        } else {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                [WakeOnLanManager wakeHost:host];
+            });
+            wolAlert.message = [LocalizationHelper localizedStringForKey:@"Successfully sent wake-up request. It may take a few moments for the PC to wake. If it never wakes up, ensure it's properly configured for Wake-on-LAN."];
+        }
+        [[self activeViewController] presentViewController:wolAlert animated:YES completion:nil];
+    }
+}
+
+- (void)pairButtonTappedForHost:(TemporaryHost *)host{
+    _selectedHost = host;
     [self showLoadingFrame: ^{
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             // Wait for the PC's status to be known
@@ -381,7 +428,7 @@ static NSMutableSet* hostList;
             if (host.state == StateOffline) {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [self hideLoadingFrame:^{
-                        [self showHostSelectionView];
+                        [self switchToHostView];
                     }];
                 });
                 return;
@@ -413,34 +460,102 @@ static NSMutableSet* hostList;
                     // Only display an alert if this was the result of a real
                     // user action, not just passively entering the foreground again
                     [self hideLoadingFrame: ^{
-                        [self showHostSelectionView];
-                        if (view != nil) {
+                        [self switchToHostView];
                             [[self activeViewController] presentViewController:applistAlert animated:YES completion:nil];
-                        }
                     }];
                     
                     host.state = StateOffline;
                 });
             } else {
+                // Update the host object with this data
+                [serverInfoResp populateHost:host];
+                // Only pair when this was the result of explicit user action
+                    Log(LOG_I, @"Trying to pairTrying to pair");
+                    // Polling the server while pairing causes the server to screw up
+                    [self->_discMan stopDiscoveryBlocking];
+                    PairManager* pMan = [[PairManager alloc] initWithManager:hMan clientCert:self->_clientCert callback:self];
+                    [self->_opQueue addOperation:pMan];
+
+            }
+        });
+    }];
+}
+
+
+- (void) noneUserInitiatedHostAction:(TemporaryHost *)host view:(UIView *)view {
+    Log(LOG_D, @"Clicked host: %@", host.name);
+    _selectedHost = host;
+    //_appManager = [[AppAssetManager alloc] initWithCallback:self];
+    [self.collectionView setCollectionViewLayout:self.collectionViewLayout];
+    [self.collectionView reloadData]; //for new scroll host view reloading mechanism
+    [self.view addSubview:self.collectionView]; //for new scroll host view reloading mechanism
+    
+#if TARGET_OS_TV
+    // Intercept the menu key to go back to the host page
+    [self.navigationController.view addGestureRecognizer:_menuRecognizer];
+#endif
+    
+    // 若未在线或未配对, 有以下:
+    
+    [self showLoadingFrame: ^{
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            // Wait for the PC's status to be known
+            while (host.state == StateUnknown) {
+                sleep(1);
+            }
+            
+            // Don't bother polling if the server is already offline
+            if (host.state == StateOffline) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self hideLoadingFrame:^{
+                        [self switchToHostView];
+                    }];
+                });
+                return;
+            }
+            
+            HttpManager* hMan = [[HttpManager alloc] initWithHost:host];
+            ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
+            
+            // Exempt this host from discovery while handling the serverinfo request
+            [self->_discMan pauseDiscoveryForHost:host];
+            [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest:false]
+                                                                fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
+            [self->_discMan resumeDiscoveryForHost:host];
+            
+            if (![serverInfoResp isStatusOk]) {
+                Log(LOG_W, @"Failed to get server info: %@", serverInfoResp.statusMessage);
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    if (host != self->_selectedHost) {
+                        [self hideLoadingFrame:nil];
+                        return;
+                    }
+                    
+                    UIAlertController* applistAlert = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Connection Failed"]
+                                                                                          message:serverInfoResp.statusMessage
+                                                                                   preferredStyle:UIAlertControllerStyleAlert];
+                    [Utils addHelpOptionToDialog:applistAlert];
+                    [applistAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Ok"] style:UIAlertActionStyleDefault handler:nil]];
+                    
+                    // Only display an alert if this was the result of a real
+                    // user action, not just passively entering the foreground again
+                    [self hideLoadingFrame: ^{
+                        [self switchToHostView];
+                    }];
+                    host.state = StateOffline;
+                });
+            } else {
                 // Update the host object with this data
                 [serverInfoResp populateHost:host];
                 if (host.pairState == PairStatePaired) {
                     Log(LOG_I, @"Already Paired");
                     [self alreadyPaired];
                 }
-                // Only pair when this was the result of explicit user action
-                else if (view != nil) {
-                    Log(LOG_I, @"Trying to pair");
-                    // Polling the server while pairing causes the server to screw up
-                    [self->_discMan stopDiscoveryBlocking];
-                    PairManager* pMan = [[PairManager alloc] initWithManager:hMan clientCert:self->_clientCert callback:self];
-                    [self->_opQueue addOperation:pMan];
-                }
-                else {
+                else if (view == nil) {
                     // Not user action, so just return to host screen
                     dispatch_async(dispatch_get_main_queue(), ^{
                         [self hideLoadingFrame:^{
-                            [self showHostSelectionView];
+                            [self switchToHostView];
                         }];
                     });
                 }
@@ -449,6 +564,7 @@ static NSMutableSet* hostList;
     }];
 }
 
+ 
 - (UIViewController*) activeViewController {
     UIViewController *topController = [UIApplication sharedApplication].keyWindow.rootViewController;
     
@@ -459,7 +575,14 @@ static NSMutableSet* hostList;
     return topController;
 }
 
-- (void)hostLongClicked:(TemporaryHost *)host view:(UIView *)view {
+- (void)restoreTintColorForAllSubViews{
+    for(UIView* view in self.view.subviews){  // iterates all on-screen widget views in StreamFrameView
+        view.tintAdjustmentMode = UIViewTintAdjustmentModeNormal;
+    }
+}
+
+- (void)hostCardLongPressed:(TemporaryHost *)host view:(UIView *)view {
+    _selectedHost = host;
     Log(LOG_D, @"Long clicked host: %@", host.name);
     NSString* message;
     
@@ -486,8 +609,9 @@ static NSMutableSet* hostList;
     }
     
     UIAlertController* longClickAlert = [UIAlertController alertControllerWithTitle:host.name message:message preferredStyle:UIAlertControllerStyleActionSheet];
+    
     if (host.state != StateOnline) {
-        [longClickAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Wake PC"] style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+        /*[longClickAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Wake PC"] style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
             UIAlertController* wolAlert = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Wake-On-LAN"] message:@"" preferredStyle:UIAlertControllerStyleAlert];
             [wolAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Ok"] style:UIAlertActionStyleDefault handler:nil]];
             if (host.mac == nil || [host.mac isEqualToString:@"00:00:00:00:00:00"]) {
@@ -499,16 +623,17 @@ static NSMutableSet* hostList;
                 wolAlert.message = [LocalizationHelper localizedStringForKey:@"Successfully sent wake-up request. It may take a few moments for the PC to wake. If it never wakes up, ensure it's properly configured for Wake-on-LAN."];
             }
             [[self activeViewController] presentViewController:wolAlert animated:YES completion:nil];
-        }]];
+        }]];*/
     }
     else if (host.pairState == PairStatePaired) {
+        /*
         [longClickAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"View All Apps"] style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
             self->_showHiddenApps = YES;
             [self hostClicked:host view:view];
-        }]];
+        }]]; */
         
 #if !TARGET_OS_TV
-        if (host.isNvidiaServerSoftware) {
+        if (false) {
             [longClickAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"NVIDIA GameStream End-of-Service"] style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
                 [Utils launchUrl:@"https://github.com/moonlight-stream/moonlight-docs/wiki/NVIDIA-GameStream-End-Of-Service-Announcement-FAQ"];
             }]];
@@ -538,7 +663,9 @@ static NSMutableSet* hostList;
                         
                         UIAlertController* netTestAlert = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Network Test Complete"] message:message preferredStyle:UIAlertControllerStyleAlert];
                         [netTestAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Ok"] style:UIAlertActionStyleDefault handler:nil]];
-                        [[self activeViewController] presentViewController:netTestAlert animated:YES completion:nil];
+                        [[self activeViewController] presentViewController:netTestAlert animated:YES completion:^{
+                            [self restoreTintColorForAllSubViews];
+                        }];
                     }];
                 });
             });
@@ -556,6 +683,7 @@ static NSMutableSet* hostList;
 #endif
     [longClickAlert addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Remove Host"] style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action) {   // host removed here
         [self->_discMan removeHostFromDiscovery:host];
+        [self.hostCollectionVC removeHost:host];
         DataManager* dataMan = [[DataManager alloc] init];
         [dataMan removeHost:host];
         @synchronized(hostList) {
@@ -573,13 +701,29 @@ static NSMutableSet* hostList;
     [[self activeViewController] presentViewController:longClickAlert animated:YES completion:nil];
 }
 
-- (void) addHostClicked {
-    Log(LOG_D, @"Clicked add host");
-    UIAlertController* alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Add Host Manually"] message:[LocalizationHelper localizedStringForKey:@"If Moonlight doesn't find your local gaming PC automatically, enter the IP address of your PC"] preferredStyle:UIAlertControllerStyleAlert];
-    [alertController addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Cancel"] style:UIAlertActionStyleCancel handler:nil]];
-    [alertController addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Ok"] style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
-        NSString* hostAddress = [((UITextField*)[[alertController textFields] objectAtIndex:0]).text trim];
-                
+- (void) addHostTapped {
+    Log(LOG_D, @"Tapped add host");
+    UIAlertController* alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Add Host Manually"]
+                                                                             message:[LocalizationHelper localizedStringForKey:@"Enter IP address to add host manually"]
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
+
+    [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+        textField.placeholder = @"192.168.0.100 or [2001:db8::1]";
+        textField.keyboardType = UIKeyboardTypeASCIICapable;
+        textField.autocorrectionType = UITextAutocorrectionTypeNo;
+        textField.spellCheckingType = UITextSpellCheckingTypeNo;
+    }];
+
+    [alertController addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Cancel"]
+                                                        style:UIAlertActionStyleCancel
+                                                      handler:nil]];
+
+    [alertController addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Ok"]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction* action) {
+        UITextField *textField = alertController.textFields.firstObject;
+        NSString *hostAddress = [textField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+
         [self showLoadingFrame:^{
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
                 [self->_discMan discoverHost:hostAddress withCallback:^(TemporaryHost* host, NSString* error){
@@ -612,7 +756,6 @@ static NSMutableSet* hostList;
             });
         }];
     }]];
-    [alertController addTextFieldWithConfigurationHandler:nil];
     [[self activeViewController] presentViewController:alertController animated:YES completion:nil];
 }
 
@@ -665,9 +808,9 @@ static NSMutableSet* hostList;
     _streamConfig.playAudioOnPC = streamSettings.playAudioOnPC;
     _streamConfig.useFramePacing = streamSettings.useFramePacing;
     _streamConfig.swapABXYButtons = streamSettings.swapABXYButtons;
-    _streamConfig.motionMode = [streamSettings.motionMode intValue];
-    NSLog(@"motionMode from settings: %ld", _streamConfig.motionMode);
-    _streamConfig.largerStickLR1 = streamSettings.largerStickLR1; // new streamConfig segment
+    _streamConfig.asyncNativeTouchPriority = streamSettings.asyncNativeTouchPriority; // new streamConfig segment
+    _streamConfig.gyroMode = [streamSettings.gyroMode intValue];
+    //NSLog(@"gyroMode from settings: %ld", _streamConfig.gyroMode);
     
     // multiController must be set before calling getConnectedGamepadMask
     _streamConfig.multiController = streamSettings.multiController;
@@ -922,32 +1065,30 @@ static NSMutableSet* hostList;
 }
 
 #if !TARGET_OS_TV
-// this method is deprecated
-- (void)simulateSettingsButtonPressClose { //force expand settings view to update resolution table, and all setting includes current fullscreen resolution will be updated.
-    if (currentPosition == FrontViewPositionRight && _settingsButton.target && [_settingsButton.target respondsToSelector:_settingsButton.action]) {
-        [_settingsButton.target performSelector:_settingsButton.action withObject:_settingsButton];
+
+- (void)expandSettingsView { //simulate pressing the setting button, called from setting view controller.
+    if (currentPosition == FrontViewPositionLeft) {
+        [[self revealViewController] revealToggleAnimated:YES];
     }
 }
 
-- (void)simulateSettingsButtonPress { //simulate pressing the setting button, called from setting view controller.
-    //if([self isIPhonePortrait]) return; // disable settings view expanding in iphone portrait mode since it's buggy.
-    if (_settingsButton.target && [_settingsButton.target respondsToSelector:_settingsButton.action]) {
-        [_settingsButton.target performSelector:_settingsButton.action withObject:_settingsButton];
+- (void)closeSettingViewAnimated:(BOOL)anaimated { //simulate pressing the setting button, called from setting view controller.
+    if (currentPosition != FrontViewPositionLeft) {
+        [[self revealViewController] revealToggleAnimated:anaimated];
     }
 }
 
+
 - (void)handleOrientationChange {
-    UIDeviceOrientation targetOrientation = [[UIDevice currentDevice] orientation];
-    if([self isIphone] && UIDeviceOrientationIsPortrait(targetOrientation)) [self simulateSettingsButtonPressClose]; // on iphone, force close settings views if target orietation is portrait.
+    // UIDeviceOrientation targetOrientation = [[UIDevice currentDevice] orientation];
+    // if([self isIPhone] && UIDeviceOrientationIsPortrait(targetOrientation)) [self simulateSettingsButtonPressClose]; // on iphone, force close settings views if target orietation is portrait.
     double delayInSeconds = 0.7;
     // Convert the delay into a dispatch_time_t value
     dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
     // Perform some task after the delay
     dispatch_after(delayTime, dispatch_get_main_queue(), ^{// Code to execute after the delay
         // [self updateResolutionAccordingly];
-        [self.settingsButton setEnabled:![self isIPhonePortrait]]; //make sure settings button is disabled in iphone portrait mode.
-        if([self->_upButton title] == nil) [self reloadScrollHostView]; // title of the _upButton is a good flag for judging if we're on the Host selection view
-        //self->recordedScreenWidth = screenWidthInPoints; // kind of obselete, but i keep this in the code.
+        // [self.settingsButton setEnabled:![self isIPhonePortrait]]; //make sure settings button is disabled in iphone portrait mode.
     });
 }
 
@@ -960,25 +1101,67 @@ static NSMutableSet* hostList;
     }
 }
 
+- (void)revealController:(SWRevealViewController *)revealController willMoveToPosition:(FrontViewPosition)position {
+    settingsViewController = (SettingsViewController*)[revealController rearViewController];
+    revealController.navBarMenuDelegate = settingsViewController;
+    if (position == FrontViewPositionLeft) {
+        self.navigationItem.leftBarButtonItems = @[_settingsButton];
+    }
+    else {
+        self.navigationItem.leftBarButtonItems = @[];
+        [settingsViewController updateTheme];
+    }
+
+    settingsViewController.mainFrameViewController = self;
+    // enable / disable widgets acoordingly: in streamview, disable, outside of streamview, enable.
+    if(self.settingsExpandedInStreamView) [revealController buttonsInStreaming];
+    else [revealController buttonsNotInStreaming];
+    
+    //[settingsViewController.resolutionSelector setEnabled:!self.settingsExpandedInStreamView];
+    //settingsViewController.resolutionStack.hidden = self.settingsExpandedInStreamView;
+    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.resolutionStack];
+    //settingsViewController.fpsStack.hidden = self.settingsExpandedInStreamView;
+    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.fpsStack];
+
+    [settingsViewController widget:settingsViewController.bitrateSlider setEnabled:!self.settingsExpandedInStreamView];
+    //settingsViewController.bitrateStack.hidden = self.settingsExpandedInStreamView;
+    //settingsViewController.optimizeGamesStack.hidden = self.settingsExpandedInStreamView;
+    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.optimizeGamesStack];
+
+    //settingsViewController.audioOnPcStack.hidden = self.settingsExpandedInStreamView;
+    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.audioOnPcStack];
+    
+    //settingsViewController.codecStack.hidden = self.settingsExpandedInStreamView;
+    //[settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.codecStack];
+    [settingsViewController.codecSelector setEnabled:!_settingsExpandedInStreamView];
+
+    
+    // settingsViewController.yuv444Stack.hidden = self.settingsExpandedInStreamView;
+    // [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.yuv444Stack];
+    [settingsViewController.yuv444Switch setEnabled:!_settingsExpandedInStreamView];
+
+
+    //settingsViewController.HdrStack.hidden = self.settingsExpandedInStreamView;
+    // [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.HdrStack];
+    [settingsViewController.hdrSwitch setEnabled:!_settingsExpandedInStreamView];
+
+
+    //settingsViewController.framepacingStack.hidden = self.settingsExpandedInStreamView;
+    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.framepacingStack];
+
+    //settingsViewController.citrixX1MouseStack.hidden = self.settingsExpandedInStreamView;
+    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.citrixX1MouseStack];
+
+    //settingsViewController.externalDisplayModeStack.hidden = self.settingsExpandedInStreamView;
+    [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.externalDisplayModeStack];
+
+    // [settingsViewController.unlockDisplayOrientationSelector setEnabled:!self.settingsExpandedInStreamView && [self isFullScreenRequired]];//need "requires fullscreen" enabled in the app bunddle to make runtime orientation limitation woring
+}
 
 - (void)revealController:(SWRevealViewController *)revealController didMoveToPosition:(FrontViewPosition)position {
         // If we moved back to the center position, we should save the settings
     SettingsViewController* settingsViewController = (SettingsViewController*)[revealController rearViewController];
     settingsViewController.mainFrameViewController = self;
-    // enable / disable widgets acoordingly: in streamview, disable, outside of streamview, enable.
-    [settingsViewController.resolutionSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.framerateSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController widget:settingsViewController.bitrateSlider setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.optimizeSettingsSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.audioOnPCSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.codecSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.yuv444Selector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.hdrSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.framePacingSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.btMouseSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.externalDisplayModeSelector setEnabled:!self.settingsExpandedInStreamView];
-    [settingsViewController.backToStreamingButton setEnabled:self.settingsExpandedInStreamView];
-    // [settingsViewController.unlockDisplayOrientationSelector setEnabled:!self.settingsExpandedInStreamView && [self isFullScreenRequired]];//need "requires fullscreen" enabled in the app bunddle to make runtime orientation limitation woring
 
     if (position == FrontViewPositionLeft) {
         [settingsViewController saveSettings];
@@ -1027,7 +1210,6 @@ static NSMutableSet* hostList;
     [super viewSafeAreaInsetsDidChange];
     
     [self adjustScrollViewForSafeArea:self.collectionView];
-    [self adjustScrollViewForSafeArea:self->hostScrollView];
 }
 
 - (void)waterMarkTapped {
@@ -1052,7 +1234,7 @@ static NSMutableSet* hostList;
 
 - (void)attachWaterMark {
     // Create and configure the label
-    if(true){
+    if(false){
         [self->waterMark removeFromSuperview];
         self->waterMark = [[UILabel alloc] init];
         self->waterMark.translatesAutoresizingMaskIntoConstraints = NO;
@@ -1060,7 +1242,6 @@ static NSMutableSet* hostList;
         self->waterMark.font = [UIFont systemFontOfSize:22];
         self->waterMark.text = [LocalizationHelper localizedStringForKey:@"waterMarkText"];
         CGFloat labelHeight = 60;
-        NSLog(@"fullscr: %d", [self isFullScreenRequired]);
         // the app is unable to automatically lock screen orientation in app window resizable mode(aka. not require fullscreen)
         
         // if(![self isFullScreenRequired]){
@@ -1092,7 +1273,7 @@ static NSMutableSet* hostList;
     }
 }
 
-- (bool)isIphone{
+- (bool)isIPhone{
     return ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone);
 }
 
@@ -1105,23 +1286,186 @@ static NSMutableSet* hostList;
    // return isPortrait;
 }
 
-- (void)viewDidLoad
-{
+- (UIBarButtonItem *)createAddHostButton{
+    // 创建按钮
+    CGFloat buttonHeight = 30;
+    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+    button.backgroundColor = [ThemeManager appPrimaryColor]; // #0A85FF
+    button.layer.cornerRadius = buttonHeight/2;
+    button.clipsToBounds = YES;
+
+    // 设置图标（SF Symbol）
+    
+    if (@available(iOS 13.0, *)) {
+        UIImageSymbolConfiguration *config = [UIImageSymbolConfiguration configurationWithPointSize:17 weight:UIImageSymbolWeightMedium];
+        UIImage *image = [UIImage systemImageNamed:@"plus.circle" withConfiguration:config];
+        [button setImage:image forState:UIControlStateNormal];
+        [button setTitle:[LocalizationHelper localizedStringForKey:@" Add Host"] forState:UIControlStateNormal]; // 注意空格用于间隔
+    } else {
+        [button setTitle:[LocalizationHelper localizedStringForKey:@"Add Host"] forState:UIControlStateNormal]; // 注意空格用于间隔
+    }
+    // [button setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
+
+    button.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
+    // 文字颜色设置为 tintColor 控制
+    button.tintColor = UIColor.whiteColor;
+    [button setTitleColor:button.tintColor forState:UIControlStateNormal];
+
+    // 设置按下时的 tintColor（变灰或淡）
+    UIColor *highlightColor = [ThemeManager textColorGray];
+    [button setTitleColor:highlightColor forState:UIControlStateHighlighted];
+    button.adjustsImageWhenHighlighted = YES; // 图标自动变淡
+
+    // 手动设定大小（如图中大约宽118高40）
+    button.frame = CGRectMake(0, 0, 130, buttonHeight);
+
+    // 添加点击事件
+    [button addTarget:self action:@selector(addHostTapped) forControlEvents:UIControlEventTouchUpInside];
+
+    // 创建 UIBarButtonItem
+    UIBarButtonItem *barItem = [[UIBarButtonItem alloc] initWithCustomView:button];
+    return barItem;
+}
+
+- (UIBarButtonItem *)createHelpButton{
+    // 创建按钮
+    CGFloat buttonHeight = 30;
+    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+    button.backgroundColor = [UIColor clearColor]; // #0A85FF
+    // button.layer.cornerRadius = buttonHeight/2;
+    button.clipsToBounds = YES;
+
+    // 设置图标（SF Symbol）
+    if (@available(iOS 13.0, *)) {
+        UIImageSymbolConfiguration *config = [UIImageSymbolConfiguration configurationWithPointSize:buttonHeight*0.85 weight:UIImageSymbolWeightRegular];
+        UIImage *image = [UIImage systemImageNamed:@"questionmark.circle" withConfiguration:config];
+        [button setImage:image forState:UIControlStateNormal];
+        [button setTitle:@"" forState:UIControlStateNormal]; // 注意空格用于间隔
+    } else {
+        [button setTitle:[LocalizationHelper localizedStringForKey:@"About"] forState:UIControlStateNormal]; // 注意空格用于间隔
+    }
+    // [button setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
+
+    button.titleLabel.font = [UIFont systemFontOfSize:buttonHeight*0.6 weight:UIFontWeightMedium];
+    // 文字颜色设置为 tintColor 控制
+    button.tintColor = [ThemeManager appPrimaryColor];
+    [button setTitleColor:button.tintColor forState:UIControlStateNormal];
+
+    button.frame = CGRectMake(0, 0, buttonHeight, buttonHeight);
+
+    // 添加点击事件
+    // [button addTarget:self action:@selector(addDeviceTapped) forControlEvents:UIControlEventTouchUpInside];
+
+    // 创建 UIBarButtonItem
+    UIBarButtonItem *barItem = [[UIBarButtonItem alloc] initWithCustomView:button];
+    return barItem;
+}
+
+- (CGFloat)getStandardNavBarHeight{
+    return [self isIPhone] ? UINavigationBarHeightIPhone : UINavigationBarHeightIPad;
+}
+
+- (void)setupHostViewTitle{
+    self->hostViewTitleLabel = [[UILabel alloc] init];
+    
+    hostViewTitleLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    hostViewTitleLabel.numberOfLines = 1;
+    hostViewTitleLabel.font = [UIFont systemFontOfSize:30 weight:UIFontWeightSemibold];
+    hostViewTitleLabel.text = [LocalizationHelper localizedStringForKey:@"Hosts"];
+    // CGFloat labelHeight = 60;
+
+    
+    hostViewTitleLabel.textColor = [ThemeManager textColor];
+    hostViewTitleLabel.textAlignment = NSTextAlignmentCenter;
+    // hostViewTitleLabel.backgroundColor = [UIColor clearColor];
+    hostViewTitleLabel.userInteractionEnabled = NO; // Enable user interaction for tap gesture
+    // Add tap gesture recognizer to handle hyperlink action
+    [self.view addSubview:hostViewTitleLabel];
+    // Set up constraints
+    [NSLayoutConstraint activateConstraints:@[
+        [hostViewTitleLabel.topAnchor constraintEqualToAnchor:self.view.topAnchor constant:0], // Aligns the horizontal center of label to the horizontal center of view
+        [hostViewTitleLabel.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:25],
+        [hostViewTitleLabel.heightAnchor constraintEqualToConstant:30],
+        [hostViewTitleLabel.widthAnchor constraintEqualToConstant:100],
+    ]];
+}
+
+- (void)applyNavBarAppearance{
+    if (@available(iOS 13.0, *)) {
+        self.navigationController.navigationBar.standardAppearance.backgroundColor = [UIColor clearColor]; // old ios depend on this, do not remove
+        self.navigationController.navigationBar.standardAppearance = navBarAppearanceStandard;
+        self.navigationController.navigationBar.scrollEdgeAppearance = navBarAppearanceStandard;
+    }
+    else{
+        self.navigationController.navigationBar.backgroundColor = [UIColor clearColor]; // old ios depend on this, do not remove
+        self.navigationController.navigationBar.barTintColor = [UIColor clearColor]; // ios 14 depend on this, do not remove
+        self.navigationController.navigationBar.barTintColor = [ThemeManager appBackgroundColor]; // ios 14 depend on this, do not remove
+    }
+}
+
+- (void)setupNavBar{
+    if (@available(iOS 13.0, *)) {
+        Class appearanceClass = NSClassFromString(@"UINavigationBarAppearance");
+        navBarAppearanceStandard = [[appearanceClass alloc] init];
+        [navBarAppearanceStandard performSelector:@selector(configureWithOpaqueBackground)]; // 不透明
+        [navBarAppearanceStandard setValue:[ThemeManager appBackgroundColor] forKey:@"backgroundColor"]; // 设置你需要的背景色
+        [navBarAppearanceStandard setValue:nil forKey:@"shadowColor"]; // 设置你需要的背景色
+        NSDictionary* titleTextAttributes = @{
+            NSForegroundColorAttributeName: [ThemeManager textColor]
+        };
+        [navBarAppearanceStandard setValue:titleTextAttributes forKey:@"titleTextAttributes"];
+        [navBarAppearanceStandard setValue:[UIColor clearColor] forKey:@"shadowColor"];
+        [navBarAppearanceStandard setValue:nil forKey:@"backgroundImage"];
+
+        //navBarAppearanceStandard.backgroundImage = nil;
+    }
+    [self applyNavBarAppearance];
+
+    self->_addHostButton = [self createAddHostButton];
+    self->_helpButton = [self createHelpButton];
+    //[self setupHostViewTitle];
+    
+    
+    
+    self.navigationItem.rightBarButtonItems = @[_helpButton, _addHostButton]; // 顺序：右边靠右的是第一个
+
+    // Set the side bar button action. When it's tapped, it'll show the sidebar.
+    
+    [_settingsButton setTarget:self.revealViewController];
+    [_settingsButton setAction:@selector(revealToggle:)];
+    if (@available(iOS 13.0, *)) {
+        [_settingsButton setTitle:nil];
+        UIImageSymbolConfiguration *config = [UIImageSymbolConfiguration configurationWithPointSize:23 weight:UIImageSymbolWeightMedium ];
+        UIImage *image = [[UIImage systemImageNamed:@"sidebar.left" withConfiguration:config] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        [_settingsButton setImage:image];
+        _settingsButton.imageInsets = UIEdgeInsetsMake(10, 10, 0, 0);
+    } else {
+        [_settingsButton setTitle:[LocalizationHelper localizedStringForKey:@"Settings"]];
+    }
+    
+    // Set the host name button action. When it's tapped, it'll show the host selection view.
+    _upButton = [[UIBarButtonItem alloc] init];
+    [self->_upButton setTitle: [LocalizationHelper localizedStringForKey: @"Select New Host"]];
+    [_upButton setTarget:self];
+    [_upButton setAction:@selector(switchToHostView)];
+}
+
+- (void)viewDidLoad{
+    [ThemeManager setUserInterfaceStyle:UIUserInterfaceStyleUnspecified];
     [super viewDidLoad];
     //[OrientationHelper updateOrientationToLandscape];
+    // self.navigationController.delegate = self;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(deviceOrientationDidChange) // handle orientation change since i made portrait mode available
+                                                 name:UIDeviceOrientationDidChangeNotification
+                                               object:nil];
+
 #if !TARGET_OS_TV
     self.settingsExpandedInStreamView = false; // init this flag
     self.revealViewController.isStreaming = false; //init this flag for rvlVC
     self.revealViewController.mainFrameIsInHostView = true;
     
-    // Set the side bar button action. When it's tapped, it'll show the sidebar.
-    [_settingsButton setTarget:self.revealViewController];
-    [_settingsButton setAction:@selector(revealToggle:)];
-    
-    // Set the host name button action. When it's tapped, it'll show the host selection view.
-    [_upButton setTarget:self];
-    [_upButton setAction:@selector(showHostSelectionView)];
-    [self disableUpButton];
+    [self setupNavBar];
     
     // Set the gesture
     if(![self isIPhonePortrait]) [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer]; // to prevent buggy settings view in iphone portrait mode;
@@ -1142,7 +1486,7 @@ static NSMutableSet* hostList;
     self.collectionView.remembersLastFocusedIndexPath = YES;
     
     _menuRecognizer = [[UITapGestureRecognizer alloc] init];
-    [_menuRecognizer addTarget:self action: @selector(showHostSelectionView)];
+    [_menuRecognizer addTarget:self action: @selector(switchToHostView)];
     _menuRecognizer.allowedPressTypes = [[NSArray alloc] initWithObjects:[NSNumber numberWithLong:UIPressTypeMenu], nil];
     
     self.navigationController.navigationBar.titleTextAttributes = [NSDictionary dictionaryWithObject:[UIColor whiteColor] forKey:NSForegroundColorAttributeName];
@@ -1169,7 +1513,6 @@ static NSMutableSet* hostList;
     _boxArtCache = [[NSCache alloc] init];
     
     //recordedScreenWidth = CGRectGetWidth([[UIScreen mainScreen] bounds]);
-    hostScrollView = [[ComputerScrollView alloc] init];
     CGFloat screenWidthInPoints = CGRectGetWidth([[UIScreen mainScreen] bounds]);
     CGFloat screenHeightInPoints = CGRectGetHeight([[UIScreen mainScreen] bounds]);
 
@@ -1183,10 +1526,6 @@ static NSMutableSet* hostList;
         realViewFrameHeight = tmpLength;
     }
 
-    // implementations for initializing hostScrollView from original moonlight-iOS
-    hostScrollView.frame = CGRectMake(0, self.navigationController.navigationBar.frame.origin.y + self.navigationController.navigationBar.frame.size.height, realViewFrameWidth, realViewFrameHeight / 2);
-    [hostScrollView setShowsHorizontalScrollIndicator:NO];
-    hostScrollView.delaysContentTouches = NO;
 
     self.collectionView.delaysContentTouches = NO;
     self.collectionView.allowsMultipleSelection = NO;
@@ -1199,12 +1538,12 @@ static NSMutableSet* hostList;
     [self.collectionView addGestureRecognizer:cellLongPress];
     #endif
 
-    [self retrieveSavedHosts];
-    _discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
     [self updateTitle];
-    [self.view addSubview:hostScrollView];
+    // [self.view addSubview:hostScrollView];
+    
+    // if ([hostList count] == 1) [self hostClicked:[hostList anyObject] view:nil]; // auto click for single host
+    
     
-    if ([hostList count] == 1) [self hostClicked:[hostList anyObject] view:nil]; // auto click for single host
     //if([SettingsViewController isLandscapeNow] != _streamConfig.width > _streamConfig.height)
     //[self simulateSettingsButtonPress]; //force expand setting view if orientation changed since last quit from app.
     //[self simulateSettingsButtonPress]; //force expand setting view if orientation changed since last quit from app.
@@ -1212,47 +1551,20 @@ static NSMutableSet* hostList;
     
     // SettingsViewController* settingsViewController = (SettingsViewController*)[self.revealViewController rearViewController];
     // [settingsViewController updateResolutionTable];
-}
-
--(void)handleRealOrientationChange{
     
+    UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleMenuResize:)];
+    [self.view addGestureRecognizer:longPress];
+
+    
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:[self isIPhone]?@"iPhone":@"iPad" bundle:nil];
+    SettingsViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"settingsViewController"];
+    // 强制加载视图
+    __unused UIView *view = viewController.view;
 }
 
--(void)reloadScrollHostView{
-    [hostScrollView removeFromSuperview]; // mandatory for scroll view refresh after orientation change and clicking "select new host"
-    CGFloat screenWidthInPoints = CGRectGetWidth([[UIScreen mainScreen] bounds]);
-    CGFloat screenHeightInPoints = CGRectGetHeight([[UIScreen mainScreen] bounds]);
-
-    // deal with scroll host view reload after device orientation change here:
-    bool isLandscape = screenWidthInPoints > screenHeightInPoints;
-    CGFloat realViewFrameWidth = self.view.frame.size.width > self.view.frame.size.height ? self.view.frame.size.width : self.view.frame.size.height;
-    CGFloat realViewFrameHeight = self.view.frame.size.width < self.view.frame.size.height ? self.view.frame.size.width : self.view.frame.size.height;
-    if(!isLandscape) {
-        CGFloat tmpLength = realViewFrameWidth;
-        realViewFrameWidth = realViewFrameHeight;
-        realViewFrameHeight = tmpLength;
-    }
-
-    hostScrollView.frame = CGRectMake(0, self.navigationController.navigationBar.frame.origin.y + self.navigationController.navigationBar.frame.size.height, realViewFrameWidth, realViewFrameHeight / 2);
-    [hostScrollView setShowsHorizontalScrollIndicator:NO];
-    hostScrollView.delaysContentTouches = NO;
-
-    self.collectionView.delaysContentTouches = NO;
-    self.collectionView.allowsMultipleSelection = NO;
-    #if !TARGET_OS_TV
-    self.collectionView.multipleTouchEnabled = NO;
-    #else
-    // This is the only way to get long press events on a UICollectionViewCell :(
-    UILongPressGestureRecognizer* cellLongPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleCollectionViewLongPress:)];
-    cellLongPress.delaysTouchesBegan = YES;
-    [self.collectionView addGestureRecognizer:cellLongPress];
-    #endif
-
-    // the reloadScrollHostView method cannnot copy what all viewDidLoad does for initializing the host scroll view, the following 2 lines of codes must be annotated, or there'll be issues with deleting hosts.
-    //[self retrieveSavedHosts];
-    //_discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
-    [self updateTitle];
-    [self.view addSubview:hostScrollView];
+-(void)viewDidLayoutSubviews{
+    [super viewDidLayoutSubviews];
+    [self updateHosts];
 }
 
 // this will also be called back when device orientation changes
@@ -1312,9 +1624,6 @@ static NSMutableSet* hostList;
             }
         }
     }
-    
-    
-    
     [dataMan saveData];
 }
 
@@ -1352,7 +1661,7 @@ static NSMutableSet* hostList;
         
         // This will refresh the applist when a paired host is selected
         if (_selectedHost != nil && _selectedHost.pairState == PairStatePaired) {
-            [self hostClicked:_selectedHost view:nil];
+            [self noneUserInitiatedHostAction:_selectedHost view:nil];
         }
     }
 }
@@ -1382,7 +1691,7 @@ static NSMutableSet* hostList;
         
         if (matchingHost != nil && _selectedHost != matchingHost) {
             // Navigate to the host page
-            [self hostClicked:matchingHost view:nil];
+            [self noneUserInitiatedHostAction:matchingHost view:nil];
         }
     }
 }
@@ -1407,6 +1716,9 @@ static NSMutableSet* hostList;
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:NO];
+ 
+    // [self setupHostViewTitle];
+    // [self reloadScrollHostView]; //remove this for proper test
     [self attachWaterMark];
     
 #if !TARGET_OS_TV
@@ -1417,16 +1729,16 @@ static NSMutableSet* hostList;
     
     [[self revealViewController] setPrimaryViewController:self];
     self.revealViewController.isStreaming = false; // tell the revealViewController streaming is finished
-    [self.settingsButton setEnabled:![self isIPhonePortrait]]; //make sure settings button is disabled in iphone portrait mode.
+    //[self.settingsButton setEnabled:![self isIPhonePortrait]]; //make sure settings button is disabled in iphone portrait mode.
     //recordedScreenWidth = CGRectGetWidth([[UIScreen mainScreen] bounds]); // Get the screen's bounds (in points), update recorded screen width
 #endif
     
-    [self.navigationController setNavigationBarHidden:NO animated:YES];
+    [self.navigationController setNavigationBarHidden:NO animated:NO];
     
     // Hide 1px border line
     UIImage* fakeImage = [[UIImage alloc] init];
-    [self.navigationController.navigationBar setShadowImage:fakeImage];
-    [self.navigationController.navigationBar setBackgroundImage:fakeImage forBarPosition:UIBarPositionAny barMetrics:UIBarMetricsDefault];
+    // [self.navigationController.navigationBar setShadowImage:fakeImage];
+    // [self.navigationController.navigationBar setBackgroundImage:fakeImage forBarPosition:UIBarPositionAny barMetrics:UIBarMetricsDefault];
     
     // Check for a pending shortcut action when appearing
     [self handlePendingShortcutAction];
@@ -1450,7 +1762,13 @@ static NSMutableSet* hostList;
 
 - (void)viewWillAppear:(BOOL)animated
 {
-    [super viewWillAppear:animated];
+    [super viewWillAppear:NO];
+    
+    /* this makes background color works*/
+    for (UIView *subview in self.view.subviews) {
+        [subview removeFromSuperview]; // 暂时移除所有子视图
+    }
+
     
     // We can get here on home press while streaming
     // since the stream view segues to us just before
@@ -1463,13 +1781,24 @@ static NSMutableSet* hostList;
     // this view via an error dialog from the stream
     // view, so we won't get a return to active notification
     // for that which would normally fire beginForegroundRefresh.
+    self.view.backgroundColor = [ThemeManager appBackgroundColor];
+    self.hostCollectionVC.view.backgroundColor = [ThemeManager appBackgroundColor];
+    self.collectionView.backgroundColor = [ThemeManager appBackgroundColor];
+
+    [self.view addSubview:self.collectionView];
+    [self initHostCollection];
+    [self switchToHostView];
+    
+    [self retrieveSavedHosts];
+    
+    _discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
+        
     [self beginForegroundRefresh];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
     [super viewDidDisappear:animated];
-    
     // when discovery stops, we must create a new instance because
     // you cannot restart an NSOperation when it is finished
     [_discMan stopDiscovery];
@@ -1549,19 +1878,32 @@ static NSMutableSet* hostList;
 
 - (void)updateHosts {
     Log(LOG_I, @"Updating hosts...");
-    [[hostScrollView subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
-    UIComputerView* addComp = [[UIComputerView alloc] initForAddWithCallback:self];
-    UIComputerView* compView;
-    float prevEdge = -1;
     @synchronized (hostList) {
         // Sort the host list in alphabetical order
         NSArray* sortedHostList = [[hostList allObjects] sortedArrayUsingSelector:@selector(compareName:)];
         for (TemporaryHost* comp in sortedHostList) {
-            compView = [[UIComputerView alloc] initWithComputer:comp andCallback:self];
-            compView.center = CGPointMake([self getCompViewX:compView addComp:addComp prevEdge:prevEdge], hostScrollView.frame.size.height / 2);
-            prevEdge = compView.frame.origin.x + compView.frame.size.width;
-            [hostScrollView addSubview:compView];
+            if(comp.state == StateOnline || comp.pairState == PairStatePaired) [self.hostCollectionVC addHost:comp];
             
+            
+            // new host card test
+            // if([comp.name isEqualToString: @"ASRockPC"]) {
+            /*
+            if([comp.name isEqualToString: @"ASRockPC"]) {
+            //if([comp.name isEqualToString: @"PianoServer"]) {
+            //if([comp.name isEqualToString: @"TrueZj"]) {
+                HostCardView *testCard = [[HostCardView alloc] initWithHost:comp];
+                
+                [self.view addSubview:testCard];
+                // [testCard resizeBySizeFactor:3];
+                [NSLayoutConstraint activateConstraints:@[
+                    [testCard.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor constant:0],
+                    [testCard.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor constant:150],
+                ]];
+                                 
+            }*/
+            //
+            
+                        
             // Start jobs to decode the box art in advance
             for (TemporaryApp* app in comp.appList) {
                 dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
@@ -1576,32 +1918,22 @@ static NSMutableSet* hostList;
     
     // Update the title in case we now have a PC
     [self updateTitle];
-    
-    prevEdge = [self getCompViewX:addComp addComp:addComp prevEdge:prevEdge];
-    addComp.center = CGPointMake(prevEdge, hostScrollView.frame.size.height / 2);
-    
-    [hostScrollView addSubview:addComp];
-    [hostScrollView setContentSize:CGSizeMake(prevEdge + addComp.frame.size.width, hostScrollView.frame.size.height)];
-}
-
-- (float) getCompViewX:(UIComputerView*)comp addComp:(UIComputerView*)addComp prevEdge:(float)prevEdge {
-    float padding;
-    
-#if TARGET_OS_TV
-    padding = 100;
-#else
-    padding = addComp.frame.size.width / 2;
-#endif
-    
-    if (prevEdge == -1) {
-        return hostScrollView.frame.origin.x + comp.frame.size.width / 2 + padding;
-    } else {
-        return prevEdge + comp.frame.size.width / 2 + padding;
-    }
 }
 
 // This function forces immediate decoding of the UIImage, rather
 // than the default lazy decoding that results in janky scrolling.
+-(void)deviceOrientationDidChange{
+    if(self.collectionView.superview == nil) return;
+    [NSLayoutConstraint activateConstraints:@[
+        [self.collectionView.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor],
+        [self.collectionView.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor],
+        [self.collectionView.leadingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.leadingAnchor],
+        [self.collectionView.trailingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.trailingAnchor],
+        //[self.collectionView.heightAnchor constraintEqualToConstant:_headerViewHeight]
+    ]];
+}
+
+
 + (UIImage*) loadBoxArtForCaching:(TemporaryApp*)app {
     UIImage* boxArt;
     
@@ -1666,7 +1998,6 @@ static NSMutableSet* hostList;
         _sortedAppList = visibleAppList;
     }
     
-    [hostScrollView removeFromSuperview];
     [self.collectionView reloadData];
 }
 
@@ -1684,7 +2015,7 @@ static NSMutableSet* hostList;
     
     [cell.subviews.firstObject removeFromSuperview]; // Remove a view that was previously added
     [cell addSubview:appView];
-    [self.settingsButton setEnabled:![self isIPhonePortrait]]; // update settings button after host is clicked & appview loaded
+    // [self.settingsButton setEnabled:![self isIPhonePortrait]]; // update settings button after host is clicked & appview loaded
     // Shadow opacity is controlled inside UIAppView based on whether the app
     // is hidden or not during the update cycle.
     UIBezierPath *shadowPath = [UIBezierPath bezierPathWithRect:cell.bounds];
@@ -1723,10 +2054,90 @@ static NSMutableSet* hostList;
     [_boxArtCache removeAllObjects];
 }
 
+- (UIView* )findMenuSeparator{
+    BOOL shouldBreak = NO;
+    UIView* seperator=self.view;
+    while(seperator && !shouldBreak) {
+        for(UIView* view in seperator.subviews) {
+            if([view.accessibilityIdentifier isEqualToString:@"menuSeparator"]) {
+                seperator = view;
+                shouldBreak = YES;
+                break;
+            }
+        }
+        if (shouldBreak) break;
+        seperator = seperator.superview;
+    }
+    return seperator;
+}
+
+- (void)handleMenuResize:(UILongPressGestureRecognizer *)gesture {
+    CGPoint locationInView = [gesture locationInView:self.view];
+    CGPoint locationInSuperView = [gesture locationInView:self.revealViewController.view];
+    CGFloat screenHeight = [UIScreen mainScreen].bounds.size.height;
+    CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width;
+
+    menuSeparator = [self findMenuSeparator];
+    if(menuSeparator.hidden || menuSeparator == nil) return;
+    
+    if(gesture.state == UIGestureRecognizerStateBegan){
+        if(locationInView.x < 30) {
+            snapshot = [[UIView alloc] init];
+            snapshot.backgroundColor = [ThemeManager appPrimaryColor];
+            screenHeight = [UIScreen mainScreen].bounds.size.height;
+            snapshot.frame = CGRectMake(locationInSuperView.x,0, 2, screenHeight);
+            [self.revealViewController.view addSubview:snapshot];
+        }
+        return;
+    }
+    
+    bool isPortrait = screenHeight>screenWidth;
+    
+    CGFloat limitedWidth = MIN(MAX(locationInSuperView.x, isPortrait ? 200 : 280),isPortrait ? screenWidth*0.75 : screenWidth/2);
+    if(gesture.state == UIGestureRecognizerStateChanged){
+        if(snapshot) snapshot.center = CGPointMake(limitedWidth, snapshot.center.y);
+    }
+    if(gesture.state == UIGestureRecognizerStateEnded || gesture.state == UIGestureRecognizerStateCancelled){
+        [snapshot removeFromSuperview];
+        self.revealViewController.rearViewRevealWidth = limitedWidth;
+        [self.revealViewController setupNavigationBar];
+        if(self.revealViewController.isStreaming) [self.revealViewController buttonsInStreaming];
+        else [self.revealViewController buttonsNotInStreaming];
+        DataManager* dataMan = [[DataManager alloc] init];
+        Settings* settings = [dataMan retrieveSettings];
+        settings.settingsMenuWidth = [NSNumber numberWithFloat:self.revealViewController.rearViewRevealWidth];
+        [dataMan saveData];
+        
+        
+        double delayInSeconds = 0.02;
+        dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+        dispatch_after(popTime, dispatch_get_main_queue(), ^{
+            [self->settingsViewController hideDynamicLabelsWhenOverlapped:self->settingsViewController.parentStack];
+        });
+    }
+}
+
+
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
     [self.view endEditing:YES];
 }
 
+- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
+    /*
+    NSLog(@"%f touchesMoved", CACurrentMediaTime());
+    UITouch* touch = touches.anyObject;
+    CGPoint touchPoint = [touch locationInView:self.view.superview];
+    if(snapshot){
+        snapshot.center = CGPointMake(touchPoint.x, snapshot.center.y);
+    }
+     */
+}
+
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
+    [snapshot removeFromSuperview];
+}
+
+
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
     [textField resignFirstResponder];
     return YES;
@@ -1764,4 +2175,42 @@ static NSMutableSet* hostList;
 #endif
 }
 
+
+- (CGSize)getHostCardSize{
+    CGSize cardSize;
+    if([self isIPhone]) cardSize.height = 0.37*MIN(CGRectGetHeight([[UIScreen mainScreen] bounds]),CGRectGetWidth([[UIScreen mainScreen] bounds]));
+    else cardSize.height = 0.25*MIN(CGRectGetHeight([[UIScreen mainScreen] bounds]),CGRectGetWidth([[UIScreen mainScreen] bounds]));
+    TemporaryHost* dummyHost = [[TemporaryHost alloc] init];
+    HostCardView* dummyCard = [[HostCardView alloc] initWithHost:dummyHost];
+    cardSize.width = cardSize.height * (dummyCard.size.width/dummyCard.size.height);
+    // cardSize.width =
+    return cardSize;
+}
+
+- (void)initHostCollection{
+    // 初始化 HostCollectionViewController
+    self.hostCollectionVC = [[HostCollectionViewController alloc] init];
+    self.hostCollectionVC.cellSize = [self getHostCardSize];
+    self.hostCollectionVC.interItemMinimumSpacing = 25;
+    self.hostCollectionVC.minimumLineSpacing = 25;
+    // 添加为子控制器
+    [self addChildViewController:self.hostCollectionVC];
+    [self.view addSubview:self.hostCollectionVC.view];
+    
+    // 设置其布局（Auto Layout 示例）
+    // CGFloat hostCollectionViewPadding = 75;
+    CGFloat leftPadding = [self isIPhone] ? 30 : 0;
+    self.hostCollectionVC.view.translatesAutoresizingMaskIntoConstraints = NO;
+    [NSLayoutConstraint activateConstraints:@[
+        [self.hostCollectionVC.view.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor constant:0],
+        [self.hostCollectionVC.view.leadingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.leadingAnchor constant:leftPadding],
+        [self.hostCollectionVC.view.trailingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.trailingAnchor constant:0],
+        // [self.hostCollectionVC.view.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor constant:0] //?
+    ]];
+    
+    // 通知子控制器已添加完成
+    [self.hostCollectionVC didMoveToParentViewController:self];
+    
+}
+
 @end
diff --git a/VoidLink/ViewControllers/SettingsViewController.h b/VoidLink/ViewControllers/SettingsViewController.h
index 89985471..0dbbcea0 100644
--- a/VoidLink/ViewControllers/SettingsViewController.h
+++ b/VoidLink/ViewControllers/SettingsViewController.h
@@ -98,6 +98,13 @@
 @property (strong, nonatomic) IBOutlet UISegmentedControl *externalDisplayModeSelector;
 @property (strong, nonatomic) IBOutlet UISegmentedControl *localMousePointerModeSelector;
 
+@property (strong, nonatomic) IBOutlet UIStackView *gyroModeStack;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *gyroModeSelector;
+@property (strong, nonatomic) IBOutlet UIStackView *gyroSensitivityStack;
+@property (strong, nonatomic) IBOutlet UISlider *gyroSensitivitySlider;
+
+
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability"
 
diff --git a/VoidLink/ViewControllers/SettingsViewController.m b/VoidLink/ViewControllers/SettingsViewController.m
index 1cceb40c..cd7b6669 100644
--- a/VoidLink/ViewControllers/SettingsViewController.m
+++ b/VoidLink/ViewControllers/SettingsViewController.m
@@ -501,7 +501,7 @@ BOOL isCustomResolution(CGSize res) {
 
     touchControlSection = [[MenuSectionView alloc] init];
     touchControlSection.delegate = self;
-    touchControlSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Touch Control"];
+    touchControlSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Touch & Control"];
     if (@available(iOS 13.0, *)) {
         [touchControlSection setSectionWithIcon:[UIImage imageNamed:@"arcade.stick.console"] andSize:20.5];
     }
@@ -511,6 +511,9 @@ BOOL isCustomResolution(CGSize res) {
     [self addSetting:self.mousePointerVelocityStack ofId:@"mousePointerVelocityStack" withInfoTag:NO withDynamicLabel:YES to:touchControlSection];
     [self addSetting:self.onScreenWidgetStack ofId:@"onScreenWidgetStack" withInfoTag:YES withDynamicLabel:YES to:touchControlSection];
     [self addSetting:self.swapAbaxyStack ofId:@"swapAbaxyStack" withInfoTag:NO withDynamicLabel:NO to:touchControlSection];
+    [self addSetting:self.gyroModeStack ofId:@"gyroModeStack" withInfoTag:YES withDynamicLabel:NO to:touchControlSection];
+    [self addSetting:self.gyroSensitivityStack ofId:@"gyroSensitivityStack" withInfoTag:NO withDynamicLabel:YES to:touchControlSection];
+
     [touchControlSection addToParentStack:_parentStack];
     [touchControlSection setExpanded:YES];
 
@@ -977,10 +980,52 @@ BOOL isCustomResolution(CGSize res) {
 
 -  (void)infoButtonTapped:(UIButton* )sender{
     
-    NSString* tipText = [NSString stringWithFormat:@"dummy text for setting stack: %@", sender.superview.accessibilityIdentifier];
+    NSString* tipText = @"";
+    bool showOnlineDocAction = false;
+    tipText = sender.superview.accessibilityIdentifier;
+    if([sender.superview.accessibilityIdentifier isEqualToString: @"bitrateStack"]){
+        tipText = [LocalizationHelper localizedStringForKey:@"bitrateStackTip"];
+        showOnlineDocAction = false;
+    }
+    if([sender.superview.accessibilityIdentifier isEqualToString: @"yuv444Stack"]){
+        tipText = [LocalizationHelper localizedStringForKey:@"yuv444StackTip"];
+        showOnlineDocAction = true;
+    }
+    if([sender.superview.accessibilityIdentifier isEqualToString: @"touchModeStack"]){
+        tipText = [LocalizationHelper localizedStringForKey:@"touchModeStackTip"];
+        showOnlineDocAction = false;
+    }
+    if([sender.superview.accessibilityIdentifier isEqualToString: @"pointerVelocityDividerStack"]){
+        tipText = [LocalizationHelper localizedStringForKey:@"pointerVelocityDividerStackTip"];
+        showOnlineDocAction = true;
+    }
+    if([sender.superview.accessibilityIdentifier isEqualToString: @"pointerVelocityFactorStack"]){
+        tipText = [LocalizationHelper localizedStringForKey:@"pointerVelocityFactorStackTip"];
+        showOnlineDocAction = true;
+    }
+
+    
+    
     
     UIAlertController *tipsAlertController = [UIAlertController alertControllerWithTitle: [LocalizationHelper localizedStringForKey:@"Tips"] message: [LocalizationHelper localizedStringForKey:@"%@", tipText] preferredStyle:UIAlertControllerStyleAlert];
 
+    
+    
+    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+    paragraphStyle.alignment = NSTextAlignmentLeft;
+
+    NSDictionary *attributes = @{
+        NSParagraphStyleAttributeName: paragraphStyle,
+        NSFontAttributeName: [UIFont systemFontOfSize:14]
+    };
+
+    NSAttributedString *attributedMessage = [[NSAttributedString alloc] initWithString:tipText
+                                                                             attributes:attributes];
+
+    // 使用 KVC 设置 attributedMessage（注意审核风险）
+    [tipsAlertController setValue:attributedMessage forKey:@"attributedMessage"];
+
+    
     UIAlertAction *readInstruction = [UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Online Documentation"]
                                                            style:UIAlertActionStyleDefault
                                                          handler:^(UIAlertAction *action){
@@ -989,11 +1034,15 @@ BOOL isCustomResolution(CGSize res) {
             [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
         }
     }];
+
+    
     
     UIAlertAction *okAction = [UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"OK"]
                                                            style:UIAlertActionStyleDefault
                                                      handler:nil];
-    [tipsAlertController addAction:readInstruction];
+    
+    
+    if(showOnlineDocAction) [tipsAlertController addAction:readInstruction];
     [tipsAlertController addAction:okAction];
     [self presentViewController:tipsAlertController animated:YES completion:nil];
 }
@@ -1292,6 +1341,8 @@ BOOL isCustomResolution(CGSize res) {
     [self.framePacingSelector setSelectedSegmentIndex:currentSettings.useFramePacing ? 1 : 0];
     [self.multiControllerSwitch setOn:currentSettings.multiController];
     [self.swapABXYButtonsSelector setSelectedSegmentIndex:currentSettings.swapABXYButtons ? 1 : 0];
+    [self.gyroModeSelector setSelectedSegmentIndex:currentSettings.gyroMode.intValue];
+
     [self.audioOnPcSwitch setOn:currentSettings.playAudioOnPC];
     _lastSelectedResolutionIndex = resolution;
     [self.resolutionSelector setSelectedSegmentIndex:resolution];
@@ -1986,6 +2037,7 @@ BOOL isCustomResolution(CGSize res) {
     BOOL optimizeGames = self.optimizeGamesSwitch.isOn;
     BOOL multiController = self.multiControllerSwitch.isOn;
     BOOL swapABXYButtons = [self.swapABXYButtonsSelector selectedSegmentIndex] == 1;
+    NSInteger gyroMode = self.gyroModeSelector.selectedSegmentIndex;
     BOOL audioOnPC = self.audioOnPcSwitch.isOn;
     uint32_t preferredCodec = [self getChosenCodecPreference];
     BOOL enableYUV444 = self.yuv444Switch.isOn;
@@ -2005,6 +2057,7 @@ BOOL isCustomResolution(CGSize res) {
                                width:width
                          audioConfig:2 // Stereo
                     onscreenControls:onscreenControls
+                          gyroMode:gyroMode
                keyboardToggleFingers:keyboardToggleFingers
                 oscLayoutToolFingers:oscLayoutToolFingers
            slideToSettingsScreenEdge:slideToSettingsScreenEdge
diff --git a/VoidLink/ViewControllers/StreamFrameViewController.m b/VoidLink/ViewControllers/StreamFrameViewController.m
index dc01b824..62b0c301 100644
--- a/VoidLink/ViewControllers/StreamFrameViewController.m
+++ b/VoidLink/ViewControllers/StreamFrameViewController.m
@@ -195,7 +195,7 @@
     [self->_streamView disableOnScreenControls]; //don't know why but this must be called outside the streamview class, just put it here. execute in streamview class cause hang
     [self.mainFrameViewcontroller reloadStreamConfig]; // reload streamconfig
     
-    _controllerSupport = [[ControllerSupport alloc] initWithConfig:self.streamConfig delegate:self]; // reload controllerSupport obj, this is mandatory for OSC reload,especially when the stream view is launched without OSC
+    [_controllerSupport updateConfig:self.streamConfig delegate:self];// reload controllerSupport obj, this is mandatory for OSC reload,especially when the stream view is launched without OSC
     [_streamView setupStreamView:_controllerSupport interactionDelegate:self config:self.streamConfig streamFrameTopLayerView:self.view]; //reinitiate setupStreamView process.
         // we got self.view passed to streamView class as the topLayerView, will be useful in many cases
     [self->_streamView reloadOnScreenControlsRealtimeWith:(ControllerSupport*)_controllerSupport
@@ -525,7 +525,9 @@
 - (void)willMoveToParentViewController:(UIViewController *)parent {
     // Only cleanup when we're being destroyed
     if (parent == nil) {
+        //NSLog(@"gyro cleanup, count: %ld", _controller.count);
         [_controllerSupport cleanup];
+        
         [UIApplication sharedApplication].idleTimerDisabled = NO;
         [_streamMan stopStream];
         if (_inactivityTimer != nil) {
diff --git a/VoidLink/mul.lproj/iPad.xcstrings b/VoidLink/mul.lproj/iPad.xcstrings
index 29ec991e..cea434f2 100644
--- a/VoidLink/mul.lproj/iPad.xcstrings
+++ b/VoidLink/mul.lproj/iPad.xcstrings
@@ -1,121 +1,61 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
-    "0bl-Hh-8ot.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Player 1 Motion Mode\"; ObjectID = \"0bl-Hh-8ot\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Player 1 Motion Mode"
-          }
-        }
-      }
-    },
     "2Bp-XZ-cCw.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Larger Sticks & L1/R1 Buttons\"; ObjectID = \"2Bp-XZ-cCw\";",
+      "comment" : "Class = \"UILabel\"; text = \"Async Native Touch\"; ObjectID = \"2Bp-XZ-cCw\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Larger Sticks & L1/R1 Buttons"
+            "value" : "Async Native Touch"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "更大的摇杆和L1/R1按键"
+            "state" : "needs_review",
+            "value" : "异步多点触控"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "更大的摇杆和L1/R1按键"
+            "state" : "needs_review",
+            "value" : "异步多点触控"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "更大的摇杆和L1/R1按键"
+            "state" : "needs_review",
+            "value" : "异步多点触控"
           }
         }
       }
     },
-    "2Jx-qH-E3Y.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; 2Jx-qH-E3Y.segmentTitles[0] = \"No\"; ObjectID = \"2Jx-qH-E3Y\";",
+    "2w1-Vw-GVy.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"HDR\"; ObjectID = \"2w1-Vw-GVy\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "No"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        }
-      }
-    },
-    "2Jx-qH-E3Y.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; 2Jx-qH-E3Y.segmentTitles[1] = \"Yes\"; ObjectID = \"2Jx-qH-E3Y\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Yes"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
+            "value" : "HDR"
           }
         }
       }
     },
     "4FU-iP-c6T.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; 4FU-iP-c6T.segmentTitles[0] = \"Restricted by Window\"; ObjectID = \"4FU-iP-c6T\";",
+      "comment" : "Class = \"UISegmentedControl\"; 4FU-iP-c6T.segmentTitles[0] = \"Captured\"; ObjectID = \"4FU-iP-c6T\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Restricted by Window"
+            "value" : "Captured"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "被窗口捕获"
           }
         },
@@ -223,14 +163,44 @@
         }
       }
     },
-    "6w5-Md-NpV.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Preferred Codec                                                                             \"; ObjectID = \"6w5-Md-NpV\";",
+    "5aI-Zx-dNf.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Citrix X1 Mouse\"; ObjectID = \"5aI-Zx-dNf\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Preferred Codec                                                                             "
+            "value" : "Citrix X1 Mouse"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Citrix X1 鼠标"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Citrix X1 鼠标"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Citrix X1 鼠标"
+          }
+        }
+      }
+    },
+    "6w5-Md-NpV.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Preferred Codec\"; ObjectID = \"6w5-Md-NpV\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Preferred Codec"
           }
         },
         "zh-Hans" : {
@@ -241,134 +211,152 @@
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "视频编解码"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "视频编解码"
           }
         }
       }
     },
-    "7Gm-zB-s7s.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; 7Gm-zB-s7s.segmentTitles[0] = \"No\"; ObjectID = \"7Gm-zB-s7s\";",
+    "7tq-jU-C6l.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Gyro Mode\"; ObjectID = \"7tq-jU-C6l\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "No"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
+            "value" : "Gyro Mode"
           }
         }
       }
     },
-    "7Gm-zB-s7s.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; 7Gm-zB-s7s.segmentTitles[1] = \"Yes\"; ObjectID = \"7Gm-zB-s7s\";",
+    "8hF-kb-2uV.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; 8hF-kb-2uV.segmentTitles[0] = \"30 FPS\"; ObjectID = \"8hF-kb-2uV\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Yes"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
+            "value" : "30 FPS"
           }
         }
       }
     },
-    "7va-uJ-IfD.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; 7va-uJ-IfD.segmentTitles[0] = \"Lowest Latency\"; ObjectID = \"7va-uJ-IfD\";",
+    "8hF-kb-2uV.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; 8hF-kb-2uV.segmentTitles[1] = \"60 FPS\"; ObjectID = \"8hF-kb-2uV\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Lowest Latency"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "低延迟"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "低延迟"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "低延迟"
+            "value" : "60 FPS"
           }
         }
       }
     },
-    "7va-uJ-IfD.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; 7va-uJ-IfD.segmentTitles[1] = \"Smoothest Video\"; ObjectID = \"7va-uJ-IfD\";",
+    "8hF-kb-2uV.segmentTitles[2]" : {
+      "comment" : "Class = \"UISegmentedControl\"; 8hF-kb-2uV.segmentTitles[2] = \"120 FPS\"; ObjectID = \"8hF-kb-2uV\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Smoothest Video"
+            "value" : "120 FPS"
+          }
+        }
+      }
+    },
+    "8wW-Sq-EOE.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Play Audio on PC\"; ObjectID = \"8wW-Sq-EOE\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Play Audio on PC"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "最高流畅度"
+            "value" : "播放主机端声音"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "最高流畅度"
+            "value" : "播放主机端声音"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "最高流畅度"
+            "value" : "播放主机端声音"
+          }
+        }
+      }
+    },
+    "9XL-xt-Q57.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Gyro Sensitivity\"; ObjectID = \"9XL-xt-Q57\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Gyro Sensitivity"
+          }
+        }
+      }
+    },
+    "aa5-3y-I4d.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; aa5-3y-I4d.segmentTitles[0] = \"Off\"; ObjectID = \"aa5-3y-I4d\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Off"
+          }
+        }
+      }
+    },
+    "aa5-3y-I4d.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; aa5-3y-I4d.segmentTitles[1] = \"Auto\"; ObjectID = \"aa5-3y-I4d\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Auto"
+          }
+        }
+      }
+    },
+    "aa5-3y-I4d.segmentTitles[2]" : {
+      "comment" : "Class = \"UISegmentedControl\"; aa5-3y-I4d.segmentTitles[2] = \"Device\"; ObjectID = \"aa5-3y-I4d\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Device"
+          }
+        }
+      }
+    },
+    "aa5-3y-I4d.segmentTitles[3]" : {
+      "comment" : "Class = \"UISegmentedControl\"; aa5-3y-I4d.segmentTitles[3] = \"Controller\"; ObjectID = \"aa5-3y-I4d\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Controller"
           }
         }
       }
@@ -458,13 +446,13 @@
       }
     },
     "Aiv-r8-9k2.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Frame Rate                                                                                    \"; ObjectID = \"Aiv-r8-9k2\";",
+      "comment" : "Class = \"UILabel\"; text = \"Frame Rate\"; ObjectID = \"Aiv-r8-9k2\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Frame Rate                                                                                    "
+            "value" : "Frame Rate"
           }
         },
         "zh-Hans" : {
@@ -475,18 +463,48 @@
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "串流帧率"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "串流帧率"
           }
         }
       }
     },
+    "AlL-fp-WCm.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Enable On-Screen Widget & Peripherals\"; ObjectID = \"AlL-fp-WCm\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Enable On-Screen Widget & Peripherals"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "启用屏显控件与外设"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "启用屏显控件与外设"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "启用屏显控件与外设"
+          }
+        }
+      }
+    },
     "aup-5k-z6P.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Show Local Keyboard Toolbar                                                      \"; ObjectID = \"aup-5k-z6P\";",
       "extractionState" : "extracted_with_value",
@@ -517,224 +535,212 @@
         }
       }
     },
-    "bFD-Ng-abn.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Multi-Controller Mode                                                                   \"; ObjectID = \"bFD-Ng-abn\";",
+    "AXb-DO-LzB.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; AXb-DO-LzB.segmentTitles[0] = \"No\"; ObjectID = \"AXb-DO-LzB\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Multi-Controller Mode                                                                   "
+            "value" : "No"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "多手柄模式"
+            "value" : "关闭"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "关闭"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "关闭"
+          }
+        }
+      }
+    },
+    "AXb-DO-LzB.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; AXb-DO-LzB.segmentTitles[1] = \"Yes\"; ObjectID = \"AXb-DO-LzB\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Yes"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "启用"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "启用"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "启用"
+          }
+        }
+      }
+    },
+    "bhC-da-VGd.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; bhC-da-VGd.segmentTitles[0] = \"Touchpad\"; ObjectID = \"bhC-da-VGd\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Touchpad"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "触控板"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "多手柄模式"
+            "value" : "触控板"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "多手柄模式"
+            "value" : "触控板"
+          }
+        }
+      }
+    },
+    "bhC-da-VGd.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; bhC-da-VGd.segmentTitles[1] = \"Native Touch\"; ObjectID = \"bhC-da-VGd\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Native Touch"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "多点触控"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "多点触控"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "多点触控"
+          }
+        }
+      }
+    },
+    "bhC-da-VGd.segmentTitles[2]" : {
+      "comment" : "Class = \"UISegmentedControl\"; bhC-da-VGd.segmentTitles[2] = \"Absolute Touch\"; ObjectID = \"bhC-da-VGd\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Absolute Touch"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "单点鼠标"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "单点鼠标"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "单点鼠标"
           }
         }
       }
     },
     "Bhn-IO-Wlt.title" : {
-      "comment" : "Class = \"UIBarButtonItem\"; title = \"Exit\"; ObjectID = \"Bhn-IO-Wlt\";",
+      "comment" : "Class = \"UIBarButtonItem\"; title = \"ExportAll\"; ObjectID = \"Bhn-IO-Wlt\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Exit"
+            "value" : "ExportAll"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "退出"
+            "value" : "导出所有"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "退出"
+            "value" : "导出所有"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "退出"
+            "value" : "导出所有"
           }
         }
       }
     },
-    "bMH-Yb-sb6.normalTitle" : {
-      "comment" : "Class = \"UIButton\"; normalTitle = \"+\"; ObjectID = \"bMH-Yb-sb6\";",
+    "c1r-Hf-b7t.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Down Button\"; ObjectID = \"c1r-Hf-b7t\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "+"
-          }
-        }
-      }
-    },
-    "bw9-4S-s2V.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; bw9-4S-s2V.segmentTitles[0] = \"No\"; ObjectID = \"bw9-4S-s2V\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "No"
+            "value" : "Down Button"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "鼠标按下"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "鼠标按下"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
-          }
-        }
-      }
-    },
-    "bw9-4S-s2V.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; bw9-4S-s2V.segmentTitles[1] = \"Yes\"; ObjectID = \"bw9-4S-s2V\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Yes"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        }
-      }
-    },
-    "byH-Qz-Nbw.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; byH-Qz-Nbw.segmentTitles[0] = \"No\"; ObjectID = \"byH-Qz-Nbw\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "No"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        }
-      }
-    },
-    "byH-Qz-Nbw.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; byH-Qz-Nbw.segmentTitles[1] = \"Yes\"; ObjectID = \"byH-Qz-Nbw\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Yes"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        }
-      }
-    },
-    "bZL-t1-mk7.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"HDR (Beta)                                                                                   \"; ObjectID = \"bZL-t1-mk7\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "HDR (Beta)                                                                                   "
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "HDR (测试功能)"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "HDR (测试功能)"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "HDR (测试功能)"
+            "value" : "鼠标按下"
           }
         }
       }
@@ -877,56 +883,104 @@
         }
       }
     },
-    "cRV-Xw-CVi.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Profile:\"; ObjectID = \"cRV-Xw-CVi\";",
+    "CpY-Sb-BDc.title" : {
+      "comment" : "Class = \"UIBarButtonItem\"; title = \"Import\"; ObjectID = \"CpY-Sb-BDc\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Profile:"
+            "value" : "Import"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "当前布局: "
+            "state" : "translated",
+            "value" : "导入"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "当前布局: "
+            "state" : "translated",
+            "value" : "导入"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "当前布局: "
+            "state" : "translated",
+            "value" : "导入"
           }
         }
       }
     },
-    "DkI-w6-jku.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Touch Pointer Velocity: Scaled on 0% of Right Screen           \"; ObjectID = \"DkI-w6-jku\";",
+    "czn-mj-8d1.title" : {
+      "comment" : "Class = \"UIBarButtonItem\"; title = \"Exit\"; ObjectID = \"czn-mj-8d1\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Touch Pointer Velocity: Scaled on 0% of Right Screen           "
+            "value" : "Exit"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "退出"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "退出"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "退出"
+          }
+        }
+      }
+    },
+    "d1N-HH-Aq9.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Optimize Game Settings\"; ObjectID = \"d1N-HH-Aq9\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Optimize Game Settings"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "优化游戏设置"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "优化游戏设置"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "优化游戏设置"
           }
         }
       }
     },
     "Dll-7x-18l.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Swap A/B and X/Y Buttons                                                            \"; ObjectID = \"Dll-7x-18l\";",
+      "comment" : "Class = \"UILabel\"; text = \"Swap A/B and X/Y Buttons\"; ObjectID = \"Dll-7x-18l\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Swap A/B and X/Y Buttons                                                            "
+            "value" : "Swap A/B and X/Y Buttons"
           }
         },
         "zh-Hans" : {
@@ -937,146 +991,116 @@
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "交换A/B键、X/Y键位置"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "交换A/B键、X/Y键位置"
           }
         }
       }
     },
-    "e4G-id-vjI.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; e4G-id-vjI.segmentTitles[0] = \"Touchpad\"; ObjectID = \"e4G-id-vjI\";",
+    "dpd-Bw-aHE.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; dpd-Bw-aHE.segmentTitles[0] = \"No\"; ObjectID = \"dpd-Bw-aHE\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Touchpad"
+            "value" : "No"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控板"
+            "value" : "关闭"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控板"
+            "value" : "关闭"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控板"
+            "value" : "关闭"
           }
         }
       }
     },
-    "e4G-id-vjI.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; e4G-id-vjI.segmentTitles[1] = \"Native Touch\"; ObjectID = \"e4G-id-vjI\";",
+    "dpd-Bw-aHE.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; dpd-Bw-aHE.segmentTitles[1] = \"Yes\"; ObjectID = \"dpd-Bw-aHE\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Native Touch"
+            "value" : "Yes"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "多点触控"
+            "value" : "启用"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "多点触控"
+            "value" : "启用"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "多点触控"
+            "value" : "启用"
           }
         }
       }
     },
-    "e4G-id-vjI.segmentTitles[2]" : {
-      "comment" : "Class = \"UISegmentedControl\"; e4G-id-vjI.segmentTitles[2] = \"Native Only\"; ObjectID = \"e4G-id-vjI\";",
+    "dqh-nl-heL.title" : {
+      "comment" : "Class = \"UINavigationItem\"; title = \"Title\"; ObjectID = \"dqh-nl-heL\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Native Only"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "仅多点触控"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "仅多点触控"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "仅多点触控"
-          }
-        }
-      }
-    },
-    "e4G-id-vjI.segmentTitles[3]" : {
-      "comment" : "Class = \"UISegmentedControl\"; e4G-id-vjI.segmentTitles[3] = \"Absolute Touch\"; ObjectID = \"e4G-id-vjI\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Absolute Touch"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "单点鼠标"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "单点鼠标"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "单点鼠标"
+            "value" : "Title"
           }
         }
       }
     },
     "egA-7n-Dpe.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Touch Pointer Velocity: 100%                                                    \"; ObjectID = \"egA-7n-Dpe\";",
+      "comment" : "Class = \"UILabel\"; text = \"Touch Pointer Velocity\"; ObjectID = \"egA-7n-Dpe\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Touch Pointer Velocity: 100%                                                    "
+            "value" : "Touch Pointer Velocity"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "触点灵敏度"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "触点灵敏度"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "触点灵敏度"
           }
         }
       }
@@ -1112,289 +1136,409 @@
       }
     },
     "FJv-HJ-UYJ.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Tap Exclusion Area Size for Custom OSC: 200%                      \"; ObjectID = \"FJv-HJ-UYJ\";",
+      "comment" : "Class = \"UILabel\"; text = \"Touch Move Event Interval\"; ObjectID = \"FJv-HJ-UYJ\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Tap Exclusion Area Size for Custom OSC: 200%                      "
+            "value" : "Touch Move Event Interval"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "触控移动事件间隔"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "触控移动事件间隔"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "触控移动事件间隔"
           }
         }
       }
     },
     "FwK-oG-vuz.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Reverse Wheel Direction for Physical Mouse                           \"; ObjectID = \"FwK-oG-vuz\";",
+      "comment" : "Class = \"UILabel\"; text = \"Physical Mouse Wheel Scroll\"; ObjectID = \"FwK-oG-vuz\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Reverse Wheel Direction for Physical Mouse                           "
+            "value" : "Physical Mouse Wheel Scroll"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "反转物理鼠标滚轮方向"
+            "value" : "物理鼠标滚轮方向"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "反转物理鼠标滚轮方向"
+            "value" : "物理鼠标滚轮方向"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "反转物理鼠标滚轮方向"
+            "value" : "物理鼠标滚轮方向"
           }
         }
       }
     },
-    "fXq-oD-MrL.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Play Audio on PC                                                                            \"; ObjectID = \"fXq-oD-MrL\";",
+    "H8S-aI-EBo.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; H8S-aI-EBo.segmentTitles[0] = \"hovering\"; ObjectID = \"H8S-aI-EBo\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Play Audio on PC                                                                            "
+            "value" : "hovering"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "播放主机端声音"
+            "state" : "translated",
+            "value" : "悬浮"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "播放主机端声音"
+            "value" : "悬浮"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "播放主机端声音"
+            "value" : "悬浮"
           }
         }
       }
     },
-    "h5g-U1-Z2J.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Touch Mode                                                                            \"; ObjectID = \"h5g-U1-Z2J\";",
+    "H8S-aI-EBo.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; H8S-aI-EBo.segmentTitles[1] = \"left button\"; ObjectID = \"H8S-aI-EBo\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Touch Mode                                                                            "
+            "value" : "left button"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "触控模式"
+            "state" : "translated",
+            "value" : "左键"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控模式"
+            "value" : "左键"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "触控模式"
+            "value" : "左键"
+          }
+        }
+      }
+    },
+    "H8S-aI-EBo.segmentTitles[2]" : {
+      "comment" : "Class = \"UISegmentedControl\"; H8S-aI-EBo.segmentTitles[2] = \"middle button\"; ObjectID = \"H8S-aI-EBo\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "middle button"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "中键"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "中键"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "中键"
+          }
+        }
+      }
+    },
+    "H8S-aI-EBo.segmentTitles[3]" : {
+      "comment" : "Class = \"UISegmentedControl\"; H8S-aI-EBo.segmentTitles[3] = \"right button\"; ObjectID = \"H8S-aI-EBo\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "right button"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "右键"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "右键"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "右键"
           }
         }
       }
     },
     "hAo-1k-oYF.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Allow 90° Display Rotation in Steaming\"; ObjectID = \"hAo-1k-oYF\";",
+      "comment" : "Class = \"UILabel\"; text = \"90° Display Rotation\"; ObjectID = \"hAo-1k-oYF\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Allow 90° Display Rotation in Steaming"
+            "value" : "90° Display Rotation"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "允许90°转屏(App视图、串流时生效)"
+            "value" : "90°转屏"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "允许90°转屏(App视图、串流时生效)"
+            "value" : "90°转屏"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "允许90°转屏(App视图、串流时生效)"
+            "value" : "90°转屏"
           }
         }
       }
     },
-    "hm3-EV-h6d.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; hm3-EV-h6d.segmentTitles[0] = \"No\"; ObjectID = \"hm3-EV-h6d\";",
+    "hq8-dy-8BF.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Custom Resolution\"; ObjectID = \"hq8-dy-8BF\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "No"
+            "value" : "Custom Resolution"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "自定义分辨率"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "自定义分辨率"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "自定义分辨率"
           }
         }
       }
     },
-    "hm3-EV-h6d.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; hm3-EV-h6d.segmentTitles[1] = \"Yes\"; ObjectID = \"hm3-EV-h6d\";",
+    "iel-xl-xd9.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Profile:\"; ObjectID = \"iel-xl-xd9\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Yes"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
+            "value" : "Profile:"
           }
         }
       }
     },
     "IvI-tw-APj.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Open Settings in Stream View by Sliding from:                        \"; ObjectID = \"IvI-tw-APj\";",
+      "comment" : "Class = \"UILabel\"; text = \"Open Settings in Streaming\"; ObjectID = \"IvI-tw-APj\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Open Settings in Stream View by Sliding from:                        "
+            "value" : "Open Settings in Streaming"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "串流中从以下屏幕边缘滑动打开设置"
+            "state" : "translated",
+            "value" : "串流中打开设置菜单"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "串流中从以下屏幕边缘滑动打开设置:"
+            "state" : "translated",
+            "value" : "串流中打开设置菜单"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "串流中从以下屏幕边缘滑动打开设置"
+            "state" : "translated",
+            "value" : "串流中打开设置菜单"
           }
         }
       }
     },
-    "KlC-fG-wEi.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; KlC-fG-wEi.segmentTitles[0] = \"Single\"; ObjectID = \"KlC-fG-wEi\";",
+    "kho-5R-daP.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; kho-5R-daP.segmentTitles[0] = \"3 Finger Tap\"; ObjectID = \"kho-5R-daP\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Single"
+            "value" : "3 Finger Tap"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "单手柄"
+            "value" : "3指轻按"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "单手柄"
+            "value" : "3指轻按"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "单手柄"
+            "value" : "3指轻按"
           }
         }
       }
     },
-    "KlC-fG-wEi.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; KlC-fG-wEi.segmentTitles[1] = \"Auto\"; ObjectID = \"KlC-fG-wEi\";",
+    "kho-5R-daP.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; kho-5R-daP.segmentTitles[1] = \"4 Finger Tap\"; ObjectID = \"kho-5R-daP\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Auto"
+            "value" : "4 Finger Tap"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "自动"
+            "value" : "4指轻按"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "自动"
+            "value" : "4指轻按"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "自动"
+            "value" : "4指轻按"
           }
         }
       }
     },
-    "KMg-3j-F9p.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; KMg-3j-F9p.segmentTitles[0] = \"No\"; ObjectID = \"KMg-3j-F9p\";",
+    "kho-5R-daP.segmentTitles[2]" : {
+      "comment" : "Class = \"UISegmentedControl\"; kho-5R-daP.segmentTitles[2] = \"5 Finger Tap\"; ObjectID = \"kho-5R-daP\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "5 Finger Tap"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "5指轻按"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "5指轻按"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "5指轻按"
+          }
+        }
+      }
+    },
+    "kho-5R-daP.segmentTitles[3]" : {
+      "comment" : "Class = \"UISegmentedControl\"; kho-5R-daP.segmentTitles[3] = \"Disabled\"; ObjectID = \"kho-5R-daP\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Disabled"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "禁用"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "禁用"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "禁用"
+          }
+        }
+      }
+    },
+    "KJd-PE-5cS.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; KJd-PE-5cS.segmentTitles[0] = \"No\"; ObjectID = \"KJd-PE-5cS\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
@@ -1423,8 +1567,8 @@
         }
       }
     },
-    "KMg-3j-F9p.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; KMg-3j-F9p.segmentTitles[1] = \"Yes\"; ObjectID = \"KMg-3j-F9p\";",
+    "KJd-PE-5cS.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; KJd-PE-5cS.segmentTitles[1] = \"Yes\"; ObjectID = \"KJd-PE-5cS\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
@@ -1453,248 +1597,254 @@
         }
       }
     },
-    "lcO-6v-Tbg.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; lcO-6v-Tbg.segmentTitles[0] = \"No\"; ObjectID = \"lcO-6v-Tbg\";",
+    "KNe-bN-CDb.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; KNe-bN-CDb.segmentTitles[0] = \"Disabled\"; ObjectID = \"KNe-bN-CDb\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "No"
+            "value" : "Disabled"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
+            "state" : "needs_review",
+            "value" : "禁用"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
+            "state" : "needs_review",
+            "value" : "禁用"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
+            "state" : "needs_review",
+            "value" : "禁用"
           }
         }
       }
     },
-    "lcO-6v-Tbg.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; lcO-6v-Tbg.segmentTitles[1] = \"Yes\"; ObjectID = \"lcO-6v-Tbg\";",
+    "KNe-bN-CDb.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; KNe-bN-CDb.segmentTitles[1] = \"Allowed\"; ObjectID = \"KNe-bN-CDb\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Yes"
+            "value" : "Allowed"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
+            "state" : "needs_review",
+            "value" : "允许"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
+            "state" : "needs_review",
+            "value" : "允许"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        }
-      }
-    },
-    "lGK-vl-pdw.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; lGK-vl-pdw.segmentTitles[0] = \"30 FPS\"; ObjectID = \"lGK-vl-pdw\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "30 FPS"
-          }
-        }
-      }
-    },
-    "lGK-vl-pdw.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; lGK-vl-pdw.segmentTitles[1] = \"60 FPS\"; ObjectID = \"lGK-vl-pdw\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "60 FPS"
-          }
-        }
-      }
-    },
-    "lGK-vl-pdw.segmentTitles[2]" : {
-      "comment" : "Class = \"UISegmentedControl\"; lGK-vl-pdw.segmentTitles[2] = \"120 FPS\"; ObjectID = \"lGK-vl-pdw\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "120 FPS"
+            "state" : "needs_review",
+            "value" : "允许"
           }
         }
       }
     },
     "LGV-5y-piG.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"On-Screen Controls & Widgets                                                \"; ObjectID = \"LGV-5y-piG\";",
+      "comment" : "Class = \"UILabel\"; text = \"On-Screen Widgets   \"; ObjectID = \"LGV-5y-piG\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "On-Screen Controls & Widgets                                                "
+            "value" : "On-Screen Widgets   "
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "屏幕虚拟手柄与控件"
+            "value" : "屏显控件"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "屏幕虚拟手柄与控件"
+            "value" : "屏显控件"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "屏幕虚拟手柄与控件"
+            "value" : "屏显控件"
           }
         }
       }
     },
     "lMt-4H-fkV.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Bitrate: 10 Mbps                                                                            \"; ObjectID = \"lMt-4H-fkV\";",
+      "comment" : "Class = \"UILabel\"; text = \"Bitrate\"; ObjectID = \"lMt-4H-fkV\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Bitrate: 10 Mbps                                                                            "
+            "value" : "Bitrate"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "码率: 10Mbps"
+            "value" : "串流码率"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "码率: 10Mbps"
+            "state" : "needs_review",
+            "value" : "串流码率"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "码率: 10Mbps"
+            "state" : "needs_review",
+            "value" : "串流码率"
           }
         }
       }
     },
     "Mm0-xf-9eh.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; Mm0-xf-9eh.segmentTitles[0] = \"Left Screen Edge\"; ObjectID = \"Mm0-xf-9eh\";",
+      "comment" : "Class = \"UISegmentedControl\"; Mm0-xf-9eh.segmentTitles[0] = \"Slide From Left Edge\"; ObjectID = \"Mm0-xf-9eh\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Left Screen Edge"
+            "value" : "Slide From Left Edge"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左边缘"
+            "value" : "左边缘滑动"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左边缘"
+            "value" : "左边缘滑动"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左边缘"
+            "value" : "左边缘滑动"
           }
         }
       }
     },
     "Mm0-xf-9eh.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; Mm0-xf-9eh.segmentTitles[1] = \"Right Screen Edge\"; ObjectID = \"Mm0-xf-9eh\";",
+      "comment" : "Class = \"UISegmentedControl\"; Mm0-xf-9eh.segmentTitles[1] = \"Slide From Right Edge\"; ObjectID = \"Mm0-xf-9eh\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Right Screen Edge"
+            "value" : "Slide From Right Edge"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "右边缘"
+            "value" : "右边缘滑动"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "右边缘"
+            "value" : "右边缘滑动"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "右边缘"
+            "value" : "右边缘滑动"
           }
         }
       }
     },
-    "Mm0-xf-9eh.segmentTitles[2]" : {
-      "comment" : "Class = \"UISegmentedControl\"; Mm0-xf-9eh.segmentTitles[2] = \"Either\"; ObjectID = \"Mm0-xf-9eh\";",
-      "extractionState" : "stale",
+    "MM5-O0-vK3.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; MM5-O0-vK3.segmentTitles[0] = \"No\"; ObjectID = \"MM5-O0-vK3\";",
+      "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Either"
+            "value" : "No"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左右任意"
+            "value" : "关闭"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左右任意"
+            "value" : "关闭"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左右任意"
+            "value" : "关闭"
+          }
+        }
+      }
+    },
+    "MM5-O0-vK3.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; MM5-O0-vK3.segmentTitles[1] = \"Yes\"; ObjectID = \"MM5-O0-vK3\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Yes"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "启用"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "启用"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "启用"
+          }
+        }
+      }
+    },
+    "MNm-86-RGl.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"YUV 4:4:4\"; ObjectID = \"MNm-86-RGl\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "YUV 4:4:4"
           }
         }
       }
@@ -1729,62 +1879,110 @@
         }
       }
     },
-    "nCO-OT-dV1.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; nCO-OT-dV1.segmentTitles[0] = \"No\"; ObjectID = \"nCO-OT-dV1\";",
+    "mTM-NL-CcF.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; mTM-NL-CcF.segmentTitles[0] = \"Align with System\"; ObjectID = \"mTM-NL-CcF\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "No"
+            "value" : "Align with System"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "与系统一致"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "与系统一致"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "与系统一致"
           }
         }
       }
     },
-    "nCO-OT-dV1.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; nCO-OT-dV1.segmentTitles[1] = \"Yes\"; ObjectID = \"nCO-OT-dV1\";",
+    "mTM-NL-CcF.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; mTM-NL-CcF.segmentTitles[1] = \"Reversed\"; ObjectID = \"mTM-NL-CcF\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Yes"
+            "value" : "Reversed"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "启用"
+            "value" : "反转"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "启用"
+            "value" : "反转"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "启用"
+            "value" : "反转"
+          }
+        }
+      }
+    },
+    "MUY-2Y-bHi.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Touch Mode\"; ObjectID = \"MUY-2Y-bHi\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Touch Mode"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "触控模式"
+          }
+        }
+      }
+    },
+    "nh6-cn-z23.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Toggle Local Soft Keyboard\"; ObjectID = \"nh6-cn-z23\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Toggle Local Soft Keyboard"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "打开软键盘"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "打开软键盘"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "打开软键盘"
           }
         }
       }
@@ -1879,104 +2077,92 @@
         }
       }
     },
-    "OA2-SA-bBO.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; OA2-SA-bBO.segmentTitles[0] = \"No\"; ObjectID = \"OA2-SA-bBO\";",
+    "OOg-A3-DdM.segmentTitles[0]" : {
+      "comment" : "Class = \"UISegmentedControl\"; OOg-A3-DdM.segmentTitles[0] = \"Lowest Latency\"; ObjectID = \"OOg-A3-DdM\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "No"
+            "value" : "Lowest Latency"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "低延迟"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "低延迟"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "低延迟"
           }
         }
       }
     },
-    "OA2-SA-bBO.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; OA2-SA-bBO.segmentTitles[1] = \"Yes\"; ObjectID = \"OA2-SA-bBO\";",
+    "OOg-A3-DdM.segmentTitles[1]" : {
+      "comment" : "Class = \"UISegmentedControl\"; OOg-A3-DdM.segmentTitles[1] = \"Smoothest Video\"; ObjectID = \"OOg-A3-DdM\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Yes"
+            "value" : "Smoothest Video"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "启用"
+            "value" : "最高流畅度"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "启用"
+            "value" : "最高流畅度"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "启用"
-          }
-        }
-      }
-    },
-    "OHY-2z-Tm7.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Enable YUV 4:4:4 (Beta)\"; ObjectID = \"OHY-2z-Tm7\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Enable YUV 4:4:4 (Beta)"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "YUV 4:4:4 (测试功能)"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "YUV 4:4:4 (测试功能)"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "YUV 4:4:4 (测试功能)"
+            "value" : "最高流畅度"
           }
         }
       }
     },
     "oPM-G6-u5O.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Mouse Pointer Velocity: 100%                                                   \"; ObjectID = \"oPM-G6-u5O\";",
+      "comment" : "Class = \"UILabel\"; text = \"Mouse Pointer Velocity\"; ObjectID = \"oPM-G6-u5O\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Mouse Pointer Velocity: 100%                                                   "
+            "value" : "Mouse Pointer Velocity"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "鼠标指针灵敏度"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "鼠标指针灵敏度"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "鼠标指针灵敏度"
           }
         }
       }
@@ -2012,31 +2198,55 @@
       }
     },
     "pMN-6T-aYE.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Slide Distance for Stream View Menu: 0.5 * screen-width     \"; ObjectID = \"pMN-6T-aYE\";",
+      "comment" : "Class = \"UILabel\"; text = \"Gesture Slide Distance\"; ObjectID = \"pMN-6T-aYE\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Slide Distance for Stream View Menu: 0.5 * screen-width     "
+            "value" : "Gesture Slide Distance"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "手势滑动触发距离"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "打开串流菜单滑动距离: "
+            "state" : "needs_review",
+            "value" : "手势滑动触发距离"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "手势滑动触发距离"
+          }
+        }
+      }
+    },
+    "Pwa-YK-6Q2.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"test\"; ObjectID = \"Pwa-YK-6Q2\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "test"
           }
         }
       }
     },
     "pYZ-GR-EwO.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Resolution                                                                                    \"; ObjectID = \"pYZ-GR-EwO\";",
+      "comment" : "Class = \"UILabel\"; text = \"Resolution   \"; ObjectID = \"pYZ-GR-EwO\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Resolution                                                                                    "
+            "value" : "Resolution   "
           }
         },
         "zh-Hans" : {
@@ -2047,44 +2257,104 @@
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "串流分辨率"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "串流分辨率"
           }
         }
       }
     },
     "Q2V-XF-4jq.title" : {
-      "comment" : "Class = \"UINavigationItem\"; title = \"Controller & Widget Profiles\"; ObjectID = \"Q2V-XF-4jq\";",
+      "comment" : "Class = \"UINavigationItem\"; title = \"Widget Profiles\"; ObjectID = \"Q2V-XF-4jq\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Controller & Widget Profiles"
+            "value" : "Widget Profiles"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "屏显手柄与控件布局"
+            "value" : "屏显控件布局"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "屏显控件布局"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "屏显控件布局"
+          }
+        }
+      }
+    },
+    "QdG-9a-5AZ.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Soft Keyboard Toolbar\"; ObjectID = \"QdG-9a-5AZ\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Soft Keyboard Toolbar"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "软键盘工具栏"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "软键盘工具栏"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "软键盘工具栏"
+          }
+        }
+      }
+    },
+    "Qs9-iS-YoW.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Divider Position\"; ObjectID = \"Qs9-iS-YoW\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Divider Position"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "灵敏度分割位置"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "屏显手柄与控件布局"
+            "value" : "灵敏度分割位置"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "屏显手柄与控件布局"
+            "value" : "灵敏度分割位置"
           }
         }
       }
@@ -2209,36 +2479,6 @@
         }
       }
     },
-    "qSU-wh-tqA.segmentTitles[4]" : {
-      "comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[4] = \"Custom\"; ObjectID = \"qSU-wh-tqA\";",
-      "extractionState" : "stale",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Custom"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "自定义"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "自定义"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "自定义"
-          }
-        }
-      }
-    },
     "QYJ-84-bvc.text" : {
       "comment" : "Class = \"UILabel\"; text = \"Lift Stream View for Local Keyboard                                          \"; ObjectID = \"QYJ-84-bvc\";",
       "extractionState" : "extracted_with_value",
@@ -2269,122 +2509,86 @@
         }
       }
     },
+    "r8L-dl-yLZ.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"test\"; ObjectID = \"r8L-dl-yLZ\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "test"
+          }
+        }
+      }
+    },
     "s2i-ZL-Gz4.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Statistics Overlay                                                                            \"; ObjectID = \"s2i-ZL-Gz4\";",
+      "comment" : "Class = \"UILabel\"; text = \"Statistics Overlay\"; ObjectID = \"s2i-ZL-Gz4\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Statistics Overlay                                                                            "
+            "value" : "Statistics Overlay"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "性能数据叠加显示"
+            "state" : "translated",
+            "value" : "性能数据叠加"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "性能数据叠加显示"
+            "value" : "性能数据叠加"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "性能数据叠加显示"
+            "value" : "性能数据叠加"
           }
         }
       }
     },
-    "sIU-PH-H7V.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; sIU-PH-H7V.segmentTitles[0] = \"No\"; ObjectID = \"sIU-PH-H7V\";",
+    "SAQ-04-n4h.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Multi-Controller Mode\"; ObjectID = \"SAQ-04-n4h\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "No"
+            "value" : "Multi-Controller Mode"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "多手柄模式"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "多手柄模式"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "关闭"
+            "value" : "多手柄模式"
           }
         }
       }
     },
-    "sIU-PH-H7V.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; sIU-PH-H7V.segmentTitles[1] = \"Yes\"; ObjectID = \"sIU-PH-H7V\";",
+    "sbd-0j-KWS.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"test\"; ObjectID = \"sbd-0j-KWS\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Yes"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        }
-      }
-    },
-    "t9f-V8-GCm.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Citrix X1 Mouse Support                                                               \"; ObjectID = \"t9f-V8-GCm\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Citrix X1 Mouse Support                                                               "
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Citrix X1 鼠标支持"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Citrix X1 鼠标支持"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Citrix X1 鼠标支持"
+            "value" : "test"
           }
         }
       }
@@ -2419,62 +2623,26 @@
         }
       }
     },
-    "uSS-ev-IFe.configuration.title" : {
-      "comment" : "Class = \"UIButton\"; configuration.title = \"Back to Streaming\"; ObjectID = \"uSS-ev-IFe\";",
+    "tG7-oX-P9b.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"test\"; ObjectID = \"tG7-oX-P9b\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Back to Streaming"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "返回串流"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "返回串流"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "返回串流"
+            "value" : "test"
           }
         }
       }
     },
-    "uSS-ev-IFe.normalTitle" : {
-      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"uSS-ev-IFe\";",
+    "vJs-pg-hHe.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"test\"; ObjectID = \"vJs-pg-hHe\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Button"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "返回串流"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "返回串流"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "返回串流"
+            "value" : "test"
           }
         }
       }
@@ -2539,337 +2707,163 @@
         }
       }
     },
-    "VWB-YB-Ptj.segmentTitles[2]" : {
-      "comment" : "Class = \"UISegmentedControl\"; VWB-YB-Ptj.segmentTitles[2] = \"Disabled\"; ObjectID = \"VWB-YB-Ptj\";",
+    "xfv-K0-1CO.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"Tap any widget to load configuration (per widget)\"; ObjectID = \"xfv-K0-1CO\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Disabled"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "禁用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "禁用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "禁用"
-          }
-        }
-      }
-    },
-    "WDY-9o-6Hb.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; WDY-9o-6Hb.segmentTitles[0] = \"No\"; ObjectID = \"WDY-9o-6Hb\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "No"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "关闭"
-          }
-        }
-      }
-    },
-    "WDY-9o-6Hb.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; WDY-9o-6Hb.segmentTitles[1] = \"Yes\"; ObjectID = \"WDY-9o-6Hb\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Yes"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "启用"
-          }
-        }
-      }
-    },
-    "WQX-ct-rnt.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; WQX-ct-rnt.segmentTitles[0] = \"Auto\"; ObjectID = \"WQX-ct-rnt\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Auto"
-          }
-        }
-      }
-    },
-    "WQX-ct-rnt.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; WQX-ct-rnt.segmentTitles[1] = \"Device Motion\"; ObjectID = \"WQX-ct-rnt\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Device Motion"
-          }
-        }
-      }
-    },
-    "WQX-ct-rnt.segmentTitles[2]" : {
-      "comment" : "Class = \"UISegmentedControl\"; WQX-ct-rnt.segmentTitles[2] = \"Controller Motion\"; ObjectID = \"WQX-ct-rnt\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Controller Motion"
-          }
-        }
-      }
-    },
-    "WSI-9V-G6c.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Optimize Game Settings                                                               \"; ObjectID = \"WSI-9V-G6c\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Optimize Game Settings                                                               "
+            "value" : "Tap any widget to load configuration (per widget)"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "优化游戏设置"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "优化游戏设置"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "优化游戏设置"
-          }
-        }
-      }
-    },
-    "yq8-Hq-UWQ.configuration.title" : {
-      "comment" : "Class = \"UIButton\"; configuration.title = \"Exit\"; ObjectID = \"yq8-Hq-UWQ\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Exit"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "退出"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "退出"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "退出"
-          }
-        }
-      }
-    },
-    "yq8-Hq-UWQ.normalTitle" : {
-      "comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"yq8-Hq-UWQ\";",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Button"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "退出"
+            "value" : "轻按任意控件加载配置 (各控件独立)"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "退出"
+            "value" : "轻按任意控件加载配置 (各控件独立)"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "needs_review",
-            "value" : "退出"
+            "value" : "轻按任意控件加载配置 (各控件独立)"
           }
         }
       }
     },
     "yY7-Sf-Zes.segmentTitles[0]" : {
-      "comment" : "Class = \"UISegmentedControl\"; yY7-Sf-Zes.segmentTitles[0] = \"Left Screen Edge\"; ObjectID = \"yY7-Sf-Zes\";",
+      "comment" : "Class = \"UISegmentedControl\"; yY7-Sf-Zes.segmentTitles[0] = \"Slide From Left Edge\"; ObjectID = \"yY7-Sf-Zes\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Left Screen Edge"
+            "value" : "Slide From Left Edge"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左边缘"
+            "value" : "左边缘滑动"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左边缘"
+            "value" : "左边缘滑动"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "左边缘"
+            "value" : "左边缘滑动"
           }
         }
       }
     },
     "yY7-Sf-Zes.segmentTitles[1]" : {
-      "comment" : "Class = \"UISegmentedControl\"; yY7-Sf-Zes.segmentTitles[1] = \"Right Screen Edge\"; ObjectID = \"yY7-Sf-Zes\";",
+      "comment" : "Class = \"UISegmentedControl\"; yY7-Sf-Zes.segmentTitles[1] = \"Slide From Right Edge\"; ObjectID = \"yY7-Sf-Zes\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Right Screen Edge"
+            "value" : "Slide From Right Edge"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "右边缘"
+            "value" : "右边缘滑动"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "右边缘"
+            "value" : "右边缘滑动"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "右边缘"
+            "value" : "右边缘滑动"
           }
         }
       }
     },
     "Zp4-fA-IeL.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Open Command Tool in Stream View by Sliding from:          \"; ObjectID = \"Zp4-fA-IeL\";",
+      "comment" : "Class = \"UILabel\"; text = \"Open Toolbox in Streaming\"; ObjectID = \"Zp4-fA-IeL\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Open Command Tool in Stream View by Sliding from:          "
+            "value" : "Open Toolbox in Streaming"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+            "state" : "translated",
+            "value" : "串流中打开工具箱"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+            "state" : "translated",
+            "value" : "串流中打开工具箱"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+            "state" : "translated",
+            "value" : "串流中打开工具箱"
+          }
+        }
+      }
+    },
+    "ZuV-4A-0Zb.text" : {
+      "comment" : "Class = \"UILabel\"; text = \"test\"; ObjectID = \"ZuV-4A-0Zb\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "test"
           }
         }
       }
     },
     "ZWC-Gw-pSq.text" : {
-      "comment" : "Class = \"UILabel\"; text = \"Frame Pacing Preference                                                              \"; ObjectID = \"ZWC-Gw-pSq\";",
+      "comment" : "Class = \"UILabel\"; text = \"Frame Pacing Preference\"; ObjectID = \"ZWC-Gw-pSq\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Frame Pacing Preference                                                              "
+            "value" : "Frame Pacing Preference"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "帧步进控制"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "帧步进控制"
           }
         },
         "zh-HK" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "帧步进控制"
           }
         }