Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,7 +1,9 @@
 IMGS = imgs/network-public.png imgs/network-private.png imgs/network-community.png \
-	imgs/confine-partners.png imgs/extend-network.png
+	imgs/confine-partners.png imgs/extend-network.png \
+	imgs/testbed.png imgs/testbed-cd-rd.png \
+	imgs/testbed-logos-node.png imgs/testbed-logos-mgmt.png imgs/testbed-logos-devel.png
 IMGS_BEAMER = imgs/confine,background.pdf
 
 
 .PHONY:	clean
 
@@ -31,8 +33,23 @@
 	inkscape -z -C -e $@ -w 1024 $<
 
 imgs/extend-network.png:	diagrams/extend-network.svg
 	inkscape -z -C -e $@ -w 1024 $<
 
+imgs/testbed.png:	diagrams/testbed-logos.dia
+	dia -e $@ -L testbed -s 1024x $<
+
+imgs/testbed-cd-rd.png:	diagrams/testbed-logos.dia
+	dia -e $@ -L testbed,cd-rd -s 1024x $<
+
+imgs/testbed-logos-node.png:	diagrams/testbed-logos.dia
+	dia -e $@ -L testbed,cd-rd,logos-node -s 1024x $<
+
+imgs/testbed-logos-mgmt.png:	diagrams/testbed-logos.dia
+	dia -e $@ -L testbed,cd-rd,logos-node,logos-mgmt -s 1024x $<
+
+imgs/testbed-logos-devel.png:	diagrams/testbed-logos.dia
+	dia -e $@ -L testbed,cd-rd,logos-node,logos-mgmt,logos-devel -s 1024x $<
+
 
 clean:
 	rm -f $(IMGS) $(IMGS_BEAMER) slides,lightning.pdf slides,lightning.html

Index: script,lightning.txt
==================================================================
--- script,lightning.txt
+++ script,lightning.txt
@@ -58,27 +58,29 @@
   infrastructure provided and managed by the community for the community.
   This is the mission of the Clommunity project. *##*
 
 * Architecture and technologies
 ** Testbed architecture
-- Community-Lab consists of a set of nodes (managed by CN members) that follow
-  the configuration in a set of servers (managed by testbed operators).
+- How does the Community-Lab testbed work?
+- It consists of a set of nodes (managed by CN members) that follow the
+  configuration in a set of servers (managed by testbed operators).
 - All components in the testbed become reachable via a dedicated management
   network implemented as an IPv6 overlay.
-- Researchers define experiments (so called slices) in a server.
-- Nodes use a REST API to get those definitions from servers and run several
-  of them simultaneously as VMs (so called slivers).
+- Then researchers define experiments (the so called slices) in a server.
+- And nodes use a REST API to get those definitions from servers and run
+  several of them simultaneously as VMs (the so called slivers).
 - Slivers can access the CN via NAT, natively at the network layer, or in an
   isolated VLAN for routing experiments. *##*
 
 ** Technologies
-- Nodes are connected via Ethernet to normal community devices.
-- Nodes are moderately powerful computers running OpenWrt with a control
-  daemon written in Lua.  Slivers are implemented as Linux containers.  We are
-  working on safe node upgrade using kexec.
+- Nodes are moderately powerful computers (like this barebone computer)
+  connected via Ethernet to normal community devices (i.e. routers). *##*
+- Nodes run OpenWrt with a control daemon written in Lua.  Slivers are
+  implemented as light Linux containers.  We are working on safe node upgrade
+  using kexec. *##*
 - The GUI and REST API in servers are implemented as Django applications.
-- The IPv6 overlay used for the management network is a tinc mesh VPN.
+- The IPv6 overlay used for the management network is a tinc mesh VPN. *##*
 - We use Git, Redmine, Jenkins and our Virtual CONFINE Tesbed (VCT) package
   for development and testing. *##*
 
 * Collaborations
 - CONFINE actively collaborates to the development of several Free software

Index: slides,lightning.txt
==================================================================
--- slides,lightning.txt
+++ slides,lightning.txt
@@ -111,23 +111,29 @@
 
 - Extend CNs (with Community-Lab nodes and links)
 - Community-Lab for hosting services
 - [Clommunity](http://clommunity-project.eu/): community clouds
 
-# Architecture and technologies
+# Architecture and technologies (1/5)
+
+![CONFINE testbed architecture](imgs/testbed.png)
+
+# Architecture and technologies (2/5)
+
+![CONFINE testbed architecture](imgs/testbed-cd-rd.png)
+
+# Architecture and technologies (3/5)
+
+![CONFINE testbed architecture](imgs/testbed-logos-node.png)
+
+# Architecture and technologies (4/5)
+
+![CONFINE testbed architecture](imgs/testbed-logos-mgmt.png)
+
+# Architecture and technologies (5/5)
 
-<!--- testbed architecture diagram --->
-- Testbed
-    - Nodes, servers, management network
-    - Researchers, slices and slivers
-    - Sliver connectivity: NAT, native L3, isolated L2
-<!--- overlay CD and RD pictures --->
-<!--- overlay logos on top of diagram --->
-- Nodes: OpenWrt, Lua, LXC, kexec
-- Servers: Django
-- Management network: tinc
-- Software development: Git, Redmine, Jenkins, VCT
+![CONFINE testbed architecture](imgs/testbed-logos-devel.png)
 
 # Collaborations
 
 - [OpenWrt](https://openwrt.org/)
 - [BMX6](http://bmx6.net/)