diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 3bbe81936..f9e2a0a16 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: numworks/setup-emscripten@v2
         with:
-          sdk: 1.39.16-fastcomp
+          sdk: latest-upstream
       - uses: actions/checkout@v1
         with:
           submodules: true
diff --git a/build/toolchain.emscripten.mak b/build/toolchain.emscripten.mak
index 198d745ca..aa85bed50 100644
--- a/build/toolchain.emscripten.mak
+++ b/build/toolchain.emscripten.mak
@@ -3,110 +3,7 @@ CXX = emcc
 LD = emcc
 CPP = cpp
 
-EMSCRIPTEN_ASYNC_SYMBOLS = \
-SAFE_HEAP_LOAD \
-SAFE_HEAP_STORE \
-_IonDisplayForceRefresh\
-_IonEventsEmscriptenKeyDown \
-_IonEventsEmscriptenKeyUp \
-_IonEventsEmscriptenPushEvent \
-_IonSimulatorCallbackDidScanKeyboard \
-__Z8ion_mainiPKPKc \
-__ZN10Invocation7performEPv \
-__ZN11MicroPython20ExecutionEnvironment7runCodeEPKc \
-__ZN13AppsContainer13dispatchEventEN3Ion6Events5EventE \
-__ZN13AppsContainer3runEv \
-__ZN13AppsContainer8switchToEPN3App8SnapshotE \
-__ZN19ButtonRowController23didBecomeFirstResponderEv \
-__ZN19ModalViewController23didBecomeFirstResponderEv \
-__ZN19StackViewController23didBecomeFirstResponderEv \
-__ZN19StackViewController25setupActiveViewControllerEv \
-__ZN19StackViewController4pushEP14ViewController7KDColorS2_S2_ \
-__ZN3App12processEventEN3Ion6Events5EventE \
-__ZN3App15didBecomeActiveEP6Window \
-__ZN3App17setFirstResponderEP9Responder \
-__ZN3Ion6Events13isAlphaActiveEv \
-__ZN3Ion6Events13isShiftActiveEv \
-__ZN3Ion6Events5EventC2Ei \
-__ZN3Ion6Events5EventC2ENS_8Keyboard3KeyEbb \
-__ZN3Ion6Events8getEventEPi \
-__ZN3Ion6EventsL16sleepWithTimeoutEiPi \
-__ZN3Ion6Timing6msleepEj \
-__ZN3Ion8Keyboard4scanEv \
-__ZN4Code14MenuController21openConsoleWithScriptENS_6ScriptE \
-__ZN4Code14MenuController23didBecomeFirstResponderEv \
-__ZN4Code14MenuController28openConsoleWithScriptAtIndexEi \
-__ZN4Code17ConsoleController10autoImportEv \
-__ZN4Code17ConsoleController14viewWillAppearEv \
-__ZN4Code17ConsoleController16autoImportScriptENS_6ScriptEb \
-__ZN4Code17ConsoleController21runAndPrintForCommandEPKc \
-__ZN4Code17ConsoleController23autoImportScriptAtIndexEib \
-__ZN4Code17ConsoleController25textFieldDidFinishEditingEP9TextFieldPKcN3Ion6Events5EventE \
-__ZN4Code17ConsoleController9inputTextEPKc \
-__ZN4Code25ScriptParameterController11handleEventEN3Ion6Events5EventE \
-__ZN5QueueIN3Ion6Events5EventELi1024EE4nextEPS2_ \
-__ZN5QueueIN3Ion6Events5EventELi1024EE4sizeEv \
-__ZN5QueueIN3Ion6Events5EventELi1024EE7enqueueES2_ \
-__ZN6Button11handleEventEN3Ion6Events5EventE \
-__ZN6Turtle10setHeadingEd \
-__ZN6Turtle10setVisibleEb \
-__ZN6Turtle3dotEdd \
-__ZN6Turtle4drawEb \
-__ZN6Turtle4goToEdd \
-__ZN6Turtle4leftEd \
-__ZN6Turtle5resetEv \
-__ZN6Turtle5rightEd \
-__ZN6Turtle6circleEld \
-__ZN6Turtle7forwardEd \
-__ZN6Turtle8backwardEd \
-__ZN7RunLoop3runEv \
-__ZN7RunLoop4stepEv \
-__ZN7RunLoop8runWhileEPFbPvES0_ \
-__ZN9Container13dispatchEventEN3Ion6Events5EventE \
-__ZN9Container3runEv \
-__ZN9Container8switchToEPN3App8SnapshotE \
-__ZN9TextField11handleEventEN3Ion6Events5EventE \
-__ZN9TextField18privateHandleEventEN3Ion6Events5EventE \
-__ZThn32_N4Code17ConsoleController25textFieldDidFinishEditingEP9TextFieldPKcN3Ion6Events5EventE \
-__ZThn28_N6Button11handleEventEN3Ion6Events5EventE \
-__ZThn32_N4Code17ConsoleController9inputTextEPKc \
-__ZThn36_N4Code17ConsoleController9inputTextEPKc \
-__ZZN4Code14MenuControllerC1EP9ResponderPNS_11ScriptStoreEP19ButtonRowControllerbEN3__08__invokeEPvS8_ \
-__ZZN4Code14MenuControllerC1EP9ResponderPNS_11ScriptStoreEP19ButtonRowControllerbENK3__0clEPvS8_ \
-_closure_call \
-_do_load \
-_do_load_from_lexer \
-_emscripten_sleep \
-_fun_bc_call \
-_fun_builtin_1_call \
-_fun_builtin_var_call \
-_main \
-_micropython_port_interruptible_msleep \
-_micropython_port_interrupt_if_needed \
-_micropython_port_vm_hook_loop \
-_modion_keyboard_keydown \
-_modtime_sleep \
-_modturtle_backward \
-_modturtle_circle \
-_modturtle_forward \
-_modturtle_goto \
-_modturtle_left \
-_modturtle_reset \
-_modturtle_right \
-_modturtle_setheading \
-_modturtle_showturtle \
-_mp_builtin___import__ \
-_mp_builtin_input \
-_mp_call_function_0 \
-_mp_call_function_n_kw \
-_mp_execute_bytecode \
-_mp_hal_input \
-_mp_import_name \
-_mp_parse_compile_execute \
-_msleep
-
-EMTERPRETIFY_WHITELIST = $(foreach sym,$(EMSCRIPTEN_ASYNC_SYMBOLS),"$(sym)",)END
-EMFLAGS = -s PRECISE_F32=1 -s EMTERPRETIFY=1 -s EMTERPRETIFY_ASYNC=1 -s EMTERPRETIFY_WHITELIST='[$(EMTERPRETIFY_WHITELIST:,END=)]'
+EMFLAGS = -s PRECISE_F32=1 -s ASYNCIFY
 
 ifeq ($(DEBUG),1)
 EMFLAGS += --profiling-funcs
