xibme

第一次提交
2024-05-29 14:55:03 +08:00 · 2024-05-27 11:54:20 +08:00 · 2024-05-27 11:53:32 +08:00 · 2023-09-18 16:27:22 -05:00 · 2023-08-11 21:52:01 -05:00 · 2023-08-11 21:51:32 -05:00
548 changed files with 29295 additions and 12822 deletions
--- a/Cores/DSDeltaCore
+++ b/Cores/DSDeltaCore
@ -1 +1 @@
-Subproject commit 1054482de95f60de78c48b01af3c04fb4eca9168
+Subproject commit 6c84366b3a76045782905293c9616e33f5da1a35
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@ -1 +1 @@
-Subproject commit 81362dd5def310f4dd908513574c7e2fd10c7d75
+Subproject commit c1db5f51cd455a7033801cc19dc3dbfcb6f2b42c
--- a/Cores/GBADeltaCore
+++ b/Cores/GBADeltaCore
@ -1 +1 @@
-Subproject commit c07950a584ed3153b90349059629db85b1c330ac
+Subproject commit 8ea36dff87bc1f787765de45fa8ccbcc1256a0e3
--- a/Cores/GBCDeltaCore
+++ b/Cores/GBCDeltaCore
@ -1 +1 @@
-Subproject commit 338a3b32c01413999e390c681dc336fdcdff1ca1
+Subproject commit 81f8ffba56823637706689fb5c6bc634ee4d9b32
--- a/Cores/GPGXDeltaCore
+++ b/Cores/GPGXDeltaCore
@ -1 +1 @@
-Subproject commit aed30506c77096c3e854c9a38fe9cc893e9480a1
+Subproject commit 18c595887a12ef23e0d54c63f83c91c99e7f4827
--- a/Cores/MelonDSDeltaCore
+++ b/Cores/MelonDSDeltaCore
@ -1 +1 @@
-Subproject commit 16f79982e468137c3bfe11a2dbff97423a5ce128
+Subproject commit 697ba731981824f53460f6e0193f159f71f22ba2
--- a/Cores/N64DeltaCore
+++ b/Cores/N64DeltaCore
@ -1 +1 @@
-Subproject commit c581c6f51efd61dc5891fac22dbada7df347c003
+Subproject commit c8816c51f82210a9c4cc62b1a7c53fa21bc705ee
--- a/Cores/NESDeltaCore
+++ b/Cores/NESDeltaCore
@ -1 +1 @@
-Subproject commit e5221a06ff2ff830bf60302ef0678fe5e554a925
+Subproject commit 78a092d4e795f83153e98749b5cbeb66cf812d7e
--- a/Cores/SNESDeltaCore
+++ b/Cores/SNESDeltaCore
@ -1 +1 @@
-Subproject commit 2ef4c123b43565688f7b7d3aa5099559b633f7ba
+Subproject commit d5717291325578f64d519822aeb2be81217c67f3
--- a/Delta.xcodeproj/project.pbxproj
+++ b/Delta.xcodeproj/project.pbxproj
--- a/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
+++ b/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
@ -29,7 +29,7 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "BFFA71D61AAC406100EE9DD1"
-               BuildableName = "Delta.app"
+               BuildableName = "Retro Game Emulator.app"
               BlueprintName = "Delta"
               ReferencedContainer = "container:Delta.xcodeproj">
            </BuildableReference>
@ -45,7 +45,7 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "BFFA71D61AAC406100EE9DD1"
-            BuildableName = "Delta.app"
+            BuildableName = "Retro Game Emulator.app"
            BlueprintName = "Delta"
            ReferencedContainer = "container:Delta.xcodeproj">
         </BuildableReference>
@ -54,7 +54,7 @@
      </Testables>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      enableASanStackUseAfterReturn = "YES"
@ -69,7 +69,7 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "BFFA71D61AAC406100EE9DD1"
-            BuildableName = "Delta.app"
+            BuildableName = "Retro Game Emulator.app"
            BlueprintName = "Delta"
            ReferencedContainer = "container:Delta.xcodeproj">
         </BuildableReference>
@ -107,7 +107,7 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "BFFA71D61AAC406100EE9DD1"
-            BuildableName = "Delta.app"
+            BuildableName = "Retro Game Emulator.app"
            BlueprintName = "Delta"
            ReferencedContainer = "container:Delta.xcodeproj">
         </BuildableReference>
--- a/Delta.xcodeproj/xcshareddata/xcschemes/DeltaFeatures.xcscheme
+++ b/Delta.xcodeproj/xcshareddata/xcschemes/DeltaFeatures.xcscheme
@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1420"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D5D7C1F029E60DFF00663793"
+               BuildableName = "libDeltaFeatures.a"
+               BlueprintName = "DeltaFeatures"
+               ReferencedContainer = "container:Delta.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D5D7C1F029E60DFF00663793"
+            BuildableName = "libDeltaFeatures.a"
+            BlueprintName = "DeltaFeatures"
+            ReferencedContainer = "container:Delta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/Delta.xcodeproj/xcshareddata/xcschemes/DeltaPreviews.xcscheme
+++ b/Delta.xcodeproj/xcshareddata/xcschemes/DeltaPreviews.xcscheme
@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D539102E29E88B6B0006B350"
+               BuildableName = "DeltaPreviews.framework"
+               BlueprintName = "DeltaPreviews"
+               ReferencedContainer = "container:Delta.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D539102E29E88B6B0006B350"
+            BuildableName = "DeltaPreviews.framework"
+            BlueprintName = "DeltaPreviews"
+            ReferencedContainer = "container:Delta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/Delta.xcodeproj/xcshareddata/xcschemes/mogenerator.xcscheme
+++ b/Delta.xcodeproj/xcshareddata/xcschemes/mogenerator.xcscheme
@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF14D8941DE7A512002CA1BE"
+               BuildableName = "mogenerator"
+               BlueprintName = "mogenerator"
+               ReferencedContainer = "container:Delta.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF14D8941DE7A512002CA1BE"
+            BuildableName = "mogenerator"
+            BlueprintName = "mogenerator"
+            ReferencedContainer = "container:Delta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/Delta.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Delta.xcworkspace/xcshareddata/swiftpm/Package.resolved
@ -14,8 +14,8 @@
        "package": "DeltaCore",
        "repositoryURL": "https://github.com/rileytestut/DeltaCore.git",
        "state": {
-          "branch": "main",
-          "revision": "27a574a46238817084f80d811b3e6c2884d9cdc0",
+          "branch": "ios14",
+          "revision": "74d2a7a6e36035cb5730d0b0cf2456cbeb6faf0c",
          "version": null
        }
      },
@ -24,8 +24,8 @@
        "repositoryURL": "https://github.com/weichsel/ZIPFoundation.git",
        "state": {
          "branch": null,
-          "revision": "f6a22e7da26314b38bf9befce34ae8e4b2543090",
-          "version": "0.9.15"
+          "revision": "02b6abe5f6eef7e3cbd5f247c5cc24e246efcfe0",
+          "version": "0.9.19"
        }
      }
    ]
--- a/Delta/AppDelegate.swift
+++ b/Delta/AppDelegate.swift
@ -12,9 +12,6 @@ import DeltaCore
 import Harmony
 import AltKit

-import Fabric
-import Crashlytics
-
 private extension CFNotificationName
 {
    static let altstoreRequestAppState: CFNotificationName = CFNotificationName("com.altstore.RequestAppState.com.rileytestut.Delta" as CFString)
@ -40,25 +37,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate
        Settings.registerDefaults()
        
        self.registerCores()
-        
-        #if DEBUG
-        
-        // Must go AFTER registering cores, or else NESDeltaCore may not work correctly when not connected to debugger 🤷‍♂️
-        Fabric.with([Crashlytics.self])
-        
-        #else
-        
-        // Fabric doesn't allow us to change what value it uses for the bundle identifier.
-        // Normally this wouldn't be an issue, except AltStore creates a unique bundle identifier per user.
-        // Rather than have every copy of Delta be listed separately in Fabric, we temporarily swizzle Bundle.infoDictionary
-        // to return a constant identifier while Fabric is starting up. This way, Fabric will now group
-        // all copies of Delta under the bundle identifier "com.rileytestut.Delta.AltStore".
-        Bundle.swizzleBundleID {
-            Fabric.with([Crashlytics.self])
-        }
-        
-        #endif
-        
        self.configureAppearance()
        
        // Controllers
@ -121,7 +99,17 @@ extension AppDelegate
    {
        // Called when a new scene session is being created.
        // Use this method to select a configuration to create the new scene with.
-        return UISceneConfiguration(name: "Main", sessionRole: connectingSceneSession.role)
+        
+        if connectingSceneSession.role == .windowExternalDisplay
+        {
+            // External Display
+            return UISceneConfiguration(name: "External Display", sessionRole: connectingSceneSession.role)
+        }
+        else
+        {
+            // Default Scene
+            return UISceneConfiguration(name: "Main", sessionRole: connectingSceneSession.role)
+        }
    }
    
    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>)
--- a/Delta/Base.lproj/LaunchScreen.storyboard
+++ b/Delta/Base.lproj/LaunchScreen.storyboard
@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13528" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="dkK-ii-Bx4">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="dkK-ii-Bx4">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13526"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@ -23,21 +19,32 @@
                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Delta" translatesAutoresizingMaskIntoConstraints="NO" id="plh-tL-LY0">
-                                <rect key="frame" x="94" y="250" width="187.5" height="167"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="plh-tL-LY0" secondAttribute="height" multiplier="64:57" id="8qM-L2-ASa"/>
-                                </constraints>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="LaunchViewC" translatesAutoresizingMaskIntoConstraints="NO" id="5XD-I3-tLg">
+                                <rect key="frame" x="0.0" y="50" width="375" height="378"/>
                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Retro Game Emulator" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vhb-Xd-o6a">
+                                <rect key="frame" x="55.5" y="448" width="264" height="33.5"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="28"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.44999998807907104" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ENJOY CLASSIC MOMENT" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wWH-Lx-U9x">
+                                <rect key="frame" x="90.5" y="513.5" width="194.5" height="19.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                        </subviews>
-                        <color key="backgroundColor" white="0.14728124936421713" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.071399740870000006" green="0.082175157959999995" blue="0.10832635309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
-                            <constraint firstItem="plh-tL-LY0" firstAttribute="width" relation="lessThanOrEqual" secondItem="8Uu-wz-ps8" secondAttribute="width" multiplier="0.5" id="8j9-39-Y2s"/>
-                            <constraint firstItem="plh-tL-LY0" firstAttribute="centerY" secondItem="8Uu-wz-ps8" secondAttribute="centerY" id="COW-Co-NFK"/>
-                            <constraint firstItem="plh-tL-LY0" firstAttribute="height" secondItem="8Uu-wz-ps8" secondAttribute="height" multiplier="0.5" priority="900" id="G3L-7B-xVc"/>
-                            <constraint firstItem="plh-tL-LY0" firstAttribute="width" secondItem="8Uu-wz-ps8" secondAttribute="width" multiplier="0.5" priority="950" id="n3i-kS-7eQ"/>
-                            <constraint firstItem="plh-tL-LY0" firstAttribute="centerX" secondItem="8Uu-wz-ps8" secondAttribute="centerX" id="sp5-Kf-N7G"/>
-                            <constraint firstItem="plh-tL-LY0" firstAttribute="height" relation="lessThanOrEqual" secondItem="8Uu-wz-ps8" secondAttribute="height" multiplier="0.5" id="ubN-Qh-I5H"/>
+                            <constraint firstItem="5XD-I3-tLg" firstAttribute="top" secondItem="qMb-3x-uIu" secondAttribute="bottom" constant="30" id="Aiv-ac-bYx"/>
+                            <constraint firstItem="wWH-Lx-U9x" firstAttribute="centerX" secondItem="vhb-Xd-o6a" secondAttribute="centerX" id="DEu-U7-qVq"/>
+                            <constraint firstAttribute="trailing" secondItem="5XD-I3-tLg" secondAttribute="trailing" id="Gc5-y0-Vsy"/>
+                            <constraint firstItem="vhb-Xd-o6a" firstAttribute="top" secondItem="5XD-I3-tLg" secondAttribute="bottom" constant="20" id="Ncn-Yh-ecr"/>
+                            <constraint firstItem="5XD-I3-tLg" firstAttribute="leading" secondItem="8Uu-wz-ps8" secondAttribute="leading" id="SSl-CS-XOC"/>
+                            <constraint firstItem="5XD-I3-tLg" firstAttribute="height" secondItem="8Uu-wz-ps8" secondAttribute="height" multiplier="1.7:3" id="WGx-z3-vXf"/>
+                            <constraint firstItem="wWH-Lx-U9x" firstAttribute="top" secondItem="vhb-Xd-o6a" secondAttribute="bottom" constant="32" id="lVY-5z-fz7"/>
+                            <constraint firstItem="vhb-Xd-o6a" firstAttribute="centerX" secondItem="8Uu-wz-ps8" secondAttribute="centerX" id="oCf-dA-bJX"/>
                        </constraints>
                    </view>
                </viewController>
@ -47,6 +54,6 @@
        </scene>
    </scenes>
    <resources>
-        <image name="Delta" width="1342" height="1196"/>
+        <image name="LaunchViewC" width="375" height="472.5"/>
    </resources>
 </document>
--- a/Delta/Base.lproj/Main.storyboard
+++ b/Delta/Base.lproj/Main.storyboard
@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SPq-Bk-fQl">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SPq-Bk-fQl">
    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
-        <!--Games-->
+        <!--Games View Controller-->
        <scene sceneID="Cd2-Pf-cua">
            <objects>
-                <viewController id="jeE-WD-wXO" customClass="GamesViewController" customModule="Delta" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="jeE-WD-wXO" customClass="GamesViewController" customModule="Retro_Game_Emulator" customModuleProvider="target" sceneMemberID="viewController">
                    <layoutGuides>
                        <viewControllerLayoutGuide type="top" id="WoX-O4-qy5"/>
                        <viewControllerLayoutGuide type="bottom" id="0om-QB-N5a"/>
@ -25,22 +25,51 @@
                                    <segue destination="tpK-ou-yEA" kind="embed" identifier="embedPageViewController" id="cjU-nW-cHY"/>
                                </connections>
                            </containerView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bg" translatesAutoresizingMaskIntoConstraints="NO" id="J8K-ZI-4X1">
+                                <rect key="frame" x="0.0" y="56" width="375" height="591"/>
+                            </imageView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CxB-GP-B6S">
+                                <rect key="frame" x="0.0" y="538" width="375" height="109"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                <state key="normal" image="home_tab"/>
+                                <connections>
+                                    <segue destination="xMK-Cs-fAS" kind="presentation" modalPresentationStyle="fullScreen" id="bxS-9X-3vh"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n4H-Kw-HPj">
+                                <rect key="frame" x="143.5" y="517" width="100" height="100"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="100" id="SLR-9h-t9y"/>
+                                    <constraint firstAttribute="width" constant="100" id="Tdv-6u-nlA"/>
+                                </constraints>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                <state key="normal" image="addtwo"/>
+                                <connections>
+                                    <action selector="importfilesBtn:" destination="jeE-WD-wXO" eventType="touchUpInside" id="T2w-zr-j8V"/>
+                                </connections>
+                            </button>
                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="CxB-GP-B6S" secondAttribute="trailing" id="5sO-AB-YB5"/>
+                            <constraint firstAttribute="trailing" secondItem="J8K-ZI-4X1" secondAttribute="trailing" id="7MY-qA-ANn"/>
                            <constraint firstAttribute="trailing" secondItem="tmn-gd-5UN" secondAttribute="trailing" id="9Rq-HM-vqk"/>
+                            <constraint firstItem="J8K-ZI-4X1" firstAttribute="leading" secondItem="3Bk-k3-7J9" secondAttribute="leading" id="9kW-o9-BMv"/>
+                            <constraint firstItem="CxB-GP-B6S" firstAttribute="centerX" secondItem="3Bk-k3-7J9" secondAttribute="centerX" id="Dbp-v1-mUp"/>
+                            <constraint firstItem="n4H-Kw-HPj" firstAttribute="centerX" secondItem="3Bk-k3-7J9" secondAttribute="centerX" constant="6" id="H9T-X7-RK8"/>
+                            <constraint firstItem="0om-QB-N5a" firstAttribute="top" secondItem="n4H-Kw-HPj" secondAttribute="bottom" constant="30" id="QHB-jA-R0s"/>
+                            <constraint firstItem="0om-QB-N5a" firstAttribute="top" secondItem="CxB-GP-B6S" secondAttribute="bottom" id="QzJ-Kr-VZk"/>
+                            <constraint firstItem="CxB-GP-B6S" firstAttribute="leading" secondItem="3Bk-k3-7J9" secondAttribute="leading" id="axc-ed-3zE"/>
                            <constraint firstItem="tmn-gd-5UN" firstAttribute="leading" secondItem="3Bk-k3-7J9" secondAttribute="leading" id="f1f-sa-dBA"/>
                            <constraint firstAttribute="bottom" secondItem="tmn-gd-5UN" secondAttribute="bottom" id="ifM-Wa-u9y"/>
+                            <constraint firstItem="J8K-ZI-4X1" firstAttribute="top" secondItem="WoX-O4-qy5" secondAttribute="bottom" id="jaI-AF-tpn"/>
                            <constraint firstItem="tmn-gd-5UN" firstAttribute="top" secondItem="3Bk-k3-7J9" secondAttribute="top" id="nhS-aC-rUR"/>
+                            <constraint firstItem="0om-QB-N5a" firstAttribute="top" secondItem="J8K-ZI-4X1" secondAttribute="bottom" id="tvh-Sd-zA1"/>
                        </constraints>
                    </view>
-                    <navigationItem key="navigationItem" title="Games" id="pFk-as-3k4">
-                        <barButtonItem key="leftBarButtonItem" image="SettingsButton" id="2gg-lC-FhX">
-                            <connections>
-                                <segue destination="xMK-Cs-fAS" kind="presentation" identifier="showSettings" id="uN5-PN-7FK"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" systemItem="add" id="FeA-O5-xd2">
+                    <navigationItem key="navigationItem" id="pFk-as-3k4">
+                        <barButtonItem key="leftBarButtonItem" image="home" id="2gg-lC-FhX"/>
+                        <barButtonItem key="rightBarButtonItem" style="plain" id="FeA-O5-xd2">
                            <connections>
                                <action selector="importFiles" destination="jeE-WD-wXO" id="A1s-kE-NkM"/>
                            </connections>
@ -52,24 +81,24 @@
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="JYx-xE-nis" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="1036" y="1002"/>
+            <point key="canvasLocation" x="1036" y="1001.649175412294"/>
        </scene>
        <!--Game Collection View Controller-->
        <scene sceneID="qNA-NP-TiF">
            <objects>
-                <collectionViewController storyboardIdentifier="gameCollectionViewController" clearsSelectionOnViewWillAppear="NO" id="kqu-75-owz" customClass="GameCollectionViewController" customModule="Delta" customModuleProvider="target" sceneMemberID="viewController">
+                <collectionViewController storyboardIdentifier="gameCollectionViewController" clearsSelectionOnViewWillAppear="NO" id="kqu-75-owz" customClass="GameCollectionViewController" customModule="Retro_Game_Emulator" customModuleProvider="target" sceneMemberID="viewController">
                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="white" dataMode="prototypes" id="OIq-Z8-kxO">
                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="20" minimumInteritemSpacing="10" id="NKN-dd-bTh" customClass="GridCollectionViewLayout" customModule="Delta" customModuleProvider="target">
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="20" minimumInteritemSpacing="10" id="NKN-dd-bTh" customClass="GridCollectionViewLayout" customModule="Retro_Game_Emulator" customModuleProvider="target">
                            <size key="itemSize" width="100" height="100"/>
                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
                            <inset key="sectionInset" minX="0.0" minY="20" maxX="0.0" maxY="20"/>
                        </collectionViewFlowLayout>
                        <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="Cell" id="ioT-sh-j8y" customClass="GridCollectionViewCell" customModule="Delta" customModuleProvider="target">
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="Cell" id="ioT-sh-j8y" customClass="GridCollectionViewCell" customModule="Retro_Game_Emulator" customModuleProvider="target">
                                <rect key="frame" x="0.0" y="20" width="100" height="100"/>
                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@ -85,7 +114,7 @@
                    </collectionView>
                    <connections>
                        <segue destination="X2o-q6-XD5" kind="unwind" identifier="unwindFromGames" unwindAction="unwindFromGamesViewControllerWith:" id="k8C-Xn-maU"/>
-                        <segue destination="MPk-bF-nkj" kind="presentation" identifier="saveStates" customClass="SaveStatesStoryboardSegue" customModule="Delta" customModuleProvider="target" id="1Xp-2J-0cq"/>
+                        <segue destination="MPk-bF-nkj" kind="presentation" identifier="saveStates" customClass="SaveStatesStoryboardSegue" customModule="Retro_Game_Emulator" customModuleProvider="target" id="1Xp-2J-0cq"/>
                        <segue destination="qdE-gb-V2e" kind="presentation" identifier="preferredControllerSkins" id="i6y-cP-3WM"/>
                        <segue destination="V2x-v0-jWm" kind="presentation" identifier="showDSSettings" id="kuV-tY-Y0B"/>
                    </connections>
@ -98,7 +127,7 @@
        <!--Launch View Controller-->
        <scene sceneID="p7y-IT-nlb">
            <objects>
-                <viewController id="SPq-Bk-fQl" customClass="LaunchViewController" customModule="Delta" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="SPq-Bk-fQl" customClass="LaunchViewController" customModule="Retro_Game_Emulator" customModuleProvider="target" sceneMemberID="viewController">
                    <layoutGuides>
                        <viewControllerLayoutGuide type="top" id="Qap-U8-zpQ"/>
                        <viewControllerLayoutGuide type="bottom" id="dca-QO-wba"/>
@ -117,12 +146,38 @@
                            <containerView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vf5-Iy-lAb" userLabel="Launch Screen">
                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" red="0.071399740870000006" green="0.082175157959999995" blue="0.10832635309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <connections>
                                    <segue destination="ibA-aC-X3M" kind="embed" id="fsv-uf-AOE"/>
                                </connections>
                            </containerView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mgn-IF-ax7">
+                                <rect key="frame" x="187.5" y="448" width="0.0" height="0.0"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="28"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.44999998807907104" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wnW-MB-udh">
+                                <rect key="frame" x="187.5" y="480" width="0.0" height="0.0"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="50O-wR-1hq">
+                                <rect key="frame" x="0.0" y="50" width="375" height="378"/>
+                            </imageView>
                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.071399740870000006" green="0.082175157959999995" blue="0.10832635309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="50O-wR-1hq" secondAttribute="trailing" id="2Xh-ZZ-Dbc"/>
+                            <constraint firstItem="50O-wR-1hq" firstAttribute="leading" secondItem="8jv-0a-ItC" secondAttribute="leading" id="6rJ-Cz-C3Z"/>
+                            <constraint firstItem="Mgn-IF-ax7" firstAttribute="centerX" secondItem="8jv-0a-ItC" secondAttribute="centerX" id="8kV-gZ-4TW"/>
+                            <constraint firstItem="50O-wR-1hq" firstAttribute="height" secondItem="8jv-0a-ItC" secondAttribute="height" multiplier="1.7:3" id="FTt-Ru-HhA"/>
+                            <constraint firstItem="wnW-MB-udh" firstAttribute="top" secondItem="Mgn-IF-ax7" secondAttribute="bottom" constant="32" id="IAR-im-kU7"/>
+                            <constraint firstItem="50O-wR-1hq" firstAttribute="top" secondItem="Qap-U8-zpQ" secondAttribute="bottom" constant="30" id="bo1-Am-BdP"/>
+                            <constraint firstItem="wnW-MB-udh" firstAttribute="centerX" secondItem="8jv-0a-ItC" secondAttribute="centerX" id="djF-KX-NgM"/>
+                            <constraint firstItem="Mgn-IF-ax7" firstAttribute="top" secondItem="50O-wR-1hq" secondAttribute="bottom" constant="20" id="igk-jf-lgM"/>
+                        </constraints>
                    </view>
                    <connections>
                        <outlet property="gameViewContainerView" destination="oBZ-xU-jeC" id="jMI-iF-JlU"/>
@ -143,7 +198,7 @@
        <!--Game View Controller-->
        <scene sceneID="ASV-Uk-0aP">
            <objects>
-                <viewController id="yhz-fF-D91" customClass="GameViewController" customModule="Delta" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="yhz-fF-D91" customClass="GameViewController" customModule="Retro_Game_Emulator" customModuleProvider="target" sceneMemberID="viewController">
                    <layoutGuides>
                        <viewControllerLayoutGuide type="top" id="ItC-Bu-WRI"/>
                        <viewControllerLayoutGuide type="bottom" id="g58-HO-6L5"/>
@ -151,12 +206,23 @@
                    <view key="view" contentMode="scaleToFill" id="skW-1S-YD4">
                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bg" translatesAutoresizingMaskIntoConstraints="NO" id="0b6-zE-QS0">
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.02214059979" green="0.092763282360000004" blue="0.18196243049999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="0b6-zE-QS0" secondAttribute="trailing" id="5n6-uA-WLa"/>
+                            <constraint firstItem="0b6-zE-QS0" firstAttribute="top" secondItem="ItC-Bu-WRI" secondAttribute="bottom" id="DTE-cg-9BW"/>
+                            <constraint firstItem="0b6-zE-QS0" firstAttribute="leading" secondItem="skW-1S-YD4" secondAttribute="leading" id="Ej3-6D-wcR"/>
+                            <constraint firstItem="g58-HO-6L5" firstAttribute="top" secondItem="0b6-zE-QS0" secondAttribute="bottom" id="ozO-Ni-qpr"/>
+                        </constraints>
                    </view>
                    <connections>
-                        <segue destination="Yrw-9v-Pcr" kind="presentation" identifier="pause" customClass="PauseStoryboardSegue" customModule="Delta" customModuleProvider="target" id="FLq-Zt-HDv"/>
-                        <segue destination="wKV-3d-NIY" kind="presentation" identifier="showGamesViewController" customClass="GamesStoryboardSegue" customModule="Delta" customModuleProvider="target" id="Tey-6Z-UHp"/>
-                        <segue destination="wKV-3d-NIY" kind="presentation" identifier="showInitialGamesViewController" customClass="InitialGamesStoryboardSegue" customModule="Delta" customModuleProvider="target" id="eR2-0c-0Rv"/>
+                        <segue destination="Yrw-9v-Pcr" kind="presentation" identifier="pause" customClass="PauseStoryboardSegue" customModule="Retro_Game_Emulator" customModuleProvider="target" id="FLq-Zt-HDv"/>
+                        <segue destination="wKV-3d-NIY" kind="presentation" identifier="showGamesViewController" customClass="GamesStoryboardSegue" customModule="Retro_Game_Emulator" customModuleProvider="target" id="Tey-6Z-UHp"/>
+                        <segue destination="wKV-3d-NIY" kind="presentation" identifier="showInitialGamesViewController" customClass="InitialGamesStoryboardSegue" customModule="Retro_Game_Emulator" customModuleProvider="target" id="eR2-0c-0Rv"/>
                    </connections>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="gxI-00-NlJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -174,10 +240,12 @@
        <!--Settings-->
        <scene sceneID="L3X-MM-hJL">
            <objects>
-                <viewControllerPlaceholder storyboardName="Settings" id="xMK-Cs-fAS" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="Settings" id="xMK-Cs-fAS" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="7yR-QM-2bX"/>
+                </viewControllerPlaceholder>
                <placeholder placeholderIdentifier="IBFirstResponder" id="2N5-3k-beA" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="1036" y="605"/>
+            <point key="canvasLocation" x="1578" y="774"/>
        </scene>
        <!--Navigation Controller-->
        <scene sceneID="zJI-sC-1sm">
@ -188,6 +256,8 @@
                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="wj9-1e-eev">
                        <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="barTintColor" red="0.032843004910000001" green="0.076728828250000006" blue="0.13726195690000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                    </navigationBar>
                    <nil name="viewControllers"/>
                    <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="M4r-sO-G4H">
@ -222,7 +292,7 @@
                    <nil name="viewControllers"/>
                    <connections>
                        <segue destination="Eae-Qk-9MI" kind="relationship" relationship="rootViewController" id="1Jh-Zf-ntp"/>
-                        <segue destination="WQV-Du-4IA" kind="unwind" identifier="unwindFromSaveStates" customClass="SaveStatesStoryboardUnwindSegue" customModule="Delta" customModuleProvider="target" unwindAction="unwindToGameCollectionViewController:" id="dwO-iv-XDr"/>
+                        <segue destination="WQV-Du-4IA" kind="unwind" identifier="unwindFromSaveStates" customClass="SaveStatesStoryboardUnwindSegue" customModule="Retro_Game_Emulator" customModuleProvider="target" unwindAction="unwindToGameCollectionViewController:" id="dwO-iv-XDr"/>
                    </connections>
                </navigationController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="htj-tq-2KP" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -277,29 +347,19 @@
                        <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
                        <autoresizingMask key="autoresizingMask"/>
                    </navigationBar>
-                    <connections>
-                        <segue destination="cFV-KV-B18" kind="relationship" relationship="rootViewController" id="VBP-fg-oNH"/>
-                    </connections>
                </navigationController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="Jo9-gl-p5p" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
            </objects>
            <point key="canvasLocation" x="2652" y="3085"/>
        </scene>
-        <!--dsSettingsViewController-->
-        <scene sceneID="anM-Cb-BaB">
-            <objects>
-                <viewControllerPlaceholder storyboardName="Settings" referencedIdentifier="dsSettingsViewController" id="cFV-KV-B18" sceneMemberID="viewController">
-                    <navigationItem key="navigationItem" id="Dkm-Hm-sQa"/>
-                </viewControllerPlaceholder>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="IS2-hO-HBN" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3258" y="3084"/>
-        </scene>
    </scenes>
    <inferredMetricsTieBreakers>
        <segue reference="Tey-6Z-UHp"/>
    </inferredMetricsTieBreakers>
    <resources>
-        <image name="SettingsButton" width="22" height="22"/>
+        <image name="addtwo" width="519" height="519"/>
+        <image name="bg" width="375" height="812"/>
+        <image name="home" width="92" height="37"/>
+        <image name="home_tab" width="384.5" height="109"/>
    </resources>
 </document>
--- a/Delta/Base.lproj/Settings.storyboard
+++ b/Delta/Base.lproj/Settings.storyboard
--- a/View/GridCollectionViewCell.swift
+++ b/View/GridCollectionViewCell.swift
@ -39,7 +39,7 @@ class GridCollectionViewCell: UICollectionViewCell
        }
    }
    
-    var maximumImageSize: CGSize = CGSize(width: 100, height: 100) {
+    var maximumImageSize: CGSize = CGSize(width: 150, height: 120) {
        didSet {
            self.updateMaximumImageSize()
        }
@ -109,13 +109,15 @@ class GridCollectionViewCell: UICollectionViewCell
        // Image View
        self.imageView.translatesAutoresizingMaskIntoConstraints = false
        
-        self.imageView.topAnchor.constraint(equalTo: self.contentView.topAnchor).isActive = true
-        self.imageView.centerXAnchor.constraint(equalTo: self.contentView.centerXAnchor).isActive = true
+        self.imageView.topAnchor.constraint(equalTo: self.vibrancyView.topAnchor).isActive = true
+        self.imageView.centerXAnchor.constraint(equalTo: self.vibrancyView.centerXAnchor).isActive = true
        
-        self.imageViewWidthConstraint = self.imageView.widthAnchor.constraint(equalToConstant: self.maximumImageSize.width)
+        self.imageViewWidthConstraint = self.imageView.widthAnchor.constraint(equalToConstant: 150)
        self.imageViewWidthConstraint.isActive = true
        
-        self.imageViewHeightConstraint = self.imageView.heightAnchor.constraint(equalToConstant: self.maximumImageSize.height)
+        self.imageViewHeightConstraint = self.imageView.heightAnchor.constraint(equalToConstant: 120)
+        
+        self.imageViewHeightConstraint.priority = UILayoutPriority(999) // Fixes "Unable to simultaneously satisfy constraints" runtime error when inserting new grid row.
        self.imageViewHeightConstraint.isActive = true
        
        
@ -181,10 +183,15 @@ private extension GridCollectionViewCell
 {
    func updateMaximumImageSize()
    {
-        self.imageViewWidthConstraint.constant = self.maximumImageSize.width
-        self.imageViewHeightConstraint.constant = self.maximumImageSize.height
+        self.imageViewWidthConstraint.constant = 150
+        self.imageViewHeightConstraint.constant = 120
        
        self.textLabelVerticalSpacingConstraint.constant = 8
        self.textLabelFocusedVerticalSpacingConstraint?.constant = self.maximumImageSize.height / 10.0
+        // 修改 textLabel 的固定高度为 30
+//              let textLabelFixedHeight: CGFloat = 30
+//              
+//              self.textLabelVerticalSpacingConstraint.constant = textLabelFixedHeight
+//              self.textLabelFocusedVerticalSpacingConstraint?.constant = textLabelFixedHeight / 50
    }
 }
--- a/View/GridCollectionViewLayout.swift
+++ b/View/GridCollectionViewLayout.swift
@ -50,7 +50,7 @@ class GridCollectionViewLayout: UICollectionViewFlowLayout
        return interitemSpacing
    }
    
-    private var cachedLayoutAttributes = [IndexPath: UICollectionViewLayoutAttributes]()
+    private var cachedCellLayoutAttributes = [IndexPath: UICollectionViewLayoutAttributes]()
    
    override var estimatedItemSize: CGSize {
        didSet {
@ -66,6 +66,18 @@ class GridCollectionViewLayout: UICollectionViewFlowLayout
        self.sectionInset.right = self.interitemSpacing + self.contentInset.right
    }
    
+    override func invalidateLayout(with context: UICollectionViewLayoutInvalidationContext)
+    {
+        super.invalidateLayout(with: context)
+        
+        if let context = context as? UICollectionViewFlowLayoutInvalidationContext,
+            context.invalidateFlowLayoutAttributes || context.invalidateFlowLayoutDelegateMetrics || context.invalidateEverything
+        {
+            // Clear layout cache to prevent crashing due to returning outdated layout attributes.
+            self.cachedCellLayoutAttributes = [:]
+        }
+    }
+    
    override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]?
    {
        let layoutAttributes = super.layoutAttributesForElements(in: rect)?.map({ $0.copy() }) as! [UICollectionViewLayoutAttributes]
@ -139,10 +151,10 @@ class GridCollectionViewLayout: UICollectionViewFlowLayout
            }
        }
        
