diff --git a/Sonic CD.xcodeproj/project.pbxproj b/Sonic CD.xcodeproj/project.pbxproj
index 127b8dd9..8c082ded 100644
--- a/Sonic CD.xcodeproj/project.pbxproj	
+++ b/Sonic CD.xcodeproj/project.pbxproj	
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		C962193925898B0B00B47AB3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C962193625898B0A00B47AB3 /* Assets.xcassets */; };
-		C962193A25898B0B00B47AB3 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C962193725898B0A00B47AB3 /* Info.plist */; };
 		C962193E25898B6000B47AB3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C962193C25898B6000B47AB3 /* Main.storyboard */; };
 		C962196C25898BF600B47AB3 /* Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C962195625898BF500B47AB3 /* Audio.cpp */; };
 		C962196D25898BF600B47AB3 /* Debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C962195725898BF500B47AB3 /* Debug.cpp */; };
@@ -64,7 +63,6 @@
 /* Begin PBXFileReference section */
 		C962191925898A9300B47AB3 /* Sonic CD.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Sonic CD.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C962193625898B0A00B47AB3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = dependencies/mac/Assets.xcassets; sourceTree = SOURCE_ROOT; };
-		C962193725898B0A00B47AB3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = dependencies/mac/Info.plist; sourceTree = SOURCE_ROOT; };
 		C962193D25898B6000B47AB3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = dependencies/mac/Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; };
 		C962194125898BCD00B47AB3 /* Text.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Text.hpp; path = SonicCDDecomp/Text.hpp; sourceTree = SOURCE_ROOT; };
 		C962194225898BCD00B47AB3 /* Script.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Script.hpp; path = SonicCDDecomp/Script.hpp; sourceTree = SOURCE_ROOT; };
@@ -161,7 +159,6 @@
 				C962193F25898B6700B47AB3 /* Source Files */,
 				C962193C25898B6000B47AB3 /* Main.storyboard */,
 				C962193625898B0A00B47AB3 /* Assets.xcassets */,
-				C962193725898B0A00B47AB3 /* Info.plist */,
 			);
 			path = "Sonic CD";
 			sourceTree = "<group>";
@@ -332,7 +329,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				C962193E25898B6000B47AB3 /* Main.storyboard in Resources */,
-				C962193A25898B0B00B47AB3 /* Info.plist in Resources */,
 				C962193925898B0B00B47AB3 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -501,8 +497,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "Sonic CD/Sonic_CD.entitlements";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/dependencies/mac",
@@ -517,8 +515,9 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "Rubberduckycooly.Sonic-CD";
+				PRODUCT_BUNDLE_IDENTIFIER = "RSDKv3.Sonic-CD";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Debug;
 		};
@@ -527,8 +526,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "Sonic CD/Sonic_CD.entitlements";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/dependencies/mac",
@@ -543,8 +544,9 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "Rubberduckycooly.Sonic-CD";
+				PRODUCT_BUNDLE_IDENTIFIER = "RSDKv3.Sonic-CD";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Release;
 		};
diff --git a/Sonic CD.xcodeproj/xcshareddata/xcschemes/Sonic CD.xcscheme b/Sonic CD.xcodeproj/xcshareddata/xcschemes/Sonic CD.xcscheme
index bf4d3a45..c8799518 100644
--- a/Sonic CD.xcodeproj/xcshareddata/xcschemes/Sonic CD.xcscheme	
+++ b/Sonic CD.xcodeproj/xcshareddata/xcschemes/Sonic CD.xcscheme	
@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/SonicCDDecomp/Ini.cpp b/SonicCDDecomp/Ini.cpp
index 59c36735..daaf2ea9 100644
--- a/SonicCDDecomp/Ini.cpp
+++ b/SonicCDDecomp/Ini.cpp
@@ -13,11 +13,10 @@ IniParser::IniParser(const char *filename)
 
     count = 0;
 
-    char pathBuffer[0x80];
-
+    char pathBuffer[0x200];
 #if RETRO_PLATFORM == RETRO_OSX
     if (!usingCWD)
-        sprintf(pathBuffer, "%s/%s",getResourcesPath(), filename);
+        sprintf(pathBuffer, "%s/%s",getResourcesPath(),filename);
     else
         sprintf(pathBuffer, "%s", filename);
 #else
