diff --git a/Cores/DSDeltaCore b/Cores/DSDeltaCore
index 23abf63..b59ca19 160000
--- a/Cores/DSDeltaCore
+++ b/Cores/DSDeltaCore
@@ -1 +1 @@
-Subproject commit 23abf633559dac471fa3b38a3cfcc12ffa68ab6e
+Subproject commit b59ca197068be7cf8ca66ff52b24e686154a1c15
diff --git a/Cores/MelonDSDeltaCore b/Cores/MelonDSDeltaCore
index 93b68d5..677d1e3 160000
--- a/Cores/MelonDSDeltaCore
+++ b/Cores/MelonDSDeltaCore
@@ -1 +1 @@
-Subproject commit 93b68d5f01acbbfacf59f35fa9ed68523d955f6a
+Subproject commit 677d1e35da42855c29afa7c92882eeb051372d94
diff --git a/Podfile.lock b/Podfile.lock
index c0f7528..7541095 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -126,10 +126,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
-  Crashlytics: 95d05f4e4c19a771250c4bd9ce344d996de32bbf
+  Crashlytics: e156f27e43abaa331f9b7afed091bda37e1052cc
   DeltaCore: 1b246a4e436c6b2b377ea84a1bc847a1c5f4b6cd
   DSDeltaCore: 7dc6a18e25d8036a5022a34c1ffb4062af9eed3d
-  Fabric: 2fb5676bc811af011a04513451f463dac6803206
+  Fabric: be0459577cee96fe21f68de24588be2dd71482b8
   GBADeltaCore: 10ff8fde89ed95c99888a9b7102b3d3e45d7458d
   GBCDeltaCore: 7468dff742927139a14f6fc909e810f253b6293c
   GoogleAPIClientForREST: 0f19a8280dfe6471f76016645d26eb5dae305101
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
index c0f7528..7541095 100644
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -126,10 +126,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
-  Crashlytics: 95d05f4e4c19a771250c4bd9ce344d996de32bbf
+  Crashlytics: e156f27e43abaa331f9b7afed091bda37e1052cc
   DeltaCore: 1b246a4e436c6b2b377ea84a1bc847a1c5f4b6cd
   DSDeltaCore: 7dc6a18e25d8036a5022a34c1ffb4062af9eed3d
-  Fabric: 2fb5676bc811af011a04513451f463dac6803206
+  Fabric: be0459577cee96fe21f68de24588be2dd71482b8
   GBADeltaCore: 10ff8fde89ed95c99888a9b7102b3d3e45d7458d
   GBCDeltaCore: 7468dff742927139a14f6fc909e810f253b6293c
   GoogleAPIClientForREST: 0f19a8280dfe6471f76016645d26eb5dae305101
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
index 5f37f63..9699d33 100644
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
@@ -85,7 +85,7 @@
 		07BB377F31975D34EB8CCC8C3E05597F /* SDWebImageDownloaderOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 792056404E543D00399F5986E8B3812F /* SDWebImageDownloaderOperation.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		07C9540E58A6035F779B84EDA2DA2205 /* clock_backend.h in Headers */ = {isa = PBXBuildFile; fileRef = 22515475C0A7E9BD8FD4145526FBC353 /* clock_backend.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		08A1B982F9CD6EA5ECD5A442973A25AD /* NDS.h in Headers */ = {isa = PBXBuildFile; fileRef = 933D69C235D50794635AA2A58BC23D85 /* NDS.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		08B9F6148C2A49A570F33B4BF7163484 /* Standard.deltaskin in Resources */ = {isa = PBXBuildFile; fileRef = B399BA8CED66B7B4AB724D2D580D4943 /* Standard.deltaskin */; };
+		08B9F6148C2A49A570F33B4BF7163484 /* Standard.deltaskin in Resources */ = {isa = PBXBuildFile; fileRef = 2889FAB221A0B4525F82A4783E48BB2F /* Standard.deltaskin */; };
 		08CBBE506F5F9C4F6B5FBA173182B627 /* NstBoardBtlDragonNinja.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0D2603FBE6D0E88895754984334C87D0 /* NstBoardBtlDragonNinja.hpp */; settings = {ATTRIBUTES = (Project, ); }; };
 		08DB3EE7795392A4AD6CDA6911C4ADE8 /* NstBoardTaitoTc0190fmcPal16r4.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBD164DBFFAA1294217B9F595993108D /* NstBoardTaitoTc0190fmcPal16r4.hpp */; settings = {ATTRIBUTES = (Project, ); }; };
 		08F81E7ABB2B97675345FC04CA722FC8 /* TxCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 6154AA0F4F3D72A490406941DDA56ECF /* TxCache.h */; settings = {ATTRIBUTES = (Project, ); }; };
