diff --git a/README b/README
index aeb199166..e3e6436e8 100644
--- a/README
+++ b/README
@@ -1232,8 +1232,16 @@ that they may be cached. The best approach in this case is to use pandoc
 without the `-s` option to produce the body of the S5 document, which
 can then be inserted into an HTML template that links to the javascript
 and CSS files required by S5. (See the instructions on the S5 website.)
-Alternatively, you may use `-s` together with the `-C/--custom-header`
-option.
+Alternatively, you may use `-s` together with the `--template`
+option to specify a custom template.
+
+You can change the style of the slides by putting customized CSS files
+in `$HOME/.pandoc/s5/default` (on unix) or
+`C:\Documents And Settings\USERNAME\Application Data\pandoc\reference.odt`
+(on Windows).  The originals may be found in pandoc's system
+data directory (generally `$CABALDIR/pandoc-VERSION/s5/default`).
+Pandoc will look there for any files it does not find in the user's
+pandoc data directory.
 
 Literate Haskell support
 ========================
diff --git a/pandoc.cabal b/pandoc.cabal
index f1577f7e8..73b1efbbf 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -48,14 +48,14 @@ Data-Files:
                  data/LaTeXMathML.js.comment,
                  data/LaTeXMathML.js.packed,
                  -- data for S5 writer
-                 data/ui/default/slides.js.comment,
-                 data/ui/default/slides.js.packed,
-                 data/ui/default/s5-core.css,
-                 data/ui/default/framing.css,
-                 data/ui/default/pretty.css,
-                 data/ui/default/opera.css,
-                 data/ui/default/outline.css,
-                 data/ui/default/print.css,
+                 s5/default/slides.js.comment,
+                 s5/default/slides.js.packed,
+                 s5/default/s5-core.css,
+                 s5/default/framing.css,
+                 s5/default/pretty.css,
+                 s5/default/opera.css,
+                 s5/default/outline.css,
+                 s5/default/print.css,
                  -- documentation
                  README, INSTALL, COPYRIGHT, BUGS, changelog,
                  -- wrappers
diff --git a/data/ui/default/blank.gif b/s5/default/blank.gif
similarity index 100%
rename from data/ui/default/blank.gif
rename to s5/default/blank.gif
diff --git a/data/ui/default/bodybg.gif b/s5/default/bodybg.gif
similarity index 100%
rename from data/ui/default/bodybg.gif
rename to s5/default/bodybg.gif
diff --git a/data/ui/default/framing.css b/s5/default/framing.css
similarity index 100%
rename from data/ui/default/framing.css
rename to s5/default/framing.css
diff --git a/data/ui/default/iepngfix.htc b/s5/default/iepngfix.htc
similarity index 100%
rename from data/ui/default/iepngfix.htc
rename to s5/default/iepngfix.htc
diff --git a/data/ui/default/opera.css b/s5/default/opera.css
similarity index 100%
rename from data/ui/default/opera.css
rename to s5/default/opera.css
diff --git a/data/ui/default/outline.css b/s5/default/outline.css
similarity index 100%
rename from data/ui/default/outline.css
rename to s5/default/outline.css
diff --git a/data/ui/default/pretty.css b/s5/default/pretty.css
similarity index 100%
rename from data/ui/default/pretty.css
rename to s5/default/pretty.css
diff --git a/data/ui/default/print.css b/s5/default/print.css
similarity index 100%
rename from data/ui/default/print.css
rename to s5/default/print.css
diff --git a/data/ui/default/s5-core.css b/s5/default/s5-core.css
similarity index 100%
rename from data/ui/default/s5-core.css
rename to s5/default/s5-core.css
diff --git a/data/ui/default/slides.css b/s5/default/slides.css
similarity index 100%
rename from data/ui/default/slides.css
rename to s5/default/slides.css
diff --git a/data/ui/default/slides.js b/s5/default/slides.js
similarity index 100%
rename from data/ui/default/slides.js
rename to s5/default/slides.js
diff --git a/data/ui/default/slides.js.comment b/s5/default/slides.js.comment
similarity index 100%
rename from data/ui/default/slides.js.comment
rename to s5/default/slides.js.comment
diff --git a/data/ui/default/slides.js.packed b/s5/default/slides.js.packed
similarity index 100%
rename from data/ui/default/slides.js.packed
rename to s5/default/slides.js.packed