@@ -233,8 +232,7 @@ int IniParser::SetComment(const char *section, const char* key, const char *comm
 
 void IniParser::Write(const char *filename)
 {
-    char pathBuffer[0x80];
-
+    char pathBuffer[0x200];
 #if RETRO_PLATFORM == RETRO_OSX
     if (!usingCWD)
         sprintf(pathBuffer, "%s/%s",getResourcesPath(),filename);
diff --git a/SonicCDDecomp/Userdata.cpp b/SonicCDDecomp/Userdata.cpp
index 7ae8f61d..c103ef46 100644
--- a/SonicCDDecomp/Userdata.cpp
+++ b/SonicCDDecomp/Userdata.cpp
@@ -2,7 +2,6 @@
 
 #if RETRO_PLATFORM == RETRO_WIN && _MSC_VER
 #include <Windows.h>
-#include <string>
 #include <codecvt>
 #include "../dependencies/windows/ValveFileVDF/vdf_parser.hpp"
 
@@ -125,7 +124,7 @@ void InitUserdata()
     }
 #endif
 
-    char buffer[0x100];
+    char buffer[0x200];
 #if RETRO_PLATFORM == RETRO_OSX
     if (!usingCWD)
         sprintf(buffer, "%s/settings.ini", getResourcesPath());
@@ -357,7 +356,7 @@ void writeSettings() {
 
 void ReadUserdata()
 {
-    char buffer[0x100];
+    char buffer[0x200];
 #if RETRO_PLATFORM == RETRO_OSX
     if (!usingCWD)
         sprintf(buffer, "%s/Udata.bin", getResourcesPath());
@@ -389,7 +388,7 @@ void ReadUserdata()
 
 void WriteUserdata()
 {
-    char buffer[0x100];
+    char buffer[0x200];
 #if RETRO_PLATFORM == RETRO_OSX
     if (!usingCWD)
         sprintf(buffer, "%s/Udata.bin", getResourcesPath());
diff --git a/SonicCDDecomp/Userdata.hpp b/SonicCDDecomp/Userdata.hpp
index 5aa09189..67d2f461 100644
--- a/SonicCDDecomp/Userdata.hpp
+++ b/SonicCDDecomp/Userdata.hpp
@@ -52,7 +52,7 @@ inline void SetGlobalVariableByName(const char *name, int value)
 
 inline bool ReadSaveRAMData()
 {
-    char buffer[0x100];
+    char buffer[0x200];
 #if RETRO_PLATFORM == RETRO_OSX
     if (!usingCWD)
         sprintf(buffer, "%s/Sdata.bin",getResourcesPath());
@@ -63,7 +63,6 @@ inline bool ReadSaveRAMData()
 #endif
 
     // Temp(?)
-    saveRAM[32] = audioEnabled;
     saveRAM[33] = bgmVolume;
     saveRAM[34] = sfxVolume;
 
@@ -78,7 +77,7 @@ inline bool ReadSaveRAMData()
 
 inline bool WriteSaveRAMData()
 {
-    char buffer[0x100];
+    char buffer[0x200];
 #if RETRO_PLATFORM == RETRO_OSX
     if (!usingCWD)
         sprintf(buffer, "%s/Sdata.bin",getResourcesPath());
@@ -93,7 +92,6 @@ inline bool WriteSaveRAMData()
         return false;
 
     //Temp
-    saveRAM[32] = audioEnabled;
     saveRAM[33] = bgmVolume;
     saveRAM[34] = sfxVolume;
 
diff --git a/SonicCDDecomp/win.ico b/SonicCDDecomp/win.ico
deleted file mode 100644
index d91a8201..00000000
Binary files a/SonicCDDecomp/win.ico and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-1024.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-1024.png
deleted file mode 100644
index 96dcca45..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-1024.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-128.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-128.png
deleted file mode 100644
index b7e6d6b9..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-128.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-16.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-16.png
deleted file mode 100644
index 18e0a67f..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-16.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-256.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-256.png
deleted file mode 100644
index 815d0d48..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-256.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-257.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-257.png
deleted file mode 100644
index 815d0d48..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-257.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-32.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-32.png
deleted file mode 100644
index eb059b65..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-32.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-33.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-33.png
deleted file mode 100644
index eb059b65..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-33.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-512.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-512.png
deleted file mode 100644
index c83c5e0c..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-512.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-513.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-513.png
deleted file mode 100644
index c83c5e0c..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-513.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-64.png b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-64.png
deleted file mode 100644
index b3c99366..00000000
Binary files a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/CD2011Art-64.png and /dev/null differ
diff --git a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/Contents.json b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/Contents.json
index 698d8082..3f00db43 100644
--- a/dependencies/mac/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/dependencies/mac/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,61 +1,51 @@
 {
   "images" : [
     {
-      "filename" : "CD2011Art-16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "CD2011Art-32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "CD2011Art-33.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "CD2011Art-64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "CD2011Art-128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "CD2011Art-256.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "CD2011Art-257.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "CD2011Art-512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "CD2011Art-513.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "CD2011Art-1024.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"