diff --git a/.gitmodules b/.gitmodules
index f8488a10..c22c46f6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
[submodule "nanoasm"]
path = nanoasm
url = https://github.com/sehugg/nanoasm
+[submodule "unicorn.js"]
+ path = unicorn.js
+ url = https://github.com/AlexAltea/unicorn.js
diff --git a/Makefile b/Makefile
index d1040b42..f5d266f9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ all:
cp node_modules/localforage/dist/localforage.min.js ./lib/
cp node_modules/jszip/dist/jszip.min.js ./lib/
cp node_modules/file-saver/dist/*.min.js ./lib/
+ cp unicorn.js/dist/unicorn-arm.min.js ./unicorn.js/demos/externals/capstone-arm.min.js ./lib/
cp gif.js/dist/* ./lib/
cd jsnes && npm i
$(TSC) -v
diff --git a/electron.html b/electron.html
index cf5b2473..d1debdf6 100644
--- a/electron.html
+++ b/electron.html
@@ -437,8 +437,8 @@ $( ".dropdown-submenu" ).click(function(event) {
+