@@ -114,12 +11,15 @@ EMFLAGS += -s ASSERTIONS=1
 EMFLAGS += -s SAFE_HEAP=1
 EMFLAGS += -s STACK_OVERFLOW_CHECK=1
 EMFLAGS += -s DEMANGLE_SUPPORT=1
+EMFLAGS += -s MAIN_MODULE=1
+else
+EMFLAGS += -s MAIN_MODULE=2
 endif
 
 # EMFLAGS += -s ERROR_ON_UNDEFINED_SYMBOLS=0
 
 # Configure EMFLAGS
-EMFLAGS += -s WASM=0
+EMFLAGS += -s WASM=1 -s SINGLE_FILE=1
 
 # Configure LDFLAGS
 EMSCRIPTEN_MODULARIZE ?= 1
diff --git a/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c
index 458d67afd..e20d7a985 100644
--- a/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c
+++ b/ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c
@@ -348,8 +348,8 @@ Emscripten_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * di
 static void
 Emscripten_SetWindowTitle(_THIS, SDL_Window * window) {
     EM_ASM_INT({
-      if (typeof Module['setWindowTitle'] !== 'undefined') {
-        Module['setWindowTitle'](UTF8ToString($0));
+      if (typeof setWindowTitle !== 'undefined') {
+        setWindowTitle(UTF8ToString($0));
       }
       return 0;
     }, window->title);