Updated for the new kernel API
diff --git a/contiki-gtk/Makefile b/contiki-gtk/Makefile
index 944558d..d14501c 100644
--- a/contiki-gtk/Makefile
+++ b/contiki-gtk/Makefile
@@ -27,13 +27,13 @@
 #
 # This file is part of the Contiki desktop environment
 #
-# $Id: Makefile,v 1.10 2004/06/06 07:02:44 adamdunkels Exp $
+# $Id: Makefile,v 1.11 2004/07/04 21:15:53 adamdunkels Exp $
 #
 
 CONTIKI=../contiki
 CC=gcc
 CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes \
-	-g  \
+	-g  -Os \
        -Iapps -Ictk -Iuip -Iconf -Ilib \
        -I$(CONTIKI)/apps -I$(CONTIKI)/ctk -I$(CONTIKI)/ek \
        -I$(CONTIKI)/lib -I$(CONTIKI)/uip \
@@ -70,16 +70,29 @@
 WEBSERVER=webserver.o webserver-dsc.o httpd.o httpd-fs.o http-strings.o
 TELNET=simpletelnet.o telnet.o
 
-CTKGTK=ctk-gtksim.o ctk-conio.o libconio.o
+CTKGTK=ctk-gtksim.o ctk-draw.o ctk-gtksim-service.o libconio.o ctk-gtksim-draw.o
 CTKVNC=ctk-vncserver.o libconio.o vnc-server.o vnc-out.o ctk-vncfont.o 
 
-contiki: contiki-main.o \
- program-handler.o about.o netconf.o processes.o \
- about-dsc.o netconf-dsc.o processes-dsc.o  \
- $(CTKGTK) \
- ctk.o dispatcher.o arg.o \
- uip.o uip_arch.o uip_arp.o uip-signal.o resolv.o uipbuf.o uip-split.o uip-fw.o\
- uiplib.o tapdev.o tapdev-drv.o $(WEBSERVER) $(WWW) \
+contiki: contiki-main.o ek.o arg.o ek-service.o \
+ tcpip.o uip.o uip_arch.o uip-fw.o \
+ timer.o uiplib.o resolv.o uip-event.o resolv.o \
+ cfs.o \
+ tapdev-service.o tapdev.o uip_arp.o uip-fw.o uip-fw-service.o \
+ ctk.o $(CTKGTK) \
+ about.o \
+ simpletelnet.o telnet.o netconf.o program-handler.o \
+ about-dsc.o netconf-dsc.o www-dsc.o \
+ www.o webclient.o htmlparser.o html-strings.o http-strings.o http-user-agent-string.o \
+ processes-dsc.o processes.o \
+ shell-dsc.o shell.o shell-gui.o \
+ calc-dsc.o calc.o \
+ email.o email-dsc.o smtp.o smtp-strings.o ctk-textedit.o #ctk-conio-service.o
+# program-handler.o about.o netconf.o processes.o \
+# about-dsc.o netconf-dsc.o processes-dsc.o  \
+# $(CTKGTK) \
+# ctk.o dispatcher.o arg.o \
+# uip.o uip_arch.o uip_arp.o uip-signal.o resolv.o uipbuf.o uip-split.o uip-fw.o\
+# uiplib.o tapdev.o tapdev-drv.o $(WEBSERVER) $(WWW) \
 # mailget.o popclient.o nntpc.o nntpc-strings.o \
 # newslog.o nntpd.o nntpd-strings.o\
 # $(EMAIL) email-dsc.o $(WEBSERVER) $(TELNET) telnet-dsc.o \
diff --git a/contiki-gtk/Makefile.depend b/contiki-gtk/Makefile.depend
index 901f2cb..92e2a84 100644
--- a/contiki-gtk/Makefile.depend
+++ b/contiki-gtk/Makefile.depend
@@ -1,300 +1,284 @@
-contiki-main.o: contiki-main.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ctk/ctk-draw.h \
- ../contiki/ek/ek-x.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
- uip/tapdev-drv.h ../contiki/uip/uip-fw.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/uip/uip_arp.h ../contiki/apps/about-dsc.h \
+contiki-main.o: contiki-main.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/lib/clock.h conf/clock-conf.h \
+ ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/uip/uip-fw.h \
+ ../contiki/apps/about-dsc.h ../contiki/ek/dsc.h \
+ ../contiki/apps/calc-dsc.h ../contiki/apps/email-dsc.h \
  ../contiki/apps/netconf-dsc.h ../contiki/apps/processes-dsc.h \
- ../contiki/apps/calc-dsc.h ../contiki/apps/telnet-dsc.h \
- ../contiki/apps/www-dsc.h ../contiki/apps/webserver-dsc.h \
- apps/wget-dsc.h ../contiki/apps/email-dsc.h \
- ../contiki/apps/telnetd-dsc.h ../contiki/uip/resolv.h \
- ../contiki/ctk/ctk-vncserver.h ../contiki/lib/mt.h lib/mtarch.h \
- ../contiki/lib/mtp.h apps/mailget.h apps/newslog.h
-coderecv.o: apps/coderecv.c ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/lib/memb.h
+ ../contiki/apps/shell-dsc.h ../contiki/apps/www-dsc.h
 http-user-agent-string.o: apps/http-user-agent-string.c
-httpd-fs.o: apps/httpd-fs.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h apps/httpd.h \
- apps/httpd-fs.h apps/httpd-fsdata.h apps/httpd-fsdata.c
 httpd-fsdata.o: apps/httpd-fsdata.c
-httpd.o: apps/httpd.c ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/apps/http-strings.h apps/httpd.h \
- apps/httpd-fs.h apps/httpd-fsdata.h ../contiki/apps/httpd-cgi.h
-mailget.o: apps/mailget.c ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h apps/popclient.h
-newslog.o: apps/newslog.c apps/newslog.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h apps/nntpd.h
 nntpc-strings.o: apps/nntpc-strings.c
-nntpc.o: apps/nntpc.c ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h apps/nntpc.h apps/nntpc-strings.h
 nntpd-strings.o: apps/nntpd-strings.c
 nntpd.o: apps/nntpd.c ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/ek/ek.h \
  conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h apps/nntpd-strings.h apps/nntpd.h
-popclient.o: apps/popclient.c ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/uipbuf.h
 presenter-dsc.o: apps/presenter-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
 presenter-parser.o: apps/presenter-parser.c apps/presenter-parser.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
 shell.o: apps/shell.c ../contiki/apps/program-handler.h \
  ../contiki/ek/dsc.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
  ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h \
- ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h \
- ../contiki/uip/uip-signal.h ../contiki/apps/shell.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/uip/uip_arp.h \
+ ../contiki/uip/resolv.h ../contiki/uip/uip-signal.h \
+ ../contiki/apps/shell.h
 vnc-draw.o: apps/vnc-draw.c ../contiki/apps/vnc-draw.h uip/uip_arch.h \
  ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h conf/vnc-conf.h
 wget-dsc.o: apps/wget-dsc.c ../contiki/ek/dsc.h ../contiki/ctk/ctk.h \
  conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+ctk-gtksim-conio.o: ctk/ctk-gtksim-conio.c ../contiki/lib/libconio.h \
+ conf/libconio-conf.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h
+ctk-gtksim-draw.o: ctk/ctk-gtksim-draw.c ctk/ctk-gtksim.h \
+ ctk/ctk-gtksim-draw.h
+ctk-gtksim-service.o: ctk/ctk-gtksim-service.c \
+ ../contiki/ctk/ctk-draw-service.h ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk.h \
+ conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h ctk/ctk-gtksim-draw.h
 ctk-gtksim.o: ctk/ctk-gtksim.c ../contiki/lib/libconio.h \
  conf/libconio-conf.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
  ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ctk/ctk-draw.h
-mtarch.o: lib/mtarch.c ../contiki/lib/mt.h ../contiki/ek/ek.h \
- conf/ek-conf.h lib/mtarch.h
-tapdev-drv.o: uip/tapdev-drv.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arp.h \
- ../contiki/uip/uip-signal.h uip/tapdev.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk-mouse.h
+mtarch.o: lib/mtarch.c ../contiki/ek/mt.h ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h lib/mtarch.h
+tapdev-service.o: uip/tapdev-service.c ../contiki/uip/packet-service.h \
+ ../contiki/ek/ek-service.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h uip/tapdev.h
 tapdev.o: uip/tapdev.c ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/ek/ek.h \
  conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h ../contiki/uip/uip_arp.h
 uip_arch.o: uip/uip_arch.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h uip/uip_arch.h
 about-dsc.o: ../contiki/apps/about-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-about.o: ../contiki/apps/about.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ctk/ctk-draw.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+about.o: ../contiki/apps/about.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ctk/ctk-draw.h \
  ../contiki/lib/petsciiconv.h
 calc-dsc.o: ../contiki/apps/calc-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-calc.o: ../contiki/apps/calc.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+calc.o: ../contiki/apps/calc.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h
 email-dsc.o: ../contiki/apps/email-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-email.o: ../contiki/apps/email.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/apps/smtp.h \
- ../contiki/uip/uiplib.h ../contiki/lib/petsciiconv.h \
- ../contiki/lib/ctk-textedit.h
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+email.o: ../contiki/apps/email.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/apps/smtp.h \
+ ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/uip/uiplib.h \
+ ../contiki/lib/petsciiconv.h ../contiki/lib/ctk-textedit.h
 html-strings.o: ../contiki/apps/html-strings.c
 htmlparser.o: ../contiki/apps/htmlparser.c \
  ../contiki/apps/htmlparser.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h \
  ../contiki/apps/html-strings.h conf/www-conf.h
 http-strings.o: ../contiki/apps/http-strings.c
 http-user-agent-string.o: ../contiki/apps/http-user-agent-string.c
-httpd-cgi.o: ../contiki/apps/httpd-cgi.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/httpd.h \
- ../contiki/apps/httpd-cgi.h ../contiki/apps/httpd-fs.h \
- ../contiki/lib/petsciiconv.h
-httpd-fs.o: ../contiki/apps/httpd-fs.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/httpd.h \
- ../contiki/apps/httpd-fs.h ../contiki/apps/httpd-fsdata.h \
- ../contiki/apps/httpd-fsdata.c
 httpd-fsdata.o: ../contiki/apps/httpd-fsdata.c
-httpd.o: ../contiki/apps/httpd.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/httpd.h \
- ../contiki/apps/httpd-fs.h ../contiki/apps/httpd-fsdata.h \
- ../contiki/apps/httpd-cgi.h
 netconf-dsc.o: ../contiki/apps/netconf-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-netconf.o: ../contiki/apps/netconf.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uiplib.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+netconf.o: ../contiki/apps/netconf.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/uip/uiplib.h \
  ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h ../contiki/ctk/ctk.h \
  conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
  ../contiki/ctk/ctk-draw.h
 processes-dsc.o: ../contiki/apps/processes-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-processes.o: ../contiki/apps/processes.c ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h
-program-handler.o: ../contiki/apps/program-handler.c \
- ../contiki/lib/petsciiconv.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+processes.o: ../contiki/apps/processes.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h
+program-handler.o: ../contiki/apps/program-handler.c \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h \
+ ../contiki/lib/petsciiconv.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
  ../contiki/ctk/ctk-draw.h ../contiki/uip/resolv.h \
  ../contiki/apps/program-handler.h ../contiki/ek/dsc.h
 shell-dsc.o: ../contiki/apps/shell-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-shell-gui.o: ../contiki/apps/shell-gui.c \
- ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
- ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/arg.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+shell-gui.o: ../contiki/apps/shell-gui.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/apps/program-handler.h \
+ ../contiki/ek/dsc.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h \
- ../contiki/apps/shell.h ../contiki/uip/uip-signal.h
-simpletelnet.o: ../contiki/apps/simpletelnet.c \
- ../contiki/lib/petsciiconv.h ../contiki/uip/uiplib.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/uip/resolv.h \
- ../contiki/apps/telnet.h ../contiki/apps/simpletelnet.h
+ ../contiki/apps/shell.h ../contiki/uip/uip-signal.h \
+ conf/shell-gui-conf.h
+simpletelnet.o: ../contiki/apps/simpletelnet.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/lib/petsciiconv.h \
+ ../contiki/uip/uiplib.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/ctk/ctk.h \
+ conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
+ ../contiki/uip/resolv.h ../contiki/apps/telnet.h \
+ ../contiki/apps/simpletelnet.h
 smtp-strings.o: ../contiki/apps/smtp-strings.c
 smtp.o: ../contiki/apps/smtp.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/smtp.h \
  ../contiki/apps/smtp-strings.h
 telnet-dsc.o: ../contiki/apps/telnet-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-telnet.o: ../contiki/apps/telnet.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/telnet.h
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+telnet.o: ../contiki/apps/telnet.c ../contiki/uip/tcpip.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/apps/telnet.h
 telnetd-dsc.o: ../contiki/apps/telnetd-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
 telnetd-gui.o: ../contiki/apps/telnetd-gui.c \
  ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/arg.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/lib/petsciiconv.h ../contiki/uip/uip_arp.h \
  ../contiki/uip/resolv.h ../contiki/apps/telnetd.h \
- ../contiki/lib/memb.h ../contiki/apps/shell.h \
+ ../contiki/ek/contiki.h ../contiki/lib/memb.h ../contiki/lib/timer.h \
+ ../contiki/lib/clock.h conf/clock-conf.h ../contiki/apps/shell.h \
  ../contiki/uip/uip-signal.h
 telnetd.o: ../contiki/apps/telnetd.c ../contiki/ek/loader.h \
  ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/lib/petsciiconv.h ../contiki/uip/uip_arp.h \
  ../contiki/uip/resolv.h ../contiki/lib/memb.h ../contiki/apps/shell.h \
- ../contiki/uip/uip-signal.h ../contiki/apps/telnetd.h \
- conf/telnetd-conf.h
+ ../contiki/uip/uip-event.h ../contiki/apps/telnetd.h \
+ ../contiki/ek/contiki.h ../contiki/lib/timer.h ../contiki/lib/clock.h \
+ conf/clock-conf.h conf/telnetd-conf.h
 vnc-dsc.o: ../contiki/apps/vnc-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
 vnc-viewer.o: ../contiki/apps/vnc-viewer.c ../contiki/apps/vnc-draw.h \
  uip/uip_arch.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/ek/ek.h \
  conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h ../contiki/apps/vnc-viewer.h
-vnc.o: ../contiki/apps/vnc.c ../contiki/lib/petsciiconv.h \
- ../contiki/uip/uiplib.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+vnc.o: ../contiki/apps/vnc.c ../contiki/ek/contiki.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
+ ../contiki/lib/memb.h ../contiki/lib/timer.h ../contiki/lib/clock.h \
+ conf/clock-conf.h ../contiki/lib/petsciiconv.h \
+ ../contiki/uip/uiplib.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
  ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ctk/ctk-mouse.h \
  ../contiki/uip/resolv.h ../contiki/apps/telnet.h \
  ../contiki/apps/vnc.h ../contiki/apps/vnc-draw.h uip/uip_arch.h \
  ../contiki/apps/vnc-viewer.h conf/vnc-conf.h
-webclient.o: ../contiki/apps/webclient.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/apps/webclient.h ../contiki/apps/http-strings.h \
+webclient.o: ../contiki/apps/webclient.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/tcpip.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/apps/webclient.h \
+ ../contiki/apps/http-strings.h \
  ../contiki/apps/http-user-agent-string.h ../contiki/uip/resolv.h \
  ../contiki/uip/uiplib.h conf/www-conf.h
 webserver-dsc.o: ../contiki/apps/webserver-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-webserver.o: ../contiki/apps/webserver.c ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/apps/http-strings.h ../contiki/lib/petsciiconv.h \
- ../contiki/apps/webserver.h ../contiki/apps/httpd.h
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
 www-dsc.o: ../contiki/apps/www-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
-www.o: ../contiki/apps/www.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/apps/webclient.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
+www.o: ../contiki/apps/www.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/apps/webclient.h \
  ../contiki/apps/http-strings.h \
  ../contiki/apps/http-user-agent-string.h ../contiki/uip/resolv.h \
- ../contiki/apps/htmlparser.h ../contiki/lib/petsciiconv.h \
- ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
- ../contiki/uip/uiplib.h conf/www-conf.h
+ ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/apps/htmlparser.h \
+ ../contiki/lib/petsciiconv.h ../contiki/apps/program-handler.h \
+ ../contiki/ek/dsc.h ../contiki/uip/uiplib.h conf/www-conf.h
+ctk-conio-service.o: ../contiki/ctk/ctk-conio-service.c \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk-draw-service.h ../contiki/ek/ek-service.h \
+ conf/ctk-conio-conf.h
 ctk-conio.o: ../contiki/ctk/ctk-conio.c ../contiki/ctk/ctk.h \
  conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h conf/ctk-conio-conf.h
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ conf/ctk-conio-conf.h
+ctk-draw.o: ../contiki/ctk/ctk-draw.c ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
+ ../contiki/ctk/ctk-draw-service.h
 ctk-vncfont.o: ../contiki/ctk/ctk-vncfont.c
 ctk-vncserver.o: ../contiki/ctk/ctk-vncserver.c ../contiki/ctk/ctk.h \
  conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ctk/vnc-server.h \
- ../contiki/ctk/vnc-out.h ../contiki/ctk/ctk-vncserver.h \
- conf/ctk-vncserver-conf.h ../contiki/lib/libconio.h \
- conf/libconio-conf.h
-ctk.o: ../contiki/ctk/ctk.c ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ctk/ctk-mouse.h
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ek/contiki.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/lib/memb.h \
+ ../contiki/lib/timer.h ../contiki/lib/clock.h conf/clock-conf.h \
+ ../contiki/ctk/vnc-server.h ../contiki/ctk/vnc-out.h \
+ ../contiki/ctk/ctk-vncserver.h conf/ctk-vncserver-conf.h \
+ ../contiki/lib/libconio.h conf/libconio-conf.h
+ctk.o: ../contiki/ctk/ctk.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk-mouse.h ../contiki/lib/timer.h \
+ ../contiki/lib/clock.h conf/clock-conf.h
 vnc-out.o: ../contiki/ctk/vnc-out.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h \
  ../contiki/ctk/vnc-server.h ../contiki/ctk/vnc-out.h \
@@ -303,95 +287,99 @@
  conf/ctk-vncserver-conf.h ../contiki/ctk/ctk-vncfont.h \
  ../contiki/ctk/ctk-mouse.h
 vnc-server.o: ../contiki/ctk/vnc-server.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h \
  ../contiki/ctk/vnc-server.h ../contiki/ctk/vnc-out.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h ctk/ctk-gtksim.h
 arg.o: ../contiki/ek/arg.c ../contiki/ek/arg.h
-dispatcher-paper.o: ../contiki/ek/dispatcher-paper.c \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/uip/uip-signal.h
-dispatcher.o: ../contiki/ek/dispatcher.c ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/ek/dispatcher.h ../contiki/lib/cc.h \
- conf/cc-conf.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/uip/uip-signal.h
+ek-service.o: ../contiki/ek/ek-service.c ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
 ek.o: ../contiki/ek/ek.c ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/ek/ek-x.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/uip/uip-event.h
-tcpip.o: ../contiki/ek/tcpip.c ../contiki/ek/tcpip.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h
+mt.o: ../contiki/ek/mt.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ek/mt.h lib/mtarch.h
+mtp.o: ../contiki/ek/mtp.c ../contiki/ek/mtp.h ../contiki/ek/loader.h
+cfs.o: ../contiki/lib/cfs.c ../contiki/ek/contiki.h ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/lib/memb.h \
+ ../contiki/lib/timer.h ../contiki/lib/clock.h conf/clock-conf.h \
+ ../contiki/lib/cfs.h ../contiki/lib/cfs-service.h \
+ ../contiki/ek/ek-service.h
 ctk-textedit.o: ../contiki/lib/ctk-textedit.c \
  ../contiki/lib/ctk-textedit.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
  ctk/ctk-arch.h ctk/ctk-gtksim.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
 libconio.o: ../contiki/lib/libconio.c ../contiki/lib/libconio.h \
  conf/libconio-conf.h
 list.o: ../contiki/lib/list.c ../contiki/lib/list.h
 memb.o: ../contiki/lib/memb.c ../contiki/lib/memb.h
-mt.o: ../contiki/lib/mt.c ../contiki/lib/mt.h ../contiki/ek/ek.h \
- conf/ek-conf.h lib/mtarch.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h
-mtp.o: ../contiki/lib/mtp.c ../contiki/lib/mtp.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/lib/mt.h lib/mtarch.h
 petsciiconv.o: ../contiki/lib/petsciiconv.c
 strncasecmp.o: ../contiki/lib/strncasecmp.c
-resolv.o: ../contiki/uip/resolv.c ../contiki/uip/resolv.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+timer.o: ../contiki/lib/timer.c ../contiki/lib/timer.h \
+ ../contiki/lib/clock.h conf/clock-conf.h
+packet-service.o: ../contiki/uip/packet-service.c \
+ ../contiki/uip/packet-service.h ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h
+resolv.o: ../contiki/uip/resolv.c ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/uip/uip-signal.h
+ ../contiki/ek/loader.h ../contiki/uip/tcpip.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/resolv.h \
+ ../contiki/uip/uip-event.h
 slipdev.o: ../contiki/uip/slipdev.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip-fw.h \
  ../contiki/uip/slipdev.h
+tcpip.o: ../contiki/uip/tcpip.c ../contiki/uip/tcpip.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/ek-service.h \
+ ../contiki/uip/uip-fw.h ../contiki/lib/timer.h ../contiki/lib/clock.h \
+ conf/clock-conf.h ../contiki/uip/packet-service.h
+uip-event.o: ../contiki/uip/uip-event.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip-event.h
+uip-fw-service.o: ../contiki/uip/uip-fw-service.c \
+ ../contiki/uip/packet-service.h ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
+ ../contiki/uip/uip-fw.h
 uip-fw.o: ../contiki/uip/uip-fw.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arch.h \
  ../contiki/uip/uip-fw.h
-uip-signal.o: ../contiki/uip/uip-signal.c ../contiki/uip/uip-signal.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h
 uip-split.o: ../contiki/uip/uip-split.c ../contiki/uip/uip-split.h \
  ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h ../contiki/uip/uip-fw.h \
  ../contiki/uip/uip_arch.h
 uip.o: ../contiki/uip/uip.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arch.h
 uip_arp.o: ../contiki/uip/uip_arp.c ../contiki/uip/uip_arp.h \
  ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h
 uipbuf.o: ../contiki/uip/uipbuf.c ../contiki/uip/uipbuf.h \
  ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/ek/loader.h
 uiplib.o: ../contiki/uip/uiplib.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arp.h \
  ../contiki/uip/uiplib.h
diff --git a/contiki-gtk/apps/httpd-fsdata.c b/contiki-gtk/apps/httpd-fsdata.c
index 64cab48..fc267e6 100644
--- a/contiki-gtk/apps/httpd-fsdata.c
+++ b/contiki-gtk/apps/httpd-fsdata.c
@@ -97,170 +97,6 @@
 	0x3e, 0xa, 0x69, 0x20, 0x2f, 0x66, 0x6f, 0x6f, 0x74, 0x65, 
 	0x72, 0x2e, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0xa, 0x2e, };
 
