diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 1faecbc7d2..580d20ba34 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -1,9 +1,7 @@
-SUBDIRS = images .
+manualname = gstreamer-manual
 
-DIST_SUBDIRS = images
-
-EXTRA_DIST = fig \
-             advanced.sgml \
+sgml_files = gstreamer-manual.sgml \
+	     advanced.sgml \
              bins.sgml \
              buffers.sgml \
              components.sgml \
@@ -14,7 +12,6 @@ EXTRA_DIST = fig \
              factories.sgml \
              ghostpads.sgml \
              goals.sgml \
-             gstreamer-manual.sgml \
              helloworld.sgml \
              helloworld2.sgml \
              intro.sgml \
@@ -28,74 +25,126 @@ EXTRA_DIST = fig \
              utility.sgml \
              xml.sgml
 
-gstreamer-manual/gstreamer.html:
-	db2html gstreamer-manual.sgml
+fig_files =  bin-element.fig \
+             connected-elements.fig \
+             filter-element-multi.fig \
+             filter-element.fig \
+             hello-world.fig \
+             mime-world.fig \
+             queue.fig \
+             sink-element.fig \
+             src-element.fig \
+             state-diagram.fig \
+             thread.fig
 
-gstreamer-manual.pdf:
-	db2pdf gstreamer-manual.sgml
+eps_files =  bin-element.eps \
+             connected-elements.eps \
+             filter-element-multi.eps \
+             filter-element.eps \
+             hello-world.eps \
+             mime-world.eps \
+             queue.eps \
+             sink-element.eps \
+             src-element.eps \
+             state-diagram.eps \
+             thread.eps
 
-gstreamer-manual.ps:
-	db2ps gstreamer-manual.sgml
+png_files =  bin-element.png \
+             connected-elements.png \
+             filter-element-multi.png \
+             filter-element.png \
+             hello-world.png \
+             mime-world.png \
+             queue.png \
+             sink-element.png \
+             src-element.png \
+             state-diagram.png \
+             thread.png
 
 
-PDFFILES=gstreamer-manual.pdf
-PSFILES=gstreamer-manual.ps
+EXTRA_DIST = $(sgml_files) $(fig_files)
 
+PDFFILES=$(manualname).pdf
+PSFILES=$(manualname).ps
 
-htmldocs: gstreamer-manual/gstreamer.html gstreamer-manual/images
+$(manualname)/gstreamer.html: $(sgml_files) $(png_files)
+	db2html $(manualname).sgml
 
-gstreamer-manual/images:
-	ln -s ../images gstreamer-manual
+$(manualname).pdf: $(manualname).ps
+	ps2pdf $< $@
 
