diff --git a/thermion_dart/native/web/CMakeLists.txt b/thermion_dart/native/web/CMakeLists.txt
index a475259b..fa32502e 100644
--- a/thermion_dart/native/web/CMakeLists.txt
+++ b/thermion_dart/native/web/CMakeLists.txt
@@ -13,57 +13,55 @@ set(EMCC_CFLAGS --bind)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sALLOW_TABLE_GROWTH=1)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sALLOW_MEMORY_GROWTH=0)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sEXPORT_NAME=${MODULE_NAME})
-# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sLINKABLE=1)
-# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSIDE_MODULE)
+
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sINITIAL_MEMORY=512mb)
-#set(EMCC_CFLAGS ${EMCC_CFLAGS} -sENVIRONMENT=shell,node,web)
-# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sENVIRONMENT=worker)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sMODULARIZE)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sERROR_ON_UNDEFINED_SYMBOLS=0 )
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sEXPORTED_RUNTIME_METHODS=wasmExports,wasmTable,addFunction,removeFunction,ccall,cwrap,allocate,intArrayFromString,intArrayToString,getValue,setValue,UTF8ToString,stringToUTF8,writeArrayToMemory,lengthBytesUTF8,HEAPU8)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sEXPORTED_FUNCTIONS=_malloc,stackAlloc,_free,stackSave,stackRestore)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sFULL_ES3)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  #add_compile_definitions(ENABLE_TRACING=1)
-  set(EMCC_CFLAGS ${EMCC_CFLAGS} -sASSERTIONS=2)
-endif()
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sPTHREAD_POOL_SIZE=1)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sALLOW_BLOCKING_ON_MAIN_THREAD=1)
-#set(EMCC_CFLAGS ${EMCC_CFLAGS} -sOFFSCREEN_FRAMEBUFFER=1)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sOFFSCREENCANVAS_SUPPORT=1)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sNO_DISABLE_EXCEPTION_CATCHING)
-set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSAFE_HEAP=1)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sASYNCIFY=0)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sMIN_WEBGL_VERSION=2)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sMAX_WEBGL_VERSION=2)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sFETCH=0)
+set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSHARED_MEMORY=0)
+set(EMCC_CFLAGS ${EMCC_CFLAGS} -sFILESYSTEM=0)
 set(EMCC_CFLAGS ${EMCC_CFLAGS} -sUSE_PTHREADS)
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(EMCC_CFLAGS ${EMCC_CFLAGS} -sASSERTIONS=2)
   set(EMCC_CFLAGS ${EMCC_CFLAGS} -sGL_ASSERTIONS=1)
   set(EMCC_CFLAGS ${EMCC_CFLAGS} -sGL_DEBUG=1)
+  # set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSAFE_HEAP=1)
+  #add_compile_definitions(ENABLE_TRACING=1)
+  set(EMCC_CFLAGS ${EMCC_CFLAGS} -sWARN_UNALIGNED=1)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align -Wover-aligned")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wover-aligned")
+  set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSTACK_SIZE=10485760)
 endif()
-# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sPROXY_TO_PTHREAD)
-# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sPROXY_TO_WORKER=1)
-set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSHARED_MEMORY=1)
-# set(EMCC_CFLAGS ${EMCC_CFLAGS} -lidbfs.js)
-set(EMCC_CFLAGS ${EMCC_CFLAGS} -sFORCE_FILESYSTEM=1)
-set(EMCC_CFLAGS ${EMCC_CFLAGS} -matomics -mbulk-memory)
-# set(EMCC_CFLAGS ${EMCC_CFLAGS} -pie)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers -Wno-deprecated-literal-operator -stdlib=libc++ -std=c++17 -fPIC --no-entry")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie")
+set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSTACK_SIZE=10485760)
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sPROXY_TO_PTHREAD=1)
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} "-sOFFSCREENCANVASES_TO_PTHREAD=#thermion_canvas")
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sPROXY_TO_WORKER=1)
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sOFFSCREEN_FRAMEBUFFER=1)
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sENVIRONMENT=web)
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sENVIRONMENT=worker)
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sLINKABLE=1)
+# set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSIDE_MODULE)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++17 -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=1")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O1") #-fsanitize=undefined
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O1")
 endif()
 
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1") #-fsanitize=undefined
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O1")
-endif()
-
-add_link_options(${EMCC_CFLAGS} -pthread -lGL)
+add_link_options(${EMCC_CFLAGS} -pthread)
 
 link_directories("${CMAKE_CURRENT_SOURCE_DIR}/lib")