-        for attributes in layoutAttributes
+        for attributes in layoutAttributes where attributes.representedElementCategory == .cell
        {
            // Update cached attributes for layoutAttributesForItem(at:)
-            self.cachedLayoutAttributes[attributes.indexPath] = attributes
+            self.cachedCellLayoutAttributes[attributes.indexPath] = attributes
        }
        
        return layoutAttributes
@ -150,7 +162,7 @@ class GridCollectionViewLayout: UICollectionViewFlowLayout
    
    override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes?
    {
-        if let cachedAttributes = self.cachedLayoutAttributes[indexPath]
+        if let cachedAttributes = self.cachedCellLayoutAttributes[indexPath]
        {
            return cachedAttributes
        }
--- a/Menu/PopoverMenuButton.swift
+++ b/Menu/PopoverMenuButton.swift
@ -17,7 +17,7 @@ extension UINavigationBar
        }
        
        // Make "copy" of self.
-        let navigationBar = UINavigationBar(frame: .zero)
+        let navigationBar = UINavigationBar(frame: self.bounds) // Use self.bounds to avoid "Unable to simultaneously satisfy constraints" runtime error.
        navigationBar.barStyle = self.barStyle
        
        // Set item with title so we can retrieve default text attributes.
@ -43,10 +43,20 @@ extension UINavigationBar
        
        let containerView: UIView
        
+        //TODO: Recursively search all subviews for title UILabel instead of hardcoded OS version-specific hierarchy traversals...
        if #available(iOS 16, *)
        {
            guard let titleControl = contentView.subviews.first(where: { NSStringFromClass(type(of: $0)).contains("Title") }) else { return nil }
-            containerView = titleControl
+            
+            if #available(iOS 17, *)
+            {
+                guard let view = titleControl.subviews.first else { return nil }
+                containerView = view
+            }
+            else
+            {
+                containerView = titleControl
+            }
        }
        else
        {
--- a/Delta/Database/DatabaseManager.swift
+++ b/Delta/Database/DatabaseManager.swift
@ -545,7 +545,7 @@ extension DatabaseManager
                            try FileManager.default.removeItem(at: outputURL)
                        }
                        
-                        _ = try archive.extract(entry, to: outputURL)
+                        _ = try archive.extract(entry, to: outputURL, skipCRC32: true)
                        
                        outputURLs.insert(outputURL)
                    }
--- a/Delta/Database/Model/Delta.xcdatamodeld/.xccurrentversion
+++ b/Delta/Database/Model/Delta.xcdatamodeld/.xccurrentversion
@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Delta 6.xcdatamodel</string>
+	<string>Delta 7.xcdatamodel</string>
 </dict>
 </plist>
--- a/Delta/Database/Model/Delta.xcdatamodeld/Delta
+++ b/Delta/Database/Model/Delta.xcdatamodeld/Delta
@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22158.8" systemVersion="22F66" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
+    <entity name="Cheat" representedClassName="Cheat" syncable="YES">
+        <attribute name="code" attributeType="String" syncable="YES"/>
+        <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="isEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="modifiedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="type" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="CheatType"/>
+            </userInfo>
+        </attribute>
+        <relationship name="game" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Game" inverseName="cheats" inverseEntity="Game" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="ControllerSkin" representedClassName="ControllerSkin" syncable="YES">
+        <attribute name="filename" attributeType="String" syncable="YES"/>
+        <attribute name="gameType" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="GameType"/>
+            </userInfo>
+        </attribute>
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="isStandard" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="supportedConfigurations" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueScalarType" value="ControllerSkinConfigurations"/>
+            </userInfo>
+        </attribute>
+        <relationship name="preferredLandscapeSkinByGames" toMany="YES" deletionRule="Nullify" destinationEntity="Game" inverseName="preferredLandscapeSkin" inverseEntity="Game" syncable="YES"/>
+        <relationship name="preferredPortraitSkinByGames" toMany="YES" deletionRule="Nullify" destinationEntity="Game" inverseName="preferredPortraitSkin" inverseEntity="Game" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+                <constraint value="gameType"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Game" representedClassName="Game" syncable="YES">
+        <attribute name="artworkURL" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="URL"/>
+            </userInfo>
+        </attribute>
+        <attribute name="filename" attributeType="String" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="NSURL"/>
+            </userInfo>
+        </attribute>
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="playedDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="type" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="GameType"/>
+            </userInfo>
+        </attribute>
+        <relationship name="cheats" toMany="YES" deletionRule="Cascade" destinationEntity="Cheat" inverseName="game" inverseEntity="Cheat" syncable="YES"/>
+        <relationship name="gameCollection" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="GameCollection" inverseName="games" inverseEntity="GameCollection" syncable="YES"/>
+        <relationship name="gameSave" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="GameSave" inverseName="game" inverseEntity="GameSave" syncable="YES"/>
+        <relationship name="preferredLandscapeSkin" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="ControllerSkin" inverseName="preferredLandscapeSkinByGames" inverseEntity="ControllerSkin" syncable="YES"/>
+        <relationship name="preferredPortraitSkin" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="ControllerSkin" inverseName="preferredPortraitSkinByGames" inverseEntity="ControllerSkin" syncable="YES"/>
+        <relationship name="previewSaveState" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SaveState" inverseName="previewGame" inverseEntity="SaveState" syncable="YES"/>
+        <relationship name="saveStates" toMany="YES" deletionRule="Cascade" destinationEntity="SaveState" inverseName="game" inverseEntity="SaveState" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="GameCollection" representedClassName="GameCollection" syncable="YES">
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="index" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="games" toMany="YES" deletionRule="Nullify" destinationEntity="Game" inverseName="gameCollection" inverseEntity="Game" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="GameControllerInputMapping" representedClassName="GameControllerInputMapping" syncable="YES">
+        <attribute name="deltaCoreInputMapping" attributeType="Transformable" valueTransformerName="GameControllerInputMappingTransformer" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="Any"/>
+            </userInfo>
+        </attribute>
+        <attribute name="gameControllerInputType" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="GameControllerInputType"/>
+            </userInfo>
+        </attribute>
+        <attribute name="gameType" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="GameType"/>
+            </userInfo>
+        </attribute>
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="playerIndex" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="gameControllerInputType"/>
+                <constraint value="gameType"/>
+                <constraint value="playerIndex"/>
+            </uniquenessConstraint>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="GameSave" representedClassName="GameSave" syncable="YES">
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="modifiedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="sha1" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="game" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Game" inverseName="gameSave" inverseEntity="Game" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="SaveState" representedClassName="SaveState" versionHashModifier="quick" syncable="YES">
+        <attribute name="coreIdentifier" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="filename" attributeType="String" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueClassName" value="NSURL"/>
+            </userInfo>
+        </attribute>
+        <attribute name="identifier" attributeType="String" syncable="YES"/>
+        <attribute name="modifiedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="type" attributeType="Integer 16" defaultValueString="2" usesScalarValueType="NO" syncable="YES">
+            <userInfo>
+                <entry key="attributeValueScalarType" value="SaveStateType"/>
+            </userInfo>
+        </attribute>
+        <relationship name="game" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Game" inverseName="saveStates" inverseEntity="Game" syncable="YES"/>
+        <relationship name="previewGame" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Game" inverseName="previewSaveState" inverseEntity="Game" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+</model>
--- a/Delta/Database/Model/Human/Cheat.swift
+++ b/Delta/Database/Model/Human/Cheat.swift
@ -53,4 +53,9 @@ extension Cheat: Syncable
    public var syncableLocalizedName: String? {
        return self.name
    }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }
--- a/Delta/Database/Model/Human/ControllerSkin.swift
+++ b/Delta/Database/Model/Human/ControllerSkin.swift
@ -13,16 +13,27 @@ import Harmony

 extension ControllerSkinConfigurations
 {
-    init(traits: DeltaCore.ControllerSkin.Traits)
+    init?(traits: DeltaCore.ControllerSkin.Traits)
    {
-        switch (traits.displayType, traits.orientation)
+        switch (traits.device, traits.displayType, traits.orientation)
        {
-        case (.standard, .portrait): self = .standardPortrait
-        case (.standard, .landscape): self = .standardLandscape
-        case (.edgeToEdge, .portrait): self = .edgeToEdgePortrait
-        case (.edgeToEdge, .landscape): self = .edgeToEdgeLandscape
-        case (.splitView, .portrait): self = .splitViewPortrait
-        case (.splitView, .landscape): self = .splitViewLandscape
+        case (.iphone, .standard, .portrait): self = .iphoneStandardPortrait
+        case (.iphone, .standard, .landscape): self = .iphoneStandardLandscape
+        case (.iphone, .edgeToEdge, .portrait): self = .iphoneEdgeToEdgePortrait
+        case (.iphone, .edgeToEdge, .landscape): self = .iphoneEdgeToEdgeLandscape
+        case (.iphone, .splitView, _): return nil
+            
+        case (.ipad, .standard, .portrait): self = .ipadStandardPortrait
+        case (.ipad, .standard, .landscape): self = .ipadStandardLandscape
+        case (.ipad, .edgeToEdge, .portrait): self = .ipadEdgeToEdgePortrait
+        case (.ipad, .edgeToEdge, .landscape): self = .ipadEdgeToEdgeLandscape
+        case (.ipad, .splitView, .portrait): self = .ipadSplitViewPortrait
+        case (.ipad, .splitView, .landscape): self = .ipadSplitViewLandscape
+            
+        case (.tv, .standard, .portrait): self = .tvStandardPortrait
+        case (.tv, .standard, .landscape): self = .tvStandardLandscape
+        case (.tv, .edgeToEdge, _): return nil
+        case (.tv, .splitView, _): return nil
        }
    }
 }
@ -90,6 +101,11 @@ extension ControllerSkin: ControllerSkinProtocol
    {
        return self.controllerSkin?.aspectRatio(for: traits)
    }
+    
+    public func contentSize(for traits: DeltaCore.ControllerSkin.Traits) -> CGSize?
+    {
+        return self.controllerSkin?.contentSize(for: traits)
+    }
 }

 extension ControllerSkin: Syncable
@ -113,4 +129,9 @@ extension ControllerSkin: Syncable
    public var syncableLocalizedName: String? {
        return self.name
    }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }
--- a/Delta/Database/Model/Human/Game.swift
+++ b/Delta/Database/Model/Human/Game.swift
@ -24,7 +24,7 @@ public class Game: _Game, GameProtocol
 {
    public var fileURL: URL {
        var fileURL: URL!
-        
+        //通过将指定的路径组件附加到 self 来返回 URL
        self.managedObjectContext?.performAndWait {
            fileURL = DatabaseManager.gamesDirectoryURL.appendingPathComponent(self.filename)
        }
@ -101,12 +101,18 @@ extension Game
        super.prepareForDeletion()
        
        guard let managedObjectContext = self.managedObjectContext else { return }
+                
+        // If filename == empty string (e.g. during merge), ignore this deletion.
+        // Otherwise, we may accidentally delete the entire Games directory!
+        guard !self.filename.isEmpty else { return }
        
        // If a game with the same identifier is also currently being inserted, Core Data is more than likely resolving a conflict by deleting the previous instance
        // In this case, we make sure we DON'T delete the game file + misc other Core Data relationships, or else we'll just lose all that data
        guard !managedObjectContext.insertedObjects.contains(where: { ($0 as? Game)?.identifier == self.identifier }) else { return }
        
-        guard FileManager.default.fileExists(atPath: self.fileURL.path) else { return }
+        // Double-check fileURL is NOT actually a directory, which we should never delete.
+        var isDirectory: ObjCBool = false
+        guard FileManager.default.fileExists(atPath: self.fileURL.path, isDirectory: &isDirectory), !isDirectory.boolValue else { return }
        
        do
        {
@ -193,4 +199,14 @@ extension Game: Syncable
    public var syncableLocalizedName: String? {
        return self.name
    }
+    
+    public func awakeFromSync(_ record: AnyRecord) throws
+    {
+        guard let gameCollection = self.gameCollection else { throw SyncValidationError.incorrectGameCollection(nil) }
+        
+        if gameCollection.identifier != self.type.rawValue
+        {
+            throw SyncValidationError.incorrectGameCollection(gameCollection.name)
+        }
+    }
 }
--- a/Delta/Database/Model/Human/GameSave.swift
+++ b/Delta/Database/Model/Human/GameSave.swift
@ -30,7 +30,7 @@ extension GameSave: Syncable
    }
    
    public var syncableKeys: Set<AnyKeyPath> {
-        return [\GameSave.modifiedDate]
+        return [\GameSave.modifiedDate, \GameSave.sha1]
    }
    
    public var syncableRelationships: Set<AnyKeyPath> {
@ -53,7 +53,9 @@ extension GameSave: Syncable
    
    public var syncableMetadata: [HarmonyMetadataKey : String] {
        guard let game = self.game else { return [:] }
-        return [.gameID: game.identifier, .gameName: game.name]
+        
+        // Use self.identifier to always link with exact matching game.
+        return [.gameID: self.identifier, .gameName: game.name]
    }
    
    public var syncableLocalizedName: String? {
@ -66,4 +68,49 @@ extension GameSave: Syncable
        
        return self.game?.identifier != Game.melonDSBIOSIdentifier && self.game?.identifier != Game.melonDSDSiBIOSIdentifier
    }
+    
+    public func awakeFromSync(_ record: AnyRecord) throws
+    {
+        do
+        {
+            guard let game = self.game else { throw SyncValidationError.incorrectGame(nil) }
+            
+            if game.identifier != self.identifier
+            {
+                let fetchRequest = GameSave.fetchRequest()
+                fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(GameSave.identifier), game.identifier)
+                
+                if let misplacedGameSave = try self.managedObjectContext?.fetch(fetchRequest).first, misplacedGameSave.game == nil
+                {
+                    // Relink game with its correct gameSave, in case we accidentally misplaced it.
+                    // Otherwise, corrupted records might displace already-downloaded GameSaves
+                    // due to automatic Core Data relationship propagation, despite us throwing error.
+                    game.gameSave = misplacedGameSave
+                }
+                else
+                {
+                    // Either there is no misplacedGameSave, or there is but it's linked to another game somehow.
+                    game.gameSave = nil
+                }
+                
+                throw SyncValidationError.incorrectGame(game.name)
+            }
+        }
+        catch let error as SyncValidationError
+        {
+            guard SyncManager.shared.ignoredCorruptedRecordIDs.contains(record.recordID) else { throw error }
+            
+            let fetchRequest = Game.fetchRequest()
+            fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(Game.identifier), self.identifier)
+            
+            if let correctGame = try self.managedObjectContext?.fetch(fetchRequest).first
+            {
+                self.game = correctGame
+            }
+            else
+            {
+                throw ValidationError.nilRelationshipObjects(keys: [#keyPath(GameSave.game)])
+            }
+        }
+    }
 }
--- a/Delta/Database/Model/Human/SaveState.swift
+++ b/Delta/Database/Model/Human/SaveState.swift
@ -134,30 +134,60 @@ extension SaveState: Syncable
    
    public var syncableMetadata: [HarmonyMetadataKey : String] {
        guard let game = self.game else { return [:] }
-        return [.gameID: game.identifier, .gameName: game.name, .coreID: self.coreIdentifier].compactMapValues { $0 }
+        return [.gameID: game.identifier, .gameName: game.name, .coreID: self.coreIdentifier, .verifiedGameID: game.identifier].compactMapValues { $0 }
    }
    
    public var syncableLocalizedName: String? {
        return self.localizedName
    }
    
-    public func awakeFromSync(_ record: AnyRecord)
+    public func awakeFromSync(_ record: AnyRecord) throws
    {
-        guard self.coreIdentifier == nil else { return }
-        guard let game = self.game, let system = System(gameType: game.type) else { return }
-           
-        if let coreIdentifier = record.remoteMetadata?[.coreID]
+        let verifiedGameID = record.remoteMetadata?[.verifiedGameID]
+        
+        do
        {
-            // SaveState was synced to older version of Delta and lost its coreIdentifier,
-            // but it remains in the remote metadata so we can reassign it.
-            self.coreIdentifier = coreIdentifier
-        }
-        else
-        {
-            switch system
+            guard let game = self.game else { return }
+            
+            if let system = System(gameType: game.type), self.coreIdentifier == nil
            {
-            case .ds: self.coreIdentifier = DS.core.identifier // Assume DS save state with nil coreIdentifier is from DeSmuME core.
-            default: self.coreIdentifier = system.deltaCore.identifier
+                if let coreIdentifier = record.remoteMetadata?[.coreID]
+                {
+                    // SaveState was synced to older version of Delta and lost its coreIdentifier,
+                    // but it remains in the remote metadata so we can reassign it.
+                    self.coreIdentifier = coreIdentifier
+                }
+                else
+                {
+                    switch system
+                    {
+                    case .ds: self.coreIdentifier = DS.core.identifier // Assume DS save state with nil coreIdentifier is from DeSmuME core.
+                    default: self.coreIdentifier = system.deltaCore.identifier
+                    }
+                }
+            }
+            
+            if let verifiedGameID, verifiedGameID != game.identifier
+            {
+                // Game does not match verified game ID, which most likely means
+                // this SaveState was reviewed + fixed on another device, but not uploaded.
+                throw SyncValidationError.incorrectGame(game.name)
+            }
+        }
+        catch let error as SyncValidationError
+        {
+            guard let verifiedGameID, SyncManager.shared.ignoredCorruptedRecordIDs.contains(record.recordID) else { throw error }
+            
+            let fetchRequest = Game.fetchRequest()
+            fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(Game.identifier), verifiedGameID)
+            
+            if let correctGame = try self.managedObjectContext?.fetch(fetchRequest).first
+            {
+                self.game = correctGame
+            }
+            else
+            {
+                throw ValidationError.nilRelationshipObjects(keys: [#keyPath(GameSave.game)])
            }
        }
    }
--- a/Delta/Database/Model/Machine/_GameSave.swift
+++ b/Delta/Database/Model/Machine/_GameSave.swift
@ -18,6 +18,8 @@ public class _GameSave: NSManagedObject

    @NSManaged public var modifiedDate: Date

+    @NSManaged public var sha1: String?
+
    // MARK: - Relationships

    @NSManaged public var game: Game?
--- a/Delta/Database/Model/Migrations/Delta6ToDelta7.xcmappingmodel/xcmapping.xml
+++ b/Delta/Database/Model/Migrations/Delta6ToDelta7.xcmappingmodel/xcmapping.xml
--- a/Delta/Database/Model/Misc/ControllerSkinConfigurations.h
+++ b/Delta/Database/Model/Misc/ControllerSkinConfigurations.h
@ -9,16 +9,35 @@
 #ifndef ControllerSkinConfigurations_h
 #define ControllerSkinConfigurations_h

+// Every possible (supported) combination of traits.
 typedef NS_OPTIONS(int16_t, ControllerSkinConfigurations)
 {
-    ControllerSkinConfigurationStandardPortrait   = 1 << 0,
-    ControllerSkinConfigurationStandardLandscape  = 1 << 1,
+    /* iPhone */
+    ControllerSkinConfigurationiPhoneStandardPortrait NS_SWIFT_NAME(iphoneStandardPortrait)        = 1 << 0,
+    ControllerSkinConfigurationiPhoneStandardLandscape NS_SWIFT_NAME(iphoneStandardLandscape)      = 1 << 1,
    
-    ControllerSkinConfigurationSplitViewPortrait    = 1 << 2,
-    ControllerSkinConfigurationSplitViewLandscape   = 1 << 3,
+    // iPhone doesn't support Split View
+    // ControllerSkinConfigurationiPhoneSplitViewPortrait                                          = 1 << 2,
+    // ControllerSkinConfigurationiPhoneSplitViewLandscape                                         = 1 << 3,
    
-    ControllerSkinConfigurationEdgeToEdgePortrait    = 1 << 4,
-    ControllerSkinConfigurationEdgeToEdgeLandscape   = 1 << 5,
+    ControllerSkinConfigurationiPhoneEdgeToEdgePortrait NS_SWIFT_NAME(iphoneEdgeToEdgePortrait)    = 1 << 4,
+    ControllerSkinConfigurationiPhoneEdgeToEdgeLandscape NS_SWIFT_NAME(iphoneEdgeToEdgeLandscape)  = 1 << 5,
+    
+    
+    /* iPad */
+    ControllerSkinConfigurationiPadStandardPortrait NS_SWIFT_NAME(ipadStandardPortrait)            = 1 << 6,
+    ControllerSkinConfigurationiPadStandardLandscape NS_SWIFT_NAME(ipadStandardLandscape)          = 1 << 7,
+
+    ControllerSkinConfigurationiPadSplitViewPortrait NS_SWIFT_NAME(ipadSplitViewPortrait)          = 1 << 2, // Backwards compatible with legacy ControllerSkinConfigurationSplitViewPortrait
+    ControllerSkinConfigurationiPadSplitViewLandscape NS_SWIFT_NAME(ipadSplitViewLandscape)        = 1 << 3, // Backwards compatible with legacy ControllerSkinConfigurationSplitViewLandscape
+    
+    ControllerSkinConfigurationiPadEdgeToEdgePortrait NS_SWIFT_NAME(ipadEdgeToEdgePortrait)        = 1 << 8,
+    ControllerSkinConfigurationiPadEdgeToEdgeLandscape NS_SWIFT_NAME(ipadEdgeToEdgeLandscape)      = 1 << 9,
+    
+    
+    /* TV */
+    ControllerSkinConfigurationTVStandardPortrait                                                  = 1 << 10,
+    ControllerSkinConfigurationTVStandardLandscape                                                 = 1 << 11,
 };

 #endif /* ControllerSkinConfigurations_h */
--- a/Delta/Database/Repair/GamePickerViewController.swift
+++ b/Delta/Database/Repair/GamePickerViewController.swift
@ -0,0 +1,126 @@
+//
+//  GamePickerViewController.swift
+//  Delta
+//
+//  Created by Riley Testut on 8/4/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import UIKit
+
+import Roxas
+
+class GamePickerViewController: UITableViewController
+{
+    private lazy var dataSource = self.makeDataSource()
+    
+    var gameHandler: ((Game?) -> Void)?
+    
+    init()
+    {
+        super.init(style: .insetGrouped)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad()
+    {
+        super.viewDidLoad()
+        
+        self.navigationController?.delegate = self
+        
+        self.dataSource.proxy = self
+        self.tableView.dataSource = self.dataSource
+        self.tableView.prefetchDataSource = self.dataSource
+        
+        self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: RSTCellContentGenericCellIdentifier)
+        
+        self.navigationItem.title = NSLocalizedString("Choose Game", comment: "")
+        self.navigationItem.searchController = self.dataSource.searchController
+        self.navigationItem.hidesSearchBarWhenScrolling = false
+    }
+}
+
+private extension GamePickerViewController
+{
+    func makeDataSource() -> RSTFetchedResultsTableViewPrefetchingDataSource<Game, UIImage>
+    {
+        let fetchRequest = Game.fetchRequest()
+        fetchRequest.propertiesToFetch = [#keyPath(Game.name), #keyPath(Game.identifier), #keyPath(Game.artworkURL)]
+        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \Game.gameCollection?.index, ascending: true), NSSortDescriptor(keyPath: \Game.name, ascending: true)]
+        
+        let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: #keyPath(Game.gameCollection.name), cacheName: nil)
+        let dataSource = RSTFetchedResultsTableViewPrefetchingDataSource<Game, UIImage>(fetchedResultsController: fetchedResultsController)
+        dataSource.cellConfigurationHandler = { (cell, game, indexPath) in
+            var configuration = UIListContentConfiguration.valueCell()
+            configuration.prefersSideBySideTextAndSecondaryText = false
+            
+            configuration.text = game.name
+            
+            configuration.secondaryText = game.identifier
+            configuration.secondaryTextProperties.font = .preferredFont(forTextStyle: .caption1)
+            
+            configuration.image = UIImage(named: "BoxArt")
+            configuration.imageProperties.maximumSize = CGSize(width: 48, height: 48)
+            configuration.imageProperties.reservedLayoutSize = CGSize(width: 48, height: 48)
+            configuration.imageProperties.cornerRadius = 4
+            
+            cell.contentConfiguration = configuration
+        }
+        dataSource.prefetchHandler = { (game, indexPath, completionHandler) in
+            guard let artworkURL = game.artworkURL else {
+                completionHandler(nil, nil)
+                return nil
+            }
+            
+            let imageOperation = LoadImageURLOperation(url: artworkURL)
+            imageOperation.resultHandler = { (image, error) in
+                completionHandler(image, error)
+            }
+            
+            return imageOperation
+        }
+        dataSource.prefetchCompletionHandler = { (cell, image, indexPath, error) in
+            guard let image = image, var config = cell.contentConfiguration as? UIListContentConfiguration else { return }
+            config.image = image
+            cell.contentConfiguration = config
+        }
+        
+        dataSource.searchController.searchableKeyPaths = [#keyPath(Game.name), #keyPath(Game.identifier)]
+        
+        return dataSource
+    }
+}
+
+extension GamePickerViewController
+{
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath)
+    {
+        let game = self.dataSource.item(at: indexPath)
+        self.gameHandler?(game)
+        
+        self.navigationController?.delegate = nil // Prevent calling navigationController(_:willShow:)
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String?
+    {
+        guard let section = self.dataSource.fetchedResultsController.sections?[section], !section.name.isEmpty else {
+            return NSLocalizedString("Unknown System", comment: "")
+        }
+        
+        return section.name
+    }
+}
+
+extension GamePickerViewController: UINavigationControllerDelegate
+{
+    func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool)
+    {
+        guard viewController != self else { return }
+        
+        self.gameHandler?(nil)
+    }
+}
--- a/Delta/Database/Repair/RepairDatabaseViewController.swift
+++ b/Delta/Database/Repair/RepairDatabaseViewController.swift
@ -0,0 +1,479 @@
+//
+//  RepairDatabaseViewController.swift
+//  Delta
+//
+//  Created by Riley Testut on 8/4/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import UIKit
+import OSLog
+
+import DeltaCore
+
+import Roxas
+import Harmony
+
+private extension String
+{
+    func sanitizedFilePath() -> String
+    {
+        let sanitizedFilePath = self.components(separatedBy: .urlFilenameAllowed.inverted).joined()
+        return sanitizedFilePath
+    }
+}
+
+class RepairDatabaseViewController: UIViewController
+{
+    var completionHandler: (() -> Void)?
+    
+    private var _viewDidAppear = false
+    
+    private lazy var managedObjectContext = DatabaseManager.shared.newBackgroundSavingViewContext()
+    private lazy var gameSavesContext = DatabaseManager.shared.newBackgroundContext(withParent: self.managedObjectContext)
+    
+    private var gamesByID: [String: Game]?
+    
+    private lazy var backupsDirectory = FileManager.default.documentsDirectory.appendingPathComponent("Backups")
+    private lazy var gameSavesDirectory = DatabaseManager.gamesDirectoryURL
+    
+    override func viewDidLoad()
+    {
+        super.viewDidLoad()
+        
+        self.view.backgroundColor = .systemBackground
+        
+        self.isModalInPresentation = true
+        
+        let placeholderView = RSTPlaceholderView()
+        placeholderView.textLabel.text = NSLocalizedString("Verifying Database…", comment: "")
+        placeholderView.detailTextLabel.text = nil
+        placeholderView.activityIndicatorView.startAnimating()
+        placeholderView.stackView.spacing = 15
+        self.view.addSubview(placeholderView, pinningEdgesWith: .zero)
+    }
+    
+    override func viewDidAppear(_ animated: Bool)
+    {
+        super.viewDidAppear(animated)
+        
+        if !_viewDidAppear
+        {
+            self.repairDatabase()
+        }
+        
+        _viewDidAppear = true
+    }
+}
+
+private extension RepairDatabaseViewController
+{
+    func repairDatabase()
+    {
+        Logger.database.info("Begin repairing database...")
+        
+        self.repairGames { result in
+            switch result
+            {
+            case .failure(let error):
+                DispatchQueue.main.async {
+                    let alertController = UIAlertController(title: "Unable to Repair Games", error: error)
+                    self.present(alertController, animated: true)
+                }
+                
+            case .success:
+                self.repairGameSaves { result in
+                    DispatchQueue.main.async {
+                        switch result
+                        {
+                        case .failure(let error):
+                            let alertController = UIAlertController(title: "Unable to Repair Save Files", error: error)
+                            self.present(alertController, animated: true)
+                            
+                        case .success:
+                            self.showReviewViewController()
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    func repairGames(completion: @escaping (Result<Void, Error>) -> Void)
+    {
+        self.managedObjectContext.perform {
+            do
+            {
+                let fetchRequest = Game.fetchRequest()
+                fetchRequest.propertiesToFetch = [#keyPath(Game.type)]
+                fetchRequest.relationshipKeyPathsForPrefetching = [#keyPath(Game.gameCollection)]
+                
+                let allGames = try self.managedObjectContext.fetch(fetchRequest)
+                let affectedGames = allGames.filter { $0.type.rawValue != $0.gameCollection?.identifier }
+                
+                let gameCollections = try self.managedObjectContext.fetch(GameCollection.fetchRequest())
+                let gameCollectionsByID = gameCollections.reduce(into: [:]) { $0[$1.identifier] = $1 }
+                
+                for game in affectedGames
+                {
+                    let gameCollection = gameCollectionsByID[game.type.rawValue]
+                    game.gameCollection = gameCollection
+                    
+                    Logger.database.notice("Re-associating “\(game.name, privacy: .public)” with GameCollection: \(gameCollection?.identifier ?? "nil", privacy: .public)")
+                }
+                
+                try self.managedObjectContext.save()
+                
+                completion(.success)
+            }
+            catch
+            {
+                completion(.failure(error))
+            }
+        }
+    }
+    
+    func repairGameSaves(completion: @escaping (Result<Void, Error>) -> Void)
+    {
+        self.managedObjectContext.perform {
+            do
+            {
+                // Fetch GameSaves that don't have same identifier as their Game,
+                // OR GameSaves that have a non-nil SHA1 hash.
+                //
+                // This covers GameSaves connected to wrong games and GameSaves with nil Games,
+                // as well as any GameSaves modified since last beta (which we assume are corrupted).
+                
+                let fetchRequest = GameSave.fetchRequest()
+                fetchRequest.predicate = NSPredicate(format: "(%K == nil) OR (%K != %K) OR (%K != nil)",
+                                                     #keyPath(GameSave.game),
+                                                     #keyPath(GameSave.identifier), #keyPath(GameSave.game.identifier),
+                                                     #keyPath(GameSave.sha1))
+                
+                let gameSaves = try self.managedObjectContext.fetch(fetchRequest)
+                let gameSavesByID = gameSaves.reduce(into: [:]) { $0[$1.identifier] = $1 }
+                
+                let gamesFetchRequest = Game.fetchRequest()
+                gamesFetchRequest.predicate = NSPredicate(format: "%K IN %@", #keyPath(Game.identifier), Set(gameSavesByID.keys))
+                
+                let games = try self.managedObjectContext.fetch(gamesFetchRequest)
+                self.gamesByID = games.reduce(into: [:]) { $0[$1.identifier] = $1 }
+                
+                let savesBackupsDirectory = self.backupsDirectory.appendingPathComponent("Saves")
+                try FileManager.default.createDirectory(at: savesBackupsDirectory, withIntermediateDirectories: true)
+                
+                var conflictedGames = Set<Game>()
+                
+                for gameSave in gameSaves
+                {
+                    let expectedGame = self.repair(gameSave, backupsDirectory: savesBackupsDirectory)
+                    
+                    // At this point, gameSave is only updated in gameSavesContext,
+                    // so gameSave here still points to previous game,
+                    
+                    if let game = gameSave.game
+                    {
+                        Logger.database.notice("The save file for “\(game.name, privacy: .public)” is potentially corrupted, writing to conflicts.txt")
+                        conflictedGames.insert(game)
+                    }
+                    
+                    if let expectedGame
+                    {
+                        Logger.database.notice("The save file for “\(expectedGame.name, privacy: .public)” is potentially corrupted, writing to conflicts.txt")
+                        conflictedGames.insert(expectedGame)
+                    }
+                }
+                
+                try self.gameSavesContext.performAndWait {
+                    try self.gameSavesContext.save()
+                }
+                
+                try self.managedObjectContext.save()
+                
+                let outputURL = self.backupsDirectory.appendingPathComponent("conflicts.txt")
+                
+                let conflictsLog = conflictedGames.map { $0.name + " (" + $0.identifier + ")" }.sorted().joined(separator: "\n")
+                try conflictsLog.write(to: outputURL, atomically: true, encoding: .utf8)
+                
+                completion(.success)
+            }
+            catch
+            {
+                completion(.failure(error))
+            }
+        }
+    }
+    
+    // Returns expectedGame, but in managedObjectContext (not gameSavesContext)
+    func repair(_ gameSave: GameSave, backupsDirectory: URL) -> Game?
+    {
+        Logger.database.notice("Repairing GameSave \(gameSave.identifier, privacy: .public)...")
+        
+        guard let expectedGame = self.gamesByID?[gameSave.identifier] else {
+            // Game doesn't exist, so we'll back up save file and delete record.
+            
+            Logger.database.warning("Orphaning GameSave \(gameSave.identifier, privacy: .public) due to no matching game.")
+            
+            do
+            {
+                try self.backup(gameSave, for: nil, to: backupsDirectory)
+            }
+            catch
+            {
+                Logger.database.error("Failed to back up save file for orphaned GameSave \(gameSave.identifier, privacy: .public). \(error, privacy: .public)")
+            }
+            
+            self.gameSavesContext.performAndWait {
+                let gameSave = self.gameSavesContext.object(with: gameSave.objectID) as! GameSave
+                gameSave.game = nil
+            }
+            
+            return nil
+        }
+        
+        let misplacedGameSave: GameSave?
+        if let otherGameSave = expectedGame.gameSave, otherGameSave != gameSave
+        {
+            misplacedGameSave = otherGameSave
+            
+            Logger.database.info("GameSave \(gameSave.identifier, privacy: .public) will misplace \(otherGameSave.identifier, privacy: .public)")
+        }
+        else
+        {
+            misplacedGameSave = nil
+        }
+        
+        do
+        {
+            // Back up the save file gameSave (incorrectly) refers to, but name it after the _expected_ game.
+            try self.backup(gameSave, for: expectedGame, to: backupsDirectory)
+        }
+        catch
+        {
+            Logger.database.error("Failed to back up save file for GameSave \(gameSave.identifier, privacy: .public). Expected Game: \(expectedGame.identifier). \(error, privacy: .public)")
+        }
+        
+        // Ignore error if we can't hash file, not that big a deal.
+        let hash = try? RSTHasher.sha1HashOfFile(at: expectedGame.gameSaveURL)
+        
+        // Make changes on separate context so we don't change any relationships until we're finished.
+        // This allows us to refer to previous relationships.
+        self.gameSavesContext.performAndWait {
+            let gameSave = self.gameSavesContext.object(with: gameSave.objectID) as! GameSave
+            let expectedGame = self.gameSavesContext.object(with: expectedGame.objectID) as! Game
+            let misplacedGameSave: GameSave? = misplacedGameSave.map { self.gameSavesContext.object(with: $0.objectID) as! GameSave }
+            
+            if hash == gameSave.sha1
+            {
+                // .sav has same hash as GameSave SHA1,
+                // so we can relink without changes.
+                
+                Logger.database.info("GameSave \(gameSave.identifier, privacy: .public)'s hash matches .sav, relinking without changes.")
+            }
+            else if let misplacedGameSave
+            {
+                // GameSave data differs from actual .sav file,
+                // so copy metadata from misplacedGameSave.
+                
+                Logger.database.info("GameSave \(gameSave.identifier, privacy: .public)'s hash does NOT match .sav, ignoring misplaced GameSave \(misplacedGameSave.identifier, privacy: .public).")
+                
+                // Not worth potential conflicts.
+                // gameSave.sha1 = misplacedGameSave.sha1
+                // gameSave.modifiedDate = misplacedGameSave.modifiedDate
+            }
+            else
+            {
+                // GameSave data differs from actual .sav file,
+                // so copy metadata from disk.
+                Logger.database.info("GameSave \(gameSave.identifier, privacy: .public)'s hash does NOT match .sav, ignoring.")
+                
+                // Not worth potential conflicts.
+                // let modifiedDate = try? FileManager.default.attributesOfItem(atPath: expectedGame.gameSaveURL.path)[.modificationDate] as? Date
+                // gameSave.sha1 = hash
+                // gameSave.modifiedDate = modifiedDate ?? Date()
+            }
+            
+            gameSave.game = expectedGame
+        }
+        
+        return expectedGame
+    }
+    
+    func backup(_ gameSave: GameSave, for expectedGame: Game?, to backupsDirectory: URL) throws
+    {
+        Logger.database.notice("Backing up GameSave \(gameSave.identifier, privacy: .public). Expected Game: \(expectedGame?.name ?? "nil", privacy: .public)")
+        
+        if let game = gameSave.game
+        {
+            // GameSave is linked with incorrect game.
+            
+            // Prefer using expectedGame's saveFileExtension over game's.
+            let saveFileExtension: String
+            if let deltaCore = Delta.core(for: expectedGame?.type ?? game.type)
+            {
+                saveFileExtension = deltaCore.gameSaveFileExtension
+            }
+            else
+            {
+                saveFileExtension = "sav"
+            }
+            
+            // 1. Backup existing file at `game`'s expected save file location
+            if FileManager.default.fileExists(atPath: game.gameSaveURL.path)
+            {
+                // Filename = expectedGame.name? + game.identifier
+                
+                let filename: String
+                if let expectedGame
+                {
+                    filename = expectedGame.name + "_" + game.identifier
+                }
+                else
+                {
+                    filename = game.identifier
+                }
+                
+                let sanitizedFilename = filename.sanitizedFilePath()
+                
+                let destinationURL = backupsDirectory.appendingPathComponent(sanitizedFilename).appendingPathExtension(saveFileExtension)
+                try FileManager.default.copyItem(at: game.gameSaveURL, to: destinationURL, shouldReplace: true)
+                
+                Logger.database.notice("Backed up save file \(game.gameSaveURL.lastPathComponent, privacy: .public) to \(destinationURL.lastPathComponent, privacy: .public)")
+                
+                let rtcFileURL = game.gameSaveURL.deletingPathExtension().appendingPathExtension("rtc")
+                if FileManager.default.fileExists(atPath: rtcFileURL.path)
+                {
+                    let destinationURL = backupsDirectory.appendingPathComponent(sanitizedFilename).appendingPathExtension("rtc")
+                    try FileManager.default.copyItem(at: rtcFileURL, to: destinationURL, shouldReplace: true)
+                    
+                    Logger.database.notice("Backed up RTC save file \(rtcFileURL.lastPathComponent, privacy: .public) to \(destinationURL.lastPathComponent, privacy: .public)")
+                }
+            }
+            
+            // 2. Backup existing file at `expectedGame`'s save file location
+            if let expectedGame, FileManager.default.fileExists(atPath: expectedGame.gameSaveURL.path)
+            {
+                // Filename = expectedGame.name + (misplacedGameSave.identifier ?? expectedGame.identifier)
+                
+                let filename = expectedGame.name + "_" + (expectedGame.gameSave?.identifier ?? expectedGame.identifier)
+                let sanitizedFilename = filename.sanitizedFilePath()
+                
+                let destinationURL = backupsDirectory.appendingPathComponent(sanitizedFilename).appendingPathExtension(saveFileExtension)
+                try FileManager.default.copyItem(at: expectedGame.gameSaveURL, to: destinationURL, shouldReplace: true)
+                
+                Logger.database.notice("Backed up expected save file \(expectedGame.gameSaveURL.lastPathComponent, privacy: .public) to \(destinationURL.lastPathComponent, privacy: .public)")
+                
+                let rtcFileURL = expectedGame.gameSaveURL.deletingPathExtension().appendingPathExtension("rtc")
+                if FileManager.default.fileExists(atPath: rtcFileURL.path)
+                {
+                    let destinationURL = backupsDirectory.appendingPathComponent(sanitizedFilename).appendingPathExtension("rtc")
+                    try FileManager.default.copyItem(at: rtcFileURL, to: destinationURL, shouldReplace: true)
+                    
+                    Logger.database.notice("Backed up expected RTC save file \(rtcFileURL.lastPathComponent, privacy: .public) to \(destinationURL.lastPathComponent, privacy: .public)")
+                }
+            }
+        }
+        else
+        {
+            @discardableResult
+            func backUp(_ saveFileURL: URL) throws -> Bool
+            {
+                guard FileManager.default.fileExists(atPath: saveFileURL.path) else { return false }
+                
+                // Filename = expectedGame.name? + gameSave.identifier
+                
+                let filename: String
+                if let expectedGame
+                {
+                    filename = expectedGame.name + "_" + gameSave.identifier
+                }
+                else
+                {
+                    filename = gameSave.identifier
+                }
+                
+                let sanitizedFilename = filename.sanitizedFilePath()
+                
+                let destinationURL = backupsDirectory.appendingPathComponent(sanitizedFilename).appendingPathExtension(saveFileURL.pathExtension)
+                try FileManager.default.copyItem(at: saveFileURL, to: destinationURL, shouldReplace: true)
+                
+                Logger.database.notice("Backed up discovered save file \(saveFileURL.lastPathComponent, privacy: .public) to \(destinationURL.lastPathComponent, privacy: .public)")
+                
+                return true
+            }
+            
+            // GameSave is _not_ linked to a Game, so instead we iterate through all save files on disk to find match.
+            let savURL = self.gameSavesDirectory.appendingPathComponent(gameSave.identifier).appendingPathExtension("sav")
+            let srmURL = self.gameSavesDirectory.appendingPathComponent(gameSave.identifier).appendingPathExtension("srm")
+            let dsvURL = self.gameSavesDirectory.appendingPathComponent(gameSave.identifier).appendingPathExtension("dsv")
+            
+            let saveFileURLs = [savURL, srmURL, dsvURL]
+            for saveFileURL in saveFileURLs
+            {
+                if try backUp(saveFileURL)
+                {
+                    break
+                }
+            }
+            
+            // ALWAYS attempt to back up RTC file.
+            let rtcURL = self.gameSavesDirectory.appendingPathComponent(gameSave.identifier).appendingPathExtension("rtc")
+            try backUp(rtcURL)
+        }
+    }
+    
+    func showReviewViewController()
+    {
+        Logger.database.info("Finished repairing Games and GameSaves, reviewing recent SaveStates...")
+        
+        let viewController = ReviewSaveStatesViewController()
+        viewController.filter = .sinceLastBeta
+        viewController.completionHandler = { [weak self] in
+            self?.finish()
+        }
+        self.navigationController?.pushViewController(viewController, animated: true)
+    }
+    
+    func finish()
+    {
+        Logger.database.info("Finished repairing database!")
+        
+        DispatchQueue.global(qos: .userInitiated).async {
+            if #available(iOS 15, *)
+            {
+                do
+                {
+                    let store = try OSLogStore(scope: .currentProcessIdentifier)
+                    
+                    // All logs since the app launched.
+                    let position = store.position(timeIntervalSinceLatestBoot: 0)
+                    
+                    let entries = try store.getEntries(at: position)
+                        .compactMap { $0 as? OSLogEntryLog }
+                        .filter { $0.subsystem == Logger.deltaSubsystem || $0.subsystem == Logger.harmonySubsystem }
+                        .map { "[\($0.date.formatted())] [\($0.level.localizedName)] \($0.composedMessage)" }
+                                    
+                    let outputURL = self.backupsDirectory.appendingPathComponent("repair.log")
+                    try FileManager.default.createDirectory(at: self.backupsDirectory, withIntermediateDirectories: true)
+                    
+                    let outputText = entries.joined(separator: "\n")
+                    try outputText.write(to: outputURL, atomically: true, encoding: .utf8)
+                }
+                catch
+                {
+                    print("Failed to export Harmony logs.", error)
+                }
+            }
+            
+            DispatchQueue.main.async {
+                let alertController = UIAlertController(title: NSLocalizedString("Database Repaired", comment: ""),
+                                                        message: NSLocalizedString("Some save files may still be corrupted and require you to restore an older version from the Delta Sync settings.\n\nA text file listing all affected games has been saved to “On My Device/Delta/Backups/conflicts.txt” in the Files app, alongside backups of any conflicted save files.", comment: ""),
+                                                        preferredStyle: .alert)
+                alertController.addAction(UIAlertAction(title: UIAlertAction.ok.title, style: UIAlertAction.ok.style) { _ in
+                    self.completionHandler?()
+                })
+                self.present(alertController, animated: true)
+            }
+        }
+    }
+}
--- a/Delta/Database/Repair/ReviewSaveStatesViewController.swift
+++ b/Delta/Database/Repair/ReviewSaveStatesViewController.swift
@ -0,0 +1,377 @@
+//
+//  ReviewSaveStatesViewController.swift
+//  Delta
+//
+//  Created by Riley Testut on 8/4/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import UIKit
+import OSLog
+
+import Harmony
+import Roxas
+
+extension ReviewSaveStatesViewController
+{
+    enum Filter
+    {
+        case recent
+        case all
+        case sinceLastBeta
+    }
+}
+
+extension RecordFlags
+{
+    static let isGameRelationshipVerified = RecordFlags(rawValue: 1 << 0)
+}
+
+class ReviewSaveStatesViewController: UITableViewController
+{
+    var filter: Filter = .recent {
+        didSet {
+            self.updateDataSource()
+        }
+    }
+    
+    var completionHandler: (() -> Void)?
+    
+    private lazy var managedObjectContext = DatabaseManager.shared.newBackgroundSavingViewContext()
+    
+    private lazy var dataSource = self.makeDataSource()
+    private lazy var descriptionDataSource = self.makeDescriptionDataSource()
+    private lazy var saveStatesDataSource = self.makeSaveStatesDataSource()
+    
+    private weak var _parentNavigationController: UINavigationController?
+    
+    init()
+    {
+        super.init(style: .insetGrouped)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad()
+    {
+        super.viewDidLoad()
+                
+        self.dataSource.proxy = self
+        self.tableView.dataSource = self.dataSource
+        self.tableView.prefetchDataSource = self.dataSource
+        
+        self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: RSTCellContentGenericCellIdentifier)
+        
+        let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(ReviewSaveStatesViewController.finish))
+        self.navigationItem.rightBarButtonItem = doneButton
+        
+        self.navigationItem.title = NSLocalizedString("Review Save States", comment: "")
+        
+        // Disable going back to RepairDatabaseViewController.
+        self.navigationItem.setHidesBackButton(true, animated: false)
+        self.navigationController?.interactivePopGestureRecognizer?.isEnabled = false
+    }
+    
+    override func viewWillAppear(_ animated: Bool)
+    {
+        super.viewWillAppear(animated)
+        
+        if let parent = self.parent, parent.navigationItem.title == nil
+        {
+            // Must change parent's navigationItem when we're contained in SwiftUI View.
+            parent.navigationItem.title = NSLocalizedString("Review Save States", comment: "")
+            parent.navigationItem.rightBarButtonItem = self.makeFilterButton()
+        }
+    }
+    
+    override func viewWillDisappear(_ animated: Bool)
+    {
+        super.viewWillDisappear(animated)
+        
+        _parentNavigationController = self.parent?.navigationController
+    }
+    
+    override func viewDidDisappear(_ animated: Bool)
+    {
+        super.viewDidDisappear(animated)
+        
+        switch self.filter
+        {
+        case .all, .recent:
+            if self.parent == nil || self.parent?.parent == nil
+            {
+                // Only finish if we're popped off navigation controller.
+                self.finish()
+            }
+            
+        case .sinceLastBeta: break
+        }
+    }
+}
+
+private extension ReviewSaveStatesViewController
+{
+    func makeDataSource() -> RSTCompositeTableViewPrefetchingDataSource<SaveState, UIImage>
+    {
+        let dataSource = RSTCompositeTableViewPrefetchingDataSource<SaveState, UIImage>(dataSources: [self.descriptionDataSource, self.saveStatesDataSource])
+        return dataSource
+    }
+    
+    func makeDescriptionDataSource() -> RSTDynamicTableViewPrefetchingDataSource<SaveState, UIImage>
+    {
+        let dataSource = RSTDynamicTableViewPrefetchingDataSource<SaveState, UIImage>()
+        dataSource.numberOfSectionsHandler = { 1 }
+        dataSource.numberOfItemsHandler = { _ in 0 }
+        return dataSource
+    }
+    
+    func makeSaveStatesDataSource() -> RSTFetchedResultsTableViewPrefetchingDataSource<SaveState, UIImage>
+    {
+        let fetchedResultsController = self.makeSaveStatesFetchedResultsController()
+        
+        let dataSource = RSTFetchedResultsTableViewPrefetchingDataSource<SaveState, UIImage>(fetchedResultsController: fetchedResultsController)
+        dataSource.cellConfigurationHandler = { (cell, saveState, indexPath) in
+            var configuration = UIListContentConfiguration.valueCell()
+            configuration.prefersSideBySideTextAndSecondaryText = false
+            
+            let fontDescriptor = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .body).withSymbolicTraits(.traitBold) ?? .preferredFontDescriptor(withTextStyle: .body)
+            configuration.text = saveState.name ?? NSLocalizedString("Untitled", comment: "")
+            configuration.textProperties.font = UIFont(descriptor: fontDescriptor, size: 0)
+            
+            configuration.secondaryText = SaveState.localizedDateFormatter.string(from: saveState.modifiedDate)
+            configuration.secondaryTextProperties.font = .preferredFont(forTextStyle: .caption1)
+            
+            configuration.image = nil
+            configuration.imageProperties.maximumSize = CGSize(width: 80, height: 80)
+            configuration.imageProperties.reservedLayoutSize = CGSize(width: 80, height: 80)
+            configuration.imageProperties.cornerRadius = 6
+            
+            cell.contentConfiguration = configuration
+            
+            cell.accessoryType = .disclosureIndicator
+        }
+        dataSource.prefetchHandler = { (saveState, indexPath, completionHandler) in
+            guard saveState.game != nil else {
+                completionHandler(nil, nil)
+                return nil
+            }
+            
+            let imageOperation = LoadImageURLOperation(url: saveState.imageFileURL)
+            imageOperation.resultHandler = { (image, error) in
+                completionHandler(image, error)
+            }
+                        
+            if self.isAppearing
+            {
+                imageOperation.start()
+                imageOperation.waitUntilFinished()
+                return nil
+            }
+            
+            return imageOperation
+        }
+        dataSource.prefetchCompletionHandler = { (cell, image, indexPath, error) in
+            guard let image = image, var config = cell.contentConfiguration as? UIListContentConfiguration else { return }
+            config.image = image
+            cell.contentConfiguration = config
+        }
+        
+        return dataSource
+    }
+    
+    func makeSaveStatesFetchedResultsController() -> NSFetchedResultsController<SaveState>
+    {
+        let fetchRequest = SaveState.fetchRequest()
+        fetchRequest.returnsObjectsAsFaults = false
+        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \SaveState.game?.name, ascending: true), NSSortDescriptor(keyPath: \SaveState.modifiedDate, ascending: false)]
+        
+        let predicate = NSPredicate(format: "%K != %@", #keyPath(SaveState.type), SaveStateType.auto.rawValue as NSNumber)
+        
+        switch self.filter
+        {
+        case .recent:
+            let oneMonthAgo = Calendar.current.date(byAdding: .month, value: -1, to: Date()) ?? Date().addingTimeInterval(-1 * 60 * 60 * 24 * 30)
+            let recentPredicate = NSPredicate(format: "%K > %@", #keyPath(SaveState.modifiedDate), oneMonthAgo as NSDate)
+            
+            fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, recentPredicate])
+            
+        case .all:
+            fetchRequest.predicate = predicate
+            
+        case .sinceLastBeta:
+            let dateComponents = DateComponents(year: 2023, month: 7, day: 18, hour: 0, minute: 0, second: 0)
+            let lastBetaDate = Calendar.current.date(from: dateComponents) ?? Date().addingTimeInterval(-1 * 60 * 60 * 24 * 45)
+            
+            let sinceLastBetaPredicate = NSPredicate(format: "%K > %@", #keyPath(SaveState.modifiedDate), lastBetaDate as NSDate)
+            fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, sinceLastBetaPredicate])
+        }
+        
+        let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: self.managedObjectContext, sectionNameKeyPath: #keyPath(SaveState.game.name), cacheName: nil)
+        return fetchedResultsController
+    }
+    
+    func updateDataSource()
+    {
+        let fetchedResultsController = self.makeSaveStatesFetchedResultsController()
+        self.saveStatesDataSource.fetchedResultsController = fetchedResultsController
+    }
+    
+    func makeFilterButton() -> UIBarButtonItem
+    {
+        let recentAction = UIAction(title: NSLocalizedString("Past Month", comment: ""), image: UIImage(systemName: "calendar")) { [weak self] _ in
+            self?.filter = .recent
+        }
+        let allAction = UIAction(title: NSLocalizedString("All Time", comment: ""), image: UIImage(systemName: "clock")) { [weak self] _ in
+            self?.filter = .all
+        }
+        
+        var options: UIMenu.Options = []
+        if #available(iOS 15, *)
+        {
+            options = .singleSelection
+            
+            recentAction.state = self.filter == .recent ? .on : .off
+            allAction.state = self.filter == .all ? .on : .off
+        }
+        
+        let filterMenu = UIMenu(options: options, children: [recentAction, allAction])
+        
+        let filterButton = UIBarButtonItem(title: NSLocalizedString("Filter", comment: ""), image: UIImage(systemName: "calendar.badge.clock"), menu: filterMenu)
+        return filterButton
+    }
+}
+
+private extension ReviewSaveStatesViewController
+{
+    func pickGame(for saveState: SaveState)
+    {
+        let gamePickerViewController = GamePickerViewController()
+        gamePickerViewController.gameHandler = { game in
+            guard let game else { return }
+            
+            let previousGame = saveState.game
+            if previousGame != nil
+            {
+                // Move files to new location.
+                
+                let destinationDirectory = DatabaseManager.saveStatesDirectoryURL(for: game)
+                
+                for fileURL in [saveState.fileURL, saveState.imageFileURL]
+                {
+                    guard FileManager.default.fileExists(atPath: fileURL.path) else { continue }
+                    
+                    let destinationURL = destinationDirectory.appendingPathComponent(fileURL.lastPathComponent)
+                    
+                    do
+                    {
+                        try FileManager.default.copyItem(at: fileURL, to: destinationURL, shouldReplace: true) // Copy, don't move, in case app quits before user confirms.
+                    }
+                    catch
+                    {
+                        Logger.database.error("Failed to copy SaveState “\(saveState.localizedName, privacy: .public)” from \(fileURL, privacy: .public) to \(destinationURL, privacy: .public). \(error.localizedDescription, privacy: .public)")
+                    }
+                }
+            }
+            
+            let tempGame = self.managedObjectContext.object(with: game.objectID) as! Game
+            saveState.game = tempGame
+            
+            Logger.database.notice("Re-associated SaveState “\(saveState.localizedName, privacy: .public)” with game “\(tempGame.name, privacy: .public)”. Previously: \(previousGame?.name ?? "nil", privacy: .public)")
+        }
+        
+        self.navigationController?.pushViewController(gamePickerViewController, animated: true)
+    }
+    
+    @objc func finish()
+    {
+        self.navigationItem.rightBarButtonItem?.isIndicatingActivity = true
+        
+        self.managedObjectContext.perform {
+            do
+            {
+                let saveStates: [SaveState]?
+                
+                switch self.filter
+                {
+                case .recent, .all:
+                    // Only upload metadata for changed SaveStates.
+                    saveStates = self.managedObjectContext.updatedObjects.compactMap { $0 as? SaveState }
+                    
+                case .sinceLastBeta:
+                    // Upload metadata for _all_ SaveStates.
+                    saveStates = self.saveStatesDataSource.fetchedResultsController.fetchedObjects
+                }
+                
+                try self.managedObjectContext.save()
+                
+                if let saveStates = saveStates, let coordinator = SyncManager.shared.coordinator
+                {
+                    let records = try coordinator.recordController.fetchRecords(for: saveStates)
+                    if let context = records.first?.recordedObject?.managedObjectContext
+                    {
+                        try context.performAndWait {
+                            for record in records
+                            {
+                                record.perform { managedRecord in
+                                    managedRecord.flags.insert(.isGameRelationshipVerified)
+                                    managedRecord.setNeedsMetadataUpdate()
+                                    
+                                    let saveState = record.recordedObject
+                                    Logger.database.notice("Flagged SaveState “\(saveState?.localizedName ?? record.recordID.identifier, privacy: .public)” for metadata update.")
+                                }
+                            }
+                            
+                            try context.save()
+                        }
+                    }
+                }
+                
+                DispatchQueue.main.async {
+                    self.completionHandler?()
+                }
+            }
+            catch
+            {
+                DispatchQueue.main.async {
+                    self.navigationItem.rightBarButtonItem?.isIndicatingActivity = false
+                    
+                    let alertController = UIAlertController(title: NSLocalizedString("Unable to Save Changes", comment: ""), error: error)
+                    (self._parentNavigationController ?? self).present(alertController, animated: true)
+                }
+            }
+        }
+    }
+}
+
+extension ReviewSaveStatesViewController
+{
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath)
+    {
+        let saveState = self.dataSource.item(at: indexPath)
+        self.pickGame(for: saveState)
+    }
+    
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String?
+    {
+        if section == 0
+        {
+            return nil
+        }
+        else
+        {
+            let section = section - 1
+            
+            guard let gameName = self.saveStatesDataSource.fetchedResultsController.sections?[section].name else { return NSLocalizedString("Unknown Game", comment: "") }
+            return gameName
+        }
+    }
+    
+    override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String?
+    {
+        guard section == 0 else { return nil }
+        
+        return NSLocalizedString("These save states have been modified recently and may be associated with the wrong game.\n\nPlease change any incorrectly associated save states to the correct game by tapping them.", comment: "")
+    }
+}
--- a/Delta/Emulation/GameViewController.swift
+++ b/Delta/Emulation/GameViewController.swift
@ -7,6 +7,7 @@
 //

 import UIKit
+import Photos

 import DeltaCore
 import GBADeltaCore
@ -61,6 +62,7 @@ private extension GameViewController
            }
            
            // Only intercept controller skin inputs.
+            // 只拦截控制器皮肤输入。
            guard controllerInput.type == .controller(.controllerSkin) else { return nil }
            
            let actionInput = ActionInput(stringValue: controllerInput.stringValue)
@ -91,6 +93,7 @@ private extension GameViewController
 class GameViewController: DeltaCore.GameViewController
 {
    /// Assumed to be Delta.Game instance
+    /// /// 假设为 Delta.Game 实例
    override var game: GameProtocol? {
        willSet {
            self.emulatorCore?.removeObserver(self, forKeyPath: #keyPath(EmulatorCore.state), context: &kvoContext)
@ -180,6 +183,14 @@ class GameViewController: DeltaCore.GameViewController
        return .all
    }
    
+    override var prefersStatusBarHidden: Bool {
+        return !ExperimentalFeatures.shared.showStatusBar.isEnabled
+    }
+    
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+        return .lightContent
+    }
+    
    required init()
    {
        super.init()
@ -203,7 +214,7 @@ class GameViewController: DeltaCore.GameViewController
        
        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.didEnterBackground(with:)), name: UIApplication.didEnterBackgroundNotification, object: UIApplication.shared)
        
-        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.settingsDidChange(with:)), name: .settingsDidChange, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.settingsDidChange(with:)), name: Settings.didChangeNotification, object: nil)
        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.deepLinkControllerLaunchGame(with:)), name: .deepLinkControllerLaunchGame, object: nil)
        
        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.didActivateGyro(with:)), name: GBA.didActivateGyroNotification, object: nil)
@ -212,6 +223,9 @@ class GameViewController: DeltaCore.GameViewController
        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.emulationDidQuit(with:)), name: EmulatorCore.emulationDidQuitNotification, object: nil)
        
        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.didEnableJIT(with:)), name: ServerManager.didEnableJITNotification, object: nil)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.sceneWillConnect(with:)), name: UIScene.willConnectNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(GameViewController.sceneDidDisconnect(with:)), name: UIScene.didDisconnectNotification, object: nil)
    }
    
    deinit
@ -404,6 +418,9 @@ extension GameViewController
            pauseViewController.fastForwardItem?.action = { [unowned self] item in
                self.performFastForwardAction(activate: item.isSelected)
            }
+            pauseViewController.screenshotItem?.action = { [unowned self] item in
+                self.performScreenshotAction()
+            }
            
            pauseViewController.sustainButtonsItem?.isSelected = gameController.sustainedInputs.count > 0
            pauseViewController.sustainButtonsItem?.action = { [unowned self, unowned pauseViewController] item in
@ -667,6 +684,12 @@ private extension GameViewController
        {
            var touchControllerSkin = TouchControllerSkin(controllerSkin: controllerSkin)
            
+            if UIApplication.shared.isExternalDisplayConnected
+            {
+                // Only show touch screen if external display is connected.
+                touchControllerSkin.screenPredicate = { $0.isTouchScreen }
+            }
+                        
            if self.view.bounds.width > self.view.bounds.height
            {
                touchControllerSkin.screenLayoutAxis = .horizontal
@ -679,8 +702,45 @@ private extension GameViewController
            self.controllerView.controllerSkin = touchControllerSkin
        }
        
+        self.updateExternalDisplay()
+        
        self.view.setNeedsLayout()
    }
+    
+    func updateGameViews()
+    {
+        if UIApplication.shared.isExternalDisplayConnected
+        {
+            // AirPlaying, hide all (non-touch) screens.
+            
+            if let traits = self.controllerView.controllerSkinTraits, let screens = self.controllerView.controllerSkin?.screens(for: traits)
+            {
+                for (screen, gameView) in zip(screens, self.gameViews)
+                {
+                    gameView.isEnabled = screen.isTouchScreen
+                    gameView.isHidden = !screen.isTouchScreen
+                }
+            }
+            else
+            {
+                // Either self.controllerView.controllerSkin is `nil`, or it doesn't support these traits.
+                // Most likely this system only has 1 screen, so just hide self.gameView.
+                
+                self.gameView.isEnabled = false
+                self.gameView.isHidden = true
+            }
+        }
+        else
+        {
+            // Not AirPlaying, show all screens.
+            
+            for gameView in self.gameViews
+            {
+                gameView.isEnabled = true
+                gameView.isHidden = false
+            }
+        }
+    }
 }

 //MARK: - Game Saves -
@ -697,23 +757,30 @@ private extension GameViewController
                let game = context.object(with: game.objectID) as! Game
                
                let hash = try RSTHasher.sha1HashOfFile(at: game.gameSaveURL)
-                let previousHash = game.gameSaveURL.extendedAttribute(name: "com.rileytestut.delta.sha1Hash")
+                let previousHash = game.gameSave?.sha1
                
                guard hash != previousHash else { return }
                
                if let gameSave = game.gameSave
                {
                    gameSave.modifiedDate = Date()
+                    gameSave.sha1 = hash
                }
                else
                {
                    let gameSave = GameSave(context: context)
                    gameSave.identifier = game.identifier
+                    gameSave.sha1 = hash
+                    
                    game.gameSave = gameSave
                }
                
                try context.save()
-                try game.gameSaveURL.setExtendedAttribute(name: "com.rileytestut.delta.sha1Hash", value: hash)
+                
+                if ExperimentalFeatures.shared.toastNotifications.gameSaveEnabled
+                {
+                    self.presentExperimentalToastView(NSLocalizedString("Game Data Saved", comment: ""))
+                }
            }
            catch CocoaError.fileNoSuchFile
            {
@ -832,6 +899,12 @@ extension GameViewController: SaveStatesViewControllerDelegate
        saveState.modifiedDate = Date()
        saveState.coreIdentifier = self.emulatorCore?.deltaCore.identifier
        
+        if ExperimentalFeatures.shared.toastNotifications.stateSaveEnabled,
+           saveState.type != .auto
+        {
+            self.presentExperimentalToastView(NSLocalizedString("Saved Save State", comment: ""))
+        }
+        
        if isRunning
        {
            self.resumeEmulation()
@ -879,6 +952,11 @@ extension GameViewController: SaveStatesViewControllerDelegate
            {
                try self.emulatorCore?.load(saveState)
            }
+            
+            if ExperimentalFeatures.shared.toastNotifications.stateLoadEnabled
+            {
+                self.presentExperimentalToastView(NSLocalizedString("Loaded Save State", comment: ""))
+            }
        }
        catch EmulatorCore.SaveStateError.doesNotExist
        {
@ -1063,13 +1141,190 @@ extension GameViewController
        
        if activate
        {
-            emulatorCore.rate = emulatorCore.deltaCore.supportedRates.upperBound
+            if ExperimentalFeatures.shared.variableFastForward.isEnabled,
+               let preferredSpeed = ExperimentalFeatures.shared.variableFastForward[emulatorCore.game.type],
+               (preferredSpeed.rawValue <= emulatorCore.deltaCore.supportedRates.upperBound || ExperimentalFeatures.shared.variableFastForward.allowUnrestrictedSpeeds)
+            {
+                emulatorCore.rate = preferredSpeed.rawValue
+            }
+            else
+            {
+                emulatorCore.rate = emulatorCore.deltaCore.supportedRates.upperBound
+            }
+            
+            if ExperimentalFeatures.shared.toastNotifications.fastForwardEnabled
+            {
+                self.presentExperimentalToastView(NSLocalizedString("Fast Forward Enabled", comment: ""))
+            }
        }
        else
        {
            emulatorCore.rate = emulatorCore.deltaCore.supportedRates.lowerBound
+            
+            if ExperimentalFeatures.shared.toastNotifications.fastForwardEnabled
+            {
+                self.presentExperimentalToastView(NSLocalizedString("Fast Forward Disabled", comment: ""))
+            }
        }
    }
+    
+    func performScreenshotAction()
+    {
+        guard let snapshot = self.emulatorCore?.videoManager.snapshot() else { return }
+
+        let imageScale = ExperimentalFeatures.shared.gameScreenshots.size?.rawValue ?? 1.0
+        let imageSize = CGSize(width: snapshot.size.width * imageScale, height: snapshot.size.height * imageScale)
+        
+        let screenshotData: Data
+        if imageScale == 1, let data = snapshot.pngData()
+        {
+            // No need to redraw image because it's already the correct size.
+            screenshotData = data
+        }
+        else
+        {
+            let format = UIGraphicsImageRendererFormat()
+            format.scale = 1
+            
+            let renderer = UIGraphicsImageRenderer(size: imageSize, format: format)
+            screenshotData = renderer.pngData { (context) in
+                context.cgContext.interpolationQuality = .none
+                snapshot.draw(in: CGRect(origin: .zero, size: imageSize))
+            }
+        }
+        
+        if ExperimentalFeatures.shared.gameScreenshots.saveToPhotos
+        {
+            PHPhotoLibrary.runIfAuthorized
+            {
+                PHPhotoLibrary.saveImageData(screenshotData)
+            }
+        }
+        
+        if ExperimentalFeatures.shared.gameScreenshots.saveToFiles
+        {
+            let screenshotsDirectory = FileManager.default.documentsDirectory.appendingPathComponent("Screenshots")
+            
+            do
+            {
+                try FileManager.default.createDirectory(at: screenshotsDirectory, withIntermediateDirectories: true, attributes: nil)
+            }
+            catch
+            {
+                print(error)
+            }
+            
+            let date = Date()
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateFormat = "yyyy-MM-dd_HH-mm-ss"
+            
+            let fileName: URL
+            if let game = self.game as? Game
+            {
+                let filename = game.name + "_" + dateFormatter.string(from: date) + ".png"
+                fileName = screenshotsDirectory.appendingPathComponent(filename)
+            }
+            else
+            {
+                fileName = screenshotsDirectory.appendingPathComponent(dateFormatter.string(from: date) + ".png")
+            }
+            
+            do
+            {
+                try screenshotData.write(to: fileName)
+            }
+            catch
+            {
+                print(error)
+            }
+        }
+        
+        self.pauseViewController?.screenshotItem?.isSelected = false
+    }
+}
+
+private extension GameViewController
+{
+    func connectExternalDisplay(for scene: ExternalDisplayScene)
+    {
+        // We need to receive gameViewController(_:didUpdateGameViews) callback.
+        scene.gameViewController.delegate = self
+        
+        self.updateControllerSkin()
+        
+        // Implicitly called from updateControllerSkin()
+        // self.updateExternalDisplay()
+    }
+    
+    func updateExternalDisplay()
+    {
+        guard let scene = UIApplication.shared.externalDisplayScene else { return }
+        
+        if scene.game?.fileURL != self.game?.fileURL
+        {
+            scene.game = self.game
+        }
+        
+        var controllerSkin: ControllerSkinProtocol?
+        
+        if let game = self.game, let traits = scene.gameViewController.controllerView.controllerSkinTraits
+        {
+            if ExperimentalFeatures.shared.airPlaySkins.isEnabled,
+               let preferredControllerSkin = ExperimentalFeatures.shared.airPlaySkins.preferredAirPlayControllerSkin(for: game.type), preferredControllerSkin.supports(traits)
+            {
+                // Use preferredControllerSkin directly.
+                controllerSkin = preferredControllerSkin
+            }
+            else if let standardSkin = DeltaCore.ControllerSkin.standardControllerSkin(for: game.type), standardSkin.supports(traits)
+            {
+                if standardSkin.hasTouchScreen(for: traits)
+                {
+                    // Only use TouchControllerSkin for standard controller skins with touch screens.
+                    
+                    var touchControllerSkin = DeltaCore.TouchControllerSkin(controllerSkin: standardSkin)
+                    touchControllerSkin.screenLayoutAxis = Settings.features.dsAirPlay.layoutAxis
+
+                    if Settings.features.dsAirPlay.topScreenOnly
+                    {
+                        touchControllerSkin.screenPredicate = { !$0.isTouchScreen }
+                    }
+
+                    controllerSkin = touchControllerSkin
+                }
+                else
+                {
+                    controllerSkin = standardSkin
+                }
+            }
+        }
+        
+        scene.gameViewController.controllerView.controllerSkin = controllerSkin
+        
+        // Implicitly called when assigning controllerSkin.
+        // self.updateExternalDisplayGameViews()
+    }
+    
+    func updateExternalDisplayGameViews()
+    {
+        guard let scene = UIApplication.shared.externalDisplayScene, let emulatorCore = self.emulatorCore else { return }
+        
+        for gameView in scene.gameViewController.gameViews
+        {
+            emulatorCore.add(gameView)
+        }
+    }
+    
+    func disconnectExternalDisplay(for scene: ExternalDisplayScene)
+    {
+        scene.gameViewController.delegate = nil
+        
+        for gameView in scene.gameViewController.gameViews
+        {
+            self.emulatorCore?.remove(gameView)
+        }
+        
+        self.updateControllerSkin() // Reset TouchControllerSkin + GameViews
+    }
 }

 //MARK: - GameViewControllerDelegate -
@ -1078,6 +1333,8 @@ extension GameViewController: GameViewControllerDelegate
 {
    func gameViewController(_ gameViewController: DeltaCore.GameViewController, handleMenuInputFrom gameController: GameController)
    {
+        guard gameViewController == self else { return }
+        
        if let pausingGameController = self.pausingGameController
        {
            guard pausingGameController == gameController else { return }
@ -1103,6 +1360,8 @@ extension GameViewController: GameViewControllerDelegate
    
    func gameViewControllerShouldResumeEmulation(_ gameViewController: DeltaCore.GameViewController) -> Bool
    {
+        guard gameViewController == self else { return false }
+        
        var result = false
        
        rst_dispatch_sync_on_main_thread {
@ -1111,6 +1370,20 @@ extension GameViewController: GameViewControllerDelegate
        
        return result
    }
+    
+    func gameViewController(_ gameViewController: DeltaCore.GameViewController, didUpdateGameViews gameViews: [GameView])
+    {
+        // gameViewController could be `self` or ExternalDisplayScene.gameViewController.
+        
+        if gameViewController == self
+        {
+            self.updateGameViews()
+        }
+        else
+        {
+            self.updateExternalDisplayGameViews()
+        }
+    }
 }

 private extension GameViewController
@ -1212,6 +1485,17 @@ private extension GameViewController
            self.updateAudio()
                
        case .syncingService, .isAltJITEnabled: break
+            
+        case Settings.features.dsAirPlay.$topScreenOnly.settingsKey: fallthrough
+        case Settings.features.dsAirPlay.$layoutAxis.settingsKey:
+            self.updateExternalDisplay()
+        
+        case ExperimentalFeatures.shared.airPlaySkins.settingsKey: fallthrough
+        case _ where settingsName.rawValue.hasPrefix(ExperimentalFeatures.shared.airPlaySkins.settingsKey.rawValue):
+            // Update whenever any of the AirPlay skins have changed.
+            self.updateExternalDisplay()
+            
+        default: break
        }
    }
    
@ -1362,6 +1646,18 @@ private extension GameViewController
            }
        }
    }
+    
+    @objc func sceneWillConnect(with notification: Notification)
+    {
+        guard let scene = notification.object as? ExternalDisplayScene else { return }
+        self.connectExternalDisplay(for: scene)
+    }
+    
+    @objc func sceneDidDisconnect(with notification: Notification)
+    {
+        guard let scene = notification.object as? ExternalDisplayScene else { return }
+        self.disconnectExternalDisplay(for: scene)
+    }
 }

 private extension UserDefaults
--- a/Delta/Emulation/PreviewGameViewController.swift
+++ b/Delta/Emulation/PreviewGameViewController.swift
@ -15,12 +15,15 @@ private var kvoContext = 0
 class PreviewGameViewController: DeltaCore.GameViewController
 {
    // If non-nil, will override the default preview action items returned in previewActionItems()
+    // 如果非nil，将覆盖previewActionItems()中返回的默认预览操作项
    var overridePreviewActionItems: [UIPreviewActionItem]?
    
    // Save state to be loaded upon preview
+    // 保存预览时加载的状态
    var previewSaveState: SaveStateProtocol?
    
    // Initial image to be shown while loading
+    // 加载时显示的初始图像
    var previewImage: UIImage? {
        didSet {
            self.updatePreviewImage()
@ -78,6 +81,8 @@ class PreviewGameViewController: DeltaCore.GameViewController
    {
        // Explicitly stop emulatorCore _before_ we remove ourselves as observer
        // so we can wait until stopped before restoring save files (again).
+        // 在我们删除自己作为观察者之前显式停止 emulatorCore
+                // 所以我们可以等到停止后再恢复保存文件（再次）。
        self.emulatorCore?.stop()
        
        self.emulatorCore?.removeObserver(self, forKeyPath: #keyPath(EmulatorCore.state), context: &kvoContext)
@ -93,9 +98,10 @@ extension PreviewGameViewController
        super.viewDidLoad()
        
        self.controllerView.isHidden = true
-        self.controllerView.controllerSkin = nil // Skip loading controller skin from disk, which may be slow.
+        self.controllerView.controllerSkin = nil // Skip loading controller skin from disk, which may be slow.跳过从磁盘加载控制器皮肤，这可能会很慢。
        
        // Temporarily prevent emulatorCore from updating gameView to prevent flicker of black, or other visual glitches
+        // 暂时阻止 emulatorCore 更新 gameView 以防止黑色闪烁或其他视觉故障
        self.emulatorCore?.remove(self.gameView)
    }
    
@ -120,6 +126,7 @@ extension PreviewGameViewController
        super.viewWillDisappear(animated)
        
        // Pause in viewWillDisappear and not viewDidDisappear like DeltaCore.GameViewController so the audio cuts off earlier if being dismissed
+        // 在 viewWillDisappear 中暂停，而不是像 DeltaCore.GameViewController 那样在 viewDidDisappear 中暂停，因此如果被关闭，音频会更早切断
        self.emulatorCore?.pause()
    }
    
@ -128,10 +135,13 @@ extension PreviewGameViewController
        super.viewDidDisappear(animated)
        
        // Already stopped = we've already restored save files and removed directory.
+        // 已经停止 = 我们已经恢复了保存文件并删除了目录。
        if self.emulatorCore?.state != .stopped
        {
            // Pre-emptively restore save files in case something goes wrong while stopping emulation.
            // This also ensures if the core is never stopped (for some reason), saves are still restored.
+            // 抢先恢复保存文件，以防在停止仿真时出现问题。
+                        // 这也确保如果核心从未停止（由于某种原因），保存仍然可以恢复。
            self.restoreSaveFiles(removeCopyDirectory: false)
        }
    }
@ -141,6 +151,8 @@ extension PreviewGameViewController
        super.viewDidLayoutSubviews()
        
        // Need to update in viewDidLayoutSubviews() to ensure bounds of gameView are not CGRect.zero
+        
+        // 需要在 viewDidLayoutSubviews() 中进行更新以确保 gameView 的边界不是 CGRect.zero
        self.updatePreviewImage()
    }

@ -148,6 +160,7 @@ extension PreviewGameViewController
    {
        super.didReceiveMemoryWarning()
        // Dispose of any resources that can be recreated.
+        // 处理掉所有可以重新创建的资源。
    }
    
    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?)
@ -165,6 +178,7 @@ extension PreviewGameViewController
        case .running where previousState == .stopped:
            self.emulatorCoreQueue.async {
                // Pause to prevent it from starting before visible (in case user peeked slowly)
+                // 暂停以防止它在可见之前启动（以防用户缓慢地偷看）
                self.emulatorCore?.pause()
                self.preparePreview()
            }
@ -172,6 +186,8 @@ extension PreviewGameViewController
        case .stopped:
            // Emulation has stopped, so we can safely restore save files,
            // and also remove the directory they were copied to.
+            // 模拟已停止，因此我们可以安全地恢复保存文件，
+                        // 并删除它们复制到的目录。
            self.restoreSaveFiles(removeCopyDirectory: true)
            
        default: break
@ -224,6 +240,7 @@ private extension PreviewGameViewController
        self.emulatorCore?.updateCheats()
        
        // Re-enable emulatorCore to update gameView again
+        // 重新启用emulatorCore以再次更新gameView
        self.emulatorCore?.add(self.gameView)
        
        self.emulatorCore?.resume()
--- a/Features/ExperimentalFeatures.swift
+++ b/Features/ExperimentalFeatures.swift
@ -0,0 +1,53 @@
+//
+//  ExperimentalFeatures.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/6/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import DeltaFeatures
+
+struct ExperimentalFeatures: FeatureContainer
+{
+    static let shared = ExperimentalFeatures()
+    
+    @Feature(name: "AirPlay Skins",
+             description: "Customize the appearance of games when AirPlaying to your TV.",
+             options: AirPlaySkinsOptions())
+    var airPlaySkins
+    
+    @Feature(name: "Variable Fast Forward",
+             description: "Change the preferred Fast Foward speed per-system. You can also change it by long-pressing the Fast Forward button from the Pause Menu.",
+             options: VariableFastForwardOptions())
+    var variableFastForward
+    
+    @Feature(name: "Show Status Bar",
+             description: "Enable to show the Status Bar during gameplay.")
+    var showStatusBar
+    
+    @Feature(name: "Game Screenshots",
+             description: "When enabled, a Screenshot button will appear in the Pause Menu, allowing you to save a screenshot of your game. You can choose to save the screenshot to Photos or Files.",
+             options: GameScreenshotsOptions())
+    var gameScreenshots
+    
+    @Feature(name: "Toast Notifications",
+             description: "Show toast notifications as a confirmation for various actions, such as saving your game or loading a save state.",
+             options: ToastNotificationOptions())
+    var toastNotifications
+    
+    @Feature(name: "Review Save States",
+             description: "Review recent Save States to make sure they are associated with the correct game.",
+             options: ReviewSaveStatesOptions())
+    var reviewSaveStates
+    
+    @Feature(name: "Alternate App Icon",
+             description: "Change the app icon.",
+             options: AlternateAppIconOptions())
+    var alternateAppIcons
+    
+    private init()
+    {
+        self.prepareFeatures()
+    }
+}
--- a/Features/Features/AirPlaySkins.swift
+++ b/Features/Features/AirPlaySkins.swift
@ -0,0 +1,167 @@
+//
+//  AirPlaySkins.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/20/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaFeatures
+import DeltaCore
+
+extension Feature where Options == AirPlaySkinsOptions
+{
+    func preferredAirPlayControllerSkin(for gameType: GameType) -> ControllerSkin?
+    {
+        guard let identifier = self[gameType] else { return nil }
+        
+        let predicate = NSPredicate(format: "%K == %@", #keyPath(ControllerSkin.identifier), identifier)
+        let controllerSkin = ControllerSkin.instancesWithPredicate(predicate, inManagedObjectContext: DatabaseManager.shared.viewContext, type: ControllerSkin.self).first
+        return controllerSkin
+    }
+}
+
+struct AirPlaySkinsOptions
+{
+    @Option(name: "Manage Skins", detailView: { _ in SkinManager() })
+    private var skinManager: String = "" // Hack until I figure out how to support Void properties...
+    
+    @Option(name: LocalizedStringKey(System.nes.localizedName), description: "The controller skin used when AirPlaying NES games.", detailView: { SkinPicker(gameType: .nes, controllerSkinID: $0) })
+    var nes: String?
+    
+    @Option(name: LocalizedStringKey(System.snes.localizedName), description: "The controller skin used when AirPlaying SNES games.", detailView: { SkinPicker(gameType: .snes, controllerSkinID: $0) })
+    var snes: String?
+    
+    @Option(name: LocalizedStringKey(System.genesis.localizedName), description: "The controller skin used when AirPlaying Genesis games.", detailView: { SkinPicker(gameType: .genesis, controllerSkinID: $0) })
+    var genesis: String?
+    
+    @Option(name: LocalizedStringKey(System.n64.localizedName), description: "The controller skin used when AirPlaying N64 games.", detailView: { SkinPicker(gameType: .n64, controllerSkinID: $0) })
+    var n64: String?
+    
+    @Option(name: LocalizedStringKey(System.gbc.localizedName), description: "The controller skin used when AirPlaying GBC games.", detailView: { SkinPicker(gameType: .gbc, controllerSkinID: $0) })
+    var gbc: String?
+    
+    @Option(name: LocalizedStringKey(System.gba.localizedName), description: "The controller skin used when AirPlaying GBA games.", detailView: { SkinPicker(gameType: .gba, controllerSkinID: $0) })
+    var gba: String?
+    
+    @Option(name: LocalizedStringKey(System.ds.localizedName), description: "The controller skin used when AirPlaying DS games.", detailView: { SkinPicker(gameType: .ds, controllerSkinID: $0) })
+    var ds: String?
+    
+    subscript(gameType: GameType) -> String? {
+        guard let system = System(gameType: gameType) else { return nil }
+        switch system
+        {
+        case .nes: return self.nes
+        case .snes: return self.snes
+        case .genesis: return self.genesis
+        case .n64: return self.n64
+        case .gbc: return self.gbc
+        case .gba: return self.gba
+        case .ds: return self.ds
+        }
+    }
+}
+
+fileprivate extension AirPlaySkinsOptions
+{
+    struct SkinPicker: View
+    {
+        let gameType: GameType
+        
+        @Binding
+        var controllerSkinID: String?
+        
+        @FetchRequest
+        private var controllerSkins: FetchedResults<ControllerSkin>
+        
+        @Environment(\.featureOption)
+        private var option
+        
+        var body: some View {
+            Picker(option.name ?? "", selection: $controllerSkinID) {
+                ForEach(controllerSkins, id: \.identifier) { controllerSkin in
+                    Text(controllerSkin.name)
+                        .tag(Optional<String>(controllerSkin.identifier)) // Must be Optional<String> in order for selection to work.
+                        // .tag(controllerSkin.identifier)
+                }
+                
+                Text("None")
+                    .tag(String?.none)
+            }
+            .pickerStyle(.menu)
+            .displayInline()
+        }
+        
+        init(gameType: GameType, controllerSkinID: Binding<String?>)
+        {
+            self.gameType = gameType
+            self._controllerSkinID = controllerSkinID
+            
+            let configuration = ControllerSkinConfigurations.tvStandardLandscape
+            
+            let predicate = NSPredicate(format: "%K == %@ AND (%K & %d) != 0 AND %K == NO",
+                                        #keyPath(ControllerSkin.gameType), self.gameType.rawValue,
+                                        #keyPath(ControllerSkin.supportedConfigurations), configuration.rawValue,
+                                        #keyPath(ControllerSkin.isStandard))
+            
+            self._controllerSkins = FetchRequest(entity: ControllerSkin.entity(), sortDescriptors: [NSSortDescriptor(keyPath: \ControllerSkin.name, ascending: true)], predicate: predicate)
+        }
+    }
+    
+    struct SkinManager: View
+    {
+        @FetchRequest(entity: ControllerSkin.entity(),
+                      sortDescriptors: [NSSortDescriptor(keyPath: \ControllerSkin.name, ascending: true)],
+                      predicate: {
+            let configuration = ControllerSkinConfigurations.tvStandardLandscape
+            return NSPredicate(format: "(%K & %d) != 0 AND %K == NO",
+                               #keyPath(ControllerSkin.supportedConfigurations), configuration.rawValue,
+                               #keyPath(ControllerSkin.isStandard))
+        }())
+        private var controllerSkins: FetchedResults<ControllerSkin>
+        
+        var body: some View {
+            if controllerSkins.isEmpty
+            {
+                Text("No AirPlay Skins")
+                    .foregroundColor(.gray)
+            }
+            else
+            {
+                List {
+                    ForEach(controllerSkins, id: \.identifier) { controllerSkin in
+                        HStack {
+                            Text(controllerSkin.name)
+                            
+                            Spacer()
+                            
+                            if let system = System(gameType: controllerSkin.gameType)
+                            {
+                                Text(system.localizedShortName)
+                                    .foregroundColor(.gray)
+                            }
+                        }
+                    }
+                    .onDelete(perform: deleteAirPlaySkins)
+                }
+            }
+        }
+        
+        private func deleteAirPlaySkins(at indexes: IndexSet)
+        {
+            let objectIDs = indexes.map { controllerSkins[$0].objectID }
+            
+            DatabaseManager.shared.performBackgroundTask { context in
+                let controllerSkins = objectIDs.compactMap { context.object(with: $0) as? ControllerSkin }
+                for controllerSkin in controllerSkins
+                {
+                    context.delete(controllerSkin)
+                }
+                
+                context.saveWithErrorLogging()
+            }
+        }
+    }
+}
--- a/Features/Features/AlternateAppIcons.swift
+++ b/Features/Features/AlternateAppIcons.swift
@ -0,0 +1,124 @@
+//
+//  AlternateAppIcons.swift
+//  Delta
+//
+//  Created by Chris Rittenhouse on 5/2/23.
+//  Copyright © 2023 LitRitt. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaFeatures
+
+enum AppIcon: String, CaseIterable, CustomStringConvertible, Identifiable
+{
+    case normal = "Default"
+    case gba4ios = "GBA4iOS"
+    case inverted = "Inverted"
+    case pixelated = "Pixelated"
+    case skin = "Controller Skin"
+    
+    var description: String {
+        return self.rawValue
+    }
+    
+    var id: String {
+        return self.rawValue
+    }
+    
+    var author: String {
+        switch self
+        {
+        case .normal: return "Caroline Moore"
+        case .gba4ios: return "Paul Thorsen"
+        case .inverted, .skin, .pixelated: return "LitRitt"
+        }
+    }
+    
+    var assetName: String {
+        switch self
+        {
+        case .normal: return "AppIcon"
+        case .gba4ios: return "IconGBA4iOS"
+        case .inverted: return "IconInverted"
+        case .pixelated: return "IconPixelated"
+        case .skin: return "IconSkin"
+        }
+    }
+}
+
+extension AppIcon: Equatable
+{
+    static func == (lhs: AppIcon, rhs: AppIcon) -> Bool
+    {
+        return lhs.description == rhs.description
+    }
+}
+
+extension AppIcon: LocalizedOptionValue
+{
+    var localizedDescription: Text {
+        Text(self.description)
+    }
+}
+
+struct AlternateAppIconOptions
+{
+    @Option(name: "Alternate App Icon",
+            description: "Choose from alternate app icons created by the community.",
+            detailView: { value in
+        List {
+            ForEach(AppIcon.allCases) { icon in
+                HStack {
+                    if icon == value.wrappedValue
+                    {
+                        Text("✓")
+                    }
+                    icon.localizedDescription
+                    Text("- by \(icon.author)")
+                        .font(.system(size: 15))
+                        .foregroundColor(.gray)
+                    Spacer()
+                    Image(uiImage: Bundle.appIcon(for: icon) ?? UIImage())
+                        .cornerRadius(13)
+                }
+                .contentShape(Rectangle())
+                .onTapGesture {
+                    value.wrappedValue = icon
+                }
+            }
+        }
+        .onChange(of: value.wrappedValue) { _ in
+            updateAppIcon()
+        }
+        .displayInline()
+    })
+    var icon: AppIcon = .normal
+}
+
+extension AlternateAppIconOptions
+{
+    static func updateAppIcon()
+    {
+        // Get current icon
+        let currentIcon = UIApplication.shared.alternateIconName
+        
+        // Apply chosen icon if feature is enabled
+        if ExperimentalFeatures.shared.alternateAppIcons.isEnabled
+        {
+            let icon = ExperimentalFeatures.shared.alternateAppIcons.icon
+            
+            // Only apply new icon if it's not already the current icon
+            switch icon
+            {
+            case .normal: if currentIcon != nil { UIApplication.shared.setAlternateIconName(nil) } // Default app icon
+            default: if currentIcon != icon.assetName { UIApplication.shared.setAlternateIconName(icon.assetName) } // Alternate app icon
+            }
+        }
+        else
+        {
+            // Remove alternate icons if feature is disabled
+            if currentIcon != nil { UIApplication.shared.setAlternateIconName(nil) }
+        }
+    }
+}
--- a/Features/Features/GameScreenshots.swift
+++ b/Features/Features/GameScreenshots.swift
@ -0,0 +1,54 @@
+//
+//  GameScreenshots.swift
+//  Delta
+//
+//  Created by Chris Rittenhouse on 4/24/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaFeatures
+
+enum ScreenshotSize: Double, CaseIterable, CustomStringConvertible
+{
+    case x5 = 5
+    case x4 = 4
+    case x3 = 3
+    case x2 = 2
+    
+    var description: String {
+        if #available(iOS 15, *)
+        {
+            let formattedText = self.rawValue.formatted(.number.decimalSeparator(strategy: .automatic))
+            return "\(formattedText)x Size"
+        }
+        else
+        {
+            return "\(self.rawValue)x Size"
+        }
+    }
+}
+
+extension ScreenshotSize: LocalizedOptionValue
+{
+    var localizedDescription: Text {
+        Text(self.description)
+    }
+    
+    static var localizedNilDescription: Text {
+        Text("Original Size")
+    }
+}
+
+struct GameScreenshotsOptions
+{
+    @Option(name: "Save to Files", description: "Save the screenshot to the app's directory in Files.")
+    var saveToFiles: Bool = true
+
+    @Option(name: "Save to Photos", description: "Save the screenshot to the Photo Library.")
+    var saveToPhotos: Bool = false
+
+    @Option(name: "Image Size", description: "Choose the size of screenshots. This only increases the export size, it does not increase the quality.", values: ScreenshotSize.allCases)
+    var size: ScreenshotSize?
+}
--- a/Features/Features/ReviewSaveStatesOptions.swift
+++ b/Features/Features/ReviewSaveStatesOptions.swift
@ -0,0 +1,30 @@
+//
+//  LinkSaveStatesOptions.swift
+//  Delta
+//
+//  Created by Riley Testut on 8/7/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaFeatures
+
+struct ReviewSaveStatesView: UIViewControllerRepresentable
+{
+    func makeUIViewController(context: Context) -> ReviewSaveStatesViewController
+    {
+        let viewController = ReviewSaveStatesViewController()
+        return viewController
+    }
+    
+    func updateUIViewController(_ uiViewController: ReviewSaveStatesViewController, context: Context)
+    {
+    }
+}
+
+struct ReviewSaveStatesOptions
+{
+    @Option(name: "View Save States", detailView: { _ in ReviewSaveStatesView() })
+    private var reviewSaveStates: String = "" // Hack until I figure out how to support Void properties...
+}
--- a/Features/Features/ToastNotificationOptions.swift
+++ b/Features/Features/ToastNotificationOptions.swift
@ -0,0 +1,38 @@
+//
+//  ToastNotificationOptions.swift
+//  Delta
+//
+//  Created by Chris Rittenhouse on 4/25/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaFeatures
+
+struct ToastNotificationOptions
+{
+    @Option(name: "Duration", description: "Change how long toasts should be shown.", detailView: { duration in
+        HStack {
+            Text("Duration: \(duration.wrappedValue, specifier: "%.1f")s")
+            Slider(value: duration, in: 1...5, step: 0.5).displayInline()
+        }
+    })
+    var duration: Double = 1.5
+    
+    @Option(name: "Game Data Saved",
+            description: "Show toasts when performing an in game save.")
+    var gameSaveEnabled: Bool = true
+    
+    @Option(name: "Saved Save State",
+            description: "Show toasts when saving a save state.")
+    var stateSaveEnabled: Bool = true
+    
+    @Option(name: "Loaded Save State",
+            description: "Show toasts when loading a save state.")
+    var stateLoadEnabled: Bool = true
+    
+    @Option(name: "Fast Forward Toggled",
+            description: "Show toasts when toggling fast forward.")
+    var fastForwardEnabled: Bool = true
+}
--- a/Features/Features/VariableFastForward.swift
+++ b/Features/Features/VariableFastForward.swift
@ -0,0 +1,129 @@
+//
+//  VariableFastForward.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/5/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaCore
+import DeltaFeatures
+
+struct FastForwardSpeed: RawRepresentable
+{
+    let rawValue: Double
+    
+    init(rawValue: Double)
+    {
+        self.rawValue = rawValue
+    }
+    
+    static func speeds(in range: ClosedRange<Double>) -> [FastForwardSpeed]
+    {
+        var range = range
+        
+        if ExperimentalFeatures.shared.variableFastForward.allowUnrestrictedSpeeds
+        {
+            range = 1.0...8.0
+        }
+        
+        // .dropFirst() to remove 1x speed.
+        var speeds = stride(from: range.lowerBound, to: range.upperBound, by: 1.0).dropFirst().map { FastForwardSpeed(rawValue: $0) }
+        
+        // Handles both integer and non-integer maximum speeds, because range.upperBound is not included in `speeds`.
+        speeds.append(.init(rawValue: range.upperBound))
+        
+        return speeds
+    }
+}
+
+extension FastForwardSpeed: CustomStringConvertible, LocalizedOptionValue
+{
+    var description: String {
+        if #available(iOS 15, *)
+        {
+            let formattedText = self.rawValue.formatted(.number.decimalSeparator(strategy: .automatic))
+            return "\(formattedText)x"
+        }
+        else
+        {
+            return "\(self.rawValue)x"
+        }
+    }
+    
+    var localizedDescription: Text {
+        Text(self.description)
+    }
+    
+    static var localizedNilDescription: Text {
+        Text("Maximum")
+    }
+}
+
+struct VariableFastForwardOptions
+{
+    // Alternatively, this feature could be implemented with single hidden dictionary @Option mapping preferred speeds to systems,
+    // because we support changing these values by long-pressing the Fast Forward button in the pause menu.
+    // However, we want to also show these options in Delta's settings, which requires us to explicitly define them one-by-one.
+    //
+    // @Option // No name = hidden
+    // var preferredSpeedsBySystem: [String: Double] = [:]
+    
+    @Option(name: "Nintendo", description: "Preferred NES fast forward speed.", values: FastForwardSpeed.speeds(in: System.nes.deltaCore.supportedRates))
+    var nes: FastForwardSpeed?
+
+    @Option(name: "Super Nintendo", description: "Preferred SNES fast forward speed.", values: FastForwardSpeed.speeds(in: System.snes.deltaCore.supportedRates))
+    var snes: FastForwardSpeed?
+    
+    @Option(name: "Sega Genesis", description: "Preferred Genesis fast forward speed.", values: FastForwardSpeed.speeds(in: System.genesis.deltaCore.supportedRates))
+    var genesis: FastForwardSpeed?
+
+    @Option(name: "Nintendo 64", description: "Preferred N64 fast forward speed.", values: FastForwardSpeed.speeds(in: System.n64.deltaCore.supportedRates))
+    var n64: FastForwardSpeed?
+
+    @Option(name: "Game Boy Color", description: "Preferred GBC fast forward speed.", values: FastForwardSpeed.speeds(in: System.gbc.deltaCore.supportedRates))
+    var gbc: FastForwardSpeed?
+
+    @Option(name: "Game Boy Advance", description: "Preferred GBA fast forward speed.", values: FastForwardSpeed.speeds(in: System.gba.deltaCore.supportedRates))
+    var gba: FastForwardSpeed?
+
+    @Option(name: "Nintendo DS", description: "Preferred DS fast forward speed.", values: FastForwardSpeed.speeds(in: System.ds.deltaCore.supportedRates))
+    var ds: FastForwardSpeed?
+    
+    @Option(name: "Allow Unrestricted Speeds", description: "Allow choosing speeds that exceed the maximum supported speed of a system.\n\nThis can be used to test the performance of new iOS devices.")
+    var allowUnrestrictedSpeeds: Bool = false
+}
+
+extension Feature where Options == VariableFastForwardOptions
+{
+    subscript(gameType: GameType) -> FastForwardSpeed? {
+        get {
+            guard let system = System(gameType: gameType) else { return nil }
+            switch system
+            {
+            case .nes: return self.nes
+            case .snes: return self.snes
+            case .genesis: return self.genesis
+            case .n64: return self.n64
+            case .gbc: return self.gbc
+            case .gba: return self.gba
+            case .ds: return self.ds
+            }
+        }
+        set {
+            guard let system = System(gameType: gameType) else { return }
+            switch system
+            {
+            case .nes: self.nes = newValue
+            case .snes: self.snes = newValue
+            case .genesis: self.genesis = newValue
+            case .n64: self.n64 = newValue
+            case .gbc: self.gbc = newValue
+            case .gba: self.gba = newValue
+            case .ds: self.ds = newValue
+            }
+        }
+    }
+}
--- a/Delta/Extensions/Bundle+AppIconImage.swift
+++ b/Delta/Extensions/Bundle+AppIconImage.swift
@ -0,0 +1,34 @@
+//
+//  Bundle+AppIconImage.swift
+//  Delta
+//
+//  Created by Chris Rittenhouse on 7/20/23.
+//  Copyright © 2023 LitRitt. All rights reserved.
+//
+
+import UIKit
+
+extension Bundle
+{
+    static func appIcon(for icon: AppIcon = .normal) -> UIImage? {
+        guard let appIcons = Bundle.main.infoDictionary?["CFBundleIcons"] as? [String: Any] else { return nil }
+        
+        switch icon
+        {
+        case .normal:
+            guard let primaryAppIcon = appIcons["CFBundlePrimaryIcon"] as? [String: Any],
+                  let appIconFiles = primaryAppIcon["CFBundleIconFiles"] as? [String],
+                  let appIcon = appIconFiles.first else { return nil }
+            
+            return UIImage(named:appIcon)
+            
+        default:
+            guard let alternateAppIcons = appIcons["CFBundleAlternateIcons"] as? [String: Any],
+                  let alternateAppIcon = alternateAppIcons[icon.assetName] as? [String: Any],
+                  let appIconFiles = alternateAppIcon["CFBundleIconFiles"] as? [String],
+                  let appIcon = appIconFiles.first else { return nil }
+            
+            return UIImage(named:appIcon)
+        }
+    }
+}
--- a/Delta/Extensions/ControllerSkin+Configuring.swift
+++ b/Delta/Extensions/ControllerSkin+Configuring.swift
@ -34,21 +34,20 @@ extension ControllerSkin
        
        var configurations = ControllerSkinConfigurations()
        
-        let device: DeltaCore.ControllerSkin.Device = (UIDevice.current.userInterfaceIdiom == .pad) ? .ipad : .iphone
-        
-        let traitCollections: [(displayType: DeltaCore.ControllerSkin.DisplayType, orientation: DeltaCore.ControllerSkin.Orientation)] =
-            [(.standard, .portrait), (.standard, .landscape), (.edgeToEdge, .portrait), (.edgeToEdge, .landscape), (.splitView, .portrait), (.splitView, .landscape)]
-        
-        for collection in traitCollections
-        {
-            let traits = DeltaCore.ControllerSkin.Traits(device: device, displayType: collection.displayType, orientation: collection.orientation)
-            if skin.supports(traits)
-            {
-                let configuration = ControllerSkinConfigurations(traits: traits)
-                configurations.formUnion(configuration)
+        let allTraitCombinations = DeltaCore.ControllerSkin.Device.allCases.flatMap { device in
+            DeltaCore.ControllerSkin.DisplayType.allCases.flatMap { displayType in
+                DeltaCore.ControllerSkin.Orientation.allCases.map { orientation in
+                    DeltaCore.ControllerSkin.Traits(device: device, displayType: displayType, orientation: orientation)
+                }
            }
        }
        
+        for traits in allTraitCombinations
+        {
+            guard let configuration = ControllerSkinConfigurations(traits: traits), skin.supports(traits) else { continue }
+            configurations.formUnion(configuration)
+        }
+        
        self.supportedConfigurations = configurations
    }
 }
--- a/Delta/Extensions/GameViewController+ExperimentalToasts.swift
+++ b/Delta/Extensions/GameViewController+ExperimentalToasts.swift
@ -0,0 +1,25 @@
+//
+//  GameViewController+ExperimentalToasts.swift
+//  Delta
+//
+//  Created by Chris Rittenhouse on 4/26/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Roxas
+
+extension GameViewController
+{
+    func presentExperimentalToastView(_ text: String)
+    {
+        guard ExperimentalFeatures.shared.toastNotifications.isEnabled else { return }
+        
+        DispatchQueue.main.async {
+            let toastView = RSTToastView(text: text, detailText: nil)
+            toastView.edgeOffset.vertical = 8
+            toastView.textLabel.textAlignment = .center
+            toastView.presentationEdge = .top
+            toastView.show(in: self.view, duration: ExperimentalFeatures.shared.toastNotifications.duration)
+        }
+    }
+}
--- a/Delta/Extensions/HarmonyMetadataKey+Keys.swift
+++ b/Delta/Extensions/HarmonyMetadataKey+Keys.swift
@ -12,6 +12,7 @@ extension HarmonyMetadataKey
 {
    static let gameID = HarmonyMetadataKey("gameID")
    static let gameName = HarmonyMetadataKey("gameName")
+    static let verifiedGameID = HarmonyMetadataKey("verifiedGameID")
    
    // Backwards compatibility
    static let coreID = HarmonyMetadataKey("coreID")
--- a/Delta/Extensions/Input+Display.swift
+++ b/Delta/Extensions/Input+Display.swift
@ -124,6 +124,8 @@ extension Input
            case .leftTrigger: return NSLocalizedString("L2", comment: "")
            case .rightShoulder: return NSLocalizedString("R1", comment: "")
            case .rightTrigger: return NSLocalizedString("R2", comment: "")
+            case .start: return NSLocalizedString("Start", comment: "")
+            case .select: return NSLocalizedString("Select", comment: "")
            }
            
        case .controller(.keyboard):
--- a/Delta/Extensions/NSManagedObjectContext+Conveniences.swift
+++ b/Delta/Extensions/NSManagedObjectContext+Conveniences.swift
@ -23,4 +23,29 @@ extension NSManagedObjectContext
            print("Error saving NSManagedObjectContext: ", error, error.userInfo)
        }
    }
+    
+    // MARK: - Perform -
+    
+    func performAndWait<T>(_ block: @escaping () -> T) -> T
+    {
+        var result: T! = nil
+        
+        self.performAndWait {
+            result = block()
+        }
+        
+        return result
+    }
+    
+    func performAndWait<T>(_ block: @escaping () throws -> T) throws -> T
+    {
+        var result: Result<T, Error>! = nil
+        
+        self.performAndWait {
+            result = Result { try block() }
+        }
+        
+        let value = try result.get()
+        return value
+    }
 }