-htmldist: 
-	@if [ -r gstreamer-manual/gstreamer.html ] ; then \
-	    echo "Adding HTML manual to distribution" ; \
-	    $(mkinstalldirs) $(distdir)/gstreamer-manual ; \
-	    cp -a gstreamer-manual/* $(distdir)/gstreamer-manual/ ; \
+$(manualname).ps: $(sgml_files) $(eps_files)
+	db2ps $(manualname).sgml
+
+%.png : %.fig
+	fig2dev -L png -s 16 $< $@
+
+%.eps : %.fig
+	fig2dev -L eps -s 16 -m 0.5 $< $@
+
+$(manualname)/images:
+	ln -s .. $(manualname)/images
+
+htmldocs: $(manualname)/gstreamer.html $(manualname)/images
+htmldist: htmldocs
+	@if [ -r $(manualname)/gstreamer.html ] ; then \
+	    echo "Adding $(manualname)/gstreamer.html to distribution" ; \
+	    $(mkinstalldirs) $(distdir)/$(manualname) ; \
+	    cp -a $(manualname)/*.html $(distdir)/$(manualname)/ ; \
 	else \
 	    echo "Skipping HTML manual from distribution: can't build" ; \
 	fi
 
 pdfdocs: $(PDFFILES)
-pdfdist:
-	@if [ -r gstreamer-manual.pdf ] ; then \
-	    echo "Adding PDF manual to distribution" ; \
-	    cp -a gstreamer-manual.pdf $(distdir)/gstreamer-manual.pdf ; \
+pdfdist: pdfdocs
+	@for a in $(PDFFILES) ; do \
+	if [ -r $$a ] ; then \
+	    echo "Adding $$a to distribution" ; \
+	    cp -a $$a $(distdir)/ ; \
 	else \
-	    echo "Skipping PDF manual from distribution: can't build" ; \
-	fi
+	    echo "Skipping $$a from distribution: can't build" ; \
+	fi \
+	done
 
 psdocs: $(PSFILES)
-psdist:
-	@if [ -r gstreamer-manual.ps ] ; then \
-	    echo "Adding PS manual to distribution" ; \
-	    cp -a gstreamer-manual.ps $(distdir)/gstreamer-manual.ps ; \
+psdist: psdocs
+	@for a $(PSFILES) ; do \
+	if [ -r $$a ] ; then \
+	    echo "Adding $$a to distribution" ; \
+	    cp -a $$a $(distdir)/ ; \
 	else \
-	    echo "Skipping PS manual from distribution: can't build" ; \
-	fi
+	    echo "Skipping $$a from distribution: can't build" ; \
+	fi \
+	done
 
 # Data to install, in the usual automake way
 docdatadir   = $(datadir)/gstreamer
 docdata_DATA = $(PDFFILES) $(PSFILES)
+pngdatadir   = $(datadir)/gstreamer/gstreamer-manual/images
+pngdata_DATA = $(png_files)
 
 htmlinst:
-	@if [ -r gstreamer-manual/gstreamer.html ] ; then \
-	echo "Installing HTML documentation" ; \
-	    $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
-	    $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual/images ; \
-	    $(INSTALL_DATA) gstreamer-manual/*.html $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
+	@if [ -r $(manualname)/gstreamer.html ] ; then \
+	echo "Installing $(manualname)/*.html" ; \
+	    $(mkinstalldirs) $(DESTDIR)$(docdatadir)/$(manualname) ; \
+	    $(INSTALL_DATA) $(manualname)/*.html $(DESTDIR)$(docdatadir)/$(manualname) ; \
 	else \
-	    if [ -r $(srcdir)/gstreamer-manual/gstreamer.html ] ; then \
-	        echo "Installing HTML documentation" ; \
-	        $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
-	        $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual/images ; \
-	        $(INSTALL_DATA) $(srcdir)/gstreamer-manual/*.html $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
+	    if [ -r $(srcdir)/$(manualname)/gstreamer.html ] ; then \
+	        echo "Installing $(srcdir)/$(manualname)/*.html" ; \
+	        $(mkinstalldirs) $(DESTDIR)$(docdatadir)/$(manualname) ; \
+	        $(INSTALL_DATA) $(srcdir)/$(manualname)/*.html $(DESTDIR)$(docdatadir)/$(manualname) ; \
 	    else \
 	        echo "NOT installing HTML documentation: not present, and can't generate" ; \
 	    fi \
 	fi
 
+htmluninst:
+	$(RM) -rf $(DESTDIR)$(docdatadir)/$(manualname)
+
 all-local: htmldocs pdfdocs psdocs
+clean-local:
+	$(RM) -rf *.png *.eps $(manualname)/ $(manualname).ps $(manualname).pdf
 dist-hook: htmldist pdfdist psdist
 install-data-local: htmlinst
+uninstall-local: htmluninst
 
diff --git a/docs/manual/bin-element.fig b/docs/manual/bin-element.fig
new file mode 100644
index 0000000000..a4259a6ef9
--- /dev/null
+++ b/docs/manual/bin-element.fig
@@ -0,0 +1,39 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 3975 3600 4725 3600 4725 4125 3975 4125 3975 3600
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 2775 2775 4725 2775 4725 4425 2775 4425 2775 2775
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 5400 2775 7350 2775 7350 4425 5400 4425 5400 2775
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 8025 2775 9975 2775 9975 4425 8025 4425 8025 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5400 3600 6150 3600 6150 4125 5400 4125 5400 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 8025 3600 8775 3600 8775 4125 8025 4125 8025 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 6600 3600 7350 3600 7350 4125 6600 4125 6600 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 4575 3750 5400 3750
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 7200 3750 8025 3750
+2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
+	 1950 1950 10575 1950 10575 4800 1950 4800 1950 1950
+4 0 0 50 0 16 12 0.0000 4 105 255 4200 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 5550 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 135 330 8175 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 6825 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 750 5625 3075 element2\001
+4 0 0 50 0 16 12 0.0000 4 135 750 8250 3075 element3\001
+4 0 0 50 0 16 12 0.0000 4 135 750 3000 3075 element1\001
+4 0 0 50 0 16 12 0.0000 4 135 255 2175 2250 bin\001
diff --git a/docs/manual/connected-elements.fig b/docs/manual/connected-elements.fig
new file mode 100644
index 0000000000..0aff06c9f4
--- /dev/null
+++ b/docs/manual/connected-elements.fig
@@ -0,0 +1,36 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 3975 3600 4725 3600 4725 4125 3975 4125 3975 3600
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 2775 2775 4725 2775 4725 4425 2775 4425 2775 2775
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 5400 2775 7350 2775 7350 4425 5400 4425 5400 2775
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 8025 2775 9975 2775 9975 4425 8025 4425 8025 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5400 3600 6150 3600 6150 4125 5400 4125 5400 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 8025 3600 8775 3600 8775 4125 8025 4125 8025 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 6600 3600 7350 3600 7350 4125 6600 4125 6600 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 4575 3750 5400 3750
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 7200 3750 8025 3750
+4 0 0 50 0 16 12 0.0000 4 105 255 4200 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 5550 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 135 330 8175 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 6825 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 750 5625 3075 element2\001
+4 0 0 50 0 16 12 0.0000 4 135 750 8250 3075 element3\001
+4 0 0 50 0 16 12 0.0000 4 135 750 3000 3075 element1\001
diff --git a/docs/manual/filter-element-multi.fig b/docs/manual/filter-element-multi.fig
new file mode 100644
index 0000000000..9cd2a3e624
--- /dev/null
+++ b/docs/manual/filter-element-multi.fig
@@ -0,0 +1,21 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 5625 2775 7575 2775 7575 4425 5625 4425 5625 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5625 3600 6375 3600 6375 4125 5625 4125 5625 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 6825 3225 7575 3225 7575 3750 6825 3750 6825 3225
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 6825 3825 7575 3825 7575 4350 6825 4350 6825 3825
+4 0 0 50 0 16 12 0.0000 4 165 1200 5775 3150 element_name\001
+4 0 0 50 0 16 12 0.0000 4 135 330 5850 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 135 465 6975 3600 video\001
+4 0 0 50 0 16 12 0.0000 4 135 465 6975 4200 audio\001
diff --git a/docs/manual/filter-element.fig b/docs/manual/filter-element.fig
new file mode 100644
index 0000000000..335a54c3b6
--- /dev/null
+++ b/docs/manual/filter-element.fig
@@ -0,0 +1,18 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 6825 3600 7575 3600 7575 4125 6825 4125 6825 3600
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 5625 2775 7575 2775 7575 4425 5625 4425 5625 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5625 3600 6375 3600 6375 4125 5625 4125 5625 3600
+4 0 0 50 0 16 12 0.0000 4 105 255 7050 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 165 1200 5775 3150 element_name\001
+4 0 0 50 0 16 12 0.0000 4 135 330 5850 3975 sink\001
diff --git a/docs/manual/hello-world.fig b/docs/manual/hello-world.fig
new file mode 100644
index 0000000000..3069a94ab3
--- /dev/null
+++ b/docs/manual/hello-world.fig
@@ -0,0 +1,51 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 2100 2775 4050 2775 4050 4425 2100 4425 2100 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 3300 3600 4050 3600 4050 4125 3300 4125 3300 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 4050 3750 4575 3750
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 4575 2775 6525 2775 6525 4425 4575 4425 4575 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 4575 3600 5325 3600 5325 4125 4575 4125 4575 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5775 3600 6525 3600 6525 4125 5775 4125 5775 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 6525 3750 7125 3750
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 7125 2775 9075 2775 9075 4425 7125 4425 7125 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 7125 3600 7875 3600 7875 4125 7125 4125 7125 3600
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 9600 2775 11550 2775 11550 4425 9600 4425 9600 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 8325 3600 9075 3600 9075 4125 8325 4125 8325 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 9600 3600 10350 3600 10350 4125 9600 4125 9600 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 9075 3750 9600 3750
+2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
+	 1950 1950 11700 1950 11700 4800 1950 4800 1950 1950
+4 0 0 50 0 16 12 0.0000 4 135 255 2175 2250 bin\001
+4 0 0 50 0 16 12 0.0000 4 105 255 3525 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 4725 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 6075 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 7350 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 8625 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 9750 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 165 1005 2250 3075 disk_source\001
+4 0 0 50 0 16 12 0.0000 4 150 465 4725 3075 parse\001
+4 0 0 50 0 16 12 0.0000 4 135 690 7275 3075 decoder\001
+4 0 0 50 0 16 12 0.0000 4 180 930 9750 3075 play_audio\001
diff --git a/docs/manual/mime-world.fig b/docs/manual/mime-world.fig
new file mode 100644
index 0000000000..61814797c8
--- /dev/null
+++ b/docs/manual/mime-world.fig
@@ -0,0 +1,162 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+0 32 #414141
+0 33 #868286
+0 34 #c7c3c7
+0 35 #8e8e8e
+0 36 #c7c3c7
+0 37 #868286
+0 38 #8e8e8e
+0 39 #414141
+0 40 #868286
+0 41 #c7c3c7
+0 42 #e7e3e7
+0 43 #c7b696
+0 44 #effbff
+0 45 #dfcba6
+0 46 #aeaaae
+0 47 #515551
+0 48 #8e8e8e
+0 49 #414141
+0 50 #868286
+0 51 #c7c3c7
+0 52 #e7e3e7
+0 53 #414141
+0 54 #868286
+0 55 #c7c3c7
+0 56 #e7e3e7
+0 57 #868286
+0 58 #c7c3c7
+0 59 #e7e3e7
+0 60 #414141
+0 61 #868286
+0 62 #c7c3c7
+0 63 #414141
+0 64 #c7c3c7
+0 65 #e7e3e7
+0 66 #414141
+0 67 #868286
+0 68 #c7c3c7
+0 69 #8e8e8e
+0 70 #414141
+0 71 #868286
+0 72 #c7c3c7
+0 73 #e7e3e7
+0 74 #414141
+0 75 #868286
+0 76 #c7c3c7
+0 77 #e7e3e7
+0 78 #414141
+0 79 #868286
+0 80 #c7c3c7
+0 81 #e7e3e7
+0 82 #cfcfcf
+0 83 #868286
+0 84 #c7c3c7
+0 85 #e7e3e7
+0 86 #8e8e8e
+0 87 #8e8e8e
+0 88 #8e8e8e
+0 89 #8e8e8e
+0 90 #414541
+0 91 #8e8e8e
+0 92 #8e8e8e
+0 93 #868286
+0 94 #c7c3c7
+0 95 #8e8e8e
+0 96 #8e8e8e
+0 97 #414141
+0 98 #c7c3c7
+0 99 #e7e3e7
+0 100 #effbff
+0 101 #e7e3e7
+0 102 #8e8e8e
+0 103 #414541
+0 104 #aeaaae
+0 105 #8e8e8e
+0 106 #414541
+0 107 #aeaaae
+0 108 #515551
+0 109 #8e8e8e
+0 110 #414541
+0 111 #c7c3c7
+0 112 #e7e3e7
+0 113 #8e8e8e
+0 114 #414541
+0 115 #8e8e8e
+0 116 #414541
+0 117 #8e8e8e
+0 118 #414541
+0 119 #868286
+0 120 #c7c3c7
+0 121 #e7e3e7
+0 122 #c7c3c7
+0 123 #e7e3e7
+0 124 #8e8e8e
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 2100 2775 4050 2775 4050 4425 2100 4425 2100 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 3300 3600 4050 3600 4050 4125 3300 4125 3300 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 4050 3750 4575 3750
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 4575 2775 6525 2775 6525 4425 4575 4425 4575 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 4575 3600 5325 3600 5325 4125 4575 4125 4575 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5775 3600 6525 3600 6525 4125 5775 4125 5775 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 6525 3750 7125 3750
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 7125 2775 9075 2775 9075 4425 7125 4425 7125 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 7125 3600 7875 3600 7875 4125 7125 4125 7125 3600
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 9600 2775 11550 2775 11550 4425 9600 4425 9600 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 8325 3600 9075 3600 9075 4125 8325 4125 8325 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 9600 3600 10350 3600 10350 4125 9600 4125 9600 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 9075 3750 9600 3750
+2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
+	 1950 1950 11700 1950 11700 4800 1950 4800 1950 1950
+2 1 1 1 0 7 50 0 -1 5.000 0 0 -1 0 0 2
+	 3675 4050 3675 5250
+2 1 1 1 0 7 50 0 -1 5.000 0 0 -1 0 0 2
+	 4875 4050 4875 5250
+2 1 1 1 0 7 50 0 -1 5.000 0 0 -1 0 0 2
+	 6150 4050 6150 5475
+2 1 1 1 0 7 50 0 -1 5.000 0 0 -1 0 0 2
+	 7500 4050 7500 5250
+2 1 1 1 0 7 50 0 -1 5.000 0 0 -1 0 0 2
+	 8775 4050 8775 5475
+2 1 1 1 0 7 50 0 -1 5.000 0 0 -1 0 0 2
+	 9975 4050 9975 5250
+4 0 0 50 0 16 12 0.0000 4 135 255 2175 2250 bin\001
+4 0 0 50 0 16 12 0.0000 4 105 255 3525 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 4725 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 6075 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 7350 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 8625 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 9750 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 165 1005 2250 3075 disk_source\001
+4 0 0 50 0 16 12 0.0000 4 150 465 4725 3075 parse\001
+4 0 0 50 0 16 12 0.0000 4 135 690 7275 3075 decoder\001
+4 0 0 50 0 16 12 0.0000 4 180 930 9750 3075 play_audio\001
+4 0 0 50 0 0 12 0.0000 4 135 75 3675 5475 ?\001
+4 0 0 50 0 0 12 0.0000 4 135 735 9825 5475 audio/raw\001
+4 0 0 50 0 0 12 0.0000 4 180 855 4350 5325 audio/mpeg\001
+4 0 0 50 0 0 12 0.0000 4 180 1395 5475 5625 audio/mpeg-frame\001
+4 0 0 50 0 0 12 0.0000 4 135 735 8700 5625 audio/raw\001
+4 0 0 50 0 0 12 0.0000 4 180 1395 6825 5325 audio/mpeg-frame\001
diff --git a/docs/manual/queue.fig b/docs/manual/queue.fig
new file mode 100644
index 0000000000..fbc552ff0f
--- /dev/null
+++ b/docs/manual/queue.fig
@@ -0,0 +1,63 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 4575 3600 5325 3600 5325 4125 4575 4125 4575 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5775 3600 6525 3600 6525 4125 5775 4125 5775 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 6525 3750 7125 3750
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 7125 3600 7875 3600 7875 4125 7125 4125 7125 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 8325 3600 9075 3600 9075 4125 8325 4125 8325 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 9600 3600 10350 3600 10350 4125 9600 4125 9600 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 9075 3750 9600 3750
+2 2 0 1 0 7 51 0 20 0.000 0 0 -1 0 0 5
+	 4575 2775 6525 2775 6525 4425 4575 4425 4575 2775
+2 2 0 1 0 7 51 0 20 0.000 0 0 -1 0 0 5
+	 7125 2775 9075 2775 9075 4425 7125 4425 7125 2775
+2 2 0 1 0 7 51 0 20 0.000 0 0 -1 0 0 5
+	 9600 2775 11550 2775 11550 4425 9600 4425 9600 2775
+2 2 0 1 0 7 100 0 19 0.000 0 0 -1 0 0 5
+	 4425 1950 11700 1950 11700 4800 4425 4800 4425 1950
+2 2 0 1 0 7 50 0 20 0.000 0 0 -1 0 0 5
+	 300 2775 2250 2775 2250 4425 300 4425 300 2775
+2 2 0 1 0 6 49 0 20 0.000 0 0 -1 0 0 5
+	 1500 3600 2250 3600 2250 4125 1500 4125 1500 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 2250 3750 2775 3750
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 3975 3750 4575 3750
+2 2 0 1 0 11 50 0 20 0.000 0 0 -1 0 0 5
+	 2775 3375 3075 3375 3075 4200 2775 4200 2775 3375
+2 2 0 1 0 11 50 0 20 0.000 0 0 -1 0 0 5
+	 3075 3375 3375 3375 3375 4200 3075 4200 3075 3375
+2 2 0 1 0 11 50 0 20 0.000 0 0 -1 0 0 5
+	 3375 3375 3675 3375 3675 4200 3375 4200 3375 3375
+2 2 0 1 0 11 50 0 20 0.000 0 0 -1 0 0 5
+	 3675 3375 3975 3375 3975 4200 3675 4200 3675 3375
+4 0 0 50 0 16 12 0.0000 4 135 330 4725 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 6075 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 7350 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 8625 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 9750 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 150 465 4725 3075 parse\001
+4 0 0 50 0 16 12 0.0000 4 135 690 7275 3075 decoder\001
+4 0 0 50 0 16 12 0.0000 4 180 930 9750 3075 play_audio\001
+4 0 0 50 0 16 12 0.0000 4 135 525 4575 2250 thread\001
+4 0 0 50 0 16 12 0.0000 4 165 1005 450 3075 disk_source\001
+4 0 0 48 0 16 12 0.0000 4 105 255 1650 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 150 525 2850 3225 queue\001
diff --git a/docs/manual/sink-element.fig b/docs/manual/sink-element.fig
new file mode 100644
index 0000000000..0a52a1b504
--- /dev/null
+++ b/docs/manual/sink-element.fig
@@ -0,0 +1,15 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 5625 2775 7575 2775 7575 4425 5625 4425 5625 2775
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5625 3600 6375 3600 6375 4125 5625 4125 5625 3600
+4 0 0 50 0 16 12 0.0000 4 165 1200 5775 3150 element_name\001
+4 0 0 50 0 16 12 0.0000 4 135 330 5850 3975 sink\001
diff --git a/docs/manual/src-element.fig b/docs/manual/src-element.fig
new file mode 100644
index 0000000000..82264aa705
--- /dev/null
+++ b/docs/manual/src-element.fig
@@ -0,0 +1,15 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 6825 3600 7575 3600 7575 4125 6825 4125 6825 3600
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 5625 2775 7575 2775 7575 4425 5625 4425 5625 2775
+4 0 0 50 0 16 12 0.0000 4 105 255 7050 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 165 1200 5775 3150 element_name\001
diff --git a/docs/manual/state-diagram.fig b/docs/manual/state-diagram.fig
new file mode 100644
index 0000000000..1b10e5db13
--- /dev/null
+++ b/docs/manual/state-diagram.fig
@@ -0,0 +1,46 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 3600 1950 480 480 3600 1950 3975 2250
+1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 3600 3150 480 480 3600 3150 3975 3450
+1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 3600 4350 480 480 3600 4350 3975 4650
+1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 4875 4350 480 480 4875 4350 5250 4650
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 3600 900 3600 1500
+2 2 0 1 7 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 1350 750 5550 750 5550 5100 1350 5100 1350 750
+3 2 0 1 0 7 50 0 -1 0.000 0 1 0 3
+	1 1 1.00 60.00 120.00
+	 3150 1875 2700 2400 3150 2925
+	 0.000 -1.000 0.000
+3 2 0 1 0 7 50 0 -1 0.000 0 1 0 3
+	1 1 1.00 60.00 120.00
+	 3150 3150 2700 3675 3150 4200
+	 0.000 -1.000 0.000
+3 2 0 1 0 7 50 0 -1 0.000 0 1 0 3
+	1 1 1.00 60.00 120.00
+	 3750 3900 4275 3675 4800 3900
+	 0.000 -1.000 0.000
+3 2 0 1 0 7 50 0 -1 0.000 0 1 0 3
+	1 1 1.00 60.00 120.00
+	 4800 4800 4275 5025 3750 4800
+	 0.000 -1.000 0.000
+3 2 0 1 0 7 50 0 -1 0.000 0 1 0 3
+	1 1 1.00 60.00 120.00
+	 5175 3975 5175 2475 4050 1725
+	 0.000 -1.000 0.000
+3 2 0 1 0 7 50 0 -1 0.000 0 1 0 3
+	1 1 1.00 60.00 120.00
+	 3225 4650 1575 3300 3150 1725
+	 0.000 -1.000 0.000
+4 0 0 50 0 0 12 0.0000 4 135 480 3375 2025 NULL\001
+4 0 0 50 0 0 12 0.0000 4 135 645 3300 3225 READY\001
+4 0 0 50 0 0 12 0.0000 4 135 810 3225 4425 PLAYING\001
+4 0 0 50 0 0 12 0.0000 4 135 735 4500 4425 PAUSED\001
diff --git a/docs/manual/thread.fig b/docs/manual/thread.fig
new file mode 100644
index 0000000000..e532c14a20
--- /dev/null
+++ b/docs/manual/thread.fig
@@ -0,0 +1,51 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 4050 3750 4575 3750
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 4575 3600 5325 3600 5325 4125 4575 4125 4575 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 5775 3600 6525 3600 6525 4125 5775 4125 5775 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 6525 3750 7125 3750
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 7125 3600 7875 3600 7875 4125 7125 4125 7125 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 8325 3600 9075 3600 9075 4125 8325 4125 8325 3600
+2 2 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+	 9600 3600 10350 3600 10350 4125 9600 4125 9600 3600
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 90.00 120.00
+	 9075 3750 9600 3750
+2 2 0 1 0 6 49 0 20 0.000 0 0 -1 0 0 5
+	 3300 3600 4050 3600 4050 4125 3300 4125 3300 3600
+2 2 0 1 0 7 50 0 20 0.000 0 0 -1 0 0 5
+	 2100 2775 4050 2775 4050 4425 2100 4425 2100 2775
+2 2 0 1 0 7 51 0 20 0.000 0 0 -1 0 0 5
+	 4575 2775 6525 2775 6525 4425 4575 4425 4575 2775
+2 2 0 1 0 7 100 0 19 0.000 0 0 -1 0 0 5
+	 1950 1950 11700 1950 11700 4800 1950 4800 1950 1950
+2 2 0 1 0 7 51 0 20 0.000 0 0 -1 0 0 5
+	 7125 2775 9075 2775 9075 4425 7125 4425 7125 2775
+2 2 0 1 0 7 51 0 20 0.000 0 0 -1 0 0 5
+	 9600 2775 11550 2775 11550 4425 9600 4425 9600 2775
+4 0 0 50 0 16 12 0.0000 4 135 330 4725 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 6075 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 7350 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 105 255 8625 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 330 9750 3975 sink\001
+4 0 0 50 0 16 12 0.0000 4 165 1005 2250 3075 disk_source\001
+4 0 0 50 0 16 12 0.0000 4 150 465 4725 3075 parse\001
+4 0 0 50 0 16 12 0.0000 4 135 690 7275 3075 decoder\001
+4 0 0 50 0 16 12 0.0000 4 180 930 9750 3075 play_audio\001
+4 0 0 48 0 16 12 0.0000 4 105 255 3525 3975 src\001
+4 0 0 50 0 16 12 0.0000 4 135 525 2175 2250 thread\001