diff --git a/.gitmodules b/.gitmodules
index 86f68b9..fdfc144 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/android/app/jni/SDL/SDL"]
 	path = src/android/app/jni/SDL/SDL
-	url = git://github.com/libsdl-org/SDL
+	url = https://github.com/libsdl-org/SDL
diff --git a/build.sh b/build.sh
index 86c0705..2bbd892 100755
--- a/build.sh
+++ b/build.sh
@@ -119,12 +119,10 @@ do
 	bin/uxncli bin/asma.rom $f bin/`basename ${f%.tal}`.rom 2> /dev/null
 done
 
-<<<<<<< HEAD
 if [ $norun = 1 ]; then exit; fi
-=======
+
 echo "Assembling(piano).."
 ./bin/uxnasm projects/software/piano.tal bin/piano.rom
->>>>>>> main
 
 echo "Running.."
 ./bin/uxnemu bin/piano.rom
diff --git a/prepare-android.sh b/prepare-android.sh
index 8736bc0..0b0ff9d 100755
--- a/prepare-android.sh
+++ b/prepare-android.sh
@@ -2,12 +2,12 @@
 
 set -e
 
-# need launcher.rom to be included
+# build the thing
 ./build.sh --no-run
-# duplicate? already have a piano
-rm -f bin/asma-piano.rom
+
+# more roms
+./bin/uxncli bin/asma.rom projects/software/piano.tal bin/piano.rom
 
 # get more roms
-curl https://rabbits.srht.site/uxn-rompack.tar.gz | tar -C bin -xzf -
-mv bin/uxn/*.rom bin
-rm -r bin/uxn
+curl -L https://github.com/randrew/uxn32/releases/latest/download/uxn32-essentials.zip | bsdtar -xvf- -C bin
+rm -f bin/*.exe
diff --git a/src/android/app/src/main/assets/automata.rom b/src/android/app/src/main/assets/automata.rom
deleted file mode 120000
index 12eed89..0000000
--- a/src/android/app/src/main/assets/automata.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/automata.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/darena.rom b/src/android/app/src/main/assets/darena.rom
deleted file mode 120000
index 4ef1ded..0000000
--- a/src/android/app/src/main/assets/darena.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/darena.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/drum-rack.rom b/src/android/app/src/main/assets/drum-rack.rom
deleted file mode 120000
index 9fec898..0000000
--- a/src/android/app/src/main/assets/drum-rack.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/drum-rack.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/dungeon.rom b/src/android/app/src/main/assets/dungeon.rom
deleted file mode 120000
index 6176c0c..0000000
--- a/src/android/app/src/main/assets/dungeon.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/dungeon.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/logic.rom b/src/android/app/src/main/assets/logic.rom
deleted file mode 120000
index 136622b..0000000
--- a/src/android/app/src/main/assets/logic.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/logic.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/nametable.rom b/src/android/app/src/main/assets/nametable.rom
deleted file mode 120000
index 1f646a3..0000000
--- a/src/android/app/src/main/assets/nametable.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/nametable.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/prng.rom b/src/android/app/src/main/assets/prng.rom
deleted file mode 120000
index adab3d1..0000000
--- a/src/android/app/src/main/assets/prng.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/prng.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/rule110.rom b/src/android/app/src/main/assets/rule110.rom
deleted file mode 120000
index 5efb9c7..0000000
--- a/src/android/app/src/main/assets/rule110.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/rule110.rom
\ No newline at end of file
diff --git a/src/android/app/src/main/assets/theme.rom b/src/android/app/src/main/assets/theme.rom
deleted file mode 120000
index 6603ba5..0000000
--- a/src/android/app/src/main/assets/theme.rom
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bin/theme.rom
\ No newline at end of file