@@ -270,7 +270,7 @@
 		265418D17A79E992D7091C6116D5D81E /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = C00543EF4F06FBFA511049B6A2E2638E /* pngget.c */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		269A8F0EF89DD3F63151C8785ABE7A51 /* GameControllerInputMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8EE4DF888D759F8A1EFC289D72E1DF95 /* GameControllerInputMapping.swift */; };
 		26B8744B23358ABFC021A6F4AC671E05 /* RSTPlaceholderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8643E93FD4508FE4A1F4CFE2588044 /* RSTPlaceholderView.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		26BD486C68EF5B079CF50F132FB6EAC5 /* Standard.deltamapping in Resources */ = {isa = PBXBuildFile; fileRef = 02BCDAEC84EB90FED96E1A7812F1B9CC /* Standard.deltamapping */; };
+		26BD486C68EF5B079CF50F132FB6EAC5 /* Standard.deltamapping in Resources */ = {isa = PBXBuildFile; fileRef = 1D1D7FA77F53D5E68F48BAA779C6ED78 /* Standard.deltamapping */; };
 		26D84D2836C13B2D939D5A5E2B1BD47B /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CD2701346D82207B53CC9EC541F8AB0 /* Schema.swift */; };
 		2759C2F52CCBBBA9F7A243D31EC1D042 /* language.h in Headers */ = {isa = PBXBuildFile; fileRef = C2095BD846E0E2918CC6C26E739E147E /* language.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		2795FDE9B8407649C0D0DA00EA13DDE4 /* RSTCellContentDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3827013A64806EC421D988347B05D5EB /* RSTCellContentDataSource.h */; settings = {ATTRIBUTES = (Project, ); }; };
@@ -524,7 +524,7 @@
 		506700D55CD43C1F9D14D10C36B2E4EA /* NstBoardAve.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 290CD775EF514EB180E591FA1BBD9EE9 /* NstBoardAve.hpp */; settings = {ATTRIBUTES = (Project, ); }; };
 		5073BE55602733E1D570CBFAF7444F9C /* FIFOSamplePipe.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E62533D6ADE3583F493484D3ABF1BB5 /* FIFOSamplePipe.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		508F79BAF68E3B5A238FE6A3953A1D4D /* GBAGfx.h in Headers */ = {isa = PBXBuildFile; fileRef = 0893F87C0C44883CFA0FF8BD37E0CB50 /* GBAGfx.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		50B180CFEAD01CDF7AE77F036B6AD4E3 /* romlist.bin in Resources */ = {isa = PBXBuildFile; fileRef = E077F3008801C506785266DF63C1EA19 /* romlist.bin */; };
+		50B180CFEAD01CDF7AE77F036B6AD4E3 /* romlist.bin in Resources */ = {isa = PBXBuildFile; fileRef = 7C52D6198DB5D064DD270A36491E44A2 /* romlist.bin */; };
 		50DD9D1435EF52DF5C2C9ED88F0FA06D /* SDKConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CCDA31768B63EA9440181D3FB6DD17 /* SDKConstants.swift */; };
 		5109815A0F3215C9E58A3C986141C9DC /* F3DSETA.h in Headers */ = {isa = PBXBuildFile; fileRef = 9147D9287688D6DBCB391FCFFB5E8CD9 /* F3DSETA.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		5126155DEED6DE59D73E61CE415BDA1D /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 471C4997518A7042AE098438B7958754 /* ioapi.h */; settings = {ATTRIBUTES = (Project, ); }; };
@@ -2125,7 +2125,6 @@
 		0275BCD590CD9EDAE776A4F66B072CD5 /* Combiner.cpp */ = {isa = PBXFileReference; includeInIndex = 1; path = Combiner.cpp; sourceTree = "<group>"; };
 		027FB4C6CC71DADB243F4D75F54D49E2 /* SaveState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SaveState.swift; sourceTree = "<group>"; };
 		028754304C5C372FE9E27565F32DD4FC /* RSTCollectionViewCell.xib */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.xib; name = RSTCollectionViewCell.xib; path = Roxas/RSTCollectionViewCell.xib; sourceTree = "<group>"; };