--- a/Delta/Extensions/OSLog+Delta.swift
+++ b/Delta/Extensions/OSLog+Delta.swift
@ -0,0 +1,38 @@
+//
+//  OSLog+Delta.swift
+//  Delta
+//
+//  Created by Riley Testut on 8/10/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import OSLog
+
+extension OSLog.Category
+{
+    static let database = "Database"
+}
+
+extension Logger
+{
+    static let deltaSubsystem = "com.rileytestut.Delta"
+    
+    static let database = Logger(subsystem: deltaSubsystem, category: OSLog.Category.database)
+}
+
+@available(iOS 15, *)
+extension OSLogEntryLog.Level
+{
+    var localizedName: String {
+        switch self
+        {
+        case .undefined: return NSLocalizedString("Undefined", comment: "")
+        case .debug: return NSLocalizedString("Debug", comment: "")
+        case .info: return NSLocalizedString("Info", comment: "")
+        case .notice: return NSLocalizedString("Notice", comment: "")
+        case .error: return NSLocalizedString("Error", comment: "")
+        case .fault: return NSLocalizedString("Fault", comment: "")
+        @unknown default: return NSLocalizedString("Unknown", comment: "")
+        }
+    }
+}
--- a/Delta/Extensions/PHPhotoLibrary+Authorization.swift
+++ b/Delta/Extensions/PHPhotoLibrary+Authorization.swift
@ -0,0 +1,46 @@
+//
+//  PHPhotoLibrary+Authorization.swift
+//  Delta
+//
+//  Created by Chris Rittenhouse on 4/24/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import UIKit
+import Photos
+
+extension PHPhotoLibrary
+{
+    static func runIfAuthorized(code: @escaping () -> Void)
+    {
+        PHPhotoLibrary.requestAuthorization(for: .addOnly, handler: { success in
+            switch success
+            {
+            case .authorized, .limited:
+                code()
+                
+            case .denied, .restricted, .notDetermined: break
+            @unknown default: break
+            }
+        })
+    }
+    
+    static func saveImageData(_ data: Data)
+    {
+        // Save the image to the Photos app
+        PHPhotoLibrary.shared().performChanges({
+            PHAssetCreationRequest.forAsset().addResource(with: .photo, data: data, options: nil)
+        }, completionHandler: { success, error in
+            if success
+            {
+                // Image saved successfully
+                print("Image saved to Photos app.")
+            }
+            else
+            {
+                // Error saving image
+                print("Error saving image: \(error?.localizedDescription ?? "Unknown error")")
+            }
+        })
+    }
+}
--- a/Delta/Extensions/ServerManager+Delta.swift
+++ b/Delta/Extensions/ServerManager+Delta.swift
@ -17,7 +17,7 @@ extension ServerManager
 {
    func prepare()
    {
-        NotificationCenter.default.addObserver(self, selector: #selector(ServerManager.didChangeJITMode(_:)), name: .settingsDidChange, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(ServerManager.didChangeJITMode(_:)), name: Settings.didChangeNotification, object: nil)
        
        #if DEBUG
        if ProcessInfo.processInfo.isDebugging
--- a/Delta/Extensions/UIColor+Delta.swift
+++ b/Delta/Extensions/UIColor+Delta.swift
@ -10,6 +10,6 @@ import UIKit

 extension UIColor
 {
-    static let deltaPurple = UIColor(named: "Purple")!
-    static let deltaDarkGray = UIColor(named: "DarkGray")!
+    static let deltaPurple = UIColor.purple
+    static let deltaDarkGray = #colorLiteral(red: 0.07139974087, green: 0.08217515796, blue: 0.1083263531, alpha: 1)
 }
--- a/Delta/Extensions/URL+ExtendedAttributes.swift
+++ b/Delta/Extensions/URL+ExtendedAttributes.swift
@ -1,45 +0,0 @@
-//
-//  URL+ExtendedAttributes.swift
-//  Delta
-//
-//  Created by Riley Testut on 3/26/19.
-//  Copyright © 2019 Riley Testut. All rights reserved.
-//
-
-import Foundation
-
-extension URL
-{
-    func setExtendedAttribute(name: String, value: String) throws
-    {
-        try self.withUnsafeFileSystemRepresentation { (path) in
-            let data = value.data(using: .utf8)
-            let result = data?.withUnsafeBytes { (buffer) in
-                setxattr(path, name, buffer.baseAddress, buffer.count, 0, 0)
-            }
-            
-            if let result = result, result < 0
-            {
-                throw POSIXError(POSIXErrorCode(rawValue: errno) ?? .ENOENT)
-            }
-        }
-    }
-    
-    func extendedAttribute(name: String) -> String?
-    {
-        let value = self.withUnsafeFileSystemRepresentation { (path) -> String? in
-            let size = getxattr(path, name, nil, 0, 0, 0)
-            guard size >= 0 else { return nil }
-            
-            var data = Data(count: size)
-            let result = data.withUnsafeMutableBytes { getxattr(path, name, $0.baseAddress, $0.count, 0, 0) }
-            
-            guard result >= 0 else { return nil }
-            
-            let value = String(data: data, encoding: .utf8)!
-            return value
-        }
-        
-        return value
-    }
-}
--- a/Delta/Extensions/UserDefaults+Delta.swift
+++ b/Delta/Extensions/UserDefaults+Delta.swift
@ -0,0 +1,14 @@
+//
+//  UserDefaults+Delta.swift
+//  Delta
+//
+//  Created by Riley Testut on 8/10/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+extension UserDefaults
+{
+    @NSManaged var shouldRepairDatabase: Bool
+}
--- a/Selection/GameCollectionViewController.swift
+++ b/Selection/GameCollectionViewController.swift
@ -43,6 +43,8 @@ class GameCollectionViewController: UICollectionViewController
            
            // Calling reloadData sometimes will not update the cells correctly if an insertion/deletion animation is in progress
            // As a workaround, we manually iterate over and configure each cell ourselves
+            // 如果正在进行插入/删除动画，调用 reloadData 有时不会正确更新单元格
+                         // 作为解决方法，我们自己手动迭代并配置每个单元
            for cell in self.collectionView?.visibleCells ?? []
            {
                if let indexPath = self.collectionView?.indexPath(for: cell)
@ -177,6 +179,7 @@ extension GameCollectionViewController
            if let emulatorBridge = destinationViewController.emulatorCore?.deltaCore.emulatorBridge as? MelonDSEmulatorBridge
            {
                //TODO: Update this to work with multiple processes by retrieving emulatorBridge directly from emulatorCore.
+                //TODO：通过直接从 emulatorCore 检索 emulatorBridge 来更新它以与多个进程一起使用。
                
                if game.identifier == Game.melonDSDSiBIOSIdentifier
                {
@ -193,6 +196,8 @@ extension GameCollectionViewController
            if let saveState = self.activeSaveState
            {
                // Must be synchronous or else there will be a flash of black
+                
+                // 必须同步否则会有黑闪
                destinationViewController.emulatorCore?.start()
                destinationViewController.emulatorCore?.pause()
                
@ -240,6 +245,7 @@ private extension GameCollectionViewController
        case .regular:
            layout.itemWidth = 150
            layout.minimumInteritemSpacing = 25 // 30 == only 3 games per line for iPad mini 6 in portrait
+            // 30 == 对于纵向 iPad mini 6，每行仅 3 场游戏
            
        case .unspecified, .compact:
            layout.itemWidth = 90
@ -309,7 +315,7 @@ private extension GameCollectionViewController
            cell.isImageViewVibrancyEnabled = true
        }
        
-        cell.imageView.image = #imageLiteral(resourceName: "BoxArt")
+        cell.imageView.image = #imageLiteral(resourceName: "zw")
        
        if self.traitCollection.horizontalSizeClass == .regular
        {
@ -369,11 +375,13 @@ private extension GameCollectionViewController
                    }
                    
                    // Disable videoManager to prevent flash of black
+                    // 禁用videoManager以防止黑屏闪烁
                    self.activeEmulatorCore?.videoManager.isEnabled = false
                    
                    launchGame(ignoringErrors: [LaunchError.alreadyRunning])
                    
                    // The game hasn't changed, so the activeEmulatorCore is the same as before, so we need to enable videoManager it again
+                    // 游戏没有改变，所以activeEmulatorCore和之前一样，所以我们需要再次启用videoManager
                    self.activeEmulatorCore?.videoManager.isEnabled = true
                }))
                alertController.addAction(UIAlertAction(title: NSLocalizedString("Restart", comment: ""), style: .destructive, handler: { (action) in
@ -413,7 +421,7 @@ private extension GameCollectionViewController
            launchGame(ignoringErrors: [])
        }
    }
-    
+    //验证启动游戏
    func validateLaunchingGame(_ game: Game, ignoringErrors ignoredErrors: [Error]) throws
    {
        let ignoredErrors = ignoredErrors.map { $0 as NSError }
@ -671,6 +679,8 @@ private extension GameCollectionViewController
                    {
                        // Manually reload item because collection view may not be in window hierarchy,
                        // which means it won't automatically update when we save the context.
+                        // 手动重新加载项目，因为集合视图可能不在窗口层次结构中，
+                                                 // 这意味着当我们保存上下文时它不会自动更新。
                        self.collectionView.reloadItems(at: [indexPath])
                    }
                    
@ -1008,6 +1018,7 @@ extension GameCollectionViewController: UICollectionViewDelegateFlowLayout
 {
    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize
    {
+        
        let collectionViewLayout = collectionView.collectionViewLayout as! GridCollectionViewLayout
        
        let widthConstraint = self.prototypeCell.contentView.widthAnchor.constraint(equalToConstant: collectionViewLayout.itemWidth)
@ -1017,7 +1028,9 @@ extension GameCollectionViewController: UICollectionViewDelegateFlowLayout
        self.configure(self.prototypeCell, for: indexPath)
        
        let size = self.prototypeCell.contentView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
-        return size
+//        return size
+        return CGSize(width: 150, height: 150)
+
    }
 }

--- a/Selection/GamesViewController.swift
+++ b/Selection/GamesViewController.swift
@ -78,9 +78,16 @@ class GamesViewController: UIViewController
        
        NotificationCenter.default.addObserver(self, selector: #selector(GamesViewController.syncingDidStart(_:)), name: SyncCoordinator.didStartSyncingNotification, object: nil)
        NotificationCenter.default.addObserver(self, selector: #selector(GamesViewController.syncingDidFinish(_:)), name: SyncCoordinator.didFinishSyncingNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(GamesViewController.settingsDidChange(_:)), name: .settingsDidChange, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(GamesViewController.settingsDidChange(_:)), name: Settings.didChangeNotification, object: nil)
        NotificationCenter.default.addObserver(self, selector: #selector(GamesViewController.emulationDidQuit(_:)), name: EmulatorCore.emulationDidQuitNotification, object: nil)
    }
+    
+    @IBAction func importfilesBtn(_ sender: UIButton) {
+        
+        self.present(self.importController, animated: true, completion: nil)
+        
+        
+    }
 }

 //MARK: - UIViewController -
@ -93,9 +100,16 @@ extension GamesViewController
        
        self.placeholderView = RSTPlaceholderView(frame: self.view.bounds)
        self.placeholderView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        self.placeholderView.textLabel.text = NSLocalizedString("No Games", comment: "")
-        self.placeholderView.detailTextLabel.text = NSLocalizedString("You can import games by pressing the + button in the top right.", comment: "")
+        self.placeholderView.textLabel.text = NSLocalizedString("", comment: "")
+        self.placeholderView.detailTextLabel.text = NSLocalizedString("You have not added any games", comment: "")
+        
+        let placeholderImagV = UIImageView(image: UIImage(named: "nogame"))
+        placeholderImagV.frame = CGRect(x: (self.view.bounds.width - 87) / 2, y: (self.view.bounds.height - (placeholderImagV.bounds.height + 80)) / 2, width: 87, height: 64)
+        placeholderImagV.contentMode = .center
+       
+        
        self.view.insertSubview(self.placeholderView, at: 0)
+        self.placeholderView.addSubview(placeholderImagV)
        
        self.pageControl = UIPageControl()
        self.pageControl.translatesAutoresizingMaskIntoConstraints = false
@ -108,32 +122,32 @@ extension GamesViewController
        self.pageControl.centerXAnchor.constraint(equalTo: (self.navigationController?.toolbar.centerXAnchor)!, constant: 0).isActive = true
        self.pageControl.centerYAnchor.constraint(equalTo: (self.navigationController?.toolbar.centerYAnchor)!, constant: 0).isActive = true
        
-        if let navigationController = self.navigationController
-        {
-            if #available(iOS 13.0, *)
-            {
-                navigationController.overrideUserInterfaceStyle = .dark
-                
-                let navigationBarAppearance = navigationController.navigationBar.standardAppearance.copy()
-                navigationBarAppearance.backgroundEffect = UIBlurEffect(style: .dark)
-                navigationController.navigationBar.standardAppearance = navigationBarAppearance
-                navigationController.navigationBar.scrollEdgeAppearance = navigationBarAppearance
-                
-                let toolbarAppearance = navigationController.toolbar.standardAppearance.copy()
-                toolbarAppearance.backgroundEffect = UIBlurEffect(style: .dark)
-                navigationController.toolbar.standardAppearance = toolbarAppearance
-                
-                if #available(iOS 15, *)
-                {
-                    navigationController.toolbar.scrollEdgeAppearance = toolbarAppearance
-                }
-            }
-            else
-            {
-                navigationController.navigationBar.barStyle = .blackTranslucent
-                navigationController.toolbar.barStyle = .blackTranslucent
-            }            
-        }
+//        if let navigationController = self.navigationController
+//        {
+//            if #available(iOS 13.0, *)
+//            {
+//                navigationController.overrideUserInterfaceStyle = .dark
+//                
+//                let navigationBarAppearance = navigationController.navigationBar.standardAppearance.copy()
+//                navigationBarAppearance.backgroundEffect = UIBlurEffect(style: .dark)
+//                navigationController.navigationBar.standardAppearance = navigationBarAppearance
+//                navigationController.navigationBar.scrollEdgeAppearance = navigationBarAppearance
+//                
+//                let toolbarAppearance = navigationController.toolbar.standardAppearance.copy()
+//                toolbarAppearance.backgroundEffect = UIBlurEffect(style: .dark)
+//                navigationController.toolbar.standardAppearance = toolbarAppearance
+//                
+//                if #available(iOS 15, *)
+//                {
+//                    navigationController.toolbar.scrollEdgeAppearance = toolbarAppearance
+//                }
+//            }
+//            else
+//            {
+//                navigationController.navigationBar.barStyle = .blackTranslucent
+//                navigationController.toolbar.barStyle = .blackTranslucent
+//            }            
+//        }
        
        if #available(iOS 14, *)
        {
@ -252,6 +266,7 @@ private extension GamesViewController
            return nil
        }
        self.searchController?.searchBar.barStyle = .black
+        self.searchController?.searchBar.placeholder = "Game here"
        
        self.navigationItem.searchController = self.searchController
        self.navigationItem.hidesSearchBarWhenScrolling = false
@ -354,7 +369,8 @@ private extension GamesViewController
                    
                    self.pageViewController.setViewControllers([viewController], direction: .forward, animated: false, completion: nil)
                    
-                    self.title = viewController.title
+//                    self.title = viewController.title
+                    self.title = ""
                    self.pageControl.currentPage = index
                }
            }
@ -393,11 +409,11 @@ extension GamesViewController: ImportControllerDelegate
        documentTypes.insert("com.rileytestut.gbc")
        documentTypes.insert("com.rileytestut.gb")
        
-        let itunesImportOption = iTunesImportOption(presentingViewController: self)
+//        let itunesImportOption = iTunesImportOption(presentingViewController: self)
        
        let importController = ImportController(documentTypes: documentTypes)
        importController.delegate = self
-        importController.importOptions = [itunesImportOption]
+//        importController.importOptions = [itunesImportOption]
        
        return importController
    }
@ -407,6 +423,10 @@ extension GamesViewController: ImportControllerDelegate
        self.present(self.importController, animated: true, completion: nil)
    }
    
+    
+    
+    
+    
    func importController(_ importController: ImportController, didImportItemsAt urls: Set<URL>, errors: [Error])
    {
        for error in errors
@ -456,6 +476,8 @@ private extension GamesViewController
        SyncManager.shared.sync()
    }
    
+    
+    
    func showSyncingToastViewIfNeeded()
    {
        guard let coordinator = SyncManager.shared.coordinator, let syncProgress = SyncManager.shared.syncProgress, coordinator.isSyncing && self.syncingToastView == nil else { return }
@ -646,7 +668,7 @@ extension GamesViewController: NSFetchedResultsControllerDelegate

 extension GamesViewController: UIAdaptivePresentationControllerDelegate
 {
-    func presentationControllerWillDismiss(_ presentationController: UIPresentationController)
+    func presentationControllerDidDismiss(_ presentationController: UIPresentationController)
    {
        self.sync()
    }
--- a/Delta/Importing/ImportController.swift
+++ b/Delta/Importing/ImportController.swift
@ -8,6 +8,7 @@

 import UIKit
 import MobileCoreServices
+import UniformTypeIdentifiers
 import ObjectiveC

 import DeltaCore
@ -147,18 +148,38 @@ class ImportController: NSObject
    
    private func presentDocumentBrowser()
    {
-        let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(ImportController.cancel))
+        let supportedTypes = self.documentTypes.compactMap { UTType($0) }
        
-        let documentBrowserViewController = UIDocumentBrowserViewController(forOpeningFilesWithContentTypes: Array(self.documentTypes))
-        documentBrowserViewController.delegate = self
-        documentBrowserViewController.modalPresentationStyle = .fullScreen
-        documentBrowserViewController.browserUserInterfaceStyle = .dark
-        documentBrowserViewController.allowsPickingMultipleItems = true
-        documentBrowserViewController.allowsDocumentCreation = false
-        documentBrowserViewController.additionalTrailingNavigationBarButtonItems = [cancelButton]
+        let presentedViewController: UIViewController
        
-        self.presentedViewController = documentBrowserViewController
-        self.presentingViewController?.present(documentBrowserViewController, animated: true, completion: nil)
+        if #available(iOS 17, *)
+        {
+            // Prior to iOS 17, UIDocumentPickerViewController was too buggy to reliably use with iCloud Drive.
+            
+            let documentPickerViewController = UIDocumentPickerViewController(forOpeningContentTypes: supportedTypes, asCopy: true)
+            documentPickerViewController.delegate = self
+            documentPickerViewController.overrideUserInterfaceStyle = .dark
+            documentPickerViewController.allowsMultipleSelection = true
+            
+            presentedViewController = documentPickerViewController
+        }
+        else
+        {
+            let documentBrowserViewController = UIDocumentBrowserViewController(forOpening: supportedTypes)
+            documentBrowserViewController.delegate = self
+            documentBrowserViewController.modalPresentationStyle = .fullScreen
+            documentBrowserViewController.browserUserInterfaceStyle = .dark
+            documentBrowserViewController.allowsPickingMultipleItems = true
+            documentBrowserViewController.allowsDocumentCreation = false
+            
+            let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(ImportController.cancel))
+            documentBrowserViewController.additionalTrailingNavigationBarButtonItems = [cancelButton]
+                        
+            presentedViewController = documentBrowserViewController
+        }
+        
+        self.presentedViewController = presentedViewController
+        self.presentingViewController?.present(presentedViewController, animated: true, completion: nil)
    }
 }

@ -195,9 +216,22 @@ extension ImportController
    }
 }

+extension ImportController: UIDocumentPickerDelegate
+{
+    func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt documentURLs: [URL])
+    {
+        self.finish(with: Set(documentURLs), errors: [])
+    }
+    
+    func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController)
+    {
+        self.cancel()
+    }
+}
+
 extension ImportController: UIDocumentBrowserViewControllerDelegate
 {
-    func documentBrowser(_ controller: UIDocumentBrowserViewController, didPickDocumentURLs documentURLs: [URL])
+    func documentBrowser(_ controller: UIDocumentBrowserViewController, didPickDocumentsAt documentURLs: [URL])
    {
        var coordinatedURLs = Set<URL>()
        var errors = [Error]()
--- a/Delta/Launch/LaunchViewController.swift
+++ b/Delta/Launch/LaunchViewController.swift
@ -13,7 +13,9 @@ import Harmony

 class LaunchViewController: RSTLaunchViewController
 {
+    
    @IBOutlet private var gameViewContainerView: UIView!
+    
    private var gameViewController: GameViewController!
    
    private var presentedGameViewController: Bool = false
@ -76,7 +78,42 @@ extension LaunchViewController
            }
        }
        
-        return [isDatabaseManagerStarted, isSyncingManagerStarted]
+        // Repair database _after_ starting SyncManager so we can access RecordController.
+        let isDatabaseRepaired = RSTLaunchCondition(condition: { !UserDefaults.standard.shouldRepairDatabase }) { completionHandler in
+            func finish()
+            {
+                UserDefaults.standard.shouldRepairDatabase = false
+                completionHandler(nil)
+            }
+            
+            do
+            {
+                let fetchRequest = Game.fetchRequest()
+                fetchRequest.fetchLimit = 1
+                
+                let isDatabaseEmpty = try DatabaseManager.shared.viewContext.count(for: fetchRequest) == 0
+                guard !isDatabaseEmpty else {
+                    // Database has no games, so no need to repair database.
+                    finish()
+                    return
+                }
+            }
+            catch
+            {
+                print("Failed to fetch games at launch, repairing database just to be safe.", error)
+            }
+            
+            let repairViewController = RepairDatabaseViewController()
+            repairViewController.completionHandler = { [weak repairViewController] in
+                repairViewController?.dismiss(animated: true)
+                finish()
+            }
+            
+            let navigationController = UINavigationController(rootViewController: repairViewController)
+            self.present(navigationController, animated: true)
+        }
+        
+        return [isDatabaseManagerStarted, isSyncingManagerStarted, isDatabaseRepaired]
    }
    
    override func handleLaunchError(_ error: Error)
--- a/Menu/GridMenuViewController.swift
+++ b/Menu/GridMenuViewController.swift
@ -70,7 +70,7 @@ extension GridMenuViewController
        collectionViewLayout.usesEqualHorizontalSpacingDistributionForSingleRow = true
        
        // Manually update prototype cell properties
-        self.prototypeCell.contentView.widthAnchor.constraint(equalToConstant: collectionViewLayout.itemWidth).isActive = true
+        self.prototypeCell.contentView.widthAnchor.constraint(equalToConstant: 150).isActive = true
    }
    
    override func viewDidAppear(_ animated: Bool)
@ -174,3 +174,31 @@ extension GridMenuViewController
    }
 }

+extension GridMenuViewController
+{
+    override func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration?
+    {
+        let item = self.dataSource.item(at: indexPath)
+        guard let menu = item.menu else { return nil }
+        
+        return UIContextMenuConfiguration(identifier: indexPath as NSIndexPath, previewProvider: nil) { _ in menu }
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, previewForHighlightingContextMenuWithConfiguration configuration: UIContextMenuConfiguration) -> UITargetedPreview?
+    {
+        guard let indexPath = configuration.identifier as? IndexPath else { return nil }
+        guard let cell = collectionView.cellForItem(at: indexPath) as? GridCollectionViewCell else { return nil }
+        
+        let parameters = UIPreviewParameters()
+        parameters.backgroundColor = .clear
+        parameters.visiblePath = UIBezierPath(rect: cell.contentView.bounds)
+        
+        let preview = UITargetedPreview(view: cell.contentView, parameters: parameters)
+        return preview
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, previewForDismissingContextMenuWithConfiguration configuration: UIContextMenuConfiguration) -> UITargetedPreview?
+    {
+        return self.collectionView(collectionView, previewForHighlightingContextMenuWithConfiguration: configuration)
+    }
+}
--- a/Menu/MenuItem.swift
+++ b/Menu/MenuItem.swift
@ -15,6 +15,8 @@ class MenuItem: NSObject
    var image: UIImage?
    var action: ((MenuItem) -> Void)
    
+    var menu: UIMenu?
+    
    @objc dynamic var isSelected = false
    
    init(text: String, image: UIImage?, action: @escaping ((MenuItem) -> Void))
--- a/Menu/PauseViewController.swift
+++ b/Menu/PauseViewController.swift
@ -19,7 +19,7 @@ class PauseViewController: UIViewController, PauseInfoProviding
    }
    
    var pauseItems: [MenuItem] {
-        return [self.saveStateItem, self.loadStateItem, self.cheatCodesItem, self.fastForwardItem, self.sustainButtonsItem].compactMap { $0 }
+        return [self.saveStateItem, self.loadStateItem, self.cheatCodesItem, self.fastForwardItem, self.sustainButtonsItem, self.screenshotItem].compactMap { $0 }
    }
    
    /// Pause Items
@ -28,6 +28,7 @@ class PauseViewController: UIViewController, PauseInfoProviding
    var cheatCodesItem: MenuItem?
    var fastForwardItem: MenuItem?
    var sustainButtonsItem: MenuItem?
+    var screenshotItem: MenuItem?
    
    /// PauseInfoProviding
    var pauseText: String?
@ -160,8 +161,9 @@ private extension PauseViewController
        self.cheatCodesItem = nil
        self.sustainButtonsItem = nil
        self.fastForwardItem = nil
+        self.screenshotItem = nil
        
-        guard self.emulatorCore != nil else { return }
+        guard let emulatorCore = self.emulatorCore else { return }
        
        self.saveStateItem = MenuItem(text: NSLocalizedString("Save State", comment: ""), image: #imageLiteral(resourceName: "SaveSaveState"), action: { [unowned self] _ in
            self.saveStatesViewControllerMode = .saving
@ -179,6 +181,17 @@ private extension PauseViewController
        
        self.fastForwardItem = MenuItem(text: NSLocalizedString("Fast Forward", comment: ""), image: #imageLiteral(resourceName: "FastForward"), action: { _ in })
        self.sustainButtonsItem = MenuItem(text: NSLocalizedString("Hold Buttons", comment: ""), image: #imageLiteral(resourceName: "SustainButtons"), action: { _ in })
+        
+        if ExperimentalFeatures.shared.gameScreenshots.isEnabled
+        {
+            self.screenshotItem = MenuItem(text: NSLocalizedString("Screenshot", comment: ""), image: #imageLiteral(resourceName: "Screenshot"), action: { _ in })
+        }
+        
+        if ExperimentalFeatures.shared.variableFastForward.isEnabled
+        {
+            let menu = self.makeFastForwardMenu(for: emulatorCore.game)
+            self.fastForwardItem?.menu = menu
+        }
    }
    
    func updateSafeAreaInsets()
@ -194,4 +207,56 @@ private extension PauseViewController
            self.additionalSafeAreaInsets.right = 0
        }
    }
+    
+    func makeFastForwardMenu(for game: GameProtocol) -> UIMenu?
+    {
+        guard let deltaCore = Delta.core(for: game.type), #available(iOS 15, *) else { return nil }
+        
+        let menu = UIMenu(title: NSLocalizedString("Change the Fast Forward speed for this system.", comment: ""), options: [.singleSelection], children: [
+            UIDeferredMenuElement.uncached { [weak self] completion in
+                let preferredSpeed = ExperimentalFeatures.shared.variableFastForward[game.type]
+                
+                let supportedSpeeds = FastForwardSpeed.speeds(in: deltaCore.supportedRates)
+                var actions = zip(0..., supportedSpeeds).map { (index, speed) in
+                    
+                    let state: UIAction.State = (speed == preferredSpeed) ? .on : .off
+                    let action = UIAction(title: speed.description, state: state) { action in
+                        ExperimentalFeatures.shared.variableFastForward[game.type] = speed
+                        
+                        if let fastForwardItem = self?.fastForwardItem
+                        {
+                            fastForwardItem.isSelected = true // Always enable FF after selecting speed.
+                            fastForwardItem.action(fastForwardItem)
+                        }
+                    }
+                    
+                    if #available(iOS 16, *)
+                    {
+                        let configuration = UIImage.SymbolConfiguration(hierarchicalColor: .deltaPurple)
+                        
+                        let percentage = Double(index + 1) / Double(supportedSpeeds.count)
+                        action.image = UIImage(systemName: "timelapse", variableValue: percentage, configuration: configuration)
+                    }
+                    
+                    return action
+                }
+
+                let state: UIAction.State = (preferredSpeed == nil) ? .on : .off
+                let action = UIAction(title: NSLocalizedString("Maximum", comment: ""), state: state) { action in
+                    ExperimentalFeatures.shared.variableFastForward[game.type] = nil
+                    
+                    if let fastForwardItem = self?.fastForwardItem
+                    {
+                        fastForwardItem.isSelected = true // Always enable FF after selecting speed.
+                        fastForwardItem.action(fastForwardItem)
+                    }
+                }
+                actions.append(action)
+                
+                completion(actions)
+            }
+        ])
+        
+        return menu
+    }
 }
