diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..83b0040
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,18 @@
+games/drascula-audio-mp3-2.0.zip filter=lfs diff=lfs merge=lfs -text
+games/feeble-dos-ni-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/lure-1.1.zip filter=lfs diff=lfs merge=lfs -text
+games/myst-win-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/tlj-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/Last_Express_demo.zip filter=lfs diff=lfs merge=lfs -text
+games/ft-dos-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/lsl7-dos-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/queen-FOTAQ_Floppy.zip filter=lfs diff=lfs merge=lfs -text
+games/grim-win-demo2-en.zip filter=lfs diff=lfs merge=lfs -text
+games/hires1-MYSTHOUS.zip filter=lfs diff=lfs merge=lfs -text
+games/monkey4-emi-win-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/riven-win-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/sword2-win-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/warlock-win-demo.zip filter=lfs diff=lfs merge=lfs -text
+games/comi-win-large-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/phantasmagoria-dos-win-demo-en.zip filter=lfs diff=lfs merge=lfs -text
+games/sky-BASS-Floppy-1.3.zip filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 17c09cb..3491b4a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,11 +27,19 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
+          lfs: true
+
+      # The games are stored as LFS objects so the build script isn't downloading them on every build
+      - name: Checkout LFS objects
+        run: git lfs checkout
+
+      - name: Move games
+        run: mv ./games/ ./scummvm/dists/emscripten/
 
       - name: Build ScummVM 🔧
         run: |
           cd scummvm