-		02BCDAEC84EB90FED96E1A7812F1B9CC /* Standard.deltamapping */ = {isa = PBXFileReference; includeInIndex = 1; path = Standard.deltamapping; sourceTree = "<group>"; };
 		030B53DF4264E1E4E75E737FC9B5B696 /* t1tables.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = t1tables.h; sourceTree = "<group>"; };
 		03152EFD6359667DF578CCCE3CAF648E /* retro_common.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = retro_common.h; sourceTree = "<group>"; };
 		033421C4854AC34E9F0A5215AE7F3AE4 /* DepthBufferToRDRAM.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = DepthBufferToRDRAM.h; sourceTree = "<group>"; };
@@ -2307,6 +2306,7 @@
 		1CA66F879B24C5B420988EA67B2A3FB0 /* ANSCompatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ANSCompatibility.h; path = iOS/Crashlytics.framework/Headers/ANSCompatibility.h; sourceTree = "<group>"; };
 		1CBA76EDD27FA2D20B1EA0F0BF7F082C /* libSwiftyDropbox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libSwiftyDropbox.a; path = libSwiftyDropbox.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		1CFCC0E9B1069C5E4DE9B21620D39BEE /* NstBoardSunsoft4.hpp */ = {isa = PBXFileReference; includeInIndex = 1; path = NstBoardSunsoft4.hpp; sourceTree = "<group>"; };
+		1D1D7FA77F53D5E68F48BAA779C6ED78 /* Standard.deltamapping */ = {isa = PBXFileReference; includeInIndex = 1; path = Standard.deltamapping; sourceTree = "<group>"; };
 		1D2B3BDB29EB37DAEDCBC3179FAA6100 /* gdbstub.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = gdbstub.h; sourceTree = "<group>"; };
 		1D48E1464F25EE094AB21C99E9CDC8BF /* NstBoardHosenkan.hpp */ = {isa = PBXFileReference; includeInIndex = 1; path = NstBoardHosenkan.hpp; sourceTree = "<group>"; };
 		1D545FA281C697B8D7BEEC43C6652189 /* UIImage+Manipulation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Manipulation.h"; path = "Roxas/UIImage+Manipulation.h"; sourceTree = "<group>"; };
@@ -2399,6 +2399,7 @@
 		285001A3E16D55354667EDFD2BF69729 /* UIImageView+WebCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImageView+WebCache.h"; path = "SDWebImage/UIImageView+WebCache.h"; sourceTree = "<group>"; };
 		287CF3209EFBA423F838FBAE494AB0C0 /* slot1.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = slot1.h; sourceTree = "<group>"; };
 		2889DF4390F5E2FFDA11CCE9E534746E /* System.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = System.h; sourceTree = "<group>"; };
+		2889FAB221A0B4525F82A4783E48BB2F /* Standard.deltaskin */ = {isa = PBXFileReference; includeInIndex = 1; path = Standard.deltaskin; sourceTree = "<group>"; };
 		28CBF616EB776A5C5D2F9A737B72AA74 /* cart.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = cart.h; sourceTree = "<group>"; };
 		290BCCDEE8D33B086E36DBC4AAE5C4AB /* NSError+LocalizedFailureDescription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "NSError+LocalizedFailureDescription.swift"; sourceTree = "<group>"; };
 		290CD775EF514EB180E591FA1BBD9EE9 /* NstBoardAve.hpp */ = {isa = PBXFileReference; includeInIndex = 1; path = NstBoardAve.hpp; sourceTree = "<group>"; };
