diff --git a/fisl2012/Makefile b/fisl2012/Makefile
index b709623..3faf7b9 100644
--- a/fisl2012/Makefile
+++ b/fisl2012/Makefile
@@ -5,7 +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=schem.pdf assoc.pdf cat-comp.pdf cat-mod.pdf
+GEN=schem.pdf assoc.pdf layout.pdf cat-comp.pdf cat-mod.pdf
 #PNG=atusb-front.png
 
 .PHONY:		spotless clean upload upload-es
@@ -35,12 +35,18 @@ cvpcb.png:	cvpcb.xwd
 moded.png:	moded.xwd
 		convert $< $@
 
+pcbnew.png:	pcbnew.xwd
+		convert $< $@
+
 schem.pdf:	schem.fig eeschema.png comped.png
 		fig2dev -L pdf $< $@
 
 assoc.pdf:	assoc.fig cvpcb.png moded.png
 		fig2dev -L pdf $< $@
 
+layout.pdf:	layout.fig pcbnew.png
+		fig2dev -L pdf $< $@
+
 cat-comp.pdf:	cat-comp.fig
 		fig2dev -L pdf $< $@
 
diff --git a/fisl2012/layout.fig b/fisl2012/layout.fig
new file mode 100644
index 0000000..3171bdb
--- /dev/null
+++ b/fisl2012/layout.fig
@@ -0,0 +1,65 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+6 1080 855 3060 2055
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1365 1140 2040 1140 2040 2040 1365 2040 1365 1140
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1365 1950 1275 1950 1275 1050 1950 1050 1950 1140
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1275 1860 1185 1860 1185 960 1860 960 1860 1050
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1185 1770 1095 1770 1095 870 1770 870 1770 960
+4 0 0 50 -1 18 16 0.0000 4 210 795 2265 1590 *.mod\001
+-6
+6 7965 4275 9315 5655
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 8325 4290 9000 4290 9000 5190 8325 5190 8325 4290
+4 1 0 50 -1 18 16 0.0000 4 270 1350 8640 5595 Postscript\001
+-6
+6 765 3375 1665 4725
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 900 3390 1575 3390 1575 4290 900 4290 900 3390
+4 1 0 50 -1 18 16 0.0000 4 210 855 1215 4695 Netlist\001
+-6
+6 6975 900 10935 4140
+6 7290 1125 8220 2445
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 7440 1140 8115 1140 8115 2040 7440 2040 7440 1140
+4 1 0 50 -1 18 16 0.0000 4 210 930 7755 2445 Gerber\001
+-6
+6 8325 1800 9450 3120
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 8572 1815 9247 1815 9247 2715 8572 2715 8572 1815
+4 1 0 50 -1 18 16 0.0000 4 210 1125 8887 3120 Excellon\001
+-6
+6 9360 2475 10605 3795
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 9667 2490 10342 2490 10342 3390 9667 3390 9667 2490
+4 1 0 50 -1 18 16 0.0000 4 210 1245 9982 3795 Positions\001
+-6
+1 2 0 2 0 7 50 -1 -1 0.000 1 5.6723 8937 2522 2250 1215 6687 2522 11187 2522
+-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
+	 6615 3375 7380 3105
+2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5
+	0 pcbnew.png
+	 2925 2655 6353 2655 6353 4941 2925 4941 2925 2655
+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
+	 1800 3825 2700 3825
+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
+	 6570 4275 8100 4590
+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
+	 2205 2205 2745 2565
+4 1 0 50 -1 18 16 0.0000 4 270 1035 4590 5310 pcbnew\001
+4 1 0 50 -1 18 16 0.0000 4 210 1500 9945 1035 Fabrication\001
diff --git a/fisl2012/pcbnew.xwd b/fisl2012/pcbnew.xwd
new file mode 100644
index 0000000..d620067
Binary files /dev/null and b/fisl2012/pcbnew.xwd differ
diff --git a/fisl2012/talk.tex b/fisl2012/talk.tex
index fb9e310..884ea80 100644
--- a/fisl2012/talk.tex
+++ b/fisl2012/talk.tex
@@ -68,9 +68,9 @@
 % --- Layout ------------------------------------------------------------------
 
 \begin{frame}{KiCad: Layout}
-cvpcb + pcbnew + module editor -> gerbers (gerbv)
-
-SCREENSHOTS
+\begin{center}
+  \includegraphics[width=1.0\textwidth]{layout.pdf}
+\end{center}
 \end{frame}
 
 % --- Qi-Hardware -------------------------------------------------------------
@@ -457,7 +457,7 @@ Issues:
       \item Better parsing
     \end{itemize}
   \item Snag: Digi-Key spider no longer works
-  \item Future: help with component selection
+  \item Future: Help with component selection
 \end{itemize}
 
 % URL http://projects.qi-hardware.com/index.php/p/eda-tools/source/tree/master/b2/
@@ -473,7 +473,11 @@ DRAWING
 % --- Schematics Design Rules -------------------------------------------------
 
 \begin{frame}{Schematics Design Rules}
-...
+\begin{itemize}
+  \item Value naming (4k7, 10 uF, $\ldots$)
+  \item Junction style
+  \item Text spacing
+\end{itemize}
 
 {\small \url{en.qi-hardware.com/wiki/Rules_on_Editing_Schematics}}
 \end{frame}