-          ./dists/emscripten/build.sh build --verbose --disable-all-engines --enable-plugins --disable-tinygl --default-dynamic --enable-engine=adl,testbed,scumm,scumm_7_8,grim,monkey4,mohawk,myst,riven,sci32,agos2,sword2,drascula,sky,lure,queen,testbed,director,stark --bundle-games=testbed,comi/comi-win-large-demo-en.zip,warlock,sky/BASS-Floppy-1.3.zip,drascula/drascula-audio-mp3-2.0.zip,monkey4,feeble,queen/FOTAQ_Floppy.zip,ft,grim/grim-win-demo2-en.zip,lsl7,lure,myst,phantasmagoria,riven,hires1,tlj,sword2
+          ./dists/emscripten/build.sh build --verbose --enable-detection-dynamic  --enable-plugins --disable-tinygl --default-dynamic --enable-all-engines  --bundle-games=bundle-games=testbed,comi/comi-win-large-demo-en.zip,warlock,sky/BASS-Floppy-1.3.zip,drascula/drascula-audio-mp3-2.0.zip,monkey4,feeble,queen/FOTAQ_Floppy.zip,ft,grim/grim-win-demo2-en.zip,lsl7,lure,myst,phantasmagoria,riven,hires1,tlj,sword2,"https://archive.org/download/Last_Express_demo/Last_Express_demo.zip
           cp build-emscripten/scummvm.html build-emscripten/index.html
           cd ..
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6582234
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Local Netlify folder
+.netlify
diff --git a/.lfsconfig b/.lfsconfig
new file mode 100644
index 0000000..866fa4f
--- /dev/null
+++ b/.lfsconfig
@@ -0,0 +1,2 @@
+[lfs]
+	url = https://62e2746d-f1b8-4e76-8338-c33ad3147446.netlify.app/.netlify/large-media
diff --git a/games/Last_Express_demo.zip b/games/Last_Express_demo.zip
new file mode 100644
index 0000000..5d56711
--- /dev/null
+++ b/games/Last_Express_demo.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d69092efaa2f70f1d589d96808a75b700367903279bf74489a82edfc4af8ce7b
+size 42613285
diff --git a/games/comi-win-large-demo-en.zip b/games/comi-win-large-demo-en.zip
new file mode 100644
index 0000000..9ef36a4
--- /dev/null
+++ b/games/comi-win-large-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f142189b26ff398916c49e9ba75cbf51947c074881c6987a146445eb21fddc98
+size 64202589
diff --git a/games/drascula-audio-mp3-2.0.zip b/games/drascula-audio-mp3-2.0.zip
new file mode 100644
index 0000000..ce9c693
--- /dev/null
+++ b/games/drascula-audio-mp3-2.0.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32bdb6d5163e538ffe20f6320e20e0b24050823be516775364be629ab1b52eee
+size 29426782
diff --git a/games/feeble-dos-ni-demo-en.zip b/games/feeble-dos-ni-demo-en.zip
new file mode 100644
index 0000000..4847561
--- /dev/null
+++ b/games/feeble-dos-ni-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f05032e64dabca0f8ccce3295c96c5e32680a767e496d9c6a08a7d375b11f32
+size 215685737
diff --git a/games/ft-dos-demo-en.zip b/games/ft-dos-demo-en.zip
new file mode 100644
index 0000000..08cee7b
--- /dev/null
+++ b/games/ft-dos-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ba0df98349453a730dfef780f8fa9b34f284d081fd9e0e190388c73a85c88c9
+size 97731231
diff --git a/games/grim-win-demo2-en.zip b/games/grim-win-demo2-en.zip
new file mode 100644
index 0000000..9145009
--- /dev/null
+++ b/games/grim-win-demo2-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c6c3a8eefee3d9dae04461b2de82481ab57eecab1dd175b2e3406fcde6bd698
+size 103599118
diff --git a/games/hires1-MYSTHOUS.zip b/games/hires1-MYSTHOUS.zip
new file mode 100644
index 0000000..67c0899
--- /dev/null
+++ b/games/hires1-MYSTHOUS.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ada412228a149394489b28c6c7f9ebab0722b52e04732fd0aa22949673cfa3a0
+size 59353
diff --git a/games/lsl7-dos-demo-en.zip b/games/lsl7-dos-demo-en.zip
new file mode 100644
index 0000000..b98b1ae
--- /dev/null
+++ b/games/lsl7-dos-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8e26190013416e45504eb188ebfc4e76e3a1bba5c176e0deaba1b6d84eb5968
+size 44930491
diff --git a/games/lure-1.1.zip b/games/lure-1.1.zip
new file mode 100644
index 0000000..d3a55ea
--- /dev/null
+++ b/games/lure-1.1.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3178245a1483da1168c3a11e70b65d33c389f1f5df63d4f3a356886c1890108
+size 5678861
diff --git a/games/monkey4-emi-win-demo-en.zip b/games/monkey4-emi-win-demo-en.zip
new file mode 100644
index 0000000..e18e8a9
--- /dev/null
+++ b/games/monkey4-emi-win-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6c5c7b60728d59c7c336e80b08fe99b04e42826001d84098d5ab982367be4b3
+size 118622284
diff --git a/games/myst-win-demo-en.zip b/games/myst-win-demo-en.zip
new file mode 100644
index 0000000..eeff0a8
--- /dev/null
+++ b/games/myst-win-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f4cb71ea9fde2df1d3d5873f3db21388da754e0082c96329a6360c03d1ba446
+size 37036626
diff --git a/games/phantasmagoria-dos-win-demo-en.zip b/games/phantasmagoria-dos-win-demo-en.zip
new file mode 100644
index 0000000..9deb023
--- /dev/null
+++ b/games/phantasmagoria-dos-win-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c791420a3fb6c93d5e17d91a153d50efd8730b508a76960603dbaa148741ce1
+size 363714852
diff --git a/games/queen-FOTAQ_Floppy.zip b/games/queen-FOTAQ_Floppy.zip
new file mode 100644
index 0000000..486865f
--- /dev/null
+++ b/games/queen-FOTAQ_Floppy.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e59de85f708cdb32bf85c85b394ac091c05f7647e856b71f5b3ae73fde761e0
+size 7109570
diff --git a/games/riven-win-demo-en.zip b/games/riven-win-demo-en.zip
new file mode 100644
index 0000000..3d5d599
--- /dev/null
+++ b/games/riven-win-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f89c02ee42649868f99e2acaa47dbb11a3c89a5dfdf3dbb62a1a31f090d71b0
+size 167988815
diff --git a/games/sky-BASS-Floppy-1.3.zip b/games/sky-BASS-Floppy-1.3.zip
new file mode 100644
index 0000000..69d419c
--- /dev/null
+++ b/games/sky-BASS-Floppy-1.3.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0bac1bd61747a67e885fa44b78c78887bf2b15d3dfa2790c483fad651078818
+size 7675813
diff --git a/games/sword2-win-demo-en.zip b/games/sword2-win-demo-en.zip
new file mode 100644
index 0000000..e9a13f4
--- /dev/null
+++ b/games/sword2-win-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f0d42f872423c5acef583e1d230955304907e9817e4baacf53c15265d1208f3
+size 12516861
diff --git a/games/tlj-demo-en.zip b/games/tlj-demo-en.zip
new file mode 100644
index 0000000..fa94a4c
--- /dev/null
+++ b/games/tlj-demo-en.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:699146687facd3e4b27008322f9d3cf20c3c018a42e33dfa17fd250192b0f968
+size 82297504
diff --git a/games/warlock-win-demo.zip b/games/warlock-win-demo.zip
new file mode 100644
index 0000000..aeb3b39
--- /dev/null
+++ b/games/warlock-win-demo.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:768310ae75064fdba6c1babf001a4680cc7adbf083724636c14a8f24d40a236c
+size 4886633
diff --git a/scummvm b/scummvm
index abb0989..2a7bb11 160000
--- a/scummvm
+++ b/scummvm
@@ -1 +1 @@
-Subproject commit abb0989a0855b1813280784106063db640049025
+Subproject commit 2a7bb115f67127c7ee8f196cde07fa12255a3044