@@ -3001,6 +3002,7 @@
 		7C336BB83B448CA034099BF3E7B12D55 /* ARMInterpreter_LoadStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ARMInterpreter_LoadStore.h; sourceTree = "<group>"; };
 		7C4240EE1FE35FE23E5975F8DCB23A33 /* Standard.deltaskin */ = {isa = PBXFileReference; includeInIndex = 1; path = Standard.deltaskin; sourceTree = "<group>"; };
 		7C4333506EF373E1D2841A18039C8379 /* S2DEX.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = S2DEX.h; sourceTree = "<group>"; };
+		7C52D6198DB5D064DD270A36491E44A2 /* romlist.bin */ = {isa = PBXFileReference; includeInIndex = 1; path = romlist.bin; sourceTree = "<group>"; };
 		7C5579DAAF54EF825979925DDD065815 /* NstBoardUnlCc21.hpp */ = {isa = PBXFileReference; includeInIndex = 1; path = NstBoardUnlCc21.hpp; sourceTree = "<group>"; };
 		7C65583B30F5CE8CB3A417DCFB648306 /* Mutex.hpp */ = {isa = PBXFileReference; includeInIndex = 1; path = Mutex.hpp; sourceTree = "<group>"; };
 		7C7894842679F86AEA25BABD02717D75 /* debugger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
@@ -3400,7 +3402,6 @@
 		B307C39B5BCD16F9563103326BB8C58A /* gbint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = gbint.h; sourceTree = "<group>"; };
 		B31BC317B925949D8F6F764866AECFAE /* RSTTintedImageView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RSTTintedImageView.h; path = Roxas/RSTTintedImageView.h; sourceTree = "<group>"; };
 		B331F7660FB59081A99ADBA1AF706462 /* dummy_video_capture.c */ = {isa = PBXFileReference; includeInIndex = 1; path = dummy_video_capture.c; sourceTree = "<group>"; };
-		B399BA8CED66B7B4AB724D2D580D4943 /* Standard.deltaskin */ = {isa = PBXFileReference; includeInIndex = 1; path = Standard.deltaskin; sourceTree = "<group>"; };
 		B3A1CF8E39DF40FA5839CDC129FE69F5 /* NSPersistentStore+Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "NSPersistentStore+Configuration.swift"; sourceTree = "<group>"; };
 		B3AEB39C358F48D203125CAFE9D03E22 /* pngstruct.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = pngstruct.h; sourceTree = "<group>"; };
 		B3C33417B33F751208C5BF623D85A06D /* GBCDeltaCore-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "GBCDeltaCore-prefix.pch"; sourceTree = "<group>"; };
@@ -3715,7 +3716,6 @@
 		DFC688B75792FBFBB3B452084CA3837C /* NstSoundRenderer.hpp */ = {isa = PBXFileReference; includeInIndex = 1; path = NstSoundRenderer.hpp; sourceTree = "<group>"; };
 		DFDA1E12C63A8E139E0F5F52E6F63F9D /* opengl_UnbufferedDrawer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = opengl_UnbufferedDrawer.h; sourceTree = "<group>"; };
 		E07126E3FC357870F5EAEC48FB308C9A /* NstBoardTxcTw.hpp */ = {isa = PBXFileReference; includeInIndex = 1; path = NstBoardTxcTw.hpp; sourceTree = "<group>"; };
-		E077F3008801C506785266DF63C1EA19 /* romlist.bin */ = {isa = PBXFileReference; includeInIndex = 1; path = romlist.bin; sourceTree = "<group>"; };
 		E0987B780D382225AE82D80ECA8C0641 /* GTMGatherInputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GTMGatherInputStream.m; path = Source/GTMGatherInputStream.m; sourceTree = "<group>"; };
 		E0F150BFDEE45BE9AA4D0FDF4D91815E /* gfx.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = gfx.h; sourceTree = "<group>"; };
 		E0F1902545FB22A0EF0B1A987A6C9D43 /* SMCalloutView-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SMCalloutView-prefix.pch"; sourceTree = "<group>"; };
@@ -4286,15 +4286,6 @@
 			path = visupng;
 			sourceTree = "<group>";
 		};
-		07F691241FBD71981877F3B34D76DB6E /* MelonDSDeltaCore */ = {
-			isa = PBXGroup;
-			children = (
-				47980AAB520B7D2038E8EBB2BBB843E1 /* Controller Skin */,
-			);
-			name = MelonDSDeltaCore;
-			path = MelonDSDeltaCore;
-			sourceTree = "<group>";
-		};
 		08C58CF73AB8BFBF56E0EB8B4D727EE1 /* Pods-Delta */ = {
 			isa = PBXGroup;
 			children = (
@@ -4548,15 +4539,6 @@
 			path = uCodes;
 			sourceTree = "<group>";
 		};
-		17D56112446A3990E9D47221D20D86FD /* melonDS */ = {
-			isa = PBXGroup;
-			children = (
-				E077F3008801C506785266DF63C1EA19 /* romlist.bin */,
-			);
-			name = melonDS;
-			path = melonDS;
-			sourceTree = "<group>";
-		};
 		18349F28E095F5DD3D13A569936BC79C /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -5578,16 +5560,6 @@
 			path = vssystem;
 			sourceTree = "<group>";
 		};