-static const unsigned char data_img_bbl_png[] = {
-	/* /img/bbl.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1b, 0x12, 0xa6, 
-	0x8, 0x31, 0x1, 00, 00, 00, 0x42, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0xed, 0x92, 0xb1, 0x11, 00, 0x20, 0x8, 
-	0x3, 0xd5, 0x73, 0xff, 0x19, 0xc9, 0x6, 0xc9, 0x4, 0x58, 
-	0xa0, 0x96, 0x4a, 0xaf, 0xdf, 0xa4, 0xe0, 0x9e, 0x50, 0x50, 
-	0xdd, 0xbd, 0x2c, 00, 0x98, 0x59, 0x39, 0xd2, 0xce, 0xe3, 
-	0x2f, 0xbc, 0x2b, 0xf4, 0x8, 0x92, 0x92, 0x48, 0x66, 0x5, 
-	0x49, 0xd7, 0xb7, 0x9b, 0x2, 0x80, 0x68, 0xc8, 0x9e, 0x94, 
-	0x5c, 0xbc, 0x19, 0xa4, 0xc8, 0x1e, 0x61, 0x37, 0x86, 0x6a, 
-	0x96, 00, 00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 
-	0x42, 0x60, 0x82, };
-
-static const unsigned char data_img_bb_png[] = {
-	/* /img/bb.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1a, 0x2c, 0x7e, 
-	0x72, 0x1d, 0xeb, 00, 00, 00, 0x28, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0x63, 0x3c, 0x70, 0xe0, 00, 0x3, 0x29, 
-	0x80, 0x89, 0x24, 0xd5, 0xa3, 0x1a, 0x88, 0x4, 0x2c, 0xa7, 
-	0x4e, 0x9d, 0xa2, 0xb1, 0x6, 0x33, 0x33, 0x33, 0x1a, 0x6b, 
-	0xa0, 0xb9, 0x1f, 0x68, 0x1f, 0xf, 00, 0x58, 0xb2, 0xd, 
-	0x28, 0xc6, 0x77, 0x29, 0x2, 00, 00, 00, 00, 0x49, 
-	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, };
-
-static const unsigned char data_img_bbr_png[] = {
-	/* /img/bbr.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1a, 0x10, 0x51, 
-	0x1d, 0x61, 0x6c, 00, 00, 00, 0x4a, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0x63, 0x3c, 0x70, 0xe0, 00, 0x3, 0x36, 
-	0x70, 0xea, 0xd4, 0xa9, 0x53, 0xa7, 0x4e, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x41, 0xd8, 0x10, 0x71, 0x26, 0xac, 0xaa, 
-	0xf1, 0x80, 0x51, 0xd, 0xc4, 00, 0x16, 0x78, 00, 0xa3, 
-	0x81, 0xa7, 0x4f, 0x9f, 0x92, 0xa6, 0x1, 0xa7, 0xd, 0x66, 
-	0x66, 0x66, 0x78, 0xa4, 0xa5, 0xa5, 0xa5, 0x49, 0xd3, 0x40, 
-	0xa6, 0x93, 0x90, 0xfd, 0x43, 0xb2, 0x1f, 0x68, 0x1f, 0xf, 
-	00, 0xa4, 0x1d, 0x1d, 0x93, 0x22, 0x42, 0x2a, 0xa0, 00, 
-	00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 
-	0x82, };
-
-static const unsigned char data_img_bl_png[] = {
-	/* /img/bl.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1e, 0x26, 0xfa, 
-	0xcb, 0x31, 0xf1, 00, 00, 00, 0x22, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0x63, 0xfc, 0xff, 0xff, 0x3f, 0x3, 0xc, 
-	0x3c, 0x7c, 0xf8, 0xf0, 0xc1, 0x83, 0x7, 0xc, 0x78, 0x1, 
-	0x13, 0x7e, 0xe9, 0x51, 0xd, 0xa3, 0x1a, 0x86, 0xb2, 0x6, 
-	00, 0x22, 0x3, 0x8, 0x60, 0x96, 0x7a, 0x39, 0x8b, 00, 
-	00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 
-	0x82, };
-
-static const unsigned char data_img_br_png[] = {
-	/* /img/br.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x19, 0x2a, 0xbc, 
-	0x3c, 0xeb, 0x1d, 00, 00, 00, 0x2b, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0x63, 0x3c, 0x70, 0xe0, 00, 0x3, 0x36, 
-	0x70, 0xea, 0xd4, 0xa9, 0x53, 0xa7, 0x4e, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x41, 0xd8, 0x10, 0x71, 0x26, 0xac, 0xaa, 
-	0xf1, 0x80, 0x51, 0xd, 0xa3, 0x1a, 0x86, 0x8e, 0x6, 00, 
-	0x8d, 0xf0, 0xd, 0x1c, 0xe2, 0x5c, 0x1e, 0x25, 00, 00, 
-	00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
-};
-
-static const unsigned char data_img_bt_png[] = {
-	/* /img/bt.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x17, 0x38, 0xd1, 
-	0x6, 0xb7, 0xdb, 00, 00, 00, 0x2f, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0x63, 0xfc, 0xff, 0xff, 0x3f, 0x3, 0x29, 
-	0x80, 0x89, 0x24, 0xd5, 0x74, 0xd1, 0xc0, 0xf2, 0xf0, 0xe1, 
-	0x43, 0xd2, 0x34, 0x3c, 0x78, 0xf0, 0x80, 0x24, 0xd, 0x8c, 
-	0x24, 0x6b, 0x20, 0x35, 0x58, 0x47, 0xfd, 0x40, 0xc, 0xa0, 
-	0x7d, 0x5a, 0x2, 00, 0xe2, 0xfb, 0x1e, 0x28, 0xbf, 0xa1, 
-	0x89, 0x2f, 00, 00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 
-	0xae, 0x42, 0x60, 0x82, };
-
-static const unsigned char data_img_btl_png[] = {
-	/* /img/btl.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x17, 0x9, 0x80, 
-	0xd8, 0xb7, 0xe1, 00, 00, 00, 0x57, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0xbd, 0xd2, 0xc1, 0x9, 0xc0, 0x50, 0x8, 
-	0x3, 0xd0, 0xb6, 0x74, 0x80, 0x6c, 0xe0, 0xfe, 0x5b, 0x39, 
-	0x42, 0x32, 0x81, 0xbd, 0x7d, 0x3c, 0xb4, 0x60, 0xe, 0xfd, 
-	0xb9, 0x9, 0x3e, 0x88, 0xe0, 0x59, 0x55, 0x87, 0x93, 0xcb, 
-	0xda, 0xde, 0x2, 0xee, 0x3e, 0x90, 0x94, 0x64, 00, 0x49, 
-	0x99, 0x69, 0x80, 0x1e, 00, 00, 0x3c, 0x10, 0x11, 0x6, 
-	0x20, 0xe9, 0x55, 0x22, 0xf9, 0x6a, 0x3e, 0x41, 0x4f, 0xbf, 
-	0x67, 0xa, 0xd6, 0x3d, 0x23, 0xd0, 0xbb, 0x4d, 0xc1, 0x32, 
-	0xff, 0xff, 0xd2, 0x3, 0xa2, 0xea, 0x21, 0x1, 0x72, 0x67, 
-	0x21, 0x34, 00, 00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 
-	0xae, 0x42, 0x60, 0x82, };
-
-static const unsigned char data_img_btr_png[] = {
-	/* /img/btr.png */
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0,
-	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
-	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
-	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
-	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
-	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
-	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
-	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x18, 0x3a, 0xb8, 
-	0x90, 0xca, 0x38, 00, 00, 00, 0x63, 0x49, 0x44, 0x41, 
-	0x54, 0x78, 0x9c, 0xa5, 0x92, 0xd1, 0xd, 0x80, 0x30, 0x8, 
-	0x44, 0xaf, 0xc6, 0x3d, 0xd8, 0x7f, 0x2b, 0xd8, 00, 0x26, 
-	0xc0, 0x1f, 0x23, 0xd5, 0x48, 0xa, 0xca, 0xf7, 0xbd, 0xde, 
-	0xbd, 0xa4, 0xc3, 0xdd, 0xd1, 0xb9, 0xad, 0x95, 0x6, 0xb0, 
-	0x57, 0x42, 0xaa, 0x6a, 0x66, 0xd, 0xc0, 0xcc, 0x98, 0xf9, 
-	0x4, 0x44, 0xa4, 0xd2, 0x10, 0x93, 0x2e, 0xb4, 0x78, 0x23, 
-	0x3, 0x54, 0x75, 0x7e, 0x38, 0x1a, 0x88, 0xa8, 0xb2, 0x24, 
-	0x80, 0xcc, 0xe1, 0x35, 0x8d, 0xbf, 0xe, 0xd9, 0xee, 0x5b, 
-	0xc3, 0xc3, 0x61, 0xd, 0xcc, 0xe, 0xcb, 0x34, 0x3e, 0x38, 
-	0xb4, 0x3f, 0x5f, 0x1b, 0x38, 00, 0x4e, 0xf7, 0x3d, 0x58, 
-	0x37, 0x83, 0x84, 0x6d, 00, 00, 00, 00, 0x49, 0x45, 
-	0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, };
-
 static const unsigned char data_img_screenshot_png[] = {
 	/* /img/screenshot.png */
 	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x73, 0x68, 0x6f, 0x74, 0x2e, 0x70, 0x6e, 0x67, 0,
@@ -479,6 +315,170 @@
 	0xa3, 0xc, 00, 00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 
 	0xae, 0x42, 0x60, 0x82, };
 