--- a/Delta/Scenes/ExternalDisplaySceneDelegate.swift
+++ b/Delta/Scenes/ExternalDisplaySceneDelegate.swift
@ -0,0 +1,85 @@
+//
+//  ExternalDisplaySceneDelegate.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/17/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import UIKit
+
+import DeltaCore
+
+extension UIApplication
+{
+    var isExternalDisplayConnected: Bool {
+        let scene = UIApplication.shared.connectedScenes.first { $0.session.role == .windowExternalDisplay }
+        return scene != nil
+    }
+    
+    var externalDisplayScene: ExternalDisplayScene? {
+        let scene = UIApplication.shared.connectedScenes.compactMap({ $0 as? ExternalDisplayScene }).first(where: { $0.session.role == .windowExternalDisplay })
+        return scene
+    }
+}
+
+class ExternalDisplayScene: UIWindowScene
+{
+    let gameViewController = DeltaCore.GameViewController()
+    
+    var game: GameProtocol? {
+        get { self.gameViewController.game }
+        set { self.gameViewController.game = newValue }
+    }
+}
+
+class ExternalDisplaySceneDelegate: UIResponder, UIWindowSceneDelegate
+{
+    var window: UIWindow?
+        
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions)
+    {
+        // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
+        // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
+        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
+        guard let windowScene = scene as? UIWindowScene, let externalDisplayScene = scene as? ExternalDisplayScene else { return }
+        
+        self.window = GameWindow(windowScene: windowScene)
+        self.window?.tintColor = .deltaPurple
+        self.window?.rootViewController = externalDisplayScene.gameViewController
+        self.window?.makeKeyAndVisible()
+    }
+    
+    func sceneDidDisconnect(_ scene: UIScene)
+    {
+        // Called as the scene is being released by the system.
+        // This occurs shortly after the scene enters the background, or when its session is discarded.
+        // Release any resources associated with this scene that can be re-created the next time the scene connects.
+        // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead).
+    }
+    
+    func sceneDidBecomeActive(_ scene: UIScene)
+    {
+        // Called when the scene has moved from an inactive state to an active state.
+        // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
+    }
+    
+    func sceneWillResignActive(_ scene: UIScene)
+    {
+        // Called when the scene will move from an active state to an inactive state.
+        // This may occur due to temporary interruptions (ex. an incoming phone call).
+    }
+    
+    func sceneWillEnterForeground(_ scene: UIScene)
+    {
+        // Called as the scene transitions from the background to the foreground.
+        // Use this method to undo the changes made on entering the background.
+    }
+    
+    func sceneDidEnterBackground(_ scene: UIScene)
+    {
+        // Called as the scene transitions from the foreground to the background.
+        // Use this method to save data, release shared resources, and store enough scene-specific state information
+        // to restore the scene back to its current state.
+    }
+}
--- a/Delta/Scenes/SceneDelegate.swift
+++ b/Delta/Scenes/SceneDelegate.swift
--- a/Delta/Settings/AboutVC.swift
+++ b/Delta/Settings/AboutVC.swift
@ -0,0 +1,34 @@
+//
+//  AboutVC.swift
+//  Delta
+//
+//  Created by 忆海16 on 2024/5/9.
+//  Copyright © 2024 Riley Testut. All rights reserved.
+//
+
+import UIKit
+
+class AboutVC: UIViewController {
+
+    @IBOutlet weak var logoimageV: UIImageView!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        logoimageV.layer.cornerRadius = 10
+    }
+
+    @IBAction func done(_ sender: Any) {
+        dismiss(animated: true)
+    }
+    
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
--- a/Delta/Settings/AboutVC.xib
+++ b/Delta/Settings/AboutVC.xib
@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AboutVC" customModule="Retro_Game_Emulator" customModuleProvider="target">
+            <connections>
+                <outlet property="logoimageV" destination="ziO-Do-7xL" id="LQE-1P-2mg"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="About" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rKh-5S-VFi">
+                    <rect key="frame" x="178" y="68" width="58" height="27"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="ziO-Do-7xL">
+                    <rect key="frame" x="137" y="125" width="140" height="140"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="140" id="1uH-on-wZs"/>
+                        <constraint firstAttribute="width" constant="140" id="W0c-de-bK4"/>
+                    </constraints>
+                </imageView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version:1.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5zF-2q-6sp">
+                    <rect key="frame" x="165.5" y="275" width="83" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nXc-vQ-hCt">
+                    <rect key="frame" x="357" y="66.5" width="37" height="30"/>
+                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                    <state key="normal" title="Done"/>
+                    <connections>
+                        <action selector="done:" destination="-1" eventType="touchUpInside" id="ZLY-fU-FB3"/>
+                    </connections>
+                </button>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <color key="backgroundColor" red="0.071399740870000006" green="0.082175157959999995" blue="0.10832635309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="nXc-vQ-hCt" firstAttribute="centerY" secondItem="rKh-5S-VFi" secondAttribute="centerY" id="2cR-wN-cus"/>
+                <constraint firstItem="5zF-2q-6sp" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="574-uc-3Ic"/>
+                <constraint firstItem="rKh-5S-VFi" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="20" id="98V-2P-ZdQ"/>
+                <constraint firstItem="5zF-2q-6sp" firstAttribute="top" secondItem="ziO-Do-7xL" secondAttribute="bottom" constant="10" id="KlD-4y-BYr"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="nXc-vQ-hCt" secondAttribute="trailing" constant="20" id="PZs-sE-MjT"/>
+                <constraint firstItem="ziO-Do-7xL" firstAttribute="top" secondItem="rKh-5S-VFi" secondAttribute="bottom" constant="30" id="jZu-I1-dgp"/>
+                <constraint firstItem="rKh-5S-VFi" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="qWc-Y0-H2U"/>
+                <constraint firstItem="ziO-Do-7xL" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="zny-8Z-VNI"/>
+            </constraints>
+            <point key="canvasLocation" x="18" y="-12"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="logo" width="1024" height="1024"/>
+    </resources>
+</document>
--- a/Delta/Settings/Contributors/ContributorsView.swift
+++ b/Delta/Settings/Contributors/ContributorsView.swift
@ -59,7 +59,8 @@ extension ContributorsView
        let contributorsView = ContributorsView(viewModel: viewModel)
        
        let hostingController = UIHostingController(rootView: contributorsView)
-        hostingController.title = NSLocalizedString("Contributors", comment: "")
+        hostingController.navigationItem.largeTitleDisplayMode = .never
+        hostingController.navigationItem.title = contributorsView.localizedTitle
        
        viewModel.hostingController = hostingController
                
@ -76,6 +77,8 @@ struct ContributorsView: View
    @State
    private var showErrorAlert: Bool = false
    
+    private var localizedTitle: String { NSLocalizedString("Contributors", comment: "") }
+    
    var body: some View {
        List {
            Section(content: {}, footer: {
@ -99,7 +102,9 @@ struct ContributorsView: View
                }
            }
        }
-        .listStyle(.grouped) // TODO: Change to .insetGrouped once we drop iOS 13 support.
+        .listStyle(.insetGrouped)
+        .navigationTitle(localizedTitle)
+        .navigationBarTitleDisplayMode(.inline)
        .environmentObject(viewModel)
        .alert(isPresented: $showErrorAlert) {
            Alert(title: Text("Unable to Load Contributors"), message: Text(viewModel.error?.localizedDescription ?? ""), dismissButton: .default(Text("OK")) {
--- a/Skins/ControllerSkinsViewController.swift
+++ b/Skins/ControllerSkinsViewController.swift
@ -108,13 +108,13 @@ private extension ControllerSkinsViewController
    {
        guard let system = self.system, let traits = self.traits else { return }
        
-        let configuration = ControllerSkinConfigurations(traits: traits)
+        guard let configuration = ControllerSkinConfigurations(traits: traits) else { return }
        
        let fetchRequest: NSFetchRequest<ControllerSkin> = ControllerSkin.fetchRequest()
        
        if traits.device == .iphone && traits.displayType == .edgeToEdge
        {
-            let fallbackConfiguration: ControllerSkinConfigurations = (traits.orientation == .landscape) ? .standardLandscape : .standardPortrait
+            let fallbackConfiguration: ControllerSkinConfigurations = (traits.orientation == .landscape) ? .iphoneStandardLandscape : .iphoneStandardPortrait
            
            // Allow selecting skins that only support standard display types as well.
            fetchRequest.predicate = NSPredicate(format: "%K == %@ AND ((%K & %d) != 0 OR (%K & %d) != 0)",
--- a/Delta/Settings/Controllers/ControllersSettingsViewController.swift
+++ b/Delta/Settings/Controllers/ControllersSettingsViewController.swift
@ -15,6 +15,7 @@ extension ControllersSettingsViewController
 {
    private enum Section: Int
    {
+        case none
        case localDevice
        case externalControllers
        case customizeControls
@ -149,6 +150,18 @@ private extension ControllersSettingsViewController
        
        switch Section(rawValue: indexPath.section)!
        {
+        case .none:
+            cell.textLabel?.text = NSLocalizedString("None", comment: "")
+            
+            if self.gameController == nil
+            {
+                cell.accessoryType = .checkmark
+            }
+            else
+            {
+                cell.accessoryType = .none
+            }
+            
        case .localDevice, .externalControllers:
            let controller: GameController
            
@ -172,7 +185,7 @@ private extension ControllersSettingsViewController
                cell.accessoryType = .checkmark
            }
            else
-            {                
+            {
                cell.accessoryType = .none
            }
            
@ -257,18 +270,20 @@ extension ControllersSettingsViewController
 {
    override func numberOfSections(in tableView: UITableView) -> Int
    {
-        if self.gameController == self.localDeviceController
+        if self.gameController == self.localDeviceController || self.gameController == nil
        {
-            return 2
+            return 3
        }

-        return 3
+        return 4
    }
    
    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int
    {
        switch Section(rawValue: section)!
        {
+        case .none where self.playerIndex == 0: return 0
+        case .none: return 1
        case .localDevice: return 1
        case .externalControllers: return self.connectedControllers.isEmpty ? 1 : self.connectedControllers.count
        case .customizeControls: return 1
@ -294,11 +309,30 @@ extension ControllersSettingsViewController
    {
        switch Section(rawValue: section)!
        {
+        case .none: return nil
        case .localDevice: return NSLocalizedString("This Device", comment: "")
        case .externalControllers: return NSLocalizedString("Game Controllers", comment: "")
        case .customizeControls: return nil
        }
    }
+    
+    override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat
+    {
+        switch Section(rawValue: section)!
+        {
+        case .none where self.playerIndex == 0: return 1
+        default: return UITableView.automaticDimension
+        }
+    }
+    
+    override func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat
+    {
+        switch Section(rawValue: section)!
+        {
+        case .none where self.playerIndex == 0: return 1
+        default: return UITableView.automaticDimension
+        }
+    }
 }

 extension ControllersSettingsViewController
@ -309,6 +343,7 @@ extension ControllersSettingsViewController
        
        switch Section(rawValue: indexPath.section)!
        {
+        case .none: self.gameController = nil
        case .localDevice: self.gameController = self.localDeviceController
        case .externalControllers where self.connectedControllers.isEmpty: return
        case .externalControllers: self.gameController = self.connectedControllers[indexPath.row]
@ -338,7 +373,7 @@ extension ControllersSettingsViewController
        }
        else
        {
-            previousIndexPath = nil
+            previousIndexPath = IndexPath(row: 0, section: Section.none.rawValue)
        }
        
        self.tableView.beginUpdates()
--- a/Delta/Settings/Cores/MelonDSCoreSettingsViewController.swift
+++ b/Delta/Settings/Cores/MelonDSCoreSettingsViewController.swift
@ -23,12 +23,19 @@ private extension MelonDSCoreSettingsViewController
    enum Section: Int
    {
        case general
+        case airPlay
        case performance
        case dsBIOS
        case dsiBIOS
        case changeCore
    }
    
+    enum AirPlayRow: Int, CaseIterable
+    {
+        case topScreenOnly
+        case layoutHorizontally
+    }
+    
    @available(iOS 13, *)
    enum BIOSError: LocalizedError
    {
@ -265,6 +272,32 @@ private extension MelonDSCoreSettingsViewController
        Settings.isAltJITEnabled = sender.isOn
    }
    
+    @IBAction func toggleTopScreenOnly(_ sender: UISwitch)
+    {
+        Settings.features.dsAirPlay.topScreenOnly = sender.isOn
+        
+        self.tableView.performBatchUpdates({
+            let layoutHorizontallyIndexPath = IndexPath(row: AirPlayRow.layoutHorizontally.rawValue, section: Section.airPlay.rawValue)
+            if sender.isOn
+            {
+                self.tableView.deleteRows(at: [layoutHorizontallyIndexPath], with: .automatic)
+            }
+            else
+            {
+                self.tableView.insertRows(at: [layoutHorizontallyIndexPath], with: .automatic)
+            }
+        }) { _ in
+            self.tableView.reloadSections([Section.airPlay.rawValue], with: .none)
+        }
+    }
+    
+    @IBAction func toggleLayoutHorizontally(_ sender: UISwitch)
+    {
+        Settings.features.dsAirPlay.layoutAxis = sender.isOn ? .horizontal : .vertical
+        
+        self.tableView.reloadSections([Section.airPlay.rawValue], with: .none)
+    }
+    
    @objc func willEnterForeground(_ notification: Notification)
    {
        self.tableView.reloadData()
@ -277,13 +310,11 @@ extension MelonDSCoreSettingsViewController
    {
        let section = Section(rawValue: sectionIndex)!
        
-        if isSectionHidden(section)
+        switch section
        {
-            return 0
-        }
-        else
-        {
-            return super.tableView(tableView, numberOfRowsInSection: sectionIndex)
+        case _ where isSectionHidden(section): return 0
+        case .airPlay where Settings.features.dsAirPlay.topScreenOnly: return 1 // Layout axis is irrelevant if only AirPlaying top screen.
+        default: return super.tableView(tableView, numberOfRowsInSection: sectionIndex)
        }
    }
    
@ -313,6 +344,16 @@ extension MelonDSCoreSettingsViewController
            
            cell.contentView.isHidden = (item == nil)
            
+        case .airPlay:
+            let cell = cell as! SwitchTableViewCell
+            
+            let row = AirPlayRow.allCases[indexPath.row]
+            switch row
+            {
+            case .topScreenOnly: cell.switchView.isOn = Settings.features.dsAirPlay.topScreenOnly
+            case .layoutHorizontally: cell.switchView.isOn = (Settings.features.dsAirPlay.layoutAxis == .horizontal)
+            }
+            
        case .performance:
            let cell = cell as! SwitchTableViewCell
            cell.switchView.isOn = Settings.isAltJITEnabled
@ -396,7 +437,7 @@ extension MelonDSCoreSettingsViewController
        case .changeCore:
            self.changeCore()
            
-        case .performance: break
+        case .airPlay, .performance: break
        }
    }
    
@ -417,14 +458,18 @@ extension MelonDSCoreSettingsViewController
    override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String?
    {
        let section = Section(rawValue: section)!
-        
-        if isSectionHidden(section)
+        switch section
        {
-            return nil
-        }
-        else
-        {
-            return super.tableView(tableView, titleForFooterInSection: section.rawValue)
+        case _ where isSectionHidden(section): return nil
+        case .airPlay:
+            switch (Settings.features.dsAirPlay.topScreenOnly, Settings.features.dsAirPlay.layoutAxis)
+            {
+            case (true, _): return NSLocalizedString("When AirPlaying DS games, only the top screen will appear on the external display.", comment: "")
+            case (false, .vertical): return NSLocalizedString("When AirPlaying DS games, both screens will be stacked vertically on the external display.", comment: "")
+            case (false, .horizontal): return NSLocalizedString("When AirPlaying DS games, both screens will be placed side-by-side on the external display.", comment: "")
+            }
+            
+        default: return super.tableView(tableView, titleForFooterInSection: section.rawValue)
        }
    }
    
--- a/Features/ExperimentalFeaturesView.swift
+++ b/Features/ExperimentalFeaturesView.swift
@ -0,0 +1,102 @@
+//
+//  ExperimentalFeaturesView.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/5/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+import Combine
+
+import DeltaFeatures
+
+extension ExperimentalFeaturesView
+{
+    private class ViewModel: ObservableObject
+    {
+        @Published
+        var sortedFeatures: [any AnyFeature]
+        
+        init()
+        {
+            // Sort features alphabetically by name.
+            self.sortedFeatures = ExperimentalFeatures.shared.allFeatures.sorted { (featureA, featureB) in
+                return String(describing: featureA.name) < String(describing: featureB.name)
+            }
+        }
+    }
+}
+
+struct ExperimentalFeaturesView: View
+{
+    @StateObject
+    private var viewModel: ViewModel = ViewModel()
+    
+    private var localizedTitle: String { NSLocalizedString("Experimental Features", comment: "") }
+    
+    var body: some View {
+        Form {
+            Section(content: {}, footer: {
+                Text("These features have been added by contributors to the open-source Delta project on GitHub and are currently being tested.\n\nYou may encounter bugs when using these features.")
+                    .font(.subheadline)
+            })
+            
+            ForEach(viewModel.sortedFeatures, id: \.key) { feature in
+                section(for: feature)
+            }
+        }
+        .listStyle(.insetGrouped)
+        .navigationTitle(localizedTitle)
+        .navigationBarTitleDisplayMode(.inline)
+    }
+    
+    // Cannot open existential if return type uses concrete type T in non-covariant position (e.g. Box<T>).
+    // So instead we erase return type to AnyView.
+    private func section<T: AnyFeature>(for feature: T) -> AnyView
+    {
+        let section = FeatureSection(feature: feature)
+        return AnyView(section)
+    }
+}
+
+extension ExperimentalFeaturesView
+{
+    static func makeViewController() -> UIHostingController<some View>
+    {
+        let experimentalFeaturesView = ExperimentalFeaturesView()
+        
+        let hostingController = UIHostingController(rootView: experimentalFeaturesView)
+        hostingController.navigationItem.largeTitleDisplayMode = .never
+        hostingController.navigationItem.title = experimentalFeaturesView.localizedTitle
+        return hostingController
+    }
+}
+
+private struct FeatureSection<T: AnyFeature>: View
+{
+    @ObservedObject
+    var feature: T
+    
+    var body: some View {
+        Section {
+            NavigationLink(destination: FeatureDetailView(feature: feature)) {
+                HStack {
+                    Text(feature.name)
+                    Spacer()
+                    
+                    if feature.isEnabled
+                    {
+                        Text("On")
+                            .foregroundColor(.secondary)
+                    }
+                }
+            }
+        }  footer: {
+            if let description = feature.description
+            {
+                Text(description)
+            }
+        }
+    }
+}
--- a/Features/FeatureDetailView.swift
+++ b/Features/FeatureDetailView.swift
@ -0,0 +1,141 @@
+//
+//  FeatureDetailView.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/10/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaFeatures
+
+struct FeatureDetailView<Feature: AnyFeature>: View
+{
+    @ObservedObject
+    var feature: Feature
+    
+    var body: some View {
+        Form {
+            Section {
+                Toggle(isOn: $feature.isEnabled.animation()) {
+                    Text(feature.name)
+                        .bold()
+                }
+            } footer: {
+                if let description = feature.description
+                {
+                    Text(description)
+                }
+            }
+            
+            if feature.isEnabled
+            {
+                ForEach(feature.allOptions, id: \.key) { option in
+                    if let optionView = optionView(option)
+                    {
+                        Section {
+                            optionView
+                        } footer: {
+                            if let description = option.description
+                            {
+                                Text(description)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    // Cannot open existential if return type uses concrete type T in non-covariant position (e.g. Box<T>).
+    // So instead we erase return type to AnyView.
+    private func optionView<T: AnyOption>(_ option: T) -> AnyView?
+    {
+        guard let view = OptionRow(option: option) else { return nil }
+        return AnyView(view)
+    }
+}
+
+private struct OptionRow<Option: AnyOption, DetailView: View>: View where DetailView == Option.DetailView
+{
+    let name: LocalizedStringKey
+    let value: any LocalizedOptionValue
+    let detailView: DetailView
+    
+    let option: Option
+    
+    @State
+    private var displayInline: Bool = false
+    
+    init?(option: Option)
+    {
+        // Only show if option has a name, localizable value, and detailView.
+        guard
+            let name = option.name,
+            let value = option.value as? any LocalizedOptionValue,
+            let detailView = option.detailView()
+        else { return nil }
+        
+        self.name = name
+        self.value = value
+        self.detailView = detailView
+        
+        self.option = option
+    }
+    
+    var body: some View {
+        VStack {
+            let detailView = detailView
+                .environment(\.managedObjectContext, DatabaseManager.shared.viewContext)
+                .environment(\.featureOption, option)
+            
+            if displayInline
+            {
+                // Display entire view inline.
+                detailView
+            }
+            else
+            {
+                NavigationLink(destination: wrap(detailView)) {
+                    HStack {
+                        Text(name)
+                        Spacer()
+
+                        value.localizedDescription
+                            .foregroundColor(.secondary)
+                    }
+                }
+                .overlay(
+                    // Hack to ensure displayInline preference is in View hierarchy.
+                    detailView
+                        .hidden()
+                        .frame(width: 0, height: 0)
+                )
+            }
+        }
+        .onPreferenceChange(DisplayInlineKey.self) { displayInline in
+            self.displayInline = displayInline
+        }
+    }
+    
+    func wrap(_ detailView: some View) -> AnyView
+    {
+        let wrappedDetailView: AnyView
+        
+        if self.detailView is any UIViewControllerRepresentable
+        {
+            wrappedDetailView = AnyView(detailView.ignoresSafeArea())
+        }
+        else
+        {
+            let form = Form {
+                detailView
+            }
+            
+            wrappedDetailView = AnyView(form)
+        }
+        
+        return wrappedDetailView
+    }
+}
--- a/Delta/Settings/Features/DSAirPlay.swift
+++ b/Delta/Settings/Features/DSAirPlay.swift
@ -0,0 +1,23 @@
+//
+//  DSAirPlay.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/26/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+import DeltaFeatures
+import DeltaCore
+
+extension TouchControllerSkin.LayoutAxis: OptionValue {}
+
+struct DSAirPlayOptions
+{
+    @Option
+    var topScreenOnly: Bool = true
+    
+    @Option
+    var layoutAxis: TouchControllerSkin.LayoutAxis = .vertical
+}
--- a/Delta/Settings/Features/Features.swift
+++ b/Delta/Settings/Features/Features.swift
@ -0,0 +1,25 @@
+//
+//  Features.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/21/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import DeltaFeatures
+
+extension Settings
+{
+    struct Features: FeatureContainer
+    {
+        static let shared = Features()
+        
+        @Feature(name: "DS AirPlay", options: DSAirPlayOptions())
+        var dsAirPlay
+        
+        private init()
+        {
+            self.prepareFeatures()
+        }
+    }
+}
--- a/Delta/Settings/PrivacyVC.swift
+++ b/Delta/Settings/PrivacyVC.swift
@ -0,0 +1,34 @@
+//
+//  PrivacyVC.swift
+//  Delta
+//
+//  Created by 忆海16 on 2024/5/9.
+//  Copyright © 2024 Riley Testut. All rights reserved.
+//
+
+import UIKit
+import WebKit
+class PrivacyVC: UIViewController {
+    var webView: WKWebView!
+    var type:Int = 0
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        webView = WKWebView()
+        view = webView
+        
+        if self.type == 0 {
+            if let url = URL(string: "https://retrogameemulator.mystrikingly.com/privacy") {
+                let request = URLRequest(url: url)
+                webView.load(request)
+            }
+        }else{
+            if let url = URL(string: "https://retrogameemulator.mystrikingly.com/terms") {
+                let request = URLRequest(url: url)
+                webView.load(request)
+            }
+        }
+
+       
+    }
+}
--- a/Delta/Settings/PrivacyVC.xib
+++ b/Delta/Settings/PrivacyVC.xib
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PrivacyVC" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+        </view>
+    </objects>
+</document>
--- a/Delta/Settings/Settings.swift
+++ b/Delta/Settings/Settings.swift
@ -9,38 +9,28 @@
 import Foundation

 import DeltaCore
+import DeltaFeatures
 import MelonDSDeltaCore

 import Roxas

-extension Notification.Name
+extension Settings.NotificationUserInfoKey
 {
-    static let settingsDidChange = Notification.Name("SettingsDidChangeNotification")
+    static let system: Settings.NotificationUserInfoKey = "system"
+    static let traits: Settings.NotificationUserInfoKey = "traits"
+    static let core: Settings.NotificationUserInfoKey = "core"
 }

-extension Settings
+extension Settings.Name
 {
-    enum NotificationUserInfoKey: String
-    {
-        case name
-        
-        case system
-        case traits
-        
-        case core
-    }
-    
-    enum Name: String
-    {
-        case localControllerPlayerIndex
-        case translucentControllerSkinOpacity
-        case preferredControllerSkin
-        case syncingService
-        case isButtonHapticFeedbackEnabled
-        case isThumbstickHapticFeedbackEnabled
-        case isAltJITEnabled
-        case respectSilentMode
-    }
+    static let localControllerPlayerIndex: Settings.Name = "localControllerPlayerIndex"
+    static let translucentControllerSkinOpacity: Settings.Name = "translucentControllerSkinOpacity"
+    static let preferredControllerSkin: Settings.Name = "preferredControllerSkin"
+    static let syncingService: Settings.Name = "syncingService"
+    static let isButtonHapticFeedbackEnabled: Settings.Name = "isButtonHapticFeedbackEnabled"
+    static let isThumbstickHapticFeedbackEnabled: Settings.Name = "isThumbstickHapticFeedbackEnabled"
+    static let isAltJITEnabled: Settings.Name = "isAltJITEnabled"
+    static let respectSilentMode: Settings.Name = "respectSilentMode"
 }

 extension Settings
@ -50,13 +40,20 @@ extension Settings
        case recent
        case manual
    }
+    
+    typealias Name = SettingsName
+    typealias NotificationUserInfoKey = SettingsUserInfoKey
+    
+    static let didChangeNotification = Notification.Name.settingsDidChange
 }

 struct Settings
 {
+    static let features = Features.shared
+    
    static func registerDefaults()
    {
-        let defaults = [#keyPath(UserDefaults.translucentControllerSkinOpacity): 0.7,
+        var defaults = [#keyPath(UserDefaults.translucentControllerSkinOpacity): 0.7,
                        #keyPath(UserDefaults.gameShortcutsMode): GameShortcutsMode.recent.rawValue,
                        #keyPath(UserDefaults.isButtonHapticFeedbackEnabled): true,
                        #keyPath(UserDefaults.isThumbstickHapticFeedbackEnabled): true,
@ -65,15 +62,21 @@ struct Settings
                        #keyPath(UserDefaults.isAltJITEnabled): false,
                        #keyPath(UserDefaults.respectSilentMode): true,
                        Settings.preferredCoreSettingsKey(for: .ds): MelonDS.core.identifier] as [String : Any]
-        UserDefaults.standard.register(defaults: defaults)
        
-        #if !BETA
+        #if BETA
+        
+        // Assume we need to repair database relationships until explicitly set to false.
+        defaults[#keyPath(UserDefaults.shouldRepairDatabase)] = true
+        
+        #else
        // Manually set MelonDS as preferred DS core in case DeSmuME is cached from a previous version.
        UserDefaults.standard.set(MelonDS.core.identifier, forKey: Settings.preferredCoreSettingsKey(for: .ds))
        
        // Manually disable AltJIT for public builds.
        UserDefaults.standard.isAltJITEnabled = false
        #endif
+        
+        UserDefaults.standard.register(defaults: defaults)
    }
 }

@ -83,7 +86,7 @@ extension Settings
    static var localControllerPlayerIndex: Int? = 0 {
        didSet {
            guard self.localControllerPlayerIndex != oldValue else { return }
-            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: Name.localControllerPlayerIndex])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: Name.localControllerPlayerIndex])
        }
    }
    
@ -91,7 +94,7 @@ extension Settings
        set {
            guard newValue != self.translucentControllerSkinOpacity else { return }
            UserDefaults.standard.translucentControllerSkinOpacity = newValue
-            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: Name.translucentControllerSkinOpacity])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: Name.translucentControllerSkinOpacity])
        }
        get { return UserDefaults.standard.translucentControllerSkinOpacity }
    }
@ -160,7 +163,7 @@ extension Settings
        }
        set {
            UserDefaults.standard.syncingService = newValue?.rawValue
-            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: Name.syncingService])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: Name.syncingService])
        }
    }
    
@ -171,7 +174,7 @@ extension Settings
        }
        set {
            UserDefaults.standard.isButtonHapticFeedbackEnabled = newValue
-            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: Name.isButtonHapticFeedbackEnabled])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: Name.isButtonHapticFeedbackEnabled])
        }
    }
    
@ -182,7 +185,7 @@ extension Settings
        }
        set {
            UserDefaults.standard.isThumbstickHapticFeedbackEnabled = newValue
-            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: Name.isThumbstickHapticFeedbackEnabled])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: Name.isThumbstickHapticFeedbackEnabled])
        }
    }
    
@ -209,7 +212,7 @@ extension Settings
        }
        set {
            UserDefaults.standard.isAltJITEnabled = newValue
-            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: Name.isAltJITEnabled])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: Name.isAltJITEnabled])
        }
    }
    
@ -220,7 +223,7 @@ extension Settings
        }
        set {
            UserDefaults.standard.respectSilentMode = newValue
-            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: Name.respectSilentMode])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: Name.respectSilentMode])
        }
    }
    
@ -241,7 +244,7 @@ extension Settings
        let key = self.preferredCoreSettingsKey(for: gameType)
        
        UserDefaults.standard.set(core.identifier, forKey: key)
-        NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [NotificationUserInfoKey.name: key, NotificationUserInfoKey.core: core])
+        NotificationCenter.default.post(name: Settings.didChangeNotification, object: nil, userInfo: [NotificationUserInfoKey.name: key, NotificationUserInfoKey.core: core])
    }
    
    static func preferredControllerSkin(for system: System, traits: DeltaCore.ControllerSkin.Traits) -> ControllerSkin?
@ -292,7 +295,7 @@ extension Settings
        
        UserDefaults.standard.set(controllerSkin?.identifier, forKey: userDefaultKey)
        
-        NotificationCenter.default.post(name: .settingsDidChange, object: controllerSkin, userInfo: [NotificationUserInfoKey.name: Name.preferredControllerSkin, NotificationUserInfoKey.system: system, NotificationUserInfoKey.traits: traits])
+        NotificationCenter.default.post(name: Settings.didChangeNotification, object: controllerSkin, userInfo: [NotificationUserInfoKey.name: Name.preferredControllerSkin, NotificationUserInfoKey.system: system, NotificationUserInfoKey.traits: traits])
    }
    
    static func preferredControllerSkin(for game: Game, traits: DeltaCore.ControllerSkin.Traits) -> ControllerSkin?
@ -350,7 +353,7 @@ extension Settings
        
        if let system = System(gameType: game.type)
        {
-            NotificationCenter.default.post(name: .settingsDidChange, object: controllerSkin, userInfo: [NotificationUserInfoKey.name: Name.preferredControllerSkin, NotificationUserInfoKey.system: system, NotificationUserInfoKey.traits: traits])
+            NotificationCenter.default.post(name: Settings.didChangeNotification, object: controllerSkin, userInfo: [NotificationUserInfoKey.name: Name.preferredControllerSkin, NotificationUserInfoKey.system: system, NotificationUserInfoKey.traits: traits])
        }
    }
 }
--- a/Delta/Settings/SettingsViewController.swift
+++ b/Delta/Settings/SettingsViewController.swift
@ -25,6 +25,7 @@ private extension SettingsViewController
        case syncing
        case hapticTouch
        case cores
+        case advanced
        case patreon
        case credits
    }
@ -56,6 +57,9 @@ private extension SettingsViewController

 class SettingsViewController: UITableViewController
 {
+    
+    
+    
    @IBOutlet private var controllerOpacityLabel: UILabel!
    @IBOutlet private var controllerOpacitySlider: UISlider!
    
@ -66,6 +70,9 @@ class SettingsViewController: UITableViewController
    
    @IBOutlet private var versionLabel: UILabel!
    
+    
+
+    
    @IBOutlet private var syncingServiceLabel: UILabel!
    
    private var selectionFeedbackGenerator: UISelectionFeedbackGenerator?
@ -78,7 +85,7 @@ class SettingsViewController: UITableViewController
    {
        super.init(coder: aDecoder)
        
-        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.settingsDidChange(with:)), name: .settingsDidChange, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.settingsDidChange(with:)), name: Settings.didChangeNotification, object: nil)
        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.externalGameControllerDidConnect(_:)), name: .externalGameControllerDidConnect, object: nil)
        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.externalGameControllerDidDisconnect(_:)), name: .externalGameControllerDidDisconnect, object: nil)
    }
@ -86,23 +93,24 @@ class SettingsViewController: UITableViewController
    override func viewDidLoad()
    {
        super.viewDidLoad()
+
        
-        if let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
-        {
-            #if LITE
-            self.versionLabel.text = NSLocalizedString(String(format: "Delta Lite %@", version), comment: "Delta Version")
-            #else
-            self.versionLabel.text = NSLocalizedString(String(format: "Delta %@", version), comment: "Delta Version")
-            #endif
-        }
-        else
-        {
-            #if LITE
-            self.versionLabel.text = NSLocalizedString("Delta Lite", comment: "")
-            #else
-            self.versionLabel.text = NSLocalizedString("Delta", comment: "")
-            #endif
-        }
+//        if let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
+//        {
+//            #if LITE
+//            self.versionLabel.text = NSLocalizedString(String(format: "Delta Lite %@", version), comment: "Delta Version")
+//            #else
+//            self.versionLabel.text = NSLocalizedString(String(format: "Delta %@", version), comment: "Delta Version")
+//            #endif
+//        }
+//        else
+//        {
+//            #if LITE
+//            self.versionLabel.text = NSLocalizedString("Delta Lite", comment: "")
+//            #else
+//            self.versionLabel.text = NSLocalizedString("Delta", comment: "")
+//            #endif
+//        }
    }
    
    override func viewWillAppear(_ animated: Bool)
@ -123,6 +131,32 @@ class SettingsViewController: UITableViewController
        
        self.update()
    }
