diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml
index 8f9b906..e46b363 100644
--- a/org.zdoom.GZDoom.yaml
+++ b/org.zdoom.GZDoom.yaml
@@ -17,12 +17,16 @@ finish-args:
 - --filesystem=xdg-desktop:ro
 - --filesystem=xdg-documents:ro
 - --filesystem=xdg-download:ro
-# Screenshots
-- --filesystem=xdg-pictures
+
+# Screenshots? 
+# Sceenshots go by default in ~/.config/
+#- --filesystem=xdg-pictures
 
 # Based on GZDoom
+# We access the original ~/.config/gzdoom because
+# that is where users should put their iwads
 - --env=DOOMWADDIR=/app/share/games/doom
-- --persist=.config/gzdoom
+- --filesystem=~/.config/gzdoom
 
 cleanup:
 - /app/include
@@ -82,40 +86,6 @@ modules:
     commands:
     - install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2
 
-# Good to discuss... What should be included by default?
-# FLOSS is fine, freeware fine?
-
-- name: freefiles
-  buildsystem: simple
-  sources:
-  # Freedoom (FLOSS Doom) - https://freedoom.github.io/
-  - type: archive
-    url: https://github.com/freedoom/freedoom/releases/download/v0.11.3/freedoom-0.11.3.zip
-    sha256: 28a5eafbb1285b78937bd408fcdd8f25f915432340eee79da692eae83bce5e8a
-  # Blasphemer (FLOSS Heretic) - https://code.google.com/archive/p/blasphemer/
-  # Chex 3 - http://www.chucktropolis.com/gamers.htm
-  # Action Doom 2 - http://action.mancubus.net/index.htm
-  # Harmony - http://heroestospare.com/rabotik/harmony.php
-  # Hacx - http://drnostromo.com/hacx/index.php
-  # Adventure of Square - http://adventuresofsquare.com/
-  # Delaweare - http://spaceisgreen.nl/delaweare.htm
-  build-commands:
-  - install -Dm 644 freedoom2.wad /app/share/games/doom
-  - install -Dm 644 freedoom1.wad /app/share/games/doom
-
-- name: shareware
-  disabled: true
-  buildsystem: simple
-  sources:
-  - type: archive
-    filename: doom1.zip
-    url: http://downloads.zdaemon.org/wads/doom1.zip
-    sha256: a86396fc9f8bca0e07caec3ef324786ab967995cf94690d077d94784fae2cae4
-    size: 1756172
-  build-commands:
-  - ls -la
-  - install -Dm 644 doom1.wad /app/share/games/doom
-
 - name: launcher
   buildsystem: simple
   sources:
@@ -136,4 +106,3 @@ modules:
   - install -Dm 644 gzdoom.png /app/share/icons/hicolor/48x48/apps/gzdoom.png
   - install -Dm 644 gzdoom.png /app/share/icons/hicolor/64x64/apps/gzdoom.png
   - install -Dm 644 gzdoom.png /app/share/icons/hicolor/128x128/apps/gzdoom.png
-