+static const unsigned char data_img_bb_png[] = {
+	/* /img/bb.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1a, 0x2c, 0x7e, 
+	0x72, 0x1d, 0xeb, 00, 00, 00, 0x28, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0x63, 0x3c, 0x70, 0xe0, 00, 0x3, 0x29, 
+	0x80, 0x89, 0x24, 0xd5, 0xa3, 0x1a, 0x88, 0x4, 0x2c, 0xa7, 
+	0x4e, 0x9d, 0xa2, 0xb1, 0x6, 0x33, 0x33, 0x33, 0x1a, 0x6b, 
+	0xa0, 0xb9, 0x1f, 0x68, 0x1f, 0xf, 00, 0x58, 0xb2, 0xd, 
+	0x28, 0xc6, 0x77, 0x29, 0x2, 00, 00, 00, 00, 0x49, 
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, };
+
+static const unsigned char data_img_bbl_png[] = {
+	/* /img/bbl.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1b, 0x12, 0xa6, 
+	0x8, 0x31, 0x1, 00, 00, 00, 0x42, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0xed, 0x92, 0xb1, 0x11, 00, 0x20, 0x8, 
+	0x3, 0xd5, 0x73, 0xff, 0x19, 0xc9, 0x6, 0xc9, 0x4, 0x58, 
+	0xa0, 0x96, 0x4a, 0xaf, 0xdf, 0xa4, 0xe0, 0x9e, 0x50, 0x50, 
+	0xdd, 0xbd, 0x2c, 00, 0x98, 0x59, 0x39, 0xd2, 0xce, 0xe3, 
+	0x2f, 0xbc, 0x2b, 0xf4, 0x8, 0x92, 0x92, 0x48, 0x66, 0x5, 
+	0x49, 0xd7, 0xb7, 0x9b, 0x2, 0x80, 0x68, 0xc8, 0x9e, 0x94, 
+	0x5c, 0xbc, 0x19, 0xa4, 0xc8, 0x1e, 0x61, 0x37, 0x86, 0x6a, 
+	0x96, 00, 00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 
+	0x42, 0x60, 0x82, };
+
+static const unsigned char data_img_bbr_png[] = {
+	/* /img/bbr.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1a, 0x10, 0x51, 
+	0x1d, 0x61, 0x6c, 00, 00, 00, 0x4a, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0x63, 0x3c, 0x70, 0xe0, 00, 0x3, 0x36, 
+	0x70, 0xea, 0xd4, 0xa9, 0x53, 0xa7, 0x4e, 0x99, 0x99, 0x99, 
+	0x99, 0x99, 0x99, 0x41, 0xd8, 0x10, 0x71, 0x26, 0xac, 0xaa, 
+	0xf1, 0x80, 0x51, 0xd, 0xc4, 00, 0x16, 0x78, 00, 0xa3, 
+	0x81, 0xa7, 0x4f, 0x9f, 0x92, 0xa6, 0x1, 0xa7, 0xd, 0x66, 
+	0x66, 0x66, 0x78, 0xa4, 0xa5, 0xa5, 0xa5, 0x49, 0xd3, 0x40, 
+	0xa6, 0x93, 0x90, 0xfd, 0x43, 0xb2, 0x1f, 0x68, 0x1f, 0xf, 
+	00, 0xa4, 0x1d, 0x1d, 0x93, 0x22, 0x42, 0x2a, 0xa0, 00, 
+	00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 
+	0x82, };
+
+static const unsigned char data_img_bl_png[] = {
+	/* /img/bl.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x1e, 0x26, 0xfa, 
+	0xcb, 0x31, 0xf1, 00, 00, 00, 0x22, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0x63, 0xfc, 0xff, 0xff, 0x3f, 0x3, 0xc, 
+	0x3c, 0x7c, 0xf8, 0xf0, 0xc1, 0x83, 0x7, 0xc, 0x78, 0x1, 
+	0x13, 0x7e, 0xe9, 0x51, 0xd, 0xa3, 0x1a, 0x86, 0xb2, 0x6, 
+	00, 0x22, 0x3, 0x8, 0x60, 0x96, 0x7a, 0x39, 0x8b, 00, 
+	00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 
+	0x82, };
+
+static const unsigned char data_img_br_png[] = {
+	/* /img/br.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x19, 0x2a, 0xbc, 
+	0x3c, 0xeb, 0x1d, 00, 00, 00, 0x2b, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0x63, 0x3c, 0x70, 0xe0, 00, 0x3, 0x36, 
+	0x70, 0xea, 0xd4, 0xa9, 0x53, 0xa7, 0x4e, 0x99, 0x99, 0x99, 
+	0x99, 0x99, 0x99, 0x41, 0xd8, 0x10, 0x71, 0x26, 0xac, 0xaa, 
+	0xf1, 0x80, 0x51, 0xd, 0xa3, 0x1a, 0x86, 0x8e, 0x6, 00, 
+	0x8d, 0xf0, 0xd, 0x1c, 0xe2, 0x5c, 0x1e, 0x25, 00, 00, 
+	00, 00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+};
+
+static const unsigned char data_img_bt_png[] = {
+	/* /img/bt.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x17, 0x38, 0xd1, 
+	0x6, 0xb7, 0xdb, 00, 00, 00, 0x2f, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0x63, 0xfc, 0xff, 0xff, 0x3f, 0x3, 0x29, 
+	0x80, 0x89, 0x24, 0xd5, 0x74, 0xd1, 0xc0, 0xf2, 0xf0, 0xe1, 
+	0x43, 0xd2, 0x34, 0x3c, 0x78, 0xf0, 0x80, 0x24, 0xd, 0x8c, 
+	0x24, 0x6b, 0x20, 0x35, 0x58, 0x47, 0xfd, 0x40, 0xc, 0xa0, 
+	0x7d, 0x5a, 0x2, 00, 0xe2, 0xfb, 0x1e, 0x28, 0xbf, 0xa1, 
+	0x89, 0x2f, 00, 00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 
+	0xae, 0x42, 0x60, 0x82, };
+
+static const unsigned char data_img_btl_png[] = {
+	/* /img/btl.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x17, 0x9, 0x80, 
+	0xd8, 0xb7, 0xe1, 00, 00, 00, 0x57, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0xbd, 0xd2, 0xc1, 0x9, 0xc0, 0x50, 0x8, 
+	0x3, 0xd0, 0xb6, 0x74, 0x80, 0x6c, 0xe0, 0xfe, 0x5b, 0x39, 
+	0x42, 0x32, 0x81, 0xbd, 0x7d, 0x3c, 0xb4, 0x60, 0xe, 0xfd, 
+	0xb9, 0x9, 0x3e, 0x88, 0xe0, 0x59, 0x55, 0x87, 0x93, 0xcb, 
+	0xda, 0xde, 0x2, 0xee, 0x3e, 0x90, 0x94, 0x64, 00, 0x49, 
+	0x99, 0x69, 0x80, 0x1e, 00, 00, 0x3c, 0x10, 0x11, 0x6, 
+	0x20, 0xe9, 0x55, 0x22, 0xf9, 0x6a, 0x3e, 0x41, 0x4f, 0xbf, 
+	0x67, 0xa, 0xd6, 0x3d, 0x23, 0xd0, 0xbb, 0x4d, 0xc1, 0x32, 
+	0xff, 0xff, 0xd2, 0x3, 0xa2, 0xea, 0x21, 0x1, 0x72, 0x67, 
+	0x21, 0x34, 00, 00, 00, 00, 0x49, 0x45, 0x4e, 0x44, 
+	0xae, 0x42, 0x60, 0x82, };
+
+static const unsigned char data_img_btr_png[] = {
+	/* /img/btr.png */
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0,
+	0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 00, 00, 
+	00, 0xd, 0x49, 0x48, 0x44, 0x52, 00, 00, 00, 0x10, 
+	00, 00, 00, 0x10, 0x8, 0x2, 00, 00, 00, 0x90, 
+	0x91, 0x68, 0x36, 00, 00, 00, 0x9, 0x70, 0x48, 0x59, 
+	0x73, 00, 00, 0xf, 0x9f, 00, 00, 0xf, 0x9f, 0x1, 
+	0xd, 0x98, 0x13, 0x33, 00, 00, 00, 0x7, 0x74, 0x49, 
+	0x4d, 0x45, 0x7, 0xd3, 0x4, 0xf, 0xc, 0x18, 0x3a, 0xb8, 
+	0x90, 0xca, 0x38, 00, 00, 00, 0x63, 0x49, 0x44, 0x41, 
+	0x54, 0x78, 0x9c, 0xa5, 0x92, 0xd1, 0xd, 0x80, 0x30, 0x8, 
+	0x44, 0xaf, 0xc6, 0x3d, 0xd8, 0x7f, 0x2b, 0xd8, 00, 0x26, 
+	0xc0, 0x1f, 0x23, 0xd5, 0x48, 0xa, 0xca, 0xf7, 0xbd, 0xde, 
+	0xbd, 0xa4, 0xc3, 0xdd, 0xd1, 0xb9, 0xad, 0x95, 0x6, 0xb0, 
+	0x57, 0x42, 0xaa, 0x6a, 0x66, 0xd, 0xc0, 0xcc, 0x98, 0xf9, 
+	0x4, 0x44, 0xa4, 0xd2, 0x10, 0x93, 0x2e, 0xb4, 0x78, 0x23, 
+	0x3, 0x54, 0x75, 0x7e, 0x38, 0x1a, 0x88, 0xa8, 0xb2, 0x24, 
+	0x80, 0xcc, 0xe1, 0x35, 0x8d, 0xbf, 0xe, 0xd9, 0xee, 0x5b, 
+	0xc3, 0xc3, 0x61, 0xd, 0xcc, 0xe, 0xcb, 0x34, 0x3e, 0x38, 
+	0xb4, 0x3f, 0x5f, 0x1b, 0x38, 00, 0x4e, 0xf7, 0x3d, 0x58, 
+	0x37, 0x83, 0x84, 0x6d, 00, 00, 00, 00, 0x49, 0x45, 
+	0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, };
+
 static const unsigned char data_footer_plain[] = {
 	/* /footer.plain */
 	0x2f, 0x66, 0x6f, 0x6f, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0,
@@ -489,6 +489,249 @@
 	0x2f, 0x62, 0x6f, 0x64, 0x79, 0x3e, 0xa, 0x3c, 0x2f, 0x68, 
 	0x74, 0x6d, 0x6c, 0x3e, };
 
