diff --git a/skia/dependencies/clean_dependencies.sh b/skia/dependencies/clean_dependencies.sh
new file mode 100755
index 0000000..bc58623
--- /dev/null
+++ b/skia/dependencies/clean_dependencies.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rm -fR ./gl3w
+rm -fR ./glfw
+rm -fR ./glfw_build
+rm -fR ./imgui
+rm -fR ./skia
+rm -fR ./skia_rive_optimized
\ No newline at end of file
diff --git a/skia/dependencies/make_skia.sh b/skia/dependencies/make_skia.sh
index 1dd2c01..e634644 100755
--- a/skia/dependencies/make_skia.sh
+++ b/skia/dependencies/make_skia.sh
@@ -4,8 +4,9 @@
 
 ./get_skia.sh
 
+build_skia_rive_optimized() {
 # use Rive optimized/stripped Skia for iOS static libs.
-cd skia_rive_optimized
+pushd skia_rive_optimized
 
 python tools/git-sync-deps
 bin/gn gen out/ios64 --type=static_library --args=" \
@@ -205,11 +206,55 @@
 xcrun -sdk iphoneos lipo -create -arch armv7 out/ios32/libskia.a out/ios64/libskia.a -output out/libskia_ios.a
 xcrun -sdk iphoneos lipo -create -arch x86_64 out/iossim_x64/libskia.a -arch i386 out/iossim_x86/libskia.a out/iossim_arm64/libskia.a -output out/libskia_ios_sim.a
 
+popd
+}
+
+build_skia() {
 # build regular/full skia
-cd ../skia
+pushd skia
+python tools/git-sync-deps
 
 # build static for host
-bin/gn gen out/static --type=static_library --args=" \
+bin/gn gen out/static/debug --type=static_library --args=" \
+    extra_cflags=[\"-fno-rtti\", \"-DSK_DISABLE_SKPICTURE\", \"-DSK_DISABLE_TEXT\", \"-DRIVE_OPTIMIZED\", \"-DSK_DISABLE_LEGACY_SHADERCONTEXT\", \"-DSK_DISABLE_LOWP_RASTER_PIPELINE\", \"-DSK_FORCE_RASTER_PIPELINE_BLITTER\", \"-DSK_DISABLE_AAA\", \"-DSK_DISABLE_EFFECT_DESERIALIZATION\"] \
+
+    is_official_build=false \
+    skia_use_gl=true \
+    skia_use_zlib=true \
+    skia_enable_gpu=true \
+    skia_enable_fontmgr_empty=false \
+    skia_use_libpng_encode=true \
+    skia_use_libpng_decode=true \
+    skia_enable_skgpu_v1=true \
+
+    skia_use_dng_sdk=false \
+    skia_use_egl=false \
+    skia_use_expat=false \
+    skia_use_fontconfig=false \
+    skia_use_freetype=false \
+    skia_use_icu=false \
+    skia_use_libheif=false \
+    skia_use_system_libpng=false \
+    skia_use_libjpeg_turbo_encode=false \
+    skia_use_libjpeg_turbo_decode=false \
+    skia_use_libwebp_encode=false \
+    skia_use_libwebp_decode=false \
+    skia_use_lua=false \
+    skia_use_piex=false \
+    skia_use_vulkan=false \
+    skia_use_metal=false \
+    skia_use_angle=false \
+    skia_use_system_zlib=false \
+    skia_enable_spirv_validation=false \
+    skia_enable_pdf=false \
+    skia_enable_skottie=false \
+    skia_enable_tools=false \
+    skia_enable_skgpu_v2=false \
+    "
+ninja -C out/static/debug
+du -hs out/static/debug/libskia.a
+
+bin/gn gen out/static/release --type=static_library --args=" \
     extra_cflags=[\"-fno-rtti\", \"-flto=full\", \"-DSK_DISABLE_SKPICTURE\", \"-DSK_DISABLE_TEXT\", \"-DRIVE_OPTIMIZED\", \"-DSK_DISABLE_LEGACY_SHADERCONTEXT\", \"-DSK_DISABLE_LOWP_RASTER_PIPELINE\", \"-DSK_FORCE_RASTER_PIPELINE_BLITTER\", \"-DSK_DISABLE_AAA\", \"-DSK_DISABLE_EFFECT_DESERIALIZATION\"] \
 
     is_official_build=true \
@@ -245,7 +290,10 @@
     skia_enable_tools=false \
     skia_enable_skgpu_v2=false \
     "
-ninja -C out/static
-du -hs out/static/libskia.a
+ninja -C out/static/release
+du -hs out/static/release/libskia.a
+popd
+}
 
-cd ..
\ No newline at end of file
+build_skia_rive_optimized
+build_skia
diff --git a/skia/viewer/build/premake5.lua b/skia/viewer/build/premake5.lua
index 1442293..e8e08aa 100644
--- a/skia/viewer/build/premake5.lua
+++ b/skia/viewer/build/premake5.lua
@@ -23,7 +23,7 @@
 
 links {"Cocoa.framework", "IOKit.framework", "CoreVideo.framework", "rive", "skia", "rive_skia_renderer", "glfw3"}
 libdirs {"../../../build/%{cfg.system}/bin/%{cfg.buildcfg}", "../../dependencies/glfw_build/src",
-         "../../dependencies/skia/out/static", "../../renderer/build/%{cfg.system}/bin/%{cfg.buildcfg}"}
+         "../../dependencies/skia/out/static/%{cfg.buildcfg}", "../../renderer/build/%{cfg.system}/bin/%{cfg.buildcfg}"}
 
 files {"../src/**.cpp", "../../dependencies/gl3w/build/src/gl3w.c",
        "../../dependencies/imgui/backends/imgui_impl_glfw.cpp",
@@ -31,16 +31,19 @@
        "../../dependencies/imgui/imgui.cpp", "../../dependencies/imgui/imgui_tables.cpp",
        "../../dependencies/imgui/imgui_draw.cpp"}
 
-buildoptions {"-Wall", "-fno-exceptions", "-fno-rtti", "-flto=full", "-g"}
+buildoptions {"-Wall", "-fno-exceptions", "-fno-rtti"}
+
 filter "configurations:debug"
 defines {"DEBUG"}
 symbols "On"
+buildoptions {"-g"}
 
 filter "configurations:release"
 
 defines {"RELEASE"}
 defines {"NDEBUG"}
 optimize "On"
+buildoptions {"-flto=full"}
 
 -- Clean Function --
 newaction {