diff --git a/dist/threeSDumper.gm9 b/dist/threeSDumper.gm9
index a59d0b7..d84348c 100644
--- a/dist/threeSDumper.gm9
+++ b/dist/threeSDumper.gm9
@@ -42,84 +42,11 @@ cp -w -n "1:/dbs/ticket.db" $[OUT]/ticket.db
 # === title.db
 cp -w -n "1:/dbs/title.db" $[OUT]/title.db
 
-# === Safe mode firm
-if not find $[OUT]/firm NULL
-    mkdir $[OUT]/firm
-end
-if chk $[ONTYPE] "N3DS"
-    if not find $[OUT]/firm/new NULL
-        mkdir $[OUT]/firm/new
-    end
-    cp -w -n "1:/title/00040138/20000003/content" $[OUT]/firm/new
-    rm $[OUT]/firm/new/cmd
-    find $[OUT]/firm/new/*.app APP
-    decrypt $[APP]
-else
-    if not find $[OUT]/firm/old NULL
-        mkdir $[OUT]/firm/old
-    end
-    cp -w -n "1:/title/00040138/00000003/content" $[OUT]/firm/old
-    rm $[OUT]/firm/old/cmd
-    find $[OUT]/firm/old/*.app APP
-    decrypt $[APP]
-end
-
 # === Secret sector (N3DS only)
 if chk $[ONTYPE] "N3DS"
     cp -w -n "S:/sector0x96.bin" $[OUT]/sector0x96.bin
 end
 
-# === System Archives
-if not find $[OUT]/sysarchives NULL
-    mkdir $[OUT]/sysarchives
-end
-
-if not find $[OUT]/sysarchives/0004009b NULL
-    mkdir $[OUT]/sysarchives/0004009b
-end
-
-# Mii Data
-find 1:/title/0004009b/00010202/content/*.app APP
-cp -w -n $[APP] $[OUT]/sysarchives/0004009b/00010202.app
-decrypt $[OUT]/sysarchives/0004009b/00010202.app
-
-# Region Manifest
-find 1:/title/0004009b/00010402/content/*.app APP
-cp -w -n $[APP] $[OUT]/sysarchives/0004009b/00010402.app
-decrypt $[OUT]/sysarchives/0004009b/00010402.app
-
-# Shared Font (JPN/EUR/USA)
-find 1:/title/0004009b/00014002/content/*.app APP
-cp -w -n $[APP] $[OUT]/sysarchives/0004009b/00014002.app
-decrypt $[OUT]/sysarchives/0004009b/00014002.app
-
-# Shared Font (CHN)
-find 1:/title/0004009b/00014102/content/*.app APP
-cp -w -n $[APP] $[OUT]/sysarchives/0004009b/00014102.app
-decrypt $[OUT]/sysarchives/0004009b/00014102.app
-
-# Shared Font (KOR)
-find 1:/title/0004009b/00014202/content/*.app APP
-cp -w -n $[APP] $[OUT]/sysarchives/0004009b/00014202.app
-decrypt $[OUT]/sysarchives/0004009b/00014202.app
-
-# Shared Font (TWN)
-find 1:/title/0004009b/00014302/content/*.app APP
-cp -w -n $[APP] $[OUT]/sysarchives/0004009b/00014302.app
-decrypt $[OUT]/sysarchives/0004009b/00014302.app
-
-if not find $[OUT]/sysarchives/000400db NULL
-    mkdir $[OUT]/sysarchives/000400db
-end
-
-# NG Bad word list
-find 1:/title/000400db/00010302/content/*.app APP
-cp -w -n $[APP] $[OUT]/sysarchives/000400db/00010302.app
-decrypt $[OUT]/sysarchives/000400db/00010302.app
-
-# === Config savegame
-cp -w -n 1:/data/$[SYSID0]/sysdata/00010017/00000000 $[OUT]/config.sav
-
 # === NAND data
 if not find $[OUT]/data NULL
     mkdir $[OUT]/data
@@ -135,9 +62,6 @@ if not find $[OUT]/data/sysdata NULL
 end
 cp -w -n "1:/data/$[SYSID0]/sysdata" $[OUT]/data/sysdata
 
-# Already dumped above
-rm $[OUT]/data/sysdata/00010017
-
 # === Other system titles
 if find $[OUT]/title NULL
     rm $[OUT]/title
@@ -162,7 +86,11 @@ if not find $[OUT]/title/00040030 NULL
 end
 cp -w -n "1:/title/00040030" $[OUT]/title/00040030
 
-# 0004009b Shared Data Archives skipped (included in sysarchives)
+# Shared Data Archives
+if not find $[OUT]/title/0004009b NULL
+    mkdir $[OUT]/title/0004009b
+end
+cp -w -n "1:/title/0004009b" $[OUT]/title/0004009b
 
 # System Data Archives
 if not find $[OUT]/title/000400db NULL
@@ -176,10 +104,11 @@ if not find $[OUT]/title/00040130 NULL
 end
 cp -w -n "1:/title/00040130" $[OUT]/title/00040130
 
-# 00040138 System Firmware skipped (dumped above)
-
-# Already included in sysarchives
-rm $[OUT]/title/000400db/00010302
+# System Firmware
+if not find $[OUT]/title/00040138 NULL
+    mkdir $[OUT]/title/00040138
+end
+cp -w -n "1:/title/00040138" $[OUT]/title/00040138
 
 # === seeddb.bin
 sdump -o -s -w seeddb.bin