+static const unsigned char data_404_html[] = {
+	/* /404.html */
+	0x2f, 0x34, 0x30, 0x34, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0,
+	0x3c, 0x68, 0x74, 0x6d, 0x6c, 0x3e, 0x3c, 0x62, 0x6f, 0x64, 
+	0x79, 0x20, 0x62, 0x67, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 
+	0x22, 0x77, 0x68, 0x69, 0x74, 0x65, 0x22, 0x3e, 0x3c, 0x63, 
+	0x65, 0x6e, 0x74, 0x65, 0x72, 0x3e, 0x3c, 0x74, 0x61, 0x62, 
+	0x6c, 0x65, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 
+	0x36, 0x30, 0x30, 0x22, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 
+	0x72, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x3c, 0x74, 0x72, 0x3e, 
+	0x3c, 0x74, 0x64, 0x3e, 0x3c, 0x68, 0x31, 0x3e, 0x34, 0x30, 
+	0x34, 0x20, 0x2d, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x6e, 
+	0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x3c, 0x2f, 
+	0x68, 0x31, 0x3e, 0x3c, 0x2f, 0x74, 0x72, 0x3e, 0x3c, 0x2f, 
+	0x74, 0x64, 0x3e, 0x3c, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+	0x3e, 0x3c, 0x2f, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3e, 
+	0x3c, 0x2f, 0x62, 0x6f, 0x64, 0x79, 0x3e, 0x3c, 0x2f, 0x68, 
+	0x74, 0x6d, 0x6c, 0x3e, };
+
+static const unsigned char data_contiki_css[] = {
+	/* /contiki.css */
+	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2e, 0x63, 0x73, 0x73, 0,
+	0x62, 0x6f, 0x64, 0x79, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 
+	0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 0x65, 0x66, 0x74, 
+	0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 
+	0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x72, 0x69, 0x67, 0x68, 
+	0x74, 0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
+	0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x74, 0x6f, 0x70, 
+	0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 
+	0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x62, 0x6f, 0x74, 0x74, 
+	0x6f, 0x6d, 0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 
+	0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 
+	0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 
+	0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x77, 0x68, 0x69, 0x74, 
+	0x65, 0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 
+	0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 
+	0x61, 0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 
+	0x63, 0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 
+	0xa, 0x7d, 0xa, 0xa, 0x61, 0x3a, 0x6c, 0x69, 0x6e, 0x6b, 
+	0xa, 0x7b, 0x20, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 
+	0x72, 0x3a, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
+	0x3b, 0xa, 0x7d, 0xa, 0xa, 0x61, 0x3a, 0x76, 0x69, 0x73, 
+	0x69, 0x74, 0x65, 0x64, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x63, 
+	0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x65, 0x30, 0x65, 
+	0x30, 0x66, 0x66, 0x3b, 0x20, 0x20, 0xa, 0x7d, 0xa, 0xa, 
+	0x61, 0x3a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0xa, 0x7b, 
+	0x20, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 
+	0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0xa, 
+	0x7d, 0xa, 0xa, 0x68, 0x31, 0xa, 0x7b, 0xa, 0x20, 0x20, 
+	0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
+	0x3a, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3b, 0xa, 0x7d, 
+	0xa, 0xa, 0x74, 0x64, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x66, 
+	0x6f, 0x6e, 0x74, 0x2d, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 
+	0x3a, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 0x63, 0x61, 
+	0x2c, 0x61, 0x72, 0x69, 0x61, 0x6c, 0x3b, 0xa, 0x20, 0x20, 
+	0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 
+	0x31, 0x30, 0x70, 0x74, 0x3b, 0xa, 0x7d, 0xa, 0xa, 0x74, 
+	0x64, 0x2e, 0x62, 0x74, 0x6c, 0xa, 0x7b, 0xa, 0x20, 0x20, 
+	0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 
+	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
+	0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
+	0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 
+	0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 
+	0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 
+	0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 
+	0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
+	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 
+	0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 
+	0x78, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 
+	0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 
+	0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 
+	0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 
+	0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 
+	0x62, 0x74, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 
+	0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x62, 0x74, 0xa, 
+	0x7b, 0xa, 0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 
+	0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 
+	0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 
+	0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 
+	0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
+	0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 
+	0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 
+	0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 
+	0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 
+	0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 
+	0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 
+	0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 
+	0xa, 0x74, 0x64, 0x2e, 0x62, 0x74, 0x72, 0xa, 0x7b, 0xa, 
+	0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 
+	0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 
+	0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
+	0xa, 0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
+	0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
+	0xa, 0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 
+	0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 
+	0x3b, 0xa, 0x20, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 
+	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
+	0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 
+	0x20, 0x70, 0x78, 0x3b, 0x20, 0x20, 0xa, 0x20, 0x20, 0x62, 
+	0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 
+	0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 
+	0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 
+	0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 
+	0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x72, 0x2e, 0x70, 0x6e, 
+	0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 
+	0x2e, 0x62, 0x6c, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 0x61, 
+	0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
+	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 
+	0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
+	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x77, 0x69, 
+	0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 
+	0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 
+	0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 
+	0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 
+	0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 
+	0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 
+	0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 
+	0x6c, 0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 
+	0xa, 0xa, 0x74, 0x64, 0x2e, 0x62, 0x72, 0xa, 0x7b, 0xa, 
+	0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 
+	0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 
+	0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
+	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 
+	0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 
+	0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 
+	0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 
+	0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 
+	0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 
+	0x6d, 0x67, 0x2f, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x29, 
+	0x3b, 0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x62, 
+	0x62, 0x6c, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 0x61, 0x78, 
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 
+	0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x61, 0x78, 
+	0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 
+	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 
+	0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
+	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 
+	0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 
+	0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x77, 
+	0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 
+	0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 
+	0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 
+	0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 
+	0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 
+	0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 
+	0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 
+	0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x6c, 
+	0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 
+	0xa, 0x74, 0x64, 0x2e, 0x62, 0x62, 0xa, 0x7b, 0xa, 0x20, 
+	0x20, 0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 
+	0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 
+	0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
+	0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 
+	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
+	0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 
+	0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 
+	0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 
+	0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 
+	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x2e, 0x70, 0x6e, 
+	0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 
+	0x2e, 0x62, 0x62, 0x72, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 
+	0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 
+	0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 
+	0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 
+	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
+	0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 
+	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
+	0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
+	0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 
+	0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 
+	0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 
+	0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 
+	0x3b, 0x20, 0x20, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 
+	0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 
+	0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 
+	0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 
+	0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 
+	0x2f, 0x62, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 
+	0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x63, 0x6f, 
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0xa, 0x7b, 0xa, 0x20, 0x20, 
+	0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x6c, 0x65, 
+	0x66, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 
+	0x20, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x72, 
+	0x69, 0x67, 0x68, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 
+	0xa, 0x20, 0x20, 0xa, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, 
+	0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x6c, 0x65, 0x66, 
+	0x74, 0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 
+	0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 
+	0x61, 0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 
+	0x63, 0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 
+	0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 
+	0x7a, 0x65, 0x3a, 0x31, 0x30, 0x70, 0x74, 0x3b, 0xa, 0x7d, 
+	0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x6d, 0x65, 0x6e, 0x75, 
+	0xa, 0x7b, 0xa, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2d, 
+	0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x6c, 0x65, 0x66, 0x74, 
+	0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x66, 
+	0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 0x61, 
+	0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 0x63, 
+	0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 0xa, 
+	0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 0x7a, 
+	0x65, 0x3a, 0x31, 0x34, 0x70, 0x74, 0x3b, 0xa, 0x20, 0x20, 
+	0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x77, 0x65, 0x69, 0x67, 0x68, 
+	0x74, 0x3a, 0x62, 0x6f, 0x6c, 0x64, 0x3b, 0x20, 0x20, 0xa, 
+	0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 
+	0x34, 0x30, 0x34, 0x30, 0x35, 0x30, 0x3b, 0xa, 0x20, 0x20, 
+	0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x63, 
+	0x30, 0x63, 0x30, 0x63, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x70, 
+	0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x74, 0x6f, 0x70, 
+	0x3a, 0x20, 0x32, 0x70, 0x78, 0x3b, 0xa, 0x7d, 0xa, 0xa, 
+	0x70, 0x2e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0xa, 0x7b, 0xa, 
+	0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 
+	0x65, 0x66, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x72, 
+	0x69, 0x67, 0x68, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 
+	0xa, 0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 
+	0x74, 0x6f, 0x70, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 0xa, 
+	0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x62, 
+	0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x3a, 0x32, 0x30, 0x70, 0x78, 
+	0x3b, 0xa, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 
+	0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x63, 0x65, 0x6e, 0x74, 0x65, 
+	0x72, 0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 
+	0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 
+	0x61, 0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 
+	0x63, 0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 
+	0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 
+	0x7a, 0x65, 0x3a, 0x31, 0x30, 0x70, 0x74, 0x3b, 0xa, 0x20, 
+	0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x77, 0x65, 0x69, 0x67, 
+	0x68, 0x74, 0x3a, 0x62, 0x6f, 0x6c, 0x64, 0x3b, 0xa, 0x7d, 
+	0xa, };
+
 static const unsigned char data_header_html[] = {
 	/* /header.html */
 	0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0,
@@ -930,258 +1173,17 @@
 	0x20, 0xa, 0x20, 0x20, 0x3c, 0x2f, 0x62, 0x6f, 0x64, 0x79, 
 	0x3e, 0xa, 0x3c, 0x2f, 0x68, 0x74, 0x6d, 0x6c, 0x3e, };
 
