diff --git a/fisl2012/Makefile b/fisl2012/Makefile
index facc4f2..0983c79 100644
--- a/fisl2012/Makefile
+++ b/fisl2012/Makefile
@@ -5,6 +5,7 @@ SHELL=/bin/bash
 #   UBB_production_08.JPG ubb-vga-pub-plugged-medium.jpg \
 #   ubb-vga-pub-1024-medium.jpg SIE_KICAD.png
 #GEN=schhist.png fped.png kicad.png achieve.pdf flow.pdf
+GEN=cat-comp.pdf cat-mod.pdf
 #PNG=atusb-front.png
 
 .PHONY:		spotless clean upload upload-es
@@ -15,9 +16,6 @@ all:		talk.pdf
 talk.pdf:	talk.tex $(GEN) $(DL) $(PNG)
 		pdflatex talk
 
-talk-es.pdf:	talk-es.tex $(GEN) $(DL) $(PNG)
-		pdflatex talk-es
-
 kicad.png:	eeschema.xwd pcbnew.xwd
 		pnmcomp -xoff=0 -yoff=300 \
 		  <(convert eeschema.xwd ppm:-) \
@@ -61,7 +59,10 @@ SIE_KICAD.png:
 achieve.pdf:	achieve.fig
 		fig2dev -L pdf $< $@
 
-flow.pdf:	flow.fig
+cat-comp.pdf:	cat-comp.fig
+		fig2dev -L pdf $< $@
+
+cat-mod.pdf:	cat-mod.fig
 		fig2dev -L pdf $< $@
 
 talk.ps:	talk.pdf
diff --git a/fisl2012/cat-comp.fig b/fisl2012/cat-comp.fig
new file mode 100644
index 0000000..af9e5a9
--- /dev/null
+++ b/fisl2012/cat-comp.fig
@@ -0,0 +1,53 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+6 2430 3780 4995 5670
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2475 3825 4950 3825 4950 5625 2475 5625 2475 3825
+4 0 0 50 -1 14 12 0.0000 4 165 600 2700 4230 Logic\001
+4 0 0 50 -1 14 12 0.0000 4 165 720 3150 4455 Single\001
+4 0 0 50 -1 14 12 0.0000 4 165 1080 3600 4680 74x1g00_5\001
+4 0 0 50 -1 14 12 0.0000 4 165 1080 3600 4905 74x1g07_4\001
+4 0 0 50 -1 14 12 0.0000 4 120 480 3150 5130 Dual\001
+4 0 0 50 -1 14 12 0.0000 4 165 960 3600 5355 742xg126\001
+-6
+6 5580 3780 11970 4770
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5625 3825 11700 3825 11700 4725 5625 4725 5625 3825
+4 0 0 50 -1 14 12 0.0000 4 165 2040 5850 4230 6N138: Darlington\001
+4 0 0 50 -1 14 12 0.0000 4 180 6120 5850 4455 6N138: http://www.fairchildsemi.com/ds/6N/6N138.pdf\001
+-6
+6 7605 5400 9495 6120
+1 1 0 2 0 7 50 -1 -1 0.000 1 0.0000 8550 5760 900 315 8550 5760 9450 6075
+4 1 0 50 -1 18 16 0.0000 4 255 1020 8550 5850 getkicat\001
+-6
+6 2445 6090 4275 6750
+1 1 0 2 0 7 50 -1 -1 0.000 1 0.0000 3360 6420 900 315 3360 6420 4260 6735
+4 1 0 50 -1 18 16 0.0000 4 195 1305 3360 6510 eeschema\001
+-6
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 5175 5175 7470 5490
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 9630 5715 11070 5715
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 8550 4905 8550 5310
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 6435 6345 7510 5968
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 1 2
+	1 1 2.00 120.00 120.00
+	1 1 2.00 120.00 120.00
+	 4455 6390 5670 6390
+4 1 0 50 -1 18 16 0.0000 4 255 1245 3105 3600 Hierarchy\001
+4 1 0 50 -1 18 16 0.0000 4 255 1485 6390 3600 Description\001
+4 1 0 50 -1 18 16 0.0000 4 195 495 6075 6525 *.lib\001
+4 1 0 50 -1 18 16 0.0000 4 195 540 11475 5805 PDF\001
diff --git a/fisl2012/cat-mod.fig b/fisl2012/cat-mod.fig
new file mode 100644
index 0000000..95c70e4
--- /dev/null
+++ b/fisl2012/cat-mod.fig
@@ -0,0 +1,58 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+6 2430 3780 5355 5670
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2475 3825 5310 3825 5310 5625 2475 5625 2475 3825
+4 0 0 50 -1 14 12 0.0000 4 135 480 2700 4230 Quad\001
+4 0 0 50 -1 14 12 0.0000 4 135 360 3150 4455 QFN\001
+4 0 0 50 -1 14 12 0.0000 4 135 1440 3600 4680 QFN32-VHHD-2\001
+4 0 0 50 -1 14 12 0.0000 4 135 1440 3600 4905 QFN32-VHHD-6\001
+4 0 0 50 -1 14 12 0.0000 4 135 360 3150 5130 QFP\001
+4 0 0 50 -1 14 12 0.0000 4 135 600 3600 5355 QFP48\001
+-6
+6 7605 5400 9495 6120
+1 1 0 2 0 7 50 -1 -1 0.000 1 0.0000 8550 5760 900 315 8550 5760 9450 6075
+4 1 0 50 -1 18 16 0.0000 4 255 1020 8550 5850 getkicat\001
+-6
+6 2445 6090 4275 6750
+1 1 0 2 0 7 50 -1 -1 0.000 1 0.0000 3360 6420 900 315 3360 6420 4260 6735
+4 1 0 50 -1 18 16 0.0000 4 255 570 3360 6510 fped\001
+-6
+6 5850 3555 10845 4770
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5865 3585 10800 3585 10800 4725 5865 4725 5865 3585
+4 0 0 50 -1 14 12 0.0000 4 165 4560 6090 3990 USB_A-PCB: Figure 6-9 (page 99) of the\001
+4 0 0 50 -1 14 12 0.0000 4 165 4200 6315 4215 Universal Serial Bus Specification;\001
+4 0 0 50 -1 14 12 0.0000 4 165 3360 6315 4440 Revision 2.0; April 27, 2000\001
+-6
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 5580 5175 7470 5490
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 9630 5715 11070 5715
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 8550 4905 8550 5310
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 6615 6075 7515 5940
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 1 2
+	1 1 2.00 120.00 120.00
+	1 1 2.00 120.00 120.00
+	 4500 6345 5670 6210
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 2.00 120.00 120.00
+	 4410 6570 5580 6750
+4 1 0 50 -1 18 16 0.0000 4 255 1245 3105 3600 Hierarchy\001
+4 1 0 50 -1 18 16 0.0000 4 195 540 11475 5805 PDF\001
+4 1 0 50 -1 18 16 0.0000 4 255 1485 6615 3375 Description\001
+4 1 0 50 -1 18 16 0.0000 4 195 750 6075 6930 *.mod\001
+4 1 0 50 -1 18 16 0.0000 4 255 600 6120 6255 *.fpd\001
diff --git a/fisl2012/talk.tex b/fisl2012/talk.tex
index 7116657..c7a2d65 100644
--- a/fisl2012/talk.tex
+++ b/fisl2012/talk.tex
@@ -10,7 +10,7 @@
 %\setbeamersize{sidebar width left=-5mm}
 \title{\Large Making Hardware \\ with KiCad and Friends}
 \author{Werner Almesberger \\\url{werner@almesberger.net}}
