diff --git a/Cores/MelonDSDeltaCore b/Cores/MelonDSDeltaCore
index 7731efb..697ba73 160000
--- a/Cores/MelonDSDeltaCore
+++ b/Cores/MelonDSDeltaCore
@@ -1 +1 @@
-Subproject commit 7731efb5d995d1f0be163cd27af1d201fd03ce33
+Subproject commit 697ba731981824f53460f6e0193f159f71f22ba2
diff --git a/Cores/NESDeltaCore b/Cores/NESDeltaCore
index bc3e017..78a092d 160000
--- a/Cores/NESDeltaCore
+++ b/Cores/NESDeltaCore
@@ -1 +1 @@
-Subproject commit bc3e0178caa29b4c1e8872133dd00aa55cc9da2a
+Subproject commit 78a092d4e795f83153e98749b5cbeb66cf812d7e
diff --git a/Delta.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Delta.xcworkspace/xcshareddata/swiftpm/Package.resolved
index d111502..50a21ad 100644
--- a/Delta.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Delta.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,6 +1,15 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "AltKit",
+        "repositoryURL": "https://github.com/rileytestut/AltKit.git",
+        "state": {
+          "branch": null,
+          "revision": "2fd376df1c79ec06a5c80cc8933da027f65b3148",
+          "version": null
+        }
+      },
       {
         "package": "DeltaCore",
         "repositoryURL": "https://github.com/rileytestut/DeltaCore.git",
diff --git a/Delta/Base.lproj/Settings.storyboard b/Delta/Base.lproj/Settings.storyboard
index 36ab082..1bbab06 100644
--- a/Delta/Base.lproj/Settings.storyboard
+++ b/Delta/Base.lproj/Settings.storyboard
@@ -13,7 +13,7 @@
             <objects>
                 <tableViewController title="Settings" id="eHi-aO-uGS" customClass="SettingsViewController" customModule="Retro_Game_Emulator" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="hRw-wV-lch">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="2500"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="600"/>
                         <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"/>
                         <color key="separatorColor" systemColor="separatorColor"/>
@@ -391,7 +391,7 @@
                                         <rect key="frame" x="16" y="538.00000071525574" width="343" height="1.1920928955078125e-07"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bza-Nl-H39" id="g7q-9D-XYR">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="1.1920928955078125e-07"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="343" height="0.0"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QWm-yw-YNv">
@@ -426,7 +426,7 @@
                             </connections>
                         </barButtonItem>
                     </navigationItem>
-                    <size key="freeformSize" width="375" height="2500"/>
+                    <size key="freeformSize" width="375" height="600"/>
                     <connections>
                         <segue destination="uBz-mm-mXr" kind="show" identifier="controllersSegue" id="MLY-hF-UB8"/>
                         <segue destination="56e-ul-z6v" kind="show" identifier="controllerSkinsSegue" id="GNM-Gt-YFf"/>
@@ -435,7 +435,7 @@
                 <placeholder placeholderIdentifier="IBFirstResponder" id="19F-9T-esM" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <exit id="slQ-xv-zI1" userLabel="Exit" sceneMemberID="exit"/>
             </objects>
-            <point key="canvasLocation" x="1468" y="1180.2098950524739"/>
+            <point key="canvasLocation" x="1498" y="794"/>
         </scene>
         <!--Controls-->
         <scene sceneID="Gi9-m1-y9x">
diff --git a/External/CheatBase b/External/CheatBase
index df52576..222ee41 160000
--- a/External/CheatBase
+++ b/External/CheatBase
@@ -1 +1 @@
-Subproject commit df52576e6fd1185747f41b022d9664ad0593608a
+Subproject commit 222ee410c0a0bc444ca828f61151b3faf511f8b2