-static const unsigned char data_404_html[] = {
-	/* /404.html */
-	0x2f, 0x34, 0x30, 0x34, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0,
-	0x3c, 0x68, 0x74, 0x6d, 0x6c, 0x3e, 0x3c, 0x62, 0x6f, 0x64, 
-	0x79, 0x20, 0x62, 0x67, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 
-	0x22, 0x77, 0x68, 0x69, 0x74, 0x65, 0x22, 0x3e, 0x3c, 0x63, 
-	0x65, 0x6e, 0x74, 0x65, 0x72, 0x3e, 0x3c, 0x74, 0x61, 0x62, 
-	0x6c, 0x65, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 
-	0x36, 0x30, 0x30, 0x22, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 
-	0x72, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x3c, 0x74, 0x72, 0x3e, 
-	0x3c, 0x74, 0x64, 0x3e, 0x3c, 0x68, 0x31, 0x3e, 0x34, 0x30, 
-	0x34, 0x20, 0x2d, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x6e, 
-	0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x3c, 0x2f, 
-	0x68, 0x31, 0x3e, 0x3c, 0x2f, 0x74, 0x72, 0x3e, 0x3c, 0x2f, 
-	0x74, 0x64, 0x3e, 0x3c, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-	0x3e, 0x3c, 0x2f, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3e, 
-	0x3c, 0x2f, 0x62, 0x6f, 0x64, 0x79, 0x3e, 0x3c, 0x2f, 0x68, 
-	0x74, 0x6d, 0x6c, 0x3e, };
-
-static const unsigned char data_contiki_css[] = {
-	/* /contiki.css */
-	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2e, 0x63, 0x73, 0x73, 0,
-	0x62, 0x6f, 0x64, 0x79, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 
-	0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 0x65, 0x66, 0x74, 
-	0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 
-	0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x72, 0x69, 0x67, 0x68, 
-	0x74, 0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
-	0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x74, 0x6f, 0x70, 
-	0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 
-	0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x62, 0x6f, 0x74, 0x74, 
-	0x6f, 0x6d, 0x3a, 0x31, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 
-	0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 
-	0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 
-	0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 
-	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x77, 0x68, 0x69, 0x74, 
-	0x65, 0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 
-	0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 
-	0x61, 0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 
-	0x63, 0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 
-	0xa, 0x7d, 0xa, 0xa, 0x61, 0x3a, 0x6c, 0x69, 0x6e, 0x6b, 
-	0xa, 0x7b, 0x20, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 
-	0x72, 0x3a, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
-	0x3b, 0xa, 0x7d, 0xa, 0xa, 0x61, 0x3a, 0x76, 0x69, 0x73, 
-	0x69, 0x74, 0x65, 0x64, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x63, 
-	0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x65, 0x30, 0x65, 
-	0x30, 0x66, 0x66, 0x3b, 0x20, 0x20, 0xa, 0x7d, 0xa, 0xa, 
-	0x61, 0x3a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0xa, 0x7b, 
-	0x20, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 
-	0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0xa, 
-	0x7d, 0xa, 0xa, 0x68, 0x31, 0xa, 0x7b, 0xa, 0x20, 0x20, 
-	0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
-	0x3a, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3b, 0xa, 0x7d, 
-	0xa, 0xa, 0x74, 0x64, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x66, 
-	0x6f, 0x6e, 0x74, 0x2d, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 
-	0x3a, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 0x63, 0x61, 
-	0x2c, 0x61, 0x72, 0x69, 0x61, 0x6c, 0x3b, 0xa, 0x20, 0x20, 
-	0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 
-	0x31, 0x30, 0x70, 0x74, 0x3b, 0xa, 0x7d, 0xa, 0xa, 0x74, 
-	0x64, 0x2e, 0x62, 0x74, 0x6c, 0xa, 0x7b, 0xa, 0x20, 0x20, 
-	0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 
-	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
-	0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
-	0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 
-	0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 
-	0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 
-	0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 
-	0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
-	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 
-	0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 
-	0x78, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 
-	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 
-	0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 
-	0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 
-	0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 
-	0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 
-	0x62, 0x74, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 
-	0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x62, 0x74, 0xa, 
-	0x7b, 0xa, 0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 
-	0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 
-	0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 
-	0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 
-	0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
-	0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 
-	0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 
-	0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 
-	0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 
-	0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 
-	0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 
-	0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 
-	0xa, 0x74, 0x64, 0x2e, 0x62, 0x74, 0x72, 0xa, 0x7b, 0xa, 
-	0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 
-	0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 
-	0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
-	0xa, 0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
-	0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
-	0xa, 0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 
-	0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 
-	0x3b, 0xa, 0x20, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 
-	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
-	0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 
-	0x20, 0x70, 0x78, 0x3b, 0x20, 0x20, 0xa, 0x20, 0x20, 0x62, 
-	0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 
-	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 
-	0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 
-	0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 
-	0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 
-	0x69, 0x6d, 0x67, 0x2f, 0x62, 0x74, 0x72, 0x2e, 0x70, 0x6e, 
-	0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 
-	0x2e, 0x62, 0x6c, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 0x61, 
-	0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
-	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 
-	0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
-	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x77, 0x69, 
-	0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 
-	0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 
-	0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 
-	0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 
-	0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 
-	0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 
-	0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 
-	0x6c, 0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 
-	0xa, 0xa, 0x74, 0x64, 0x2e, 0x62, 0x72, 0xa, 0x7b, 0xa, 
-	0x20, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 
-	0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 
-	0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
-	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 
-	0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 
-	0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 
-	0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 
-	0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 
-	0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 
-	0x6d, 0x67, 0x2f, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x29, 
-	0x3b, 0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x62, 
-	0x62, 0x6c, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 0x61, 0x78, 
-	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 
-	0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x61, 0x78, 
-	0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 
-	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 
-	0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 
-	0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 0x69, 
-	0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 
-	0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x77, 
-	0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 
-	0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 
-	0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 
-	0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 
-	0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 
-	0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 
-	0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 
-	0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x6c, 
-	0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 
-	0xa, 0x74, 0x64, 0x2e, 0x62, 0x62, 0xa, 0x7b, 0xa, 0x20, 
-	0x20, 0x6d, 0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 
-	0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 
-	0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 
-	0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 
-	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
-	0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 
-	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 
-	0x30, 0x34, 0x30, 0x65, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 
-	0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 
-	0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 
-	0x2f, 0x69, 0x6d, 0x67, 0x2f, 0x62, 0x62, 0x2e, 0x70, 0x6e, 
-	0x67, 0x29, 0x3b, 0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 
-	0x2e, 0x62, 0x62, 0x72, 0xa, 0x7b, 0xa, 0x20, 0x20, 0x6d, 
-	0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 
-	0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x6d, 
-	0x61, 0x78, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 
-	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
-	0x6d, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 
-	0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 
-	0x6d, 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
-	0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 
-	0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x36, 
-	0x20, 0x70, 0x78, 0x3b, 0xa, 0x20, 0x20, 0x68, 0x65, 0x69, 
-	0x67, 0x68, 0x74, 0x3a, 0x20, 0x31, 0x36, 0x20, 0x70, 0x78, 
-	0x3b, 0x20, 0x20, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 
-	0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 
-	0x6f, 0x72, 0x3a, 0x20, 0x23, 0x34, 0x30, 0x34, 0x30, 0x65, 
-	0x30, 0x3b, 0xa, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 
-	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 
-	0x65, 0x3a, 0x75, 0x72, 0x6c, 0x28, 0x2f, 0x69, 0x6d, 0x67, 
-	0x2f, 0x62, 0x62, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x29, 0x3b, 
-	0xa, 0x7d, 0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x63, 0x6f, 
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0xa, 0x7b, 0xa, 0x20, 0x20, 
-	0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x6c, 0x65, 
-	0x66, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 0xa, 0x20, 
-	0x20, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x72, 
-	0x69, 0x67, 0x68, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 
-	0xa, 0x20, 0x20, 0xa, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, 
-	0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x6c, 0x65, 0x66, 
-	0x74, 0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 
-	0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 
-	0x61, 0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 
-	0x63, 0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 
-	0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 
-	0x7a, 0x65, 0x3a, 0x31, 0x30, 0x70, 0x74, 0x3b, 0xa, 0x7d, 
-	0x20, 0xa, 0xa, 0x74, 0x64, 0x2e, 0x6d, 0x65, 0x6e, 0x75, 
-	0xa, 0x7b, 0xa, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2d, 
-	0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x6c, 0x65, 0x66, 0x74, 
-	0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x66, 
-	0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 0x61, 
-	0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 0x63, 
-	0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 0xa, 
-	0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 0x7a, 
-	0x65, 0x3a, 0x31, 0x34, 0x70, 0x74, 0x3b, 0xa, 0x20, 0x20, 
-	0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x77, 0x65, 0x69, 0x67, 0x68, 
-	0x74, 0x3a, 0x62, 0x6f, 0x6c, 0x64, 0x3b, 0x20, 0x20, 0xa, 
-	0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 
-	0x34, 0x30, 0x34, 0x30, 0x35, 0x30, 0x3b, 0xa, 0x20, 0x20, 
-	0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 
-	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x63, 
-	0x30, 0x63, 0x30, 0x63, 0x30, 0x3b, 0xa, 0x20, 0x20, 0x70, 
-	0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x74, 0x6f, 0x70, 
-	0x3a, 0x20, 0x32, 0x70, 0x78, 0x3b, 0xa, 0x7d, 0xa, 0xa, 
-	0x70, 0x2e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0xa, 0x7b, 0xa, 
-	0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 
-	0x65, 0x66, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x72, 
-	0x69, 0x67, 0x68, 0x74, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 
-	0xa, 0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 
-	0x74, 0x6f, 0x70, 0x3a, 0x32, 0x30, 0x70, 0x78, 0x3b, 0xa, 
-	0x20, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x62, 
-	0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x3a, 0x32, 0x30, 0x70, 0x78, 
-	0x3b, 0xa, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 
-	0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x63, 0x65, 0x6e, 0x74, 0x65, 
-	0x72, 0x3b, 0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 
-	0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x61, 0x72, 0x69, 
-	0x61, 0x6c, 0x2c, 0x68, 0x65, 0x6c, 0x76, 0x65, 0x74, 0x69, 
-	0x63, 0x61, 0x2c, 0x6c, 0x75, 0x63, 0x69, 0x64, 0x61, 0x3b, 
-	0xa, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 
-	0x7a, 0x65, 0x3a, 0x31, 0x30, 0x70, 0x74, 0x3b, 0xa, 0x20, 
-	0x20, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x77, 0x65, 0x69, 0x67, 
-	0x68, 0x74, 0x3a, 0x62, 0x6f, 0x6c, 0x64, 0x3b, 0xa, 0x7d, 
-	0xa, };
-
 const struct httpd_fsdata_file file_cgi_files[] = {{NULL, data_cgi_files, data_cgi_files + 11, sizeof(data_cgi_files) - 11}};
 
 const struct httpd_fsdata_file file_cgi_tcp[] = {{file_cgi_files, data_cgi_tcp, data_cgi_tcp + 9, sizeof(data_cgi_tcp) - 9}};
 
-const struct httpd_fsdata_file file_img_bbl_png[] = {{file_cgi_tcp, data_img_bbl_png, data_img_bbl_png + 13, sizeof(data_img_bbl_png) - 13}};
+const struct httpd_fsdata_file file_img_screenshot_png[] = {{file_cgi_tcp, data_img_screenshot_png, data_img_screenshot_png + 20, sizeof(data_img_screenshot_png) - 20}};
 
-const struct httpd_fsdata_file file_img_bb_png[] = {{file_img_bbl_png, data_img_bb_png, data_img_bb_png + 12, sizeof(data_img_bb_png) - 12}};
+const struct httpd_fsdata_file file_img_bb_png[] = {{file_img_screenshot_png, data_img_bb_png, data_img_bb_png + 12, sizeof(data_img_bb_png) - 12}};
 
-const struct httpd_fsdata_file file_img_bbr_png[] = {{file_img_bb_png, data_img_bbr_png, data_img_bbr_png + 13, sizeof(data_img_bbr_png) - 13}};
+const struct httpd_fsdata_file file_img_bbl_png[] = {{file_img_bb_png, data_img_bbl_png, data_img_bbl_png + 13, sizeof(data_img_bbl_png) - 13}};
+
+const struct httpd_fsdata_file file_img_bbr_png[] = {{file_img_bbl_png, data_img_bbr_png, data_img_bbr_png + 13, sizeof(data_img_bbr_png) - 13}};
 
 const struct httpd_fsdata_file file_img_bl_png[] = {{file_img_bbr_png, data_img_bl_png, data_img_bl_png + 12, sizeof(data_img_bl_png) - 12}};
 
@@ -1193,18 +1195,16 @@
 
 const struct httpd_fsdata_file file_img_btr_png[] = {{file_img_btl_png, data_img_btr_png, data_img_btr_png + 13, sizeof(data_img_btr_png) - 13}};
 
-const struct httpd_fsdata_file file_img_screenshot_png[] = {{file_img_btr_png, data_img_screenshot_png, data_img_screenshot_png + 20, sizeof(data_img_screenshot_png) - 20}};
+const struct httpd_fsdata_file file_footer_plain[] = {{file_img_btr_png, data_footer_plain, data_footer_plain + 14, sizeof(data_footer_plain) - 14}};
 
-const struct httpd_fsdata_file file_footer_plain[] = {{file_img_screenshot_png, data_footer_plain, data_footer_plain + 14, sizeof(data_footer_plain) - 14}};
-
-const struct httpd_fsdata_file file_header_html[] = {{file_footer_plain, data_header_html, data_header_html + 13, sizeof(data_header_html) - 13}};
-
-const struct httpd_fsdata_file file_index_html[] = {{file_header_html, data_index_html, data_index_html + 12, sizeof(data_index_html) - 12}};
-
-const struct httpd_fsdata_file file_404_html[] = {{file_index_html, data_404_html, data_404_html + 10, sizeof(data_404_html) - 10}};
+const struct httpd_fsdata_file file_404_html[] = {{file_footer_plain, data_404_html, data_404_html + 10, sizeof(data_404_html) - 10}};
 
 const struct httpd_fsdata_file file_contiki_css[] = {{file_404_html, data_contiki_css, data_contiki_css + 13, sizeof(data_contiki_css) - 13}};
 
-#define HTTPD_FS_ROOT file_contiki_css
+const struct httpd_fsdata_file file_header_html[] = {{file_contiki_css, data_header_html, data_header_html + 13, sizeof(data_header_html) - 13}};
+
+const struct httpd_fsdata_file file_index_html[] = {{file_header_html, data_index_html, data_index_html + 12, sizeof(data_index_html) - 12}};
+
+#define HTTPD_FS_ROOT file_index_html
 
 #define HTTPD_FS_NUMFILES 16
\ No newline at end of file
diff --git a/contiki-gtk/apps/httpd-fsdata.h b/contiki-gtk/apps/httpd-fsdata.h
index e84fc2d..70a04f3 100644
--- a/contiki-gtk/apps/httpd-fsdata.h
+++ b/contiki-gtk/apps/httpd-fsdata.h
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright 
  *    notice, this list of conditions and the following disclaimer in the 
  *    documentation and/or other materials provided with the distribution. 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Swedish Institute
- *      of Computer Science and its contributors.
- * 4. Neither the name of the Institute nor the names of its contributors 
+ * 3. Neither the name of the Institute nor the names of its contributors 
  *    may be used to endorse or promote products derived from this software 
  *    without specific prior written permission. 
  *
@@ -34,7 +30,7 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fsdata.h,v 1.1 2004/02/16 21:18:14 adamdunkels Exp $
+ * $Id: httpd-fsdata.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  */
 #ifndef __HTTPD_FSDATA_H__
 #define __HTTPD_FSDATA_H__
diff --git a/contiki-gtk/apps/httpd.c b/contiki-gtk/apps/httpd.c
index 7c21122..01d0f64 100644
--- a/contiki-gtk/apps/httpd.c
+++ b/contiki-gtk/apps/httpd.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd.c,v 1.1 2004/02/16 21:18:14 adamdunkels Exp $
+ * $Id: httpd.c,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
@@ -79,7 +79,7 @@
   unsigned char typelen;
 };
 