-\date{July 21, 2012}
+\date{July 24, 2012}
 
 %\setul{}{1.5pt}
 
@@ -177,7 +177,8 @@ Solution:
 \begin{itemize}
   \item Maintain manually
   \item {\tt purge} script: \\
-{\small \url{qi-hw.com/p/wernermisc/source/tree/master/bin/purge}}
+% URL http://projects.qi-hw.com/index.phpp/wernermisc/source/tree/master/bin/purge
+{\small \url{tiny.cc/wernermisc-bin-purge}}
 \end{itemize}
 \end{frame}
 
@@ -186,7 +187,7 @@ Solution:
 \begin{frame}[fragile]{Makefile}
 Objectives:
 \begin{itemize}
-  \item Shortcuts
+  \item Convenience shortcuts
   \item Combine tools
   \item Share common procedures
   \item Avoid mistakes
@@ -273,13 +274,15 @@ D: http://www.atmel.com/Images/doc8265.pdf
 \begin{frame}{Schematics Symbol Catalog}
 \begin{itemize}
   \item For selection, review
-  \item Hierarchical order with alphabetic index
+  \item Hierarchical order with alphabetical index
   \item Short descriptions and data sheet links
   \item Added value: indicate pin types
-  \item TODO: connect to dsv
+  \item To do: connect to dsv
 \end{itemize}
 
-DRAWING (hierarchy + descr + com libs ---genkicat--> PDF) <-> eeschema
+\begin{center}
+  \includegraphics[width=1.0\textwidth]{cat-comp.pdf}
+\end{center}
 \end{frame}
 
 % --- Schematics History ------------------------------------------------------
@@ -327,7 +330,9 @@ Issues:
   \item Added value: measurements, pad types
 \end{itemize}
 
-DRAWING (hierarchy + descr + com libs ---genkicat--> PDF) <-> fped
+\begin{center}
+  \includegraphics[width=1.0\textwidth]{cat-mod.pdf}
+\end{center}
 
 % URL http://projects.qi-hardware.com/index.php/p/eda-tools/source/tree/master/genkicat/
 {\small \url{tiny.cc/eda-tools-genkicat}}
@@ -413,7 +418,7 @@ DRAWING
 \begin{frame}{Schematics Design Rules}
 ...
 
-URL
+{\small \url{en.qi-hardware.com/wiki/Rules_on_Editing_Schematics}}
 \end{frame}
 
 % --- Libraries ---------------------------------------------------------------