+    
+    
+    @IBAction func didmisiigame(_ sender: Any) {
+        dismiss(animated: true)
+    }
+    
+    
+    @IBAction func aboutbtn(_ sender: Any) {
+        let vc = AboutVC()
+        self.present(vc, animated: true)
+    }
+    
+    @IBAction func privacybtn(_ sender: Any) {
+        let vc = PrivacyVC()
+        vc.type = 0
+        self.present(vc, animated: true)
+    }
+    
+    
+    @IBAction func useragreemBtn(_ sender: Any) {
+        let vc = PrivacyVC()
+        vc.type = 1
+        self.present(vc, animated: true)
+    }
+    
+    

    override func didReceiveMemoryWarning()
    {
@ -159,29 +193,31 @@ class SettingsViewController: UITableViewController

 private extension SettingsViewController
 {
+    
+    
    func update()
    {
-        self.controllerOpacitySlider.value = Float(Settings.translucentControllerSkinOpacity)
-        self.updateControllerOpacityLabel()
-        
-        self.respectSilentModeSwitch.isOn = Settings.respectSilentMode
-        
-        self.syncingServiceLabel.text = Settings.syncingService?.localizedName
-        
-        do
-        {
-            let records = try SyncManager.shared.recordController?.fetchConflictedRecords() ?? []
-            self.syncingConflictsCount = records.count
-        }
-        catch
-        {
-            print(error)
-        }
-        
-        self.buttonHapticFeedbackEnabledSwitch.isOn = Settings.isButtonHapticFeedbackEnabled
-        self.thumbstickHapticFeedbackEnabledSwitch.isOn = Settings.isThumbstickHapticFeedbackEnabled
-        self.previewsEnabledSwitch.isOn = Settings.isPreviewsEnabled
+//        self.controllerOpacitySlider.value = Float(Settings.translucentControllerSkinOpacity)
+//        self.updateControllerOpacityLabel()
+//        
+//        self.respectSilentModeSwitch.isOn = Settings.respectSilentMode
+//        
+//        self.syncingServiceLabel.text = Settings.syncingService?.localizedName
+//        
+//        do
+//        {
+//            let records = try SyncManager.shared.recordController?.fetchConflictedRecords() ?? []
+//            self.syncingConflictsCount = records.count
+//        }
+//        catch
+//        {
+//            print(error)
+//        }
        
+//        self.buttonHapticFeedbackEnabledSwitch.isOn = Settings.isButtonHapticFeedbackEnabled
+//        self.thumbstickHapticFeedbackEnabledSwitch.isOn = Settings.isThumbstickHapticFeedbackEnabled
+//        self.previewsEnabledSwitch.isOn = Settings.isPreviewsEnabled
+//        
        self.tableView.reloadData()
    }
    
@ -213,6 +249,9 @@ private extension SettingsViewController

 private extension SettingsViewController
 {
+    
+    
+    
    @IBAction func beginChangingControllerOpacity(with sender: UISlider)
    {
        self.selectionFeedbackGenerator = UISelectionFeedbackGenerator()
@ -259,6 +298,8 @@ private extension SettingsViewController
        Settings.respectSilentMode = sender.isOn
    }
    
+    
+    
    func openTwitter(username: String)
    {
        let twitterAppURL = URL(string: "twitter://user?screen_name=" + username)!
@ -287,6 +328,12 @@ private extension SettingsViewController
        let hostingController = ContributorsView.makeViewController()
        self.navigationController?.pushViewController(hostingController, animated: true)
    }
+    
+    func showExperimentalFeatures()
+    {
+        let hostingController = ExperimentalFeaturesView.makeViewController()
+        self.navigationController?.pushViewController(hostingController, animated: true)
+    }
 }

 private extension SettingsViewController
@ -309,6 +356,7 @@ private extension SettingsViewController
            }
            
        case .localControllerPlayerIndex, .preferredControllerSkin, .translucentControllerSkinOpacity, .respectSilentMode, .isButtonHapticFeedbackEnabled, .isThumbstickHapticFeedbackEnabled, .isAltJITEnabled: break
+        default: break
        }
    }

@ -325,14 +373,17 @@ private extension SettingsViewController

 extension SettingsViewController
 {
+    
    override func tableView(_ tableView: UITableView, numberOfRowsInSection sectionIndex: Int) -> Int
    {
        let section = Section(rawValue: sectionIndex)!
        switch section
        {
-        case .controllers: return 1 // Temporarily hide other controller indexes until controller logic is finalized
-        case .controllerSkins: return System.registeredSystems.count
-        case .syncing: return SyncManager.shared.coordinator?.account == nil ? 1 : super.tableView(tableView, numberOfRowsInSection: sectionIndex)
+        case .controllers: return 1
+        case .controllerSkins: return 1 /*System.registeredSystems.count*/
+        case .syncing: return 0 /*SyncManager.shared.coordinator?.account == nil ? 1 : super.tableView(tableView, numberOfRowsInSection: sectionIndex)*/
+        case .controllerOpacity: return 3
+        case .gameAudio: return 1
        default:
            if isSectionHidden(section)
            {
@ -340,7 +391,8 @@ extension SettingsViewController
            }
            else
            {
-                return super.tableView(tableView, numberOfRowsInSection: sectionIndex)
+//                return super.tableView(tableView, numberOfRowsInSection: sectionIndex)
+                return 0
            }
        }
    }
@ -385,7 +437,7 @@ extension SettingsViewController
            let preferredCore = Settings.preferredCore(for: .ds)
            cell.detailTextLabel?.text = preferredCore?.metadata?.name.value ?? preferredCore?.name ?? NSLocalizedString("Unknown", comment: "")
            
-        case .controllerOpacity, .gameAudio, .hapticFeedback, .hapticTouch, .patreon, .credits: break
+        case .controllerOpacity, .gameAudio, .hapticFeedback, .hapticTouch, .advanced, .patreon, .credits: break
        }

        return cell
@ -402,6 +454,7 @@ extension SettingsViewController
        case .controllerSkins: self.performSegue(withIdentifier: Segue.controllerSkins.rawValue, sender: cell)
        case .cores: self.performSegue(withIdentifier: Segue.dsSettings.rawValue, sender: cell)
        case .controllerOpacity, .gameAudio, .hapticFeedback, .hapticTouch, .syncing: break
+        case .advanced: self.showExperimentalFeatures()
        case .patreon:
            let patreonURL = URL(string: "altstore://patreon")!
            
@ -521,4 +574,6 @@ extension SettingsViewController
            return super.tableView(tableView, heightForFooterInSection: section.rawValue)
        }
    }
+
+
 }
--- a/Delta/Settings/Syncing/RecordVersionsViewController.swift
+++ b/Delta/Settings/Syncing/RecordVersionsViewController.swift
@ -136,7 +136,7 @@ private extension RecordVersionsViewController
        
        let localVersionsDataSource = RSTDynamicTableViewDataSource<Version>()
        localVersionsDataSource.numberOfSectionsHandler = { 1 }