-static struct http_filetype filetypes[] = {
+static const struct http_filetype filetypes[] = {
   {http_html, sizeof(http_html) - 1,
    http_content_type_html, sizeof(http_content_type_html) - 1},
   {http_htm, sizeof(http_htm) - 1,
diff --git a/contiki-gtk/apps/httpd.h b/contiki-gtk/apps/httpd.h
index 78c885b..0fd5348 100644
--- a/contiki-gtk/apps/httpd.h
+++ b/contiki-gtk/apps/httpd.h
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright 
  *    notice, this list of conditions and the following disclaimer in the 
  *    documentation and/or other materials provided with the distribution. 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Adam Dunkels.
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -31,7 +28,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd.h,v 1.1 2004/02/16 21:18:14 adamdunkels Exp $
+ * $Id: httpd.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
@@ -52,7 +49,7 @@
 
 struct httpd_state {
   u8_t state; 
-  u16_t count;
+  unsigned long count;
   u8_t poll;
   char *dataptr;
   struct httpd_fs_file file;
diff --git a/contiki-gtk/apps/makestrings b/contiki-gtk/apps/makestrings
index e6e8470..b81b9b9 100755
--- a/contiki-gtk/apps/makestrings
+++ b/contiki-gtk/apps/makestrings
@@ -34,6 +34,8 @@
   close(OUTPUTH);
 }
 stringify("http-user-agent-string");
+stringify("nntpc-strings");
+stringify("nntpd-strings");
 
 exit 0;
 
diff --git a/contiki-gtk/apps/shell.c b/contiki-gtk/apps/shell.c
index 9fe0a1f..4ad2a62 100644
--- a/contiki-gtk/apps/shell.c
+++ b/contiki-gtk/apps/shell.c
@@ -28,14 +28,13 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: shell.c,v 1.2 2004/02/16 21:44:24 adamdunkels Exp $
+ * $Id: shell.c,v 1.3 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
 #include "program-handler.h"
 #include "loader.h"
 #include "uip.h"
-#include "uip_main.h"
 #include "uip_arp.h"
 #include "resolv.h"
 
@@ -107,12 +106,12 @@
 processes(char *str)
 {
   static char idstr[5];
-  struct dispatcher_proc *p;
+  struct ek_proc *p;
 
   shell_output("Processes:", "");
   /* Step through each possible process ID and see if there is a
      matching process. */
-  for(p = DISPATCHER_PROCS(); p != NULL; p = p->next) {
+  for(p = EK_PROCS(); p != NULL; p = p->next) {
     inttostr(idstr, p->id);
     shell_output(idstr, p->name);
   }
@@ -179,7 +178,7 @@
   if(procnum != 0) {
     inttostr(procstr, procnum);
     shell_output("Killing process ", procstr);
-    dispatcher_emit(dispatcher_signal_quit, NULL, procnum);
+    ek_post(procnum, EK_EVENT_REQUEST_EXIT, NULL);
   } else {
     shell_output("Could not parse process number", "");
   }
diff --git a/contiki-gtk/apps/vnc-draw.c b/contiki-gtk/apps/vnc-draw.c
index 05a18d4..f3c2902 100644
--- a/contiki-gtk/apps/vnc-draw.c
+++ b/contiki-gtk/apps/vnc-draw.c
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the Contiki VNC client
  *
- * $Id: vnc-draw.c,v 1.1 2003/04/24 13:27:02 adamdunkels Exp $
+ * $Id: vnc-draw.c,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
diff --git a/contiki-gtk/apps/wget.c b/contiki-gtk/apps/wget.c
index 47a8120..d849352 100644
--- a/contiki-gtk/apps/wget.c
+++ b/contiki-gtk/apps/wget.c
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: wget.c,v 1.1 2003/08/20 22:36:44 adamdunkels Exp $
+ * $Id: wget.c,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
diff --git a/contiki-gtk/conf/cc-conf.h b/contiki-gtk/conf/cc-conf.h
index 3f4b9cc..84db2b8 100644
--- a/contiki-gtk/conf/cc-conf.h
+++ b/contiki-gtk/conf/cc-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: cc-conf.h,v 1.1 2003/04/05 12:24:43 adamdunkels Exp $
+ * $Id: cc-conf.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 #ifndef __CC_CONF_H__
diff --git a/contiki-gtk/conf/clock-conf.h b/contiki-gtk/conf/clock-conf.h
new file mode 100644
index 0000000..1f8ad10
--- /dev/null
+++ b/contiki-gtk/conf/clock-conf.h
@@ -0,0 +1,7 @@
+#ifndef __CLOCK_CONF_H__
+#define __CLOCK_CONF_H__
+
+typedef unsigned long clock_time_t;
+#define CLOCK_CONF_SECOND 1000
+
+#endif /* __CLOCK_CONF_H__ */
diff --git a/contiki-gtk/conf/ctk-conf.h b/contiki-gtk/conf/ctk-conf.h
index fa87a29..3d5c19b 100644
--- a/contiki-gtk/conf/ctk-conf.h
+++ b/contiki-gtk/conf/ctk-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-conf.h,v 1.4 2004/06/27 12:49:32 oliverschmidt Exp $
+ * $Id: ctk-conf.h,v 1.5 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
@@ -86,4 +83,6 @@
 /* The maximum number of menu items in each menu. */
 #define CTK_CONF_MAXMENUITEMS         10
 
+#define CTK_CONF_WIDGET_FLAGS         1
+
 #endif /* __CTK_CONF_H__ */
diff --git a/contiki-gtk/conf/ctk-conio-conf.h b/contiki-gtk/conf/ctk-conio-conf.h
index ec998c0..984abc1 100644
--- a/contiki-gtk/conf/ctk-conio-conf.h
+++ b/contiki-gtk/conf/ctk-conio-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-conio-conf.h,v 1.1 2003/04/15 21:20:42 adamdunkels Exp $
+ * $Id: ctk-conio-conf.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
diff --git a/contiki-gtk/conf/ctk-vncserver-conf.h b/contiki-gtk/conf/ctk-vncserver-conf.h
index b3ff4bd..6a22665 100644
--- a/contiki-gtk/conf/ctk-vncserver-conf.h
+++ b/contiki-gtk/conf/ctk-vncserver-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: ctk-vncserver-conf.h,v 1.1 2003/09/04 19:19:08 adamdunkels Exp $
+ * $Id: ctk-vncserver-conf.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 #ifndef __CTK_VNCSERVER_CONF_H__
diff --git a/contiki-gtk/conf/ek-conf.h b/contiki-gtk/conf/ek-conf.h
index b0effb4..a5a07d4 100644
--- a/contiki-gtk/conf/ek-conf.h
+++ b/contiki-gtk/conf/ek-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the "ek" event kernel.
  *
- * $Id: ek-conf.h,v 1.1 2003/04/02 09:17:24 adamdunkels Exp $
+ * $Id: ek-conf.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
@@ -45,6 +42,7 @@
 typedef void *ek_data_t;
 
 typedef unsigned char ek_signal_t;
+typedef unsigned char ek_event_t;
 typedef unsigned char ek_id_t;
 
 /* ek_ticks_t: should be defined to be the largest type that fits the
@@ -58,15 +56,12 @@
    used by the underlying system. (Look for time_t or similar.) */
 typedef unsigned long ek_clock_t; 
 
-#define EK_CONF_NUMSIGNALS   32    /* Must be 2^n */
-typedef unsigned char ek_num_signals_t;
-
-#define EK_CONF_NUMTIMERS    4    /* Must be 2^n */
-typedef unsigned char ek_num_timers_t;
-
 #define EK_CONF_NUMLISTENERS  32    /* Must be 2^n */
 typedef unsigned char ek_num_listeners_t;
 
-#define EK_CONF_UNLISTEN 0
+#define EK_CONF_MAXPROCS 32
+
+#define EK_CONF_NUMEVENTS 32
+typedef unsigned char ek_num_events_t;
 
 #endif /* __EK_CONF_H__ */
diff --git a/contiki-gtk/conf/libconio-conf.h b/contiki-gtk/conf/libconio-conf.h
index 40b01e8..96493ed 100644
--- a/contiki-gtk/conf/libconio-conf.h
+++ b/contiki-gtk/conf/libconio-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,14 +29,14 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: libconio-conf.h,v 1.2 2003/09/04 19:18:24 adamdunkels Exp $
+ * $Id: libconio-conf.h,v 1.3 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 #ifndef __LIBCONIO_CONF_H__
 #define __LIBCONIO_CONF_H__
 
-#define LIBCONIO_CONF_SCREEN_WIDTH  100
-#define LIBCONIO_CONF_SCREEN_HEIGHT 75
+#define LIBCONIO_CONF_SCREEN_WIDTH  80
+#define LIBCONIO_CONF_SCREEN_HEIGHT 45
 
 #endif /* __LIBCONIO_CONF_H__ */
 
diff --git a/contiki-gtk/conf/shell-gui-conf.h b/contiki-gtk/conf/shell-gui-conf.h
new file mode 100644
index 0000000..45846b0
--- /dev/null
+++ b/contiki-gtk/conf/shell-gui-conf.h
@@ -0,0 +1,8 @@
+#ifndef __SHELL_GUI_CONF_H__
+#define __SHELL_GUI_CONF_H__
+
+#define SHELL_GUI_CONF_XSIZE 46
+#define SHELL_GUI_CONF_YSIZE 22
+
+
+#endif /* __SHELL_GUI_CONF_H__ */
diff --git a/contiki-gtk/conf/uip-conf.h b/contiki-gtk/conf/uip-conf.h
index 614384c..888e37e 100644
--- a/contiki-gtk/conf/uip-conf.h
+++ b/contiki-gtk/conf/uip-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the Contiki Destop OS
  *
- * $Id: uip-conf.h,v 1.1 2003/08/20 22:38:37 adamdunkels Exp $
+ * $Id: uip-conf.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 #ifndef __UIP_CONF_H__
diff --git a/contiki-gtk/conf/vnc-conf.h b/contiki-gtk/conf/vnc-conf.h
index 4c972f8..bad8c37 100644
--- a/contiki-gtk/conf/vnc-conf.h
+++ b/contiki-gtk/conf/vnc-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the Contiki VNC client
  *
- * $Id: vnc-conf.h,v 1.1 2003/04/02 09:17:24 adamdunkels Exp $
+ * $Id: vnc-conf.h,v 1.2 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
diff --git a/contiki-gtk/conf/www-conf.h b/contiki-gtk/conf/www-conf.h
index b17cdaf..9b7858c 100644
--- a/contiki-gtk/conf/www-conf.h
+++ b/contiki-gtk/conf/www-conf.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,25 +29,25 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: www-conf.h,v 1.3 2003/09/04 19:18:40 adamdunkels Exp $
+ * $Id: www-conf.h,v 1.4 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 #ifndef __WWW_CONF_H__
 #define __WWW_CONF_H__
 
 /* The size of the HTML viewing area. */
-#define WWW_CONF_WEBPAGE_WIDTH 56
-#define WWW_CONF_WEBPAGE_HEIGHT 37
+#define WWW_CONF_WEBPAGE_WIDTH 76
+#define WWW_CONF_WEBPAGE_HEIGHT 30
 
 /* The size of the "Back" history. */
-#define WWW_CONF_HISTORY_SIZE 4
+#define WWW_CONF_HISTORY_SIZE 40
 
 /* Defines the maximum length of an URL */
-#define WWW_CONF_MAX_URLLEN 100
+#define WWW_CONF_MAX_URLLEN 200
 
 /* The maxiumum number of widgets (i.e., hyperlinks, form elements) on
    a page. */
-#define WWW_CONF_MAX_NUMPAGEWIDGETS 20
+#define WWW_CONF_MAX_NUMPAGEWIDGETS 80
 
 /* Turns <center> support on or off; must be on for forms to work. */
 #define WWW_CONF_RENDERSTATE 1
@@ -59,10 +56,10 @@
 #define WWW_CONF_FORMS       1
 
 /* Maximum lengths for various HTML form parameters. */
-#define WWW_CONF_MAX_FORMACTIONLEN  40
-#define WWW_CONF_MAX_FORMNAMELEN    20
-#define WWW_CONF_MAX_INPUTNAMELEN   20
-#define WWW_CONF_MAX_INPUTVALUELEN  34
+#define WWW_CONF_MAX_FORMACTIONLEN  400
+#define WWW_CONF_MAX_FORMNAMELEN    200
+#define WWW_CONF_MAX_INPUTNAMELEN   200
+#define WWW_CONF_MAX_INPUTVALUELEN  340
 
 #define WWW_CONF_PAGEVIEW 1
 
diff --git a/contiki-gtk/contiki-main.c b/contiki-gtk/contiki-main.c
index 1395ba7..e4281e1 100644
--- a/contiki-gtk/contiki-main.c
+++ b/contiki-gtk/contiki-main.c
@@ -29,63 +29,30 @@
  *
  * This file is part of the Contiki desktop environment 
  *
- * $Id: contiki-main.c,v 1.11 2004/06/06 07:05:40 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.12 2004/07/04 21:15:53 adamdunkels Exp $
  *
  */
 
-
-#include "ctk.h"
-#include "ctk-draw.h"
-/*#include "ek-x.h"*/
-#include "dispatcher.h"
-
-#include "program-handler.h"
-
-#include "tapdev-drv.h"
-
-#include "uip-fw.h"
-
-#include "uip.h"
-#include "uip_arp.h"
-
-#include "about-dsc.h"
-#include "netconf-dsc.h"
-#include "processes-dsc.h"
-#include "calc-dsc.h"
-
-#include "telnet-dsc.h"
-#include "www-dsc.h"
-#include "webserver-dsc.h"
-
-/*#include "presenter-dsc.h"*/
-
-#include "wget-dsc.h"
-
-#include "email-dsc.h"
-/*#include "maze-dsc.h"*/
-
-#include "telnetd-dsc.h"
-
-#include "resolv.h"
-#include "ctk-vncserver.h"
+#include "ek.h"
+#include "clock.h"
 
 #include <gdk/gdktypes.h>
 #include <gtk/gtk.h>
 
-#include "mt.h"
-#include "mtp.h"
+#include "uip.h"
+#include "ctk.h"
 
-#include "mailget.h"
+#include "uip-fw.h"
 
-#include "newslog.h"
+#include "about-dsc.h"
+#include "calc-dsc.h"
+#include "email-dsc.h"
+#include "netconf-dsc.h"
+#include "processes-dsc.h"
+#include "shell-dsc.h"
+#include "www-dsc.h"
 
-/*
-MTP(thread1, "Test thread", p1, t1, t1_idle);
-static void test1(void *data) { while(1) { printf("Test\n"); mt_yield(); } }
 
-MTP(thread2, "Test thread 2", p2, t2, t2_idle);
-static void test2(void *data) { while(1) { printf("Test 2\n"); mt_yield(); } }
-*/
 
 void tapdev_send(void);
 static struct uip_fw_netif tapif =
@@ -95,13 +62,10 @@
 static gint
 idle_callback(gpointer data)
 {
-  /*  ek_run();*/
-      /* Process one signal */
-    dispatcher_process_signal();
 
-    /* Run "idle" handlers */
-    dispatcher_process_idle();
+  ek_run();
 
+  ctk_gtksim_redraw();
   return TRUE;
 }
 /*-----------------------------------------------------------------------------------*/
@@ -110,10 +74,49 @@
 {
   u16_t addr[2];
 
-  /*  ek_init();*/
-  dispatcher_init();  
+  ek_init();
+
+  tcpip_init(NULL);
   
+  ctk_gtksim_init(&argc, &argv);
+  ctk_gtksim_service_init(NULL);
+  ctk_init();
+
+  uip_init();
+  uip_ipaddr(addr, 192,168,2,2);
+  uip_sethostaddr(addr);
+
+  uip_ipaddr(addr, 192,168,2,1);
+  uip_setdraddr(addr);
+
+  uip_ipaddr(addr, 255,255,255,0);
+  uip_setnetmask(addr);  
+
+
+  resolv_init(NULL);
   
+  tapdev_init();
+  uip_fw_service_init();
+  uip_fw_init();
+  uip_fw_default(&tapif);
+
+  /*  tapdev_service_init(NULL);*/
+
+
+  program_handler_init();
+  program_handler_add(&about_dsc, "About", 1);
+  program_handler_add(&netconf_dsc, "Network setup", 1);
+  program_handler_add(&www_dsc, "Web browser", 1);
+  program_handler_add(&processes_dsc, "Processes", 1);
+  program_handler_add(&shell_dsc, "Command shell", 1);
+  program_handler_add(&calc_dsc, "Calculator", 1);
+  program_handler_add(&email_dsc, "E-mail", 1);
+  
+  gtk_timeout_add(20, idle_callback, NULL);
+  
+  gtk_main();
+  
+#if 0  
   uip_init();
   resolv_init(NULL);
 
@@ -146,10 +149,11 @@
   ctk_init();
 #endif
   
+#endif /* 0 */
 
-  gtk_timeout_add(20, idle_callback, NULL);
   
-#if 1
+  
+#if 0
   program_handler_init();
   
 
@@ -185,7 +189,8 @@
   
   /*  newslog_init(NULL);*/
   
-  webserver_init();
+
+  /*webserver_init();*/
     
   gtk_main();
     
@@ -197,8 +202,8 @@
 /*-----------------------------------------------------------------------------------*/
 #include <sys/time.h>
  
-ek_clock_t
-ek_clock(void)
+clock_time_t
+clock_time(void)
 {
   struct timeval tv;
   struct timezone tz;
diff --git a/contiki-gtk/ctk/conio.h b/contiki-gtk/ctk/conio.h
index c5740d9..de89d5e 100644
--- a/contiki-gtk/ctk/conio.h
+++ b/contiki-gtk/ctk/conio.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -32,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: conio.h,v 1.1 2003/04/15 21:20:43 adamdunkels Exp $
+ * $Id: conio.h,v 1.2 2004/07/04 21:15:54 adamdunkels Exp $
  *
  */
 #ifndef __CONIO_H__
diff --git a/contiki-gtk/ctk/ctk-arch.h b/contiki-gtk/ctk/ctk-arch.h
index e6f2787..c9c0c5b 100644
--- a/contiki-gtk/ctk/ctk-arch.h
+++ b/contiki-gtk/ctk/ctk-arch.h
@@ -11,10 +11,7 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution. 
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *        This product includes software developed by Adam Dunkels. 
- * 4. The name of the author may not be used to endorse or promote
+ * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.  
  *
@@ -30,9 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
  *
- * This file is part of the "ctk" console GUI toolkit for cc65
- *
- * $Id: ctk-arch.h,v 1.2 2003/09/04 19:18:09 adamdunkels Exp $
+ * $Id: ctk-arch.h,v 1.3 2004/07/04 21:15:54 adamdunkels Exp $
  *
  */
 
@@ -45,4 +40,6 @@
 #include "ctk-gtksim.h"
 #endif
 
+#define ctk_arch_isprint(x) isprint(x)
+
 #endif /* __CTK_ARCH_H__ */
diff --git a/contiki-gtk/uip/tapdev-service.c b/contiki-gtk/uip/tapdev-service.c
new file mode 100644
index 0000000..016b827
--- /dev/null
+++ b/contiki-gtk/uip/tapdev-service.c
@@ -0,0 +1,55 @@
+
+#include "packet-service.h"
+#include "tapdev.h"
+
+static void output(u8_t *hdr, u16_t hdrlen, u8_t *data, u16_t datalen);
+
+static const struct packet_service_state state =
+  {
+    PACKET_SERVICE_VERSION,
+    output
+  };
+
+EK_EVENTHANDLER(eventhandler, ev, data);
+EK_POLLHANDLER(pollhandler);
+EK_PROCESS(proc, PACKET_SERVICE_NAME, EK_PRIO_NORMAL,
+	   eventhandler, pollhandler, (void *)&state);
+
+/*---------------------------------------------------------------------------*/
+EK_PROCESS_INIT(tapdev_service_init, arg)
+{
+  ek_service_start(PACKET_SERVICE_NAME, &proc);
+}
+/*---------------------------------------------------------------------------*/
+static void
+output(u8_t *hdr, u16_t hdrlen, u8_t *data, u16_t datalen)
+{
+  printf("packet-service: output (%p, %d) (%p, %d)\n",
+	 hdr, hdrlen, data, datalen);
+  tapdev_send();
+}
+/*---------------------------------------------------------------------------*/
+EK_EVENTHANDLER(eventhandler, ev, data)
+{
+  printf("packet-service: event %d\n", ev);
+  switch(ev) {
+  case EK_EVENT_INIT:
+    tapdev_init();
+    break;
+  case EK_EVENT_REQUEST_REPLACE:
+    ek_replace((struct ek_proc *)data, NULL);
+    LOADER_UNLOAD();
+    break;
+  case EK_EVENT_REQUEST_EXIT:
+    ek_exit();
+    LOADER_UNLOAD();
+    break;
+  default:
+    break;
+  }
+}
+/*---------------------------------------------------------------------------*/
+EK_POLLHANDLER(pollhandler)
+{
+}
+/*---------------------------------------------------------------------------*/
diff --git a/contiki-gtk/uip/tapdev.c b/contiki-gtk/uip/tapdev.c
index 9f6ed35..c2c9968 100644
--- a/contiki-gtk/uip/tapdev.c
+++ b/contiki-gtk/uip/tapdev.c
@@ -31,7 +31,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: tapdev.c,v 1.3 2004/06/06 07:07:15 adamdunkels Exp $
+ * $Id: tapdev.c,v 1.4 2004/07/04 21:15:54 adamdunkels Exp $
  */
 
 
@@ -62,6 +62,7 @@
 #include "uip_arp.h"
 
 
+#include "tcpip.h"
 
 #define DROP 0
 
@@ -82,23 +83,22 @@
 {
   int ret;
   
-  ret = read(fd, uip_buf, UIP_BUFSIZE);  
+  ret = read(fd, uip_buf, UIP_BUFSIZE);
+  
   if(ret == -1) {
     perror("tap_dev: tapdev_read: read");
   }
-
+  
   uip_len = ret;
   
   if(BUF->type == htons(UIP_ETHTYPE_IP)) {
     uip_arp_ipin();
     uip_len -= sizeof(struct uip_eth_hdr);
-    uip_input();
+    /*    uip_input();*/
+    tcpip_input();
     /* If the above function invocation resulted in data that
        should be sent out on the network, the global variable
        uip_len is set to a value > 0. */
-    if(uip_len > 0) {
-      uip_split_output();
-    }
   } else if(BUF->type == htons(UIP_ETHTYPE_ARP)) {
     uip_arp_arpin();
     /* If the above function invocation resulted in data that
@@ -122,7 +122,9 @@
        should be sent out on the network, the global variable
        uip_len is set to a value > 0. */
     if(uip_len > 0) {
-      uip_split_output();
+      tcpip_output();
+      /*      uip_split_output();*/
+      /*      tapdev_send();*/
     }
   }
 
@@ -132,7 +134,9 @@
        should be sent out on the network, the global variable
        uip_len is set to a value > 0. */
     if(uip_len > 0) {
-      uip_split_output();
+      /*      uip_split_output(); */
+      /*      tapdev_send();*/
+      tcpip_output();
       }
     }
 
@@ -171,6 +175,7 @@
 
   snprintf(buf, sizeof(buf), "ifconfig tap0 inet 192.168.2.1");
   system(buf);
+  printf("%s\n", buf); 
 
   lasttime = 0;