diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 6da75c5b..21efecfe 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -8,7 +8,8 @@
                 "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
                 "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
                 "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include",
-                "${workspaceRoot}/src"
+                "${workspaceRoot}/src",
+                "${workspaceRoot}/deps/ox/src"
             ],
             "defines": [],
             "intelliSenseMode": "clang-x64",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 817c0892..6500d167 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,7 +4,9 @@
         "ostream": "cpp",
         "array": "cpp",
         "initializer_list": "cpp",
-        "utility": "cpp"
+        "utility": "cpp",
+        "__config": "cpp",
+        "__nullptr": "cpp"
     },
     "editor.insertSpaces": false,
     "editor.tabSize": 3,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1157176..992f284b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,8 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
 		-fno-strict-aliasing
 		-mthumb-interwork
 		-mthumb
-		-std=c++17
 	)
+	set(CMAKE_CXX_STANDARD 17)
 else()
 	set(CMAKE_CXX_STANDARD 14)
 endif()
@@ -44,11 +44,11 @@ endif()
 if(APPLE)
 	set(CMAKE_MACOSX_RPATH OFF)
 	set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia")
-	set(NOSTALGIA_DIST_BIN              Nostalgia.app/Contents/MacOS)
-	set(NOSTALGIA_DIST_LIB              Nostalgia.app/Contents/Library)
-	set(NOSTALGIA_DIST_PLUGIN           Nostalgia.app/Contents/Plugins)
-	set(NOSTALGIA_DIST_RESOURCES        Nostalgia.app/Contents/Resources)
-	set(NOSTALGIA_DIST_MAC_APP_CONTENTS Nostalgia.app/Contents)
+	set(NOSTALGIA_DIST_BIN              nostalgia-studio.app/Contents/MacOS)
+	set(NOSTALGIA_DIST_LIB              nostalgia-studio.app/Contents/Library)
+	set(NOSTALGIA_DIST_PLUGIN           nostalgia-studio.app/Contents/Plugins)
+	set(NOSTALGIA_DIST_RESOURCES        nostalgia-studio.app/Contents/Resources)
+	set(NOSTALGIA_DIST_MAC_APP_CONTENTS nostalgia-studio.app/Contents)
 else()
 	set(CMAKE_INSTALL_RPATH "$ORIGIN" "$ORIGIN/../lib/nostalgia")
 	if(NOT ${NOSTALGIA_QT_PATH} STREQUAL "")
diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt
index 789f6566..7edf9507 100644
--- a/src/nostalgia/studio/CMakeLists.txt
+++ b/src/nostalgia/studio/CMakeLists.txt
@@ -5,7 +5,7 @@ project(nostalgia-studio)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 add_executable(
-	nostalgia-studio
+	nostalgia-studio MACOSX_BUNDLE
 		main.cpp
 		mainwindow.cpp
 )
@@ -44,6 +44,7 @@ install(
 		nostalgia-studio
 	RUNTIME DESTINATION
 		${NOSTALGIA_DIST_BIN}
+	BUNDLE DESTINATION .
 )
 
 add_subdirectory(lib)