-        localVersionsDataSource.numberOfItemsHandler = { [weak self] _ in self?.record.localModificationDate != nil ? 1 : 0 }
+        localVersionsDataSource.numberOfItemsHandler = { [weak self] _ in self?.record.localModificationDate != nil ? 1 : 0 } // fetchVersions() assumes this logic, so update there too.
        localVersionsDataSource.cellConfigurationHandler = { [weak self] (cell, _, indexPath) in
            guard let `self` = self else { return }
            
@ -200,6 +200,19 @@ private extension RecordVersionsViewController
                self.versions = versions
                
                DispatchQueue.main.async {
+                    let previousLocalVersionExists = self.tableView.numberOfRows(inSection: Section.local.rawValue) > 0
+                    let localVersionExists = self.record.localModificationDate != nil
+                    
+                    let localVersionIndexPath = IndexPath(row: 0, section: Section.local.rawValue)
+                    if !previousLocalVersionExists && localVersionExists
+                    {
+                        self.tableView.insertRows(at: [localVersionIndexPath], with: .fade)
+                    }
+                    else if previousLocalVersionExists && !localVersionExists
+                    {
+                        self.tableView.deleteRows(at: [localVersionIndexPath], with: .fade)
+                    }
+                    
                    let count = self.tableView.numberOfRows(inSection: Section.remote.rawValue)
                    
                    let deletions = (0 ..< count).map { (row) -> RSTCellContentChange in
@ -245,6 +258,8 @@ private extension RecordVersionsViewController
        {
            DispatchQueue.main.async {
                
+                SyncManager.shared.ignoredCorruptedRecordIDs.remove(self.record.recordID)
+                
                CATransaction.begin()
                
                CATransaction.setCompletionBlock {
@ -274,17 +289,34 @@ private extension RecordVersionsViewController
                }
                catch
                {
-                    let title: String
-                    
-                    switch self.mode
+                    switch error
                    {
-                    case .restoreVersion: title = NSLocalizedString("Failed to Restore Version", comment: "")
-                    case .resolveConflict: title = NSLocalizedString("Failed to Resolve Conflict", comment: "")
+                    case RecordError.other(let record, let error as SyncValidationError):
+                        // Only allow restoring corrupted records with incorrect games.
+                        guard case .incorrectGame = error else { fallthrough }
+                        
+                        let message = NSLocalizedString("Would you like to download this version anyway? Delta will try to fix the corruption if possible.", comment: "")
+                        let alertController = UIAlertController(title: NSLocalizedString("Version Corrupted", comment: ""), message: message, preferredStyle: .alert)
+                        alertController.addAction(.cancel)
+                        alertController.addAction(UIAlertAction(title: NSLocalizedString("Download Anyway", comment: ""), style: .destructive) { _ in
+                            SyncManager.shared.ignoredCorruptedRecordIDs.insert(record.recordID)
+                            self.restoreVersion()
+                        })
+                        self.present(alertController, animated: true, completion: nil)
+                        
+                    default:
+                        let title: String
+                        
+                        switch self.mode
+                        {
+                        case .restoreVersion: title = NSLocalizedString("Failed to Restore Version", comment: "")
+                        case .resolveConflict: title = NSLocalizedString("Failed to Resolve Conflict", comment: "")
+                        }
+                        
+                        let alertController = UIAlertController(title: title, message: error.localizedDescription, preferredStyle: .alert)
+                        alertController.addAction(.ok)
+                        self.present(alertController, animated: true, completion: nil)
                    }
-                    
-                    let alertController = UIAlertController(title: title, message: error.localizedDescription, preferredStyle: .alert)
-                    alertController.addAction(.ok)
-                    self.present(alertController, animated: true, completion: nil)
                }
                
                CATransaction.commit()
@ -358,6 +390,7 @@ private extension RecordVersionsViewController
        }
        
        let alertController = UIAlertController(title: nil, message: message, preferredStyle: .actionSheet)
+        alertController.popoverPresentationController?.barButtonItem = sender
        alertController.addAction(.cancel)
        alertController.addAction(UIAlertAction(title: actionTitle, style: .destructive) { (action) in
            self.restoreVersion()
--- a/Delta/Settings/Syncing/SyncingServicesViewController.swift
+++ b/Delta/Settings/Syncing/SyncingServicesViewController.swift
@ -32,6 +32,7 @@ extension SyncingServicesViewController
 class SyncingServicesViewController: UITableViewController
 {
    @IBOutlet private var syncingEnabledSwitch: UISwitch!
+    private var activityIndicatorView: UIActivityIndicatorView!
    
    private var selectedSyncingService = Settings.syncingService
    
@ -39,6 +40,12 @@ class SyncingServicesViewController: UITableViewController
    {
        super.viewDidLoad()
        
+        self.activityIndicatorView = UIActivityIndicatorView(style: .medium)
+        self.activityIndicatorView.hidesWhenStopped = true
+        
+        let barButtonItem = UIBarButtonItem(customView: self.activityIndicatorView)
+        self.navigationItem.rightBarButtonItem = barButtonItem
+        
        self.syncingEnabledSwitch.onTintColor = .deltaPurple
        self.syncingEnabledSwitch.isOn = (self.selectedSyncingService != nil)
    }
@ -57,7 +64,9 @@ private extension SyncingServicesViewController
            if SyncManager.shared.coordinator?.account != nil
            {
                let alertController = UIAlertController(title: NSLocalizedString("Disable Syncing?", comment: ""), message: NSLocalizedString("Enabling syncing again later may result in conflicts that must be resolved manually.", comment: ""), preferredStyle: .alert)
-                alertController.addAction(.cancel)
+                alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style) { (action) in
+                    sender.setOn(true, animated: true)
+                })
                alertController.addAction(UIAlertAction(title: NSLocalizedString("Disable", comment: ""), style: .default) { (action) in
                    self.changeService(to: nil)
                })
@ -170,7 +179,7 @@ extension SyncingServicesViewController
            
            if SyncManager.shared.coordinator?.account != nil
            {
-                let alertController = UIAlertController(title: NSLocalizedString("Are you sure you want to change sync services?", comment: ""), message: NSLocalizedString("Switching back later may result in conflicts that must be resolved manually.", comment: ""), preferredStyle: .actionSheet)
+                let alertController = UIAlertController(title: NSLocalizedString("Are you sure you want to change sync services?", comment: ""), message: NSLocalizedString("Switching back later may result in conflicts that must be resolved manually.", comment: ""), preferredStyle: .alert)
                alertController.addAction(.cancel)
                alertController.addAction(UIAlertAction(title: NSLocalizedString("Change Sync Service", comment: ""), style: .destructive, handler: { (action) in
                    self.changeService(to: syncingService)
@ -188,7 +197,7 @@ extension SyncingServicesViewController
        case .authenticate:            
            if SyncManager.shared.coordinator?.account != nil
            {
-                let alertController = UIAlertController(title: NSLocalizedString("Are you sure you want to sign out?", comment: ""), message: NSLocalizedString("Signing in again later may result in conflicts that must be resolved manually.", comment: ""), preferredStyle: .actionSheet)
+                let alertController = UIAlertController(title: NSLocalizedString("Are you sure you want to sign out?", comment: ""), message: NSLocalizedString("Signing in again later may result in conflicts that must be resolved manually.", comment: ""), preferredStyle: .alert)
                alertController.addAction(.cancel)
                alertController.addAction(UIAlertAction(title: NSLocalizedString("Sign Out", comment: ""), style: .destructive) { (action) in
                    SyncManager.shared.deauthenticate { (result) in
@ -213,6 +222,8 @@ extension SyncingServicesViewController
            }
            else
            {
+                self.activityIndicatorView.startAnimating()
+                
                SyncManager.shared.authenticate(presentingViewController: self) { (result) in
                    DispatchQueue.main.async {
                        do
@ -231,6 +242,8 @@ extension SyncingServicesViewController
                            let alertController = UIAlertController(title: NSLocalizedString("Failed to Sign In", comment: ""), error: error)
                            self.present(alertController, animated: true, completion: nil)
                        }
+                        
+                        self.activityIndicatorView.stopAnimating()
                    }
                }
            }
--- a/Files/Info.plist
+++ b/Files/Info.plist
@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ALTDeviceID</key>
+	<string>00008110-000A68390A82801E</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDocumentTypes</key>
@ -176,20 +178,6 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>Fabric</key>
-	<dict>
-		<key>APIKey</key>
-		<string>d542629b4f6625cfd5564d27318550321272076d</string>
-		<key>Kits</key>
-		<array>
-			<dict>
-				<key>KitInfo</key>
-				<dict/>
-				<key>KitName</key>
-				<string>Crashlytics</string>
-			</dict>
-		</array>
-	</dict>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>dbapi-8-emm</string>
@ -199,10 +187,14 @@
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<false/>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>Delta uses your microphone to emulate the Nintendo DS microphone.</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_altserver._tcp</string>
+	</array>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>Retro Game Emulator uses the local network to communicate with AltServer and enable JIT.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Press "OK" to allow Delta to use images from your Photo Library as game artwork.</string>
+	<string>Press "OK" to allow Retro Game Emulator to use images from your Photo Library as game artwork.</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@ -222,6 +214,17 @@
 					<string>Main</string>
 				</dict>
 			</array>
+			<key>UIWindowSceneSessionRoleExternalDisplay</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).ExternalDisplayScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>External Display</string>
+					<key>UISceneDelegateClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).ExternalDisplaySceneDelegate</string>
+				</dict>
+			</array>
 		</dict>
 	</dict>
 	<key>UIBackgroundModes</key>
@ -430,13 +433,5 @@
 			</dict>
 		</dict>
 	</array>
-    <key>NSBonjourServices</key>
-    <array>
-        <string>_altserver._tcp</string>
-    </array>
-    <key>ALTDeviceID</key>
-    <string>00008110-000A68390A82801E</string>
-    <key>NSLocalNetworkUsageDescription</key>
-    <string>Delta uses the local network to communicate with AltServer and enable JIT.</string>
 </dict>
 </plist>
--- a/Delta/Syncing/SyncManager.swift
+++ b/Delta/Syncing/SyncManager.swift
@ -95,6 +95,9 @@ final class SyncManager
        return self.coordinator?.recordController
    }
    
+    // Hacky, but YOLO I'm under time crunch.
+    public var ignoredCorruptedRecordIDs = Set<RecordID>()
+    
    private(set) var syncProgress: Progress?
        
    private(set) var previousSyncResult: SyncResult?
@ -209,31 +212,7 @@ extension SyncManager
    {
        guard let coordinator = self.coordinator else { return completionHandler(.failure(AuthenticationError(Error.nilService))) }
        
-        coordinator.authenticate(presentingViewController: presentingViewController) { (result) in
-            do
-            {
-                let account = try result.get()
-                
-                if !coordinator.recordController.isSeeded
-                {
-                    coordinator.recordController.seedFromPersistentContainer { (result) in
-                        switch result
-                        {
-                        case .success: completionHandler(.success(account))
-                        case .failure(let error): completionHandler(.failure(AuthenticationError(error)))
-                        }
-                    }
-                }
-                else
-                {
-                    completionHandler(.success(account))
-                }
-            }
-            catch
-            {
-                completionHandler(.failure(AuthenticationError(error)))
-            }
-        }
+        coordinator.authenticate(presentingViewController: presentingViewController, completionHandler: completionHandler)
    }
    
    func deauthenticate(completionHandler: @escaping (Result<Void, DeauthenticationError>) -> Void)
@ -245,6 +224,9 @@ extension SyncManager
    
    func sync()
    {
+        // Don't sync until we've repaired database.
+        guard !UserDefaults.standard.shouldRepairDatabase else { return }
+        
        let progress = self.coordinator?.sync()
        self.syncProgress = progress
    }
--- a/Delta/Syncing/SyncResultViewController.swift
+++ b/Delta/Syncing/SyncResultViewController.swift
@ -173,6 +173,15 @@ private extension SyncResultViewController
                            errorMessage = NSLocalizedString("The game for this item is missing. Please re-import the game to resume syncing its data.", comment: "")
                        }
                        
+                    case .other(_, let error as SyncValidationError):
+                        var message = error.failureReason ?? error.localizedDescription
+                        if let recoverySuggestion = error.recoverySuggestion
+                        {
+                            message += "\n\n" + recoverySuggestion
+                        }
+                        
+                        errorMessage = message
+                        
                    case .other(_, let error as NSError): errorMessage = error.localizedFailureReason ?? error.localizedDescription
                    default: errorMessage = error.failureReason
                    }
@ -249,9 +258,7 @@ private extension SyncResultViewController
                case .gameControllerInputMapping: group = .gameControllerInputMapping
                    
                case .gameSave:
-                    guard let gameID = metadata?[.gameID] else { continue }
-                    
-                    let recordID = RecordID(type: SyncManager.RecordType.game.rawValue, identifier: gameID)
+                    let recordID = RecordID(type: SyncManager.RecordType.game.rawValue, identifier: error.record.recordID.identifier)
                    group = .game(recordID)
                    
                case .saveState:
@ -387,7 +394,11 @@ extension SyncResultViewController
            
        case .game:
            guard let error = section.errors.first as? RecordError else { return nil }
-            return error.record.localizedName
+            
+            let recordID = RecordID(type: SyncManager.RecordType.game.rawValue, identifier: error.record.recordID.identifier)
+            
+            let gameName = self.gameNamesByRecordID[recordID] // In case the remote record is corrupted, rely on local names.
+            return gameName ?? error.record.localizedName
            
        case .saveState(let gameID):
            guard let error = section.errors.first as? RecordError else { return nil }
--- a/Delta/Syncing/SyncValidationError.swift
+++ b/Delta/Syncing/SyncValidationError.swift
@ -0,0 +1,40 @@
+//
+//  SyncValidationError.swift
+//  Delta
+//
+//  Created by Riley Testut on 8/10/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+enum SyncValidationError: LocalizedError
+{
+    case incorrectGame(String?)
+    case incorrectGameCollection(String?)
+    
+    var failureReason: String? {
+        switch self
+        {
+        case .incorrectGame(let name?):
+            return String(format: NSLocalizedString("The downloaded record is associated with the wrong game (%@).", comment: ""), name)
+        
+        case .incorrectGame(nil):
+            return NSLocalizedString("The downloaded record is not associated with a game.", comment: "")
+            
+        case .incorrectGameCollection(let name?):
+            return String(format: NSLocalizedString("The downloaded record is associated with the wrong game system (%@).", comment: ""), name)
+            
+        case .incorrectGameCollection(nil):
+            return NSLocalizedString("The downloaded record is not associated with a game system.", comment: "")
+        }
+    }
+    
+    var recoverySuggestion: String? {
+        switch self
+        {
+        case .incorrectGame: return NSLocalizedString("Try restoring an older version to resolve this issue.", comment: "")
+        case .incorrectGameCollection: return NSLocalizedString("Try restoring an older version, or manually re-import the game to resolve this issue.", comment: "")
+        }
+    }
+}
--- a/Delta/Systems/System.swift
+++ b/Delta/Systems/System.swift
@ -44,7 +44,7 @@ extension System
    var localizedName: String {
        switch self
        {
-        case .nes: return NSLocalizedString("Nintendo", comment: "")
+        case .nes: return NSLocalizedString("", comment: "")
        case .snes: return NSLocalizedString("Super Nintendo", comment: "")
        case .n64: return NSLocalizedString("Nintendo 64", comment: "")
        case .gbc: return NSLocalizedString("Game Boy Color", comment: "")
--- a/DeltaFeatures/Extensions/Collection+Optionals.swift
+++ b/DeltaFeatures/Extensions/Collection+Optionals.swift
@ -0,0 +1,19 @@
+//
+//  Collection+Optionals.swift
+//  DeltaFeatures
+//
+//  Created by Riley Testut on 4/12/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+extension Collection
+{
+    func appendingNil() -> [Element] where Element: OptionalProtocol, Element.Wrapped: LocalizedOptionValue
+    {
+        var values = Array(self)
+        values.append(Element.none)
+        return values
+    }
+}
--- a/DeltaFeatures/Extensions/EnvironmentValues+FeatureOption.swift
+++ b/DeltaFeatures/Extensions/EnvironmentValues+FeatureOption.swift
@ -0,0 +1,22 @@
+//
+//  EnvironmentValues+FeatureOption.swift
+//  DeltaFeatures
+//
+//  Created by Riley Testut on 4/26/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+private struct FeatureOptionKey: EnvironmentKey
+{
+    static let defaultValue: any AnyOption = Option(wrappedValue: true)
+}
+
+public extension EnvironmentValues
+{
+    var featureOption: any AnyOption {
+        get { self[FeatureOptionKey.self] }
+        set { self[FeatureOptionKey.self] = newValue }
+    }
+}
--- a/DeltaFeatures/Extensions/NotificationName+Settings.swift
+++ b/DeltaFeatures/Extensions/NotificationName+Settings.swift
@ -0,0 +1,14 @@
+//
+//  Notification+Settings.swift
+//  DeltaFeatures
+//
+//  Created by Riley Testut on 4/13/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+public extension Notification.Name
+{
+    static let settingsDidChange = Notification.Name("SettingsDidChangeNotification")
+}
--- a/DeltaFeatures/Extensions/UserDefaults+OptionValues.swift
+++ b/DeltaFeatures/Extensions/UserDefaults+OptionValues.swift
@ -0,0 +1,115 @@
+//
+//  UserDefaults+OptionValues.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/7/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+private func wrap<RawType, WrapperType: RawRepresentable>(rawValue: RawType, in type: WrapperType.Type) -> WrapperType?
+{
+    // Ensure rawValue is correct type.
+    guard let rawValue = rawValue as? WrapperType.RawValue else { return nil }
+
+    let representingValue = WrapperType.init(rawValue: rawValue)
+    return representingValue
+}
+
+extension UserDefaults
+{
+    func setOptionValue<Value: OptionValue>(_ newValue: Value, forKey key: String) throws
+    {
+        switch newValue
+        {
+        // case .none/nil does _not_ catch nil values passed in,
+        // but casting to NSSecureCoding then checking if NSNull does.
+        // case .none: break
+            
+        case let secureCoding as any NSSecureCoding:
+            if secureCoding is NSNull
+            {
+                // Removing value will make us return default value later,
+                // which isn't what we want if we explicitly set nil.
+                // Instead, we persist a dictionary with "isNil" key to let
+                // us know we should return nil later, not the default value.
+                let nilDictionary = ["isNil": true] as NSDictionary
+                self.set(nilDictionary, forKey: key)
+            }
+            else
+            {
+                self.set(secureCoding, forKey: key)
+            }
+            
+        case let rawRepresentable as any RawRepresentable:
+            self.set(rawRepresentable.rawValue, forKey: key)
+            
+        case let codable as any Codable:
+            let data = try PropertyListEncoder().encode(codable)
+            self.set(data, forKey: key)
+            
+        default:
+            // Try anyway ¯\_(ツ)_/¯
+            self.set(newValue, forKey: key)
+        }
+    }
+    
+    // Returns Optional<Value>. If Value is already an Optional type, this will return a *nested* Optional<Optional<Value>>.
+    // If return value == nil, value does _not_ yet exist, so we should use default value.
+    // If return value == .some(nil) (aka nested nil), the value _does_ exist, and it is explicitly nil.
+    func optionValue<Value: OptionValue>(forKey key: String, type: Value.Type) throws -> Value?
+    {
+        guard let rawValue = UserDefaults.standard.object(forKey: key) else { return nil }
+        
+        if let nilDictionary = rawValue as? [String: Bool], let isNil = nilDictionary["isNil"], let optionalType = Value.self as? any OptionalProtocol.Type, isNil
+        {
+            // Return nil nested inside Optional (aka .some(nil)).
+            // Caller will treat it as non-nil and thus won't return default value.
+            let nestedNil = optionalType.none as? Value
+            return nestedNil
+        }
+
+        if let value = rawValue as? Value
+        {
+            return value
+        }
+        else if let optionalType = Value.self as? any OptionalProtocol.Type, let rawRepresentableType = optionalType.wrappedType as? any RawRepresentable.Type
+        {
+            // Open `rawRepresentableType` existential as concrete type so we can initialize RawRepresentable.
+            // Don't cast via as? Value yet because that may result in `.some(nil)` if Value is optional.
+            guard let rawRepresentable = wrap(rawValue: rawValue, in: rawRepresentableType) else {
+                // Incorrect raw type, so return nil directly without nesting to use default value.
+                return nil
+            }
+            
+            // Return (potentially) nested optional.
+            return rawRepresentable as? Value
+        }
+        else if let rawRepresentableType = Value.self as? any RawRepresentable.Type
+        {
+            // Open `rawRepresentableType` existential as concrete type so we can initialize RawRepresentable.
+            // Don't cast via as? Value yet because that may result in `.some(nil)` if Value is optional.
+            guard let rawRepresentable = wrap(rawValue: rawValue, in: rawRepresentableType) else {
+                // Incorrect raw type, so return nil directly without nesting to use default value.
+                return nil
+            }
+            
+            // Return (potentially) nested optional.
+            return rawRepresentable as? Value
+        }
+        else if let codableType = Value.self as? any Codable.Type, let data = rawValue as? Data
+        {
+            let decodedValue = try PropertyListDecoder().decode(codableType, from: data) as? Value
+            return decodedValue
+        }
+        else
+        {
+            print("[RSTLog] Unsupported option type:", Value.self)
+            
+            // Return nil directly, no nesting.
+            // Caller will treat this as nil and will return the default value instead.
+            return nil
+        }
+    }
+}
--- a/DeltaFeatures/Feature.swift
+++ b/DeltaFeatures/Feature.swift
@ -0,0 +1,95 @@
+//
+//  Feature.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/5/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+import Combine
+
+public struct EmptyOptions
+{
+    public init() {}
+}
+
+@propertyWrapper @dynamicMemberLookup
+public final class Feature<Options>: _AnyFeature
+{
+    public let name: LocalizedStringKey
+    public let description: LocalizedStringKey?
+    
+    // Assigned to property name.
+    public internal(set) var key: String = ""
+    
+    // Used for `SettingsUserInfoKey.name` value in .settingsDidChange notification.
+    public var settingsKey: SettingsName {
+        return SettingsName(rawValue: self.key)
+    }
+    
+    public var isEnabled: Bool {
+        get {
+            let isEnabled = UserDefaults.standard.bool(forKey: self.key)
+            return isEnabled
+        }
+        set {
+            self.objectWillChange.send()
+            UserDefaults.standard.set(newValue, forKey: self.key)
+            
+            NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [SettingsUserInfoKey.name: self.settingsKey, SettingsUserInfoKey.value: newValue])
+        }
+    }
+    
+    public var wrappedValue: some Feature {
+        return self
+    }
+    
+    private var options: Options
+    
+    public init(name: LocalizedStringKey, description: LocalizedStringKey? = nil, options: Options = EmptyOptions())
+    {
+        self.name = name
+        self.description = description
+        self.options = options
+        
+        self.prepareOptions()
+    }
+    
+    // Use `KeyPath` instead of `WritableKeyPath` as parameter to allow accessing projected property wrappers.
+    public subscript<T>(dynamicMember keyPath: KeyPath<Options, T>) -> T {
+        get {
+            options[keyPath: keyPath]
+        }
+        set {
+            guard let writableKeyPath = keyPath as? WritableKeyPath<Options, T> else { return }
+            options[keyPath: writableKeyPath] = newValue
+        }
+    }
+}
+
+public extension Feature
+{
+    var allOptions: [any AnyOption] {
+        let features = Mirror(reflecting: self.options).children.compactMap { (child) -> (any AnyOption)? in
+            let feature = child.value as? (any AnyOption)
+            return feature
+        }
+        return features
+    }
+}
+
+private extension Feature
+{
+    func prepareOptions()
+    {
+        // Update option keys + feature
+        for case (let key?, let option as any _AnyOption) in Mirror(reflecting: self.options).children
+        {
+            // Remove leading underscore.
+            let sanitizedKey = key.dropFirst()
+            option.key = String(sanitizedKey)
+            option.feature = self
+        }
+    }
+}
--- a/DeltaFeatures/Option.swift
+++ b/DeltaFeatures/Option.swift
@ -0,0 +1,219 @@
+//
+//  Option.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/7/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+import Combine
+
+@propertyWrapper
+public class Option<Value: OptionValue, DetailView: View>: _AnyOption
+{
+    // Nil name == hidden option.
+    public let name: LocalizedStringKey?
+    public let description: LocalizedStringKey?
+    
+    public let values: (() -> [Value])?
+    public private(set) var detailView: () -> DetailView? = { nil }
+    
+    // Assigned to property name.
+    public internal(set) var key: String = ""
+    
+    // Used for `SettingsUserInfoKey.name` value in .settingsDidChange notification.
+    public var settingsKey: SettingsName {
+        guard let feature = self.feature else { return SettingsName(rawValue: self.key) }
+        
+        let defaultsKey = feature.key + "_" + self.key
+        return SettingsName(rawValue: defaultsKey)
+    }
+    
+    internal weak var feature: (any AnyFeature)?
+    
+    private let defaultValue: Value
+    
+    private var valueBinding: Binding<Value> {
+        Binding(get: {
+            self.wrappedValue
+        }, set: { newValue in
+            self.wrappedValue = newValue
+        })
+    }
+    
+    /// @propertyWrapper
+    public var projectedValue: some Option {
+        return self
+    }
+    
+    public var wrappedValue: Value {
+        get {
+            do {
+                let wrappedValue = try UserDefaults.standard.optionValue(forKey: self.settingsKey.rawValue, type: Value.self)
+                return wrappedValue ?? self.defaultValue
+            }
+            catch {
+                print("[ALTLog] Failed to read option value for key \(self.settingsKey.rawValue).", error)
+                return self.defaultValue
+            }
+        }
+        set {
+            do {
+                try UserDefaults.standard.setOptionValue(newValue, forKey: self.settingsKey.rawValue)
+                
+                Task { @MainActor in
+                    // Delay to avoid "Publishing changes from within view updates is not allowed" runtime warning.
+                    (self.feature?.objectWillChange as? ObservableObjectPublisher)?.send()
+                    
+                    // Delay to avoid potential simultaneous memory access runtime error.
+                    NotificationCenter.default.post(name: .settingsDidChange, object: nil, userInfo: [SettingsUserInfoKey.name: self.settingsKey, SettingsUserInfoKey.value: newValue])
+                }
+            }
+            catch {
+                print("[ALTLog] Failed to set option value for key \(self.settingsKey.rawValue).", error)
+            }
+        }
+    }
+    
+    private init(defaultValue: Value, name: LocalizedStringKey?, description: LocalizedStringKey?, values: (() -> some Collection<Value>)?)
+    {
+        self.defaultValue = defaultValue
+        
+        self.name = name
+        self.description = description
+        
+        if let values
+        {
+            self.values = { Array(values()) }
+        }
+        else
+        {
+            self.values = nil
+        }
+        
+        self.detailView = { nil }
+    }
+    
+    private convenience init(defaultValue: Value, name: LocalizedStringKey?, description: LocalizedStringKey?)
+    {
+        self.init(defaultValue: defaultValue, name: name, description: description, values: (() -> [Value])?.none)
+    }
+}
+
+// "Hidden" Option (no name, pre-set values, or custom SwiftUI view)
+public extension Option where DetailView == EmptyView
+{
+    // Non-Optional
+    convenience init(wrappedValue: Value)
+    {
+        self.init(defaultValue: wrappedValue, name: nil, description: nil)
+    }
+    
+    // Optional, default = nil
+    convenience init() where Value: OptionalProtocol
+    {
+        self.init(defaultValue: Value.none, name: nil, description: nil)
+    }
+    
+    // Optional, default = non-nil
+    convenience init(wrappedValue: Value) where Value: OptionalProtocol
+    {
+        self.init(defaultValue: wrappedValue, name: nil, description: nil)
+    }
+}
+
+// "Toggle" Option (User-visible, Bool option with default toggle UI)
+public extension Option where Value == Bool, DetailView == OptionToggleView
+{
+    // Non-Optional
+    convenience init(wrappedValue: Value, name: LocalizedStringKey, description: LocalizedStringKey? = nil)
+    {
+        self.init(defaultValue: wrappedValue, name: name, description: description)
+        
+        self.detailView = { [weak self] () -> DetailView? in
+            guard let self else { return nil }
+            return OptionToggleView(name: name, selectedValue: self.valueBinding)
+        }
+    }
+}
+
+// "Picker" Option (User-visible, pre-set options with default picker UI)
+public extension Option where Value: LocalizedOptionValue, DetailView == OptionPickerView<Value>
+{
+    // Non-Optional
+    convenience init(wrappedValue: Value, name: LocalizedStringKey, description: LocalizedStringKey? = nil, values: @autoclosure @escaping () -> some Collection<Value>)
+    {
+        self.init(defaultValue: wrappedValue, name: name, description: description, values: values)
+        
+        self.detailView = { [weak self] () -> DetailView? in
+            guard let self else { return nil }
+            return OptionPickerView(name: name, options: Array(values()), selectedValue: self.valueBinding)
+        }
+    }
+    
+    // Optional, default = nil
+    convenience init(name: LocalizedStringKey, description: LocalizedStringKey? = nil, values: @autoclosure @escaping () -> some Collection<Value>) where Value: OptionalProtocol, Value.Wrapped: LocalizedOptionValue
+    {
+        self.init(defaultValue: Value.none, name: name, description: description, values: values)
+        
+        self.detailView = { [weak self] () -> DetailView? in
+            guard let self else { return nil }
+            return OptionPickerView(name: name, options: values().appendingNil(), selectedValue: self.valueBinding)
+        }
+    }
+    
+    // Optional, default = non-nil
+    convenience init(wrappedValue: Value, name: LocalizedStringKey, description: LocalizedStringKey? = nil, values: @autoclosure @escaping () -> some Collection<Value>) where Value: OptionalProtocol, Value.Wrapped: LocalizedOptionValue
+    {
+        self.init(defaultValue: wrappedValue, name: name, description: description, values: values)
+        
+        self.detailView = { [weak self] () -> DetailView? in
+            guard let self else { return nil }
+            return OptionPickerView(name: name, options: values().appendingNil(), selectedValue: self.valueBinding)
+        }
+    }
+}
+
+// "Custom" Option (User-visible, provides SwiftUI view to configure option)
+public extension Option where Value: LocalizedOptionValue
+{
+    // Non-Optional
+    convenience init(wrappedValue: Value, name: LocalizedStringKey, description: LocalizedStringKey? = nil, @ViewBuilder detailView: @escaping (Binding<Value>) -> DetailView)
+    {
+        self.init(defaultValue: wrappedValue, name: name, description: description)
+        
+        self.detailView = { [weak self] in
+            guard let self else { return nil }
+            
+            let view = detailView(self.valueBinding)
+            return view
+        }
+    }
+    
+    // Optional, default = nil
+    convenience init(name: LocalizedStringKey, description: LocalizedStringKey? = nil, @ViewBuilder detailView: @escaping (Binding<Value>) -> DetailView) where Value: OptionalProtocol, Value.Wrapped: LocalizedOptionValue
+    {
+        self.init(defaultValue: Value.none, name: name, description: description)
+        
+        self.detailView = { [weak self] in
+            guard let self else { return nil }
+            
+            let view = detailView(self.valueBinding)
+            return view
+        }
+    }
+    
+    // Optional, default = non-nil
+    convenience init(wrappedValue: Value, name: LocalizedStringKey, description: LocalizedStringKey? = nil, @ViewBuilder detailView: @escaping (Binding<Value>) -> DetailView) where Value: OptionalProtocol, Value.Wrapped: LocalizedOptionValue
+    {
+        self.init(defaultValue: wrappedValue, name: name, description: description)
+        
+        self.detailView = { [weak self] in
+            guard let self else { return nil }
+            
+            let view = detailView(self.valueBinding)
+            return view
+        }
+    }
+}
--- a/DeltaFeatures/Protocols/AnyFeature.swift
+++ b/DeltaFeatures/Protocols/AnyFeature.swift
@ -0,0 +1,38 @@
+//
+//  AnyFeature.swift
+//  DeltaFeatures
+//
+//  Created by Riley Testut on 4/12/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+@dynamicMemberLookup
+public protocol AnyFeature<Options>: ObservableObject, Identifiable
+{
+    associatedtype Options = EmptyOptions
+    
+    var name: LocalizedStringKey { get }
+    var description: LocalizedStringKey?  { get }
+    
+    var key: String  { get }
+    var settingsKey: SettingsName { get }
+    
+    var isEnabled: Bool { get set }
+    
+    var allOptions: [any AnyOption] { get }
+    
+    subscript<T>(dynamicMember keyPath: KeyPath<Options, T>) -> T { get set }
+}
+
+extension AnyFeature
+{
+    public var id: String { self.key }
+}
+
+// Don't expose `key` setter via AnyFeature protocol.
+internal protocol _AnyFeature: AnyFeature
+{
+    var key: String { get set }
+}
--- a/DeltaFeatures/Protocols/AnyOption.swift
+++ b/DeltaFeatures/Protocols/AnyOption.swift
@ -0,0 +1,48 @@
+//
+//  AnyOption.swift
+//  DeltaFeatures
+//
+//  Created by Riley Testut on 4/12/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+public protocol AnyOption<Value>: AnyObject, Identifiable
+{
+    associatedtype Value: OptionValue
+    associatedtype DetailView: View
+    
+    var name: LocalizedStringKey? { get }
+    var description: LocalizedStringKey? { get }
+    
+    var key: String { get }
+    var settingsKey: SettingsName { get }
+    
+    var values: (() -> [Value])? { get }
+    var detailView: () -> DetailView? { get }
+    
+    var value: Value { get set }
+}
+
+extension AnyOption
+{
+    public var id: String { self.key }
+}
+
+// Don't expose `feature` or `key` setters via AnyOption protocol.
+internal protocol _AnyOption: AnyOption
+{
+    var key: String { get set }
+    var feature: (any AnyFeature)? { get set }
+    
+    var wrappedValue: Value { get set }
+}
+
+extension _AnyOption
+{
+    public var value: Value {
+        get { self.wrappedValue }
+        set { self.wrappedValue = newValue }
+    }
+}
--- a/DeltaFeatures/Protocols/FeatureContainer.swift
+++ b/DeltaFeatures/Protocols/FeatureContainer.swift
@ -0,0 +1,36 @@
+//
+//  FeatureContainer.swift
+//  DeltaFeatures
+//
+//  Created by Riley Testut on 4/11/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+public protocol FeatureContainer
+{
+    static var shared: Self { get }
+}
+
+public extension FeatureContainer
+{    
+    var allFeatures: [any AnyFeature] {
+        let features = Mirror(reflecting: self).children.compactMap { (child) -> (any AnyFeature)? in
+            let feature = child.value as? any AnyFeature
+            return feature
+        }
+        return features
+    }
+    
+    func prepareFeatures()
+    {
+        // Assign keys to property names.
+        for case (let key?, let feature as any _AnyFeature) in Mirror(reflecting: self).children
+        {
+            // Remove leading underscore.
+            let sanitizedKey = key.dropFirst()
+            feature.key = String(sanitizedKey)
+        }
+    }
+}
--- a/DeltaFeatures/Protocols/OptionalProtocol.swift
+++ b/DeltaFeatures/Protocols/OptionalProtocol.swift
@ -0,0 +1,24 @@
+//
+//  OptionalProtocol.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/11/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+// Public so we can use as generic constraint.
+public protocol OptionalProtocol
+{
+    associatedtype Wrapped
+    
+    static var none: Self { get }
+    
+    static var wrappedType: Wrapped.Type { get }
+}
+
+extension Optional: OptionalProtocol
+{
+    public static var wrappedType: Wrapped.Type { return Wrapped.self }
+}
--- a/DeltaFeatures/Types/DisplayInlineKey.swift
+++ b/DeltaFeatures/Types/DisplayInlineKey.swift
@ -0,0 +1,27 @@
+//
+//  DisplayInlineKey.swift
+//  DeltaFeatures
+//
+//  Created by Riley Testut on 4/11/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+public struct DisplayInlineKey: PreferenceKey
+{
+    public static var defaultValue: Bool = false
+    
+    public static func reduce(value: inout Bool, nextValue: () -> Bool)
+    {
+        value = nextValue()
+    }
+}
+
+public extension View
+{
+    func displayInline(_ value: Bool = true) -> some View
+    {
+        self.preference(key: DisplayInlineKey.self, value: value)
+    }
+}
--- a/DeltaFeatures/Types/LocalizedOptionValue.swift
+++ b/DeltaFeatures/Types/LocalizedOptionValue.swift
@ -0,0 +1,60 @@
+//
+//  LocalizedOptionValue.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/11/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import SwiftUI
+
+public protocol LocalizedOptionValue: OptionValue, Hashable /* Identifiable */ // We don't want to implicitly conform types we don't own to `Identifiable`.
+{
+    static var localizedNilDescription: Text { get }
+    
+    var localizedDescription: Text { get }
+}
+
+public extension LocalizedOptionValue
+{
+    static var localizedNilDescription: Text {
+        Text("None")
+    }
+}
+
+// Provide `localizedDescription` implementation for standard library types.
+public extension LocalizedOptionValue where Self: CustomStringConvertible
+{
+    var localizedDescription: Text {
+        Text(String(describing: self))
+    }
+}
+
+extension Int: LocalizedOptionValue {}
+extension Int8: LocalizedOptionValue {}
+extension Int16: LocalizedOptionValue {}
+extension Int32: LocalizedOptionValue {}
+extension Int64: LocalizedOptionValue {}
+
+extension UInt: LocalizedOptionValue {}
+extension UInt8: LocalizedOptionValue {}
+extension UInt16: LocalizedOptionValue {}
+extension UInt32: LocalizedOptionValue {}
+extension UInt64: LocalizedOptionValue {}
+
+extension Float: LocalizedOptionValue {}
+extension Double: LocalizedOptionValue {}
+
+extension String: LocalizedOptionValue {}
+extension Bool: LocalizedOptionValue {}
+
+extension Optional: LocalizedOptionValue where Wrapped: LocalizedOptionValue
+{
+    public var localizedDescription: Text {
+        switch self
+        {
+        case .none: return Wrapped.localizedNilDescription
+        case .some(let value): return value.localizedDescription
+        }
+    }
+}
--- a/DeltaFeatures/Types/OptionValue.swift
+++ b/DeltaFeatures/Types/OptionValue.swift
@ -0,0 +1,21 @@
+//
+//  OptionValue.swift
+//  Delta
+//
+//  Created by Riley Testut on 4/11/23.
+//  Copyright © 2023 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+public protocol OptionValue
+{
+}
+
+extension Data: OptionValue {}
+
+extension Optional: OptionValue where Wrapped: OptionValue {}
+
+extension Array: OptionValue where Element: OptionValue {}
+extension Set: OptionValue where Element: OptionValue {}
+extension Dictionary: OptionValue where Key: OptionValue, Value: OptionValue {}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
忆海16	7399e8cd5c	xibme	2024-05-29 14:55:03 +08:00
忆海16	8161aa6d8c	第一次提交	2024-05-27 11:54:20 +08:00
忆海16	18c51d8d1b	第一次提交	2024-05-27 11:53:32 +08:00
Riley Testut	af01b97faf	Fixes N64 games crashing when compiled with Xcode 15 # Conflicts: # Delta.xcodeproj/project.pbxproj	2023-09-18 16:27:22 -05:00
Riley Testut	62ebf05a8f	Updates wording of “Database Repaired” alert to mention conflicts.txt	2023-08-11 21:52:01 -05:00
Riley Testut	452e3dab06	Writes text file of possibly corrupted save files to Files apps instead of actually conflicting them In practice, the number of conflicts was far too high for the number of save files that actually matter.	2023-08-11 21:51:32 -05:00
Riley Testut	43fedf6fcc	Fixes compiling with Xcode 14	2023-08-11 21:37:21 -05:00
Riley Testut	9ab8cf29b6	Updates app version to 1.5b4	2023-08-11 18:57:28 -05:00
Riley Testut	e6cd5475e9	Replaces Logger.debug() usage with Logger.notice() Debug logs aren’t exported from release builds, so we now use `notice` level instead.	2023-08-11 18:57:28 -05:00
Riley Testut	9c31b8a864	Updates wording of “Database Repaired” alert	2023-08-11 18:57:28 -05:00
Riley Testut	5c7e3cc5b9	[ExpFeat] Adds filter button to change RepairSaveStatesViewController’s date range * Recent (Last month) * All	2023-08-11 18:57:28 -05:00
Riley Testut	d5f910ff00	Adds missing `throws` to SaveState.awakeFromSync()	2023-08-11 18:57:28 -05:00
Riley Testut	d1643dbc8f	Throws SyncValidationError when downloading corrupted versions of “verified” SaveStates After reviewing save states upon first launch, Delta will upload the verified game ID as metadata to ensure other devices don’t download remote versions with incorrect relationships.	2023-08-11 18:57:27 -05:00
Riley Testut	dc3a5b479c	[Contributors] Credits Chris Rittenhouse for Alternate App Icons	2023-08-11 15:58:43 -05:00
Riley Testut	b3d8dbc554	[ExpFeat] Fixes Controller Skin alternate app icon filename	2023-08-11 15:57:39 -05:00
Riley Testut	f3534e4415	[ExpFeat] Alternate App Icons (#259 ) commit 34ed9726034adbb439515ccb3d576311603bfe2b Author: Chris Rittenhouse <dev@litritt.com> Date: Thu Aug 3 15:31:47 2023 -0400 Removes `experimentalFeatures` property from `Settings` commit 4e31d22d56d68439a340707d2fdbac3763df1e3a Author: Chris Rittenhouse <dev@litritt.com> Date: Thu Aug 3 15:17:47 2023 -0400 Reorder icons commit 7509eaa29946b622ce0ad920a740f0212db5e771 Author: Chris Rittenhouse <dev@litritt.com> Date: Thu Aug 3 15:17:24 2023 -0400 Moves icon changing code to `AlternateAppIcons` commit 84821ef99ded74c066563041618aec3c4acb30d7 Author: Chris Rittenhouse <dev@litritt.com> Date: Thu Aug 3 14:33:15 2023 -0400 Fixes icon authors commit 0b821830f09b434fa375c37a2504c21ee5f90bdb Author: Chris Rittenhouse <dev@litritt.com> Date: Fri Jul 21 01:44:00 2023 -0400 Adds comments for functional alternate app icon code commit e8dd6165619bc143f13dde51e5160af2695ef17e Author: Chris Rittenhouse <dev@litritt.com> Date: Fri Jul 21 01:30:03 2023 -0400 Adds implementation for changing app icon commit 1e07483d18d1e865804ae34d6011844b63cb33cc Author: Chris Rittenhouse <dev@litritt.com> Date: Fri Jul 21 01:28:24 2023 -0400 Adds Alternate App Icon experimental feature and options commit 46ed2ce3ae9593d4cc95f29d6caa09f33f2ce62d Author: Chris Rittenhouse <dev@litritt.com> Date: Fri Jul 21 01:26:51 2023 -0400 Adds extension to handle retrieving app icon images commit 9dddb5f98f4523e7877f97c66a5ae95e6513cc09 Author: Chris Rittenhouse <dev@litritt.com> Date: Fri Jul 21 01:24:19 2023 -0400 Adds experimental features as a property of `Settings` commit d74038fd418a0e6fcd45942cb67e722904fc3e24 Author: Chris Rittenhouse <dev@litritt.com> Date: Fri Jul 21 01:23:02 2023 -0400 Adds alternate icon assets Co-authored-by: Chris Rittenhouse <dev@litritt.com>	2023-08-10 19:46:08 -05:00
Riley Testut	061f5abd3e	Allows explicitly downloading corrupted record versions from RecordVersionsViewController	2023-08-10 19:33:27 -05:00
Riley Testut	be047b28a6	Fixes crash when restoring remote record without local version	2023-08-10 19:33:27 -05:00
Riley Testut	fcdd3c7840	Throws SyncValidationError when downloading corrupted Game or GameSave record	2023-08-10 19:33:27 -05:00
Riley Testut	ca8c2cb8c5	[ExpFeat] Adds “Review Save States” to fix save states associated with wrong game	2023-08-10 19:33:27 -05:00
Riley Testut	a9f15144ed	Repairs corrupted Game, GameSave, and SaveState relationships on initial launch Automatically fixes Game and GameSaves, but requires user to manually review + fix all recent SaveStates.	2023-08-10 19:33:27 -05:00
Riley Testut	a80ac04650	Fixes corrupted Harmony database relationships after heavyweight migration	2023-08-10 19:33:26 -05:00
Riley Testut	25e237cfcb	[Delta Sync] Uses local modification date when uploading changes Previously we used the server’s modification dates, which could be confusing when comparing against local modification dates since the same version may have different dates.	2023-07-10 19:00:39 -05:00
Riley Testut	3227ee4c49	Migrates Core Data model from v6 to v7	2023-07-10 16:09:07 -05:00
Riley Testut	45ed97c255	Actually fixes crash loading save states on iOS 17 The underlying issue causing the crash is that we were returning cached supplementary view layout attributes by accident from layoutAttributesForItem(at:). Now, we only cache layout attributes for cells.	2023-07-10 15:39:31 -05:00
Riley Testut	31578e2e34	Updated mogenerator target to use Homebrew version	2023-07-07 18:22:33 -05:00
Riley Testut	e33a7c662f	[Delta Sync] Delays sync until after interactive Settings dismissal has completed Avoids false-positives when user scrolls to top of a Settings screen.	2023-07-07 18:22:33 -05:00
Riley Testut	8ea40a4728	[Delta Sync] Fixes queued syncs sometimes fetching outdated changes Rare, but more common when performing initial sync.	2023-07-07 18:22:32 -05:00
Riley Testut	29f152fcb3	[Delta Sync] Repairs references to remote files when signing out then back in Fixes redundant uploads and potentially ophaned remote files, the latter due to no remote files being deleted if LocalRecord.remoteFiles is empty.	2023-07-07 18:22:26 -05:00
Riley Testut	5779927831	[Delta Sync] Delays seeding Harmony database until initial sync	2023-07-07 18:19:07 -05:00
Riley Testut	f184639c6b	[Delta Sync] Fixes incorrect mass conflicts when signing out then back in	2023-07-07 18:17:13 -05:00
Riley Testut	043fb923ae	[Delta Sync] Displays activity indicator when signing-in Without an indicator it can feel like the app has froze, when really it’s just preparing to sync.	2023-07-07 14:59:41 -05:00
Riley Testut	19fb333a67	Toggles Delta Sync switch back on if user cancels “Disable Syncing?” warning alert	2023-07-06 19:11:09 -05:00
Riley Testut	35a8f90a1c	Converts Delta Sync action sheets into alerts Implicitly fixes crashing on iPad.	2023-07-06 18:44:18 -05:00
Riley Testut	c898f72847	Fixes “file does not exist” sync error after restoring previous version Due to a bug, it was possible for Harmony records to contain duplicate file entries after restoring a previous version. Harmony would then try to download _all_ files, including the duplicates, and would fail if any of them no longer exist. These changes fix the underlying bug, and also fix existing corrupted records on the fly.	2023-06-28 13:45:44 -05:00
Riley Testut	981c868f6e	Fixes “Harmony.sqlite couldn’t be opened” sync error when there are more than 1000 games	2023-06-28 13:37:20 -05:00
Riley Testut	15e228f287	Adds GameSave.sha1 to sync hash between devices Fixes redundant record uploads post-sync due to comparing hashes against locally-cached hash via extended attributes.	2023-06-28 13:33:16 -05:00
Riley Testut	707116a39b	Automatically resolves Cheat + ControllerSkin sync conflicts	2023-06-27 18:58:41 -05:00
Riley Testut	750740ac16	Updates app version to 1.5b3 (69)	2023-06-22 13:11:13 -05:00
Riley Testut	6909b6248f	Skips checksum verification when importing zipped games Verification can take an annoyingly long time, especially for larger ROMs.	2023-06-19 19:19:40 -05:00
Riley Testut	8bd6fe1e11	Replaces UIDocumentBrowserViewController with UIDocumentPickerViewController on iOS 17+ Prior to iOS 17, UIDocumentPickerViewController was too buggy to reliably use with iCloud Drive.	2023-06-19 19:19:40 -05:00
Riley Testut	4cf705f141	[ExpFeat] Fixes saving screenshots to Photos as JPEGs	2023-06-16 16:57:00 -05:00
Riley Testut	99417b418a	[ExpFeat] Adds missing `@unknown default` to PHAuthorizationStatus switch statement	2023-06-16 16:46:35 -05:00
Riley Testut	648e9b8393	[ExpFeat] Fixes saving screenshots to Photos with .limited authorization	2023-06-16 16:44:24 -05:00
Riley Testut	69eff8fa28	Fixes displaying system name in dark text (again) when remapping inputs on iOS 17	2023-06-16 15:55:51 -05:00
Riley Testut	3e858c652f	Fixes crash loading save states on iOS 17 Crashes due to GridCollectionViewLayout returning outdated cached layout information when inserting “Auto” save states section for the first time. To fix this, we now clear the layout cache in invalidateLayout(with:) when relevant.	2023-06-16 15:25:49 -05:00
Riley Testut	21147969ea	Fixes GridCollectionViewCell "Unable to simultaneously satisfy constraints" runtime error	2023-06-16 15:18:02 -05:00
Riley Testut	731de7023f	Merge branch 'app_store' into develop	2023-06-16 15:14:39 -05:00
Riley Testut	810bc4572c	Replaces app icon variants with single 1024x1024 version	2023-06-16 15:11:59 -05:00
Riley Testut	4e8580b8f5	Obfuscates private API usage to pass TestFlight App Review	2023-06-16 15:04:47 -05:00
Riley Testut	2e21141bc6	[Pods] Removes Fabric + Crashlytics	2023-05-10 13:36:44 -05:00
Riley Testut	08a40b3516	[Pods] Updates GoogleSignIn dependency to 5.0.2 * GoogleSignIn (4.4.0 -> 5.0.2) * GTMSessionFetcher (1.5.0 -> 1.7.2) * GoogleToolboxForMac (Removed)	2023-05-10 13:30:30 -05:00
Riley Testut	7b9ab2488e	Fixes accidentally deleting Games directory during sync in rare circumstances If a Game with empty filename happens to be deleted (e.g. during sync merge), it will accidentally delete the entire Games folder due to its fileURL being “Games/[empty]”. To prevent this, we now explicitly check that a Game’s identifier isn’t empty AND that that Game.fileURL doesn’t point to a directory before deleting local files.	2023-05-02 14:29:23 -05:00
Riley Testut	00121bd31f	[iPad] Fixes crash when resolving sync merge conflicts	2023-05-02 14:29:23 -05:00
Riley Testut	ea260cb8a6	Updates Settings to use large titles where appropriate * SettingsViewController * PreferredControllerSkinsViewController	2023-05-02 14:29:23 -05:00
Riley Testut	b0bd5ba906	Updates most Settings view controllers to use .insetGrouped style Excludes PreferredControllerSkinsViewController and ControllerSkinsViewController	2023-04-28 17:22:20 -05:00
Riley Testut	726c4ab93b	Resolves Settings.storyboard ambiguity warnings Expands static UITableViewController subclasses to show all static cells. Wow I wish I knew this years ago…	2023-04-28 16:54:21 -05:00
Riley Testut	5dc91c87c6	Updates app version to 1.5b2	2023-04-28 16:04:51 -05:00
Riley Testut	de7a812cbd	[Contributors] Credits Chris Rittenhouse for experimental features * Show Status Bar * Game Screenshots * Toast Notifications	2023-04-28 15:56:51 -05:00
Riley Testut	b1a3a5076f	Merge branch 'experimental_features' into develop # Conflicts: # Delta.xcodeproj/project.pbxproj # Delta/Emulation/GameViewController.swift # Delta/Pause Menu/PauseViewController.swift	2023-04-28 15:51:08 -05:00
Riley Testut	9470caf83a	Sorts Delta’s Info.plist items alphabetically	2023-04-28 15:42:22 -05:00
Riley Testut	bdee5d17a5	Updates Xcode project file format * Adds DEVELOPMENT_TEAM to Delta target * Updates LD_RUNPATH_SEARCH_PATHS format	2023-04-28 15:42:22 -05:00
Riley Testut	85d53162c1	Fixes internal location of CharacterSet+Filename.swift in Xcode project	2023-04-28 15:42:22 -05:00
Riley Testut	75814ca04d	[Experimental Feature] Adds VariableFastForward.allowUnrestrictedSpeeds @Option When enabled, the user can choose any integer speed from 1x to 8x for their preferred Fast Forward speed, regardless of the system’s maximumFastForwardSpeed.	2023-04-28 15:42:22 -05:00
Riley Testut	2ead48ad40	[Features] Supports dynamic @Option `values` that may change over time Uses @autoclosure to keep call site the same, but allows a single picker @Option to show different values depending on other factors (e.g. other @Options).	2023-04-28 15:42:11 -05:00
Riley Testut	6fd7f9e1d5	[Experimental Feature] Implements VariableFastForward feature	2023-04-28 15:42:10 -05:00
Riley Testut	7fceccc114	[Experimental Feature] Toast Notifications (#244 ) commit c340cf842fbf5fea476a6637efe4928dbd734eba Author: Chris Rittenhouse <dev@litritt.com> Date: Thu Apr 27 17:24:30 2023 -0400 Addresses Riley's requested changes - Minor code structure change in extension - Minor changes to text and phrasing commit 2a928dfa637dfb503e861dc863f6f85f5240941a Author: Chris Rittenhouse <dev@litritt.com> Date: Wed Apr 26 20:11:38 2023 -0400 Adds implementation for Toast Notifications Experimental Feature commit 4fa7d139669994eff888c41bf7af9ac0b6cd2a75 Author: Chris Rittenhouse <dev@litritt.com> Date: Wed Apr 26 20:11:04 2023 -0400 Adds @Feature and @Options for Toast Notifications Experimental Feature Co-authored-by: Chris Rittenhouse <dev@litritt.com>	2023-04-28 15:32:13 -05:00
Chris Rittenhouse	6bdc05f640	[Experimental Feature] Game Screenshots (#242 ) * Adds extension to handle interactions with Photos app - isAuthorized to check/ask for authorization - saveUIImage to save a UIImage to Photos * Adds a Pause Menu button for taking game screenshots * Adds @Feature and @Options for Game Screenshots * Implements Game Screenshots feature in GameViewController * Updates project settings * Passes call to save to Photos as a closure into authorization prompt - Ensures that the screenshot is saved when the user is first prompted for access to Photos - More elegant extension code --------- Co-authored-by: Riley Testut <riley@rileytestut.com>	2023-04-28 14:35:26 -05:00
Chris Rittenhouse	05e94902b8	[Experimental Feature] Show Status Bar (#241 ) * Adds @Feature for Show Status Bar * Shows the Status Bar if the @Feature is enabled * Forces light content on Status Bar	2023-04-28 14:26:57 -05:00
Riley Testut	233ef7d418	Removes accidental togglePreviewsEnabled: action selector from isAltJITEnabled switch	2023-04-27 16:39:13 -05:00
Riley Testut	5cef975a9e	Fixes incorrect controller skin appearance after rotating device	2023-04-27 15:20:14 -05:00
Riley Testut	39522fda58	[Experimental Feature] Supports AirPlay controller skins Allows users to customize controller skin when AirPlaying games to an external display.	2023-04-27 14:58:51 -05:00
Riley Testut	1137189b57	Adds Nintendo DS AirPlay settings to customize how games appear on TV * Top Screen Only = Shows just the top screen on TV * Layout Horizontally = Places screens side-by-side on TV (instead of stacked vertically)	2023-04-26 16:07:17 -05:00
Riley Testut	32e7c1f93e	Supports AirPlaying games to external displays	2023-04-26 14:56:45 -05:00
Riley Testut	7ad5df1949	[Features] Fixes potential crash when handling .settingsDidChange Notification Handling .settingsDidChange notification in the same run loop as changing an @Option’s value can result in exclusive memory access violation due to accessing Option.settingsKey. As a workaround, we delay posting the notification until a later run loop via Task.	2023-04-25 15:14:16 -05:00
Riley Testut	77b26210ab	[Experimental Features] Adds (unimplemented) VariableFastForward feature	2023-04-21 14:51:45 -05:00
Riley Testut	20749c5419	Adds “Experimental Features” section to SettingsViewController	2023-04-21 14:51:45 -05:00
Riley Testut	14adb41ff8	[Previews] Adds example “Random Dancing” experimental feature	2023-04-21 14:51:45 -05:00
Riley Testut	8efefd19a0	[Previews] Adds example “Custom Tint Color” feature to preview ExperimentalFeaturesView	2023-04-21 14:51:45 -05:00
Riley Testut	bd0c72e847	Adds ExperimentalFeaturesView to browse and configure experimental features	2023-04-21 14:03:10 -05:00
Riley Testut	5b4f9ea593	[Features] Removes redundant `public` access modifier from SettingsUserInfoKey constants	2023-04-21 13:43:24 -05:00
Riley Testut	ef47d78c64	[Features] Adds `displayInline(_:)` View modifier Controls whether @Option detailView will be displayed inline in the Feature detail view in Delta’s settings, or as a full-screen view that’s pushed onto navigation stack when tapped.	2023-04-14 18:23:34 -05:00
Riley Testut	9f40223e6c	[Features] Provides default toggle view for Bool @Options	2023-04-14 18:15:26 -05:00
Riley Testut	6d95924145	[Features] Provides default picker view for @Options with pre-set values To use, pass in a collection of values to `values` parameter in @Option initializer.	2023-04-14 18:10:55 -05:00
Riley Testut	240b74de94	[Features] Supports user-facing @Options with custom SwiftUI views @Options with non-nil names will be exposed in Delta’s settings and can be configured by users via provided SwiftUI view.	2023-04-14 16:41:16 -05:00
Riley Testut	4d30ef2929	[Features] Supports @Feature-specific settings via @Option property wrapper	2023-04-14 16:17:31 -05:00
Riley Testut	415450a943	[Features] Adds UserDefaults+OptionValues to read/write arbitrary OptionValues	2023-04-14 15:38:19 -05:00
Riley Testut	80a9132ff5	[Features] Adds OptionValue + LocalizedOptionValue	2023-04-13 17:22:18 -05:00
Riley Testut	d613cc9ad7	[Features] Adds @Feature property wrapper Simplifies defining feature flags that can enabled + disabled via UserDefaults.	2023-04-13 16:20:54 -05:00
Riley Testut	3fb7e8b4b7	[Features] Moves Notification.Name.settingsDidChange to DeltaFeatures Re-exports as Settings.didChangeNotification to allow accessing without explicitly importing DeltaFeatures.	2023-04-13 15:57:25 -05:00
Riley Testut	9406cfe6cc	[Features] Moves Settings.Name + Settings.NotificationUserInfoKey to DeltaFeatures Also refactors from enums to RawRepresentable structs to support arbitrary values.	2023-04-13 15:43:43 -05:00
Riley Testut	c3af9f7209	[Features] Adds DeltaFeatures target	2023-04-13 15:08:17 -05:00
Riley Testut	af0d239de1	[Previews] Links target with DeltaCore and Roxas pods	2023-04-13 15:00:33 -05:00
Riley Testut	ff65b15277	[Pods] Updates Cocoapods to 1.12	2023-04-13 14:59:24 -05:00
Riley Testut	91d40cbeea	[Previews] Adds DeltaPreviews target for previewing SwiftUI views The main Delta target cannot use SwiftUI Previews due to linker errors with Systems.framework, so we’ve made a separate target specifically for previewing SwiftUI views.	2023-04-13 14:58:58 -05:00
Riley Testut	21f628fd1e	[Contributors] Credits Ian Clawson for Local Multiplayer	2023-02-28 19:00:51 -06:00
Riley Testut	f5b124b175	Updates app version to 1.5b1	2023-02-28 18:52:51 -06:00
Riley Testut	10af836105	Supports local multiplayer (up to 4 players) Heavily based on Ian Clawson’s PRs, including #128	2023-02-28 18:49:32 -06:00
Riley Testut	5a019e5950	Optimizes default input mappings for Joy-Cons, Switch Online, and other non-MFi controllers * Uses Home button as Menu button when possible * Supports “Start/Select” buttons for Switch NES controllers * Rotates single JoyCon face buttons 90º * Re-maps single JoyCon control stick from dPad to leftAnalogStick * Re-maps L1/R1/L2/R2 buttons for N64 core	2023-02-28 18:12:14 -06:00
Riley Testut	c8860c6aaa	Raises deployment target to iOS 14.0	2023-02-28 17:31:28 -06:00