-		47980AAB520B7D2038E8EBB2BBB843E1 /* Controller Skin */ = {
-			isa = PBXGroup;
-			children = (
-				02BCDAEC84EB90FED96E1A7812F1B9CC /* Standard.deltamapping */,
-				B399BA8CED66B7B4AB724D2D580D4943 /* Standard.deltaskin */,
-			);
-			name = "Controller Skin";
-			path = "Controller Skin";
-			sourceTree = "<group>";
-		};
 		48108D7847251652893F854B19A7370F /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -5879,6 +5851,15 @@
 			name = "Development Pods";
 			sourceTree = "<group>";
 		};
+		5DE720EFA7E6C68977B2BF37EB706998 /* melonDS */ = {
+			isa = PBXGroup;
+			children = (
+				7C52D6198DB5D064DD270A36491E44A2 /* romlist.bin */,
+			);
+			name = melonDS;
+			path = melonDS;
+			sourceTree = "<group>";
+		};
 		5E17B37210FA8ADA5462EB3753473933 /* GTMSessionFetcher */ = {
 			isa = PBXGroup;
 			children = (
@@ -6005,6 +5986,15 @@
 			path = ../Cores/GBADeltaCore;
 			sourceTree = "<group>";
 		};
+		6533133AE108037DC83356F22372D81B /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				5DE720EFA7E6C68977B2BF37EB706998 /* melonDS */,
+				FE352A55833A20D462CA9CF5C343A4B7 /* MelonDSDeltaCore */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
 		666CF51E00E65540C78ED2BCEDCB4DDA /* config */ = {
 			isa = PBXGroup;
 			children = (
@@ -6265,6 +6255,15 @@
 			path = Types;
 			sourceTree = "<group>";
 		};
+		764000D0A66D243606D1C378E8CD0196 /* Controller Skin */ = {
+			isa = PBXGroup;
+			children = (
+				2889FAB221A0B4525F82A4783E48BB2F /* Standard.deltaskin */,
+			);
+			name = "Controller Skin";
+			path = "Controller Skin";
+			sourceTree = "<group>";
+		};
 		766178C737CCE1B1D4E3A5FA1919443E /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -7224,15 +7223,6 @@
 			path = GLideNUI;
 			sourceTree = "<group>";
 		};
-		AED09EB0CF0D0E4BEE6843F3C010806E /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				17D56112446A3990E9D47221D20D86FD /* melonDS */,
-				07F691241FBD71981877F3B34D76DB6E /* MelonDSDeltaCore */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
 		AEDE8715D20259E949AA770C030F17C1 /* Types */ = {
 			isa = PBXGroup;
 			children = (
@@ -8122,7 +8112,7 @@
 				0E99AAB0073C58E2C37B88FD78102676 /* melonDS */,
 				DFC6BB9FEC353F31B6139E8A5658E24D /* MelonDSDeltaCore */,
 				58FF6D9DB0D1B03CB4B69021F6DAFDCC /* Pod */,
-				AED09EB0CF0D0E4BEE6843F3C010806E /* Resources */,
+				6533133AE108037DC83356F22372D81B /* Resources */,
 				A47C858A468F63C07F24FD81A9A449A9 /* Support Files */,
 			);
 			name = MelonDSDeltaCore;
@@ -8620,6 +8610,16 @@
 			path = inc;
 			sourceTree = "<group>";
 		};
+		FE352A55833A20D462CA9CF5C343A4B7 /* MelonDSDeltaCore */ = {
+			isa = PBXGroup;
+			children = (
+				1D1D7FA77F53D5E68F48BAA779C6ED78 /* Standard.deltamapping */,
+				764000D0A66D243606D1C378E8CD0196 /* Controller Skin */,
+			);
+			name = MelonDSDeltaCore;
+			path = MelonDSDeltaCore;
+			sourceTree = "<group>";
+		};
 		FED68DD8032AAB116053C7ECE64534FC /* snes9x */ = {
 			isa = PBXGroup;
 			children = (