diff --git a/Limelight/Limelight.xcdatamodeld/.xccurrentversion b/Limelight/Limelight.xcdatamodeld/.xccurrentversion
index cffa4ac2..b202eb9f 100644
--- a/Limelight/Limelight.xcdatamodeld/.xccurrentversion
+++ b/Limelight/Limelight.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Moonlight v1.11.xcdatamodel</string>
+	<string>Moonlight v1.10.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents b/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents
index 9ef9ef06..6bb357d8 100644
--- a/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents	
+++ b/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents	
@@ -41,10 +41,11 @@
         <attribute name="playAudioOnPC" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="pointerVelocityModeDivider" optional="YES" attributeType="Float" defaultValueString="0.5" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="preferredCodec" attributeType="Integer 32" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="resolutionSelected" optional="YES" attributeType="Integer 16" defaultValueString="5" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="reverseMouseWheelDirection" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="showKeyboardToolbar" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="slideToSettingsDistance" optional="YES" attributeType="Float" defaultValueString="0.5" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="slideToSettingsScreenEdge" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="slideToSettingsScreenEdge" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="statsOverlay" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="swapABXYButtons" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="touchMode" optional="YES" attributeType="Integer 16" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
diff --git a/Moonlight.xcodeproj/project.pbxproj b/Moonlight.xcodeproj/project.pbxproj
index d5fe32ea..5e3699dd 100644
--- a/Moonlight.xcodeproj/project.pbxproj
+++ b/Moonlight.xcodeproj/project.pbxproj
@@ -582,7 +582,6 @@
 				FB89463719F6473800339C8A /* Launch Screen.xib */,
 				FB290D0819B2C406004C83CF /* Images.xcassets */,
 				FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */,
-				8473AE262CED9E3100E7D3FE /* Limelight.xcdatamodeld */,
 				FB1D59951BBCCB6400F482CA /* ComputerScrollView.h */,
 				FB1D59961BBCCB6400F482CA /* ComputerScrollView.m */,
 				FB1D59981BBCCD7E00F482CA /* AppCollectionView.h */,
@@ -1054,7 +1053,6 @@
 				FBDE86E019F7A837001C18A8 /* UIComputerView.m in Sources */,
 				FB89463019F646E200339C8A /* StreamConfiguration.m in Sources */,
 				FBD3495319FF36FB002D2A60 /* SWRevealViewController.m in Sources */,
-				8473AE382CED9E3100E7D3FE /* Limelight.xcdatamodeld in Sources */,
 				84203F232C5F24C00032EEED /* OnScreenButtonView.swift in Sources */,
 				84FD0B512C31338D006B5BE5 /* LocalizationHelper.m in Sources */,
 				FB1D59971BBCCB6400F482CA /* ComputerScrollView.m in Sources */,
@@ -1398,31 +1396,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
-		8473AE262CED9E3100E7D3FE /* Limelight.xcdatamodeld */ = {
-			isa = XCVersionGroup;
-			children = (
-				8473AE272CED9E3100E7D3FE /* Moonlight v1.4.xcdatamodel */,
-				8473AE282CED9E3100E7D3FE /* Moonlight v1.10.xcdatamodel */,
-				8473AE292CED9E3100E7D3FE /* Limelight.xcdatamodel */,
-				8473AE2A2CED9E3100E7D3FE /* Moonlight v1.8.xcdatamodel */,
-				8473AE2B2CED9E3100E7D3FE /* Moonlight v1.1.xcdatamodel */,
-				8473AE2C2CED9E3100E7D3FE /* Moonlight v1.2.xcdatamodel */,
-				8473AE2D2CED9E3100E7D3FE /* Moonlight v1.0-2.xcdatamodel */,
-				8473AE2E2CED9E3100E7D3FE /* Limelight 0.3.1.xcdatamodel */,
-				8473AE2F2CED9E3100E7D3FE /* Moonlight v1.7.xcdatamodel */,
-				8473AE302CED9E3100E7D3FE /* Moonlight v1.0.xcdatamodel */,
-				8473AE312CED9E3100E7D3FE /* Moonlight v1.9.xcdatamodel */,
-				8473AE322CED9E3100E7D3FE /* Moonlight v1.11.xcdatamodel */,
-				8473AE332CED9E3100E7D3FE /* Moonlight v1.5.xcdatamodel */,
-				8473AE342CED9E3100E7D3FE /* Limelight 0.3.0.xcdatamodel */,
-				8473AE352CED9E3100E7D3FE /* Moonlight v1.6.xcdatamodel */,
-				8473AE362CED9E3100E7D3FE /* Moonlight v1.3.xcdatamodel */,
-			);
-			currentVersion = 8473AE322CED9E3100E7D3FE /* Moonlight v1.11.xcdatamodel */;
-			path = Limelight.xcdatamodeld;
-			sourceTree = "<group>";
-			versionGroupType = wrapper.xcdatamodel;
-		};
 		FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (