diff --git a/.config/qutebrowser/bindings.py b/.config/qutebrowser/bindings.py
index 10f30a1..21c33bd 100644
--- a/.config/qutebrowser/bindings.py
+++ b/.config/qutebrowser/bindings.py
@@ -14,7 +14,7 @@ bind = {
     'sa': 'open -t archive.is/?run=1&url={url}',
     'sc': 'config-cycle content.user_stylesheets adapta.css ""',
     'sd': "spawn fish -c 'dl; open (ls | rofi -dmenu -b -i || exit 0)'",
-    'gs': 'debug-dump-page ~/Downloads/dump.html',
+    'sg': 'debug-dump-page ~/Downloads/dump.html',
     'sq': 'spawn -u qr',
     'sr': 'remove-sticky',
     'st': 'config-cycle content.proxy socks://localhost:9050/ system',
diff --git a/.local/bin/appdwarf b/.local/bin/appdwarf
index c6e230d..59a3e1f 100755
--- a/.local/bin/appdwarf
+++ b/.local/bin/appdwarf
@@ -1,20 +1,14 @@
 #!/bin/sh
-mkdir appdir
-mkdwarfs -i $@ -o appdir/root.dwarfs
-
-cat > appdir/AppRun <<'EOF'
+mkdwarfs -i "$@" -o "$(basename "$@").sh" --header <(cat << 'EOF'
 #!/bin/sh
-HERE=$(dirname $(readlink -f "${0}"))
-DIR=/tmp/.dwarf_$RANDOM
-mkdir $DIR 2> /dev/null
-dwarfs $HERE/root.dwarfs $DIR 2> /dev/null
-$DIR/AppRun $@
-fusermount -uz $DIR 2> /dev/null
-rmdir $DIR 2> /dev/null
+DIR=/tmp/.dwarf_$(basename "$0")$RANDOM
+mkdir "$DIR" 2> /dev/null
+dwarfs -o offset=auto "$0" "$DIR" 2> /dev/null
+"$DIR/AppRun" $@
+fusermount -uz "$DIR" 2> /dev/null
+rmdir "$DIR" 2> /dev/null
+exit
 EOF
+)
 
-chmod +x appdir/AppRun
-mksquashfs appdir app.sfs -noD
-cat $(which appimageruntime) app.sfs > $(basename $@).sh
-chmod +x $(basename $@).sh
-rm -r appdir app.sfs
+chmod +x "$(basename "$@").sh"
diff --git a/.local/bin/dwarfmount b/.local/bin/dwarfmount
index cc19be7..f5a6357 100755
--- a/.local/bin/dwarfmount
+++ b/.local/bin/dwarfmount
@@ -2,5 +2,5 @@
 DIR=/tmp/.dwarf_$(basename $@ .dwarfs)$RANDOM
 mkdir $DIR
 echo $DIR
-dwarfs -f $@ $DIR 2> /dev/null
+dwarfs -o offset=auto -f $@ $DIR 2> /dev/null
 rmdir $DIR
diff --git a/.local/bin/foldwarf b/.local/bin/foldwarf
index 4918e29..41fe758 100755
--- a/.local/bin/foldwarf
+++ b/.local/bin/foldwarf
@@ -1,24 +1,18 @@
 #!/bin/sh
-a=../appdir
-mkdir $a
-mkdwarfs -i . -o $a/root.dwarfs
-
-echo '#!/bin/sh' > $a/AppRun
-echo D=$@ >> $a/AppRun
-cat >> $a/AppRun <<'EOF'
-H=$(dirname $(readlink -f "${0}"))
-
+H=/tmp/folheader
+echo '#!/bin/sh' > $H
+echo D=$@ >> $H
+cat >> $H <<'EOF'
 if [ ! -d $D ]; then
     mkdir $D
-    dwarfs2 $H/root.dwarfs $D
+    dwarfs -o offset=auto "$0" $D
 else
     fusermount -u $D
     rmdir $D
 fi
+exit
 EOF
 
-chmod +x $a/AppRun
-mksquashfs $a ../app.sfs -noD
-cat $(which appimageruntime) ../app.sfs > $PWD.sh
+mkdwarfs -i . -o "$PWD.sh" --header $H
 chmod +x "$PWD.sh"
-rm -r $a ../app.sfs
+rm $H