401 files changed, 2209 insertions, 1692 deletions

diff --git a/.gitignore b/.gitignore
index 3d2c4908..b2c8de0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,13 @@
 *~
 *.swp
-server/stage3.1/
-data/stage3.1/lib/modules/
-stage3.2/
-initramfs
+server/kernel
+server/initramfs
+server/initramfs2
+server/openslx
 src
-build
+build/
 .built
 .fetched_source
 list*
 test
+logs/
diff --git a/data/stage3.1/etc/netconfig b/data/stage3.1/etc/netconfig
deleted file mode 100644
index effc67eb..00000000
--- a/data/stage3.1/etc/netconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# The network configuration file. This file is currently only used in
-# conjunction with the TI-RPC code in the libtirpc library.
-#
-# Entries consist of:
-#
-#       <network_id> <semantics> <flags> <protofamily> <protoname> \
-#               <device> <nametoaddr_libs>
-#
-# The <device> and <nametoaddr_libs> fields are always empty in this
-# implementation.
-#
-udp        tpi_clts      v     inet     udp     -       -
-tcp        tpi_cots_ord  v     inet     tcp     -       -
-udp6       tpi_clts      v     inet6    udp     -       -
-tcp6       tpi_cots_ord  v     inet6    tcp     -       -
-rawip      tpi_raw       -     inet      -      -       -
-local      tpi_cots_ord  -     loopback  -      -       -
-unix       tpi_cots_ord  -     loopback  -      -       -
diff --git a/data/stage3.1/etc/networks b/data/stage3.1/etc/networks
deleted file mode 100644
index c0608214..00000000
--- a/data/stage3.1/etc/networks
+++ /dev/null
@@ -1 +0,0 @@
-link-local            169.254.0.0
diff --git a/data/stage3.1/etc/protocols b/data/stage3.1/etc/protocols
deleted file mode 100644
index 1eac5963..00000000
--- a/data/stage3.1/etc/protocols
+++ /dev/null
@@ -1,54 +0,0 @@
-ip                    0 IP
-icmp                  1 ICMP
-igmp                  2 IGMP
-ggp                   3 GGP
-ipencap               4 IP-ENCAP
-st                    5 ST
-tcp                   6 TCP
-egp                   8 EGP
-igp                   9 IGP
-pup                   12 PUP
-udp                   17 UDP
-hmp                   20 HMP
-xns-idp               22 XNS-IDP
-rdp                   27 RDP
-iso-tp4               29 ISO-TP4
-dccp                  33 DCCP
-xtp                   36 XTP
-ddp                   37 DDP
-idpr-cmtp             38 IDPR-CMTP
-ipv6                  41 IPv6
-ipv6-route            43 IPv6-Route
-ipv6-frag             44 IPv6-Frag
-idrp                  45 IDRP
-rsvp                  46 RSVP
-gre                   47 GRE
-esp                   50 IPSEC-ESP
-ah                    51 IPSEC-AH
-skip                  57 SKIP
-ipv6-icmp             58 IPv6-ICMP
-ipv6-nonxt            59 IPv6-NoNxt
-ipv6-opts             60 IPv6-Opts
-rspf                  73 RSPF CPHB
-vmtp                  81 VMTP
-eigrp                 88 EIGRP
-ospf                  89 OSPFIGP
-ax.25                 93 AX.25
-ipip                  94 IPIP
-etherip               97 ETHERIP
-encap                 98 ENCAP
-pim                   103 PIM
-ipcomp                108 IPCOMP
-vrrp                  112 VRRP
-l2tp                  115 L2TP
-isis                  124 ISIS
-sctp                  132 SCTP
-fc                    133 FC
-mobility-header       135 Mobility-Header
-udplite               136 UDPLite
-mpls-in-ip            137 MPLS-in-IP
-manet                 138
-hip                   139 HIP
-shim6                 140 Shim6
-wesp                  141 WESP
-rohc                  142 ROHC
diff --git a/data/stage3.1/etc/services b/data/stage3.1/etc/services
deleted file mode 100644
index 65869e99..00000000
--- a/data/stage3.1/etc/services
+++ /dev/null
@@ -1,550 +0,0 @@
-tcpmux                1/tcp
-echo                  7/tcp
-echo                  7/udp
-discard               9/tcp sink null
-discard               9/udp sink null
-systat                11/tcp users
-daytime               13/tcp
-daytime               13/udp
-netstat               15/tcp
-qotd                  17/tcp quote
-msp                   18/tcp
-msp                   18/udp
-chargen               19/tcp ttytst source
-chargen               19/udp ttytst source
-ftp-data              20/tcp
-ftp                   21/tcp
-fsp                   21/udp fspd
-ssh                   22/tcp
-ssh                   22/udp
-telnet                23/tcp
-smtp                  25/tcp mail
-time                  37/tcp timserver
-time                  37/udp timserver
-rlp                   39/udp resource
-nameserver            42/tcp name
-whois                 43/tcp nicname
-tacacs                49/tcp
-tacacs                49/udp
-re-mail-ck            50/tcp
-re-mail-ck            50/udp
-domain                53/tcp
-domain                53/udp
-mtp                   57/tcp
-tacacs-ds             65/tcp
-tacacs-ds             65/udp
-bootps                67/tcp
-bootps                67/udp
-bootpc                68/tcp
-bootpc                68/udp
-tftp                  69/udp
-gopher                70/tcp
-gopher                70/udp
-rje                   77/tcp netrjs
-finger                79/tcp
-http                  80/tcp www
-http                  80/udp
-link                  87/tcp ttylink
-kerberos              88/tcp kerberos5 krb5 kerberos-sec
-kerberos              88/udp kerberos5 krb5 kerberos-sec
-supdup                95/tcp
-hostnames             101/tcp hostname
-iso-tsap              102/tcp tsap
-acr-nema              104/tcp dicom
-acr-nema              104/udp dicom
-csnet-ns              105/tcp cso-ns
-csnet-ns              105/udp cso-ns
-rtelnet               107/tcp
-rtelnet               107/udp
-pop2                  109/tcp postoffice pop-2
-pop2                  109/udp pop-2
-pop3                  110/tcp pop-3
-pop3                  110/udp pop-3
-sunrpc                111/tcp portmapper
-sunrpc                111/udp portmapper
-auth                  113/tcp authentication tap ident
-sftp                  115/tcp
-uucp-path             117/tcp
-nntp                  119/tcp readnews untp
-ntp                   123/tcp
-ntp                   123/udp
-pwdgen                129/tcp
-pwdgen                129/udp
-loc-srv               135/tcp epmap
-loc-srv               135/udp epmap
-netbios-ns            137/tcp
-netbios-ns            137/udp
-netbios-dgm           138/tcp
-netbios-dgm           138/udp
-netbios-ssn           139/tcp
-netbios-ssn           139/udp
-imap2                 143/tcp imap
-imap2                 143/udp imap
-snmp                  161/tcp
-snmp                  161/udp
-snmp-trap             162/tcp snmptrap
-snmp-trap             162/udp snmptrap
-cmip-man              163/tcp
-cmip-man              163/udp
-cmip-agent            164/tcp
-cmip-agent            164/udp
-mailq                 174/tcp
-mailq                 174/udp
-xdmcp                 177/tcp
-xdmcp                 177/udp
-nextstep              178/tcp NeXTStep NextStep
-nextstep              178/udp NeXTStep NextStep
-bgp                   179/tcp
-bgp                   179/udp
-prospero              191/tcp
-prospero              191/udp
-irc                   194/tcp
-irc                   194/udp
-smux                  199/tcp
-smux                  199/udp
-at-rtmp               201/tcp
-at-rtmp               201/udp
-at-nbp                202/tcp
-at-nbp                202/udp
-at-echo               204/tcp
-at-echo               204/udp
-at-zis                206/tcp
-at-zis                206/udp
-qmtp                  209/tcp
-qmtp                  209/udp
-z3950                 210/tcp wais
-z3950                 210/udp wais
-ipx                   213/tcp
-ipx                   213/udp
-imap3                 220/tcp
-imap3                 220/udp
-pawserv               345/tcp
-pawserv               345/udp
-zserv                 346/tcp
-zserv                 346/udp
-fatserv               347/tcp
-fatserv               347/udp
-rpc2portmap           369/tcp
-rpc2portmap           369/udp
-codaauth2             370/tcp
-codaauth2             370/udp
-clearcase             371/tcp Clearcase
-clearcase             371/udp Clearcase
-ulistserv             372/tcp
-ulistserv             372/udp
-ldap                  389/tcp
-ldap                  389/udp
-imsp                  406/tcp
-imsp                  406/udp
-svrloc                427/tcp
-svrloc                427/udp
-https                 443/tcp
-https                 443/udp
-snpp                  444/tcp
-snpp                  444/udp
-microsoft-ds          445/tcp
-microsoft-ds          445/udp
-kpasswd               464/tcp
-kpasswd               464/udp
-saft                  487/tcp
-saft                  487/udp
-isakmp                500/tcp
-isakmp                500/udp
-rtsp                  554/tcp
-rtsp                  554/udp
-nqs                   607/tcp
-nqs                   607/udp
-npmp-local            610/tcp dqs313_qmaster
-npmp-local            610/udp dqs313_qmaster
-npmp-gui              611/tcp dqs313_execd
-npmp-gui              611/udp dqs313_execd
-hmmp-ind              612/tcp dqs313_intercell
-hmmp-ind              612/udp dqs313_intercell
-qmqp                  628/tcp
-qmqp                  628/udp
-ipp                   631/tcp
-ipp                   631/udp
-exec                  512/tcp
-biff                  512/udp comsat
-login                 513/tcp
-who                   513/udp whod
-shell                 514/tcp cmd
-syslog                514/udp
-printer               515/tcp spooler
-talk                  517/udp
-ntalk                 518/udp
-route                 520/udp router routed
-timed                 525/udp timeserver
-tempo                 526/tcp newdate
-courier               530/tcp rpc
-conference            531/tcp chat
-netnews               532/tcp readnews
-netwall               533/udp
-gdomap                538/tcp
-gdomap                538/udp
-uucp                  540/tcp uucpd
-klogin                543/tcp
-kshell                544/tcp krcmd
-dhcpv6-client         546/tcp
-dhcpv6-client         546/udp
-dhcpv6-server         547/tcp
-dhcpv6-server         547/udp
-afpovertcp            548/tcp
-afpovertcp            548/udp
-idfp                  549/tcp
-idfp                  549/udp
-remotefs              556/tcp rfs_server rfs
-nntps                 563/tcp snntp
-nntps                 563/udp snntp
-submission            587/tcp
-submission            587/udp
-ldaps                 636/tcp
-ldaps                 636/udp
-tinc                  655/tcp
-tinc                  655/udp
-silc                  706/tcp
-silc                  706/udp
-kerberos-adm          749/tcp
-webster               765/tcp
-webster               765/udp
-rsync                 873/tcp
-rsync                 873/udp
-ftps-data             989/tcp
-ftps                  990/tcp
-telnets               992/tcp
-telnets               992/udp
-imaps                 993/tcp
-imaps                 993/udp
-ircs                  994/tcp
-ircs                  994/udp
-pop3s                 995/tcp
-pop3s                 995/udp
-socks                 1080/tcp
-socks                 1080/udp
-proofd                1093/tcp
-proofd                1093/udp
-rootd                 1094/tcp
-rootd                 1094/udp
-openvpn               1194/tcp
-openvpn               1194/udp
-rmiregistry           1099/tcp
-rmiregistry           1099/udp
-kazaa                 1214/tcp
-kazaa                 1214/udp
-nessus                1241/tcp
-nessus                1241/udp
-lotusnote             1352/tcp lotusnotes
-lotusnote             1352/udp lotusnotes
-ms-sql-s              1433/tcp
-ms-sql-s              1433/udp
-ms-sql-m              1434/tcp
-ms-sql-m              1434/udp
-ingreslock            1524/tcp
-ingreslock            1524/udp
-prospero-np           1525/tcp
-prospero-np           1525/udp
-datametrics           1645/tcp old-radius
-datametrics           1645/udp old-radius
-sa-msg-port           1646/tcp old-radacct
-sa-msg-port           1646/udp old-radacct
-kermit                1649/tcp
-kermit                1649/udp
-groupwise             1677/tcp
-groupwise             1677/udp
-l2f                   1701/tcp l2tp
-l2f                   1701/udp l2tp
-radius                1812/tcp
-radius                1812/udp
-radius-acct           1813/tcp radacct
-radius-acct           1813/udp radacct
-msnp                  1863/tcp
-msnp                  1863/udp
-unix-status           1957/tcp
-log-server            1958/tcp
-remoteping            1959/tcp
-cisco-sccp            2000/tcp
-cisco-sccp            2000/udp
-search                2010/tcp ndtp
-pipe-server           2010/tcp pipe_server
-nfs                   2049/tcp
-nfs                   2049/udp
-gnunet                2086/tcp
-gnunet                2086/udp
-rtcm-sc104            2101/tcp
-rtcm-sc104            2101/udp
-gsigatekeeper         2119/tcp
-gsigatekeeper         2119/udp
-gris                  2135/tcp
-gris                  2135/udp
-cvspserver            2401/tcp
-cvspserver            2401/udp
-venus                 2430/tcp
-venus                 2430/udp
-venus-se              2431/tcp
-venus-se              2431/udp
-codasrv               2432/tcp
-codasrv               2432/udp
-codasrv-se            2433/tcp
-codasrv-se            2433/udp
-mon                   2583/tcp
-mon                   2583/udp
-dict                  2628/tcp
-dict                  2628/udp
-f5-globalsite         2792/tcp
-f5-globalsite         2792/udp
-gsiftp                2811/tcp
-gsiftp                2811/udp
-gpsd                  2947/tcp
-gpsd                  2947/udp
-gds-db                3050/tcp gds_db
-gds-db                3050/udp gds_db
-icpv2                 3130/tcp icp
-icpv2                 3130/udp icp
-mysql                 3306/tcp
-mysql                 3306/udp
-nut                   3493/tcp
-nut                   3493/udp
-distcc                3632/tcp
-distcc                3632/udp
-daap                  3689/tcp
-daap                  3689/udp
-svn                   3690/tcp subversion
-svn                   3690/udp subversion
-suucp                 4031/tcp
-suucp                 4031/udp
-sysrqd                4094/tcp
-sysrqd                4094/udp
-sieve                 4190/tcp
-epmd                  4369/tcp
-epmd                  4369/udp
-remctl                4373/tcp
-remctl                4373/udp
-f5-iquery             4353/tcp
-f5-iquery             4353/udp
-iax                   4569/tcp
-iax                   4569/udp
-mtn                   4691/tcp
-mtn                   4691/udp
-radmin-port           4899/tcp
-radmin-port           4899/udp
-rfe                   5002/udp
-rfe                   5002/tcp
-mmcc                  5050/tcp
-mmcc                  5050/udp
-sip                   5060/tcp
-sip                   5060/udp
-sip-tls               5061/tcp
-sip-tls               5061/udp
-aol                   5190/tcp
-aol                   5190/udp
-xmpp-client           5222/tcp jabber-client
-xmpp-client           5222/udp jabber-client
-xmpp-server           5269/tcp jabber-server
-xmpp-server           5269/udp jabber-server
-cfengine              5308/tcp
-cfengine              5308/udp
-mdns                  5353/tcp
-mdns                  5353/udp
-postgresql            5432/tcp postgres
-postgresql            5432/udp postgres
-freeciv               5556/tcp rptp
-freeciv               5556/udp
-amqp                  5672/tcp
-amqp                  5672/udp
-amqp                  5672/sctp
-ggz                   5688/tcp
-ggz                   5688/udp
-x11                   6000/tcp x11-0
-x11                   6000/udp x11-0
-x11-1                 6001/tcp
-x11-1                 6001/udp
-x11-2                 6002/tcp
-x11-2                 6002/udp
-x11-3                 6003/tcp
-x11-3                 6003/udp
-x11-4                 6004/tcp
-x11-4                 6004/udp
-x11-5                 6005/tcp
-x11-5                 6005/udp
-x11-6                 6006/tcp
-x11-6                 6006/udp
-x11-7                 6007/tcp
-x11-7                 6007/udp
-gnutella-svc          6346/tcp
-gnutella-svc          6346/udp
-gnutella-rtr          6347/tcp
-gnutella-rtr          6347/udp
-sge-qmaster           6444/tcp sge_qmaster
-sge-qmaster           6444/udp sge_qmaster
-sge-execd             6445/tcp sge_execd
-sge-execd             6445/udp sge_execd
-mysql-proxy           6446/tcp
-mysql-proxy           6446/udp
-afs3-fileserver       7000/tcp bbs
-afs3-fileserver       7000/udp bbs
-afs3-callback         7001/tcp
-afs3-callback         7001/udp
-afs3-prserver         7002/tcp
-afs3-prserver         7002/udp
-afs3-vlserver         7003/tcp
-afs3-vlserver         7003/udp
-afs3-kaserver         7004/tcp
-afs3-kaserver         7004/udp
-afs3-volser           7005/tcp
-afs3-volser           7005/udp
-afs3-errors           7006/tcp
-afs3-errors           7006/udp
-afs3-bos              7007/tcp
-afs3-bos              7007/udp
-afs3-update           7008/tcp
-afs3-update           7008/udp
-afs3-rmtsys           7009/tcp
-afs3-rmtsys           7009/udp
-font-service          7100/tcp xfs
-font-service          7100/udp xfs
-http-alt              8080/tcp webcache
-http-alt              8080/udp
-bacula-dir            9101/tcp
-bacula-dir            9101/udp
-bacula-fd             9102/tcp
-bacula-fd             9102/udp
-bacula-sd             9103/tcp
-bacula-sd             9103/udp
-xmms2                 9667/tcp
-xmms2                 9667/udp
-nbd                   10809/tcp
-zabbix-agent          10050/tcp
-zabbix-agent          10050/udp
-zabbix-trapper        10051/tcp
-zabbix-trapper        10051/udp
-amanda                10080/tcp
-amanda                10080/udp
-hkp                   11371/tcp
-hkp                   11371/udp
-bprd                  13720/tcp
-bprd                  13720/udp
-bpdbm                 13721/tcp
-bpdbm                 13721/udp
-bpjava-msvc           13722/tcp
-bpjava-msvc           13722/udp
-vnetd                 13724/tcp
-vnetd                 13724/udp
-bpcd                  13782/tcp
-bpcd                  13782/udp
-vopied                13783/tcp
-vopied                13783/udp
-dcap                  22125/tcp
-gsidcap               22128/tcp
-wnn6                  22273/tcp
-wnn6                  22273/udp
-rtmp                  1/ddp
-nbp                   2/ddp
-echo                  4/ddp
-zip                   6/ddp
-kerberos4             750/udp kerberos-iv kdc
-kerberos4             750/tcp kerberos-iv kdc
-kerberos-master       751/udp kerberos_master
-kerberos-master       751/tcp
-passwd-server         752/udp passwd_server
-krb-prop              754/tcp krb_prop krb5_prop hprop
-krbupdate             760/tcp kreg
-swat                  901/tcp
-kpop                  1109/tcp
-knetd                 2053/tcp
-zephyr-srv            2102/udp
-zephyr-clt            2103/udp
-zephyr-hm             2104/udp
-eklogin               2105/tcp
-kx                    2111/tcp
-iprop                 2121/tcp
-supfilesrv            871/tcp
-supfiledbg            1127/tcp
-linuxconf             98/tcp
-poppassd              106/tcp
-poppassd              106/udp
-ssmtp                 465/tcp smtps
-moira-db              775/tcp moira_db
-moira-update          777/tcp moira_update
-moira-ureg            779/udp moira_ureg
-spamd                 783/tcp
-omirr                 808/tcp omirrd
-omirr                 808/udp omirrd
-customs               1001/tcp
-customs               1001/udp
-skkserv               1178/tcp
-predict               1210/udp
-rmtcfg                1236/tcp
-wipld                 1300/tcp
-xtel                  1313/tcp
-xtelw                 1314/tcp
-support               1529/tcp
-cfinger               2003/tcp
-frox                  2121/tcp
-ninstall              2150/tcp
-ninstall              2150/udp
-zebrasrv              2600/tcp
-zebra                 2601/tcp
-ripd                  2602/tcp
-ripngd                2603/tcp
-ospfd                 2604/tcp
-bgpd                  2605/tcp
-ospf6d                2606/tcp
-ospfapi               2607/tcp
-isisd                 2608/tcp
-afbackup              2988/tcp
-afbackup              2988/udp
-afmbackup             2989/tcp
-afmbackup             2989/udp
-xtell                 4224/tcp
-fax                   4557/tcp
-hylafax               4559/tcp
-distmp3               4600/tcp
-munin                 4949/tcp lrrd
-enbd-cstatd           5051/tcp
-enbd-sstatd           5052/tcp
-pcrd                  5151/tcp
-noclog                5354/tcp
-noclog                5354/udp
-hostmon               5355/tcp
-hostmon               5355/udp
-rplay                 5555/udp
-nrpe                  5666/tcp
-nsca                  5667/tcp
-mrtd                  5674/tcp
-bgpsim                5675/tcp
-canna                 5680/tcp
-sane-port             6566/tcp sane saned
-ircd                  6667/tcp
-zope-ftp              8021/tcp
-tproxy                8081/tcp
-omniorb               8088/tcp
-omniorb               8088/udp
-clc-build-daemon      8990/tcp
-xinetd                9098/tcp
-mandelspawn           9359/udp mandelbrot
-git                   9418/tcp
-zope                  9673/tcp
-webmin                10000/tcp
-kamanda               10081/tcp
-kamanda               10081/udp
-amandaidx             10082/tcp
-amidxtape             10083/tcp
-smsqp                 11201/tcp
-smsqp                 11201/udp
-xpilot                15345/tcp
-xpilot                15345/udp
-sgi-cmsd              17001/udp
-sgi-crsd              17002/udp
-sgi-gcd               17003/udp
-sgi-cad               17004/tcp
-isdnlog               20011/tcp
-isdnlog               20011/udp
-vboxd                 20012/tcp
-vboxd                 20012/udp
-binkp                 24554/tcp
-asp                   27374/tcp
-asp                   27374/udp
-csync2                30865/tcp
-dircproxy             57000/tcp
-tfido                 60177/tcp
-fido                  60179/tcp
diff --git a/data/stage3.1/lib b/data/stage3.1/lib
deleted file mode 120000
index f760dc2b..00000000
--- a/data/stage3.1/lib
+++ /dev/null
@@ -1 +0,0 @@
-openslx/lib
\ No newline at end of file
diff --git a/data/stage3.1/openslx/lib/firmware/3com/3C359.bin b/data/stage3.1/openslx/lib/firmware/3com/3C359.bin
deleted file mode 100644
index b132989c..00000000
--- a/data/stage3.1/openslx/lib/firmware/3com/3C359.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/3com/typhoon.bin b/data/stage3.1/openslx/lib/firmware/3com/typhoon.bin
deleted file mode 100644
index 81d1294c..00000000
--- a/data/stage3.1/openslx/lib/firmware/3com/typhoon.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/RTL8192E/boot.img b/data/stage3.1/openslx/lib/firmware/RTL8192E/boot.img
deleted file mode 100644
index 16998bb5..00000000
--- a/data/stage3.1/openslx/lib/firmware/RTL8192E/boot.img
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/RTL8192E/data.img b/data/stage3.1/openslx/lib/firmware/RTL8192E/data.img
deleted file mode 100644
index 4cabc4af..00000000
--- a/data/stage3.1/openslx/lib/firmware/RTL8192E/data.img
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/RTL8192E/main.img b/data/stage3.1/openslx/lib/firmware/RTL8192E/main.img
deleted file mode 100644
index 7703afdf..00000000
--- a/data/stage3.1/openslx/lib/firmware/RTL8192E/main.img
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw.bin b/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw.bin
deleted file mode 100644
index 87644cb8..00000000
--- a/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw492.bin b/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw492.bin
deleted file mode 100644
index f2a837fb..00000000
--- a/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw492.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw74.bin b/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw74.bin
deleted file mode 100644
index 7bcc9dfa..00000000
--- a/data/stage3.1/openslx/lib/firmware/RTL8192SE/rtl8192sfw74.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/e100/d101m_ucode.bin b/data/stage3.1/openslx/lib/firmware/e100/d101m_ucode.bin
deleted file mode 100644
index b700b759..00000000
--- a/data/stage3.1/openslx/lib/firmware/e100/d101m_ucode.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/e100/d101s_ucode.bin b/data/stage3.1/openslx/lib/firmware/e100/d101s_ucode.bin
deleted file mode 100644
index d869e060..00000000
--- a/data/stage3.1/openslx/lib/firmware/e100/d101s_ucode.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/e100/d102e_ucode.bin b/data/stage3.1/openslx/lib/firmware/e100/d102e_ucode.bin
deleted file mode 100644
index 3cfc65b6..00000000
--- a/data/stage3.1/openslx/lib/firmware/e100/d102e_ucode.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/matrox/g200_warp.fw b/data/stage3.1/openslx/lib/firmware/matrox/g200_warp.fw
deleted file mode 100644
index 2c7f7fec..00000000
--- a/data/stage3.1/openslx/lib/firmware/matrox/g200_warp.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/matrox/g400_warp.fw b/data/stage3.1/openslx/lib/firmware/matrox/g400_warp.fw
deleted file mode 100644
index 57f1088e..00000000
--- a/data/stage3.1/openslx/lib/firmware/matrox/g400_warp.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/r128/r128_cce.bin b/data/stage3.1/openslx/lib/firmware/r128/r128_cce.bin
deleted file mode 100644
index 18b00b7b..00000000
--- a/data/stage3.1/openslx/lib/firmware/r128/r128_cce.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/BARTS_mc.bin b/data/stage3.1/openslx/lib/firmware/radeon/BARTS_mc.bin
deleted file mode 100644
index 5ba95683..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/BARTS_mc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/BARTS_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/BARTS_me.bin
deleted file mode 100644
index 439cefc2..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/BARTS_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/BARTS_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/BARTS_pfp.bin
deleted file mode 100644
index 2377f176..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/BARTS_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/BTC_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/BTC_rlc.bin
deleted file mode 100644
index 93e8c401..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/BTC_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_mc.bin b/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_mc.bin
deleted file mode 100644
index 5ba95683..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_mc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_me.bin
deleted file mode 100644
index 439cefc2..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_pfp.bin
deleted file mode 100644
index f417d5c6..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CAICOS_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_mc.bin b/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_mc.bin
deleted file mode 100644
index f3839f09..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_mc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_me.bin
deleted file mode 100644
index 07f8dc3a..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_pfp.bin
deleted file mode 100644
index 2e49c4f0..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_rlc.bin
deleted file mode 100644
index 2ba672fb..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CAYMAN_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_me.bin
deleted file mode 100644
index a5268062..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_pfp.bin
deleted file mode 100644
index f9b82639..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_rlc.bin
deleted file mode 100644
index 1358c7a1..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CEDAR_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_me.bin
deleted file mode 100644
index fd6cc24e..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_pfp.bin
deleted file mode 100644
index b1629574..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_rlc.bin
deleted file mode 100644
index 1358c7a1..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/CYPRESS_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_me.bin
deleted file mode 100644
index fd6cc24e..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_pfp.bin
deleted file mode 100644
index b1629574..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_rlc.bin
deleted file mode 100644
index 1358c7a1..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/JUNIPER_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/PALM_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/PALM_me.bin
deleted file mode 100644
index a03030f8..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/PALM_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/PALM_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/PALM_pfp.bin
deleted file mode 100644
index 94d779f7..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/PALM_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R100_cp.bin b/data/stage3.1/openslx/lib/firmware/radeon/R100_cp.bin
deleted file mode 100644
index f1e8a112..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R100_cp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R200_cp.bin b/data/stage3.1/openslx/lib/firmware/radeon/R200_cp.bin
deleted file mode 100644
index 8ac88c62..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R200_cp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R300_cp.bin b/data/stage3.1/openslx/lib/firmware/radeon/R300_cp.bin
deleted file mode 100644
index b1b11007..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R300_cp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R420_cp.bin b/data/stage3.1/openslx/lib/firmware/radeon/R420_cp.bin
deleted file mode 100644
index bfeff601..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R420_cp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R520_cp.bin b/data/stage3.1/openslx/lib/firmware/radeon/R520_cp.bin
deleted file mode 100644
index 1c93ca90..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R520_cp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R600_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/R600_me.bin
deleted file mode 100644
index 39396852..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R600_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R600_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/R600_pfp.bin
deleted file mode 100644
index b1b2e951..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R600_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R600_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/R600_rlc.bin
deleted file mode 100644
index 4b023f3e..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R600_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/R700_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/R700_rlc.bin
deleted file mode 100644
index 280568f9..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/R700_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_me.bin
deleted file mode 100644
index 3208c8e6..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_pfp.bin
deleted file mode 100644
index f9b82639..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_rlc.bin
deleted file mode 100644
index 1358c7a1..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/REDWOOD_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RS600_cp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RS600_cp.bin
deleted file mode 100644
index 171ecac1..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RS600_cp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RS690_cp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RS690_cp.bin
deleted file mode 100644
index 38f11b40..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RS690_cp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RS780_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RS780_me.bin
deleted file mode 100644
index 67292bf1..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RS780_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RS780_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RS780_pfp.bin
deleted file mode 100644
index 7d89878b..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RS780_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV610_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV610_me.bin
deleted file mode 100644
index 66d265c4..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV610_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV610_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV610_pfp.bin
deleted file mode 100644
index 18c3546d..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV610_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV620_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV620_me.bin
deleted file mode 100644
index 66d265c4..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV620_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV620_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV620_pfp.bin
deleted file mode 100644
index 18c3546d..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV620_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV630_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV630_me.bin
deleted file mode 100644
index 9ded7573..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV630_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV630_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV630_pfp.bin
deleted file mode 100644
index 18c3546d..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV630_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV635_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV635_me.bin
deleted file mode 100644
index 9ded7573..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV635_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV635_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV635_pfp.bin
deleted file mode 100644
index 18c3546d..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV635_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV670_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV670_me.bin
deleted file mode 100644
index 109b675b..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV670_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV670_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV670_pfp.bin
deleted file mode 100644
index 18c3546d..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV670_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV710_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV710_me.bin
deleted file mode 100644
index da259e05..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV710_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV710_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV710_pfp.bin
deleted file mode 100644
index 925b36db..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV710_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV730_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV730_me.bin
deleted file mode 100644
index 09b8eae0..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV730_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV730_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV730_pfp.bin
deleted file mode 100644
index 925b36db..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV730_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV770_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV770_me.bin
deleted file mode 100644
index ae8c8d98..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV770_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/RV770_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/RV770_pfp.bin
deleted file mode 100644
index e835372d..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/RV770_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/SUMO2_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/SUMO2_me.bin
deleted file mode 100644
index 0072308b..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/SUMO2_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/SUMO2_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/SUMO2_pfp.bin
deleted file mode 100644
index 73690ba6..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/SUMO2_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/SUMO_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/SUMO_me.bin
deleted file mode 100644
index 0072308b..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/SUMO_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/SUMO_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/SUMO_pfp.bin
deleted file mode 100644
index b3bcb64b..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/SUMO_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/SUMO_rlc.bin b/data/stage3.1/openslx/lib/firmware/radeon/SUMO_rlc.bin
deleted file mode 100644
index a7762731..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/SUMO_rlc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/TURKS_mc.bin b/data/stage3.1/openslx/lib/firmware/radeon/TURKS_mc.bin
deleted file mode 100644
index 5ba95683..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/TURKS_mc.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/TURKS_me.bin b/data/stage3.1/openslx/lib/firmware/radeon/TURKS_me.bin
deleted file mode 100644
index 439cefc2..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/TURKS_me.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/radeon/TURKS_pfp.bin b/data/stage3.1/openslx/lib/firmware/radeon/TURKS_pfp.bin
deleted file mode 100644
index 5d9a63a7..00000000
--- a/data/stage3.1/openslx/lib/firmware/radeon/TURKS_pfp.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8105e-1.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8105e-1.fw
deleted file mode 100644
index 4c2cbd0e..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8105e-1.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168d-1.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168d-1.fw
deleted file mode 100644
index 99e002de..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168d-1.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168d-2.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168d-2.fw
deleted file mode 100644
index 7022ab0a..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168d-2.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-1.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-1.fw
deleted file mode 100644
index d203bd5d..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-1.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-2.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-2.fw
deleted file mode 100644
index 7ea5984c..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-2.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-3.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-3.fw
deleted file mode 100644
index 0f888a32..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168e-3.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168f-1.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168f-1.fw
deleted file mode 100644
index 41822b54..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168f-1.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168f-2.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168f-2.fw
deleted file mode 100644
index c3424929..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8168f-2.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8402-1.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8402-1.fw
deleted file mode 100644
index 82fa35d7..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8402-1.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8411-1.fw b/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8411-1.fw
deleted file mode 100644
index 1bd9e7cd..00000000
--- a/data/stage3.1/openslx/lib/firmware/rtl_nic/rtl8411-1.fw
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/tigon/tg3.bin b/data/stage3.1/openslx/lib/firmware/tigon/tg3.bin
deleted file mode 100644
index 0b8ae5ae..00000000
--- a/data/stage3.1/openslx/lib/firmware/tigon/tg3.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/tigon/tg3_tso.bin b/data/stage3.1/openslx/lib/firmware/tigon/tg3_tso.bin
deleted file mode 100644
index 3c481c92..00000000
--- a/data/stage3.1/openslx/lib/firmware/tigon/tg3_tso.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/firmware/tigon/tg3_tso5.bin b/data/stage3.1/openslx/lib/firmware/tigon/tg3_tso5.bin
deleted file mode 100644
index fb77f0ff..00000000
--- a/data/stage3.1/openslx/lib/firmware/tigon/tg3_tso5.bin
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/ld-2.15.so b/data/stage3.1/openslx/lib/i386-linux-gnu/ld-2.15.so
deleted file mode 100755
index d2306d9b..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/ld-2.15.so
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/libc-2.15.so b/data/stage3.1/openslx/lib/i386-linux-gnu/libc-2.15.so
deleted file mode 100755
index 8c11121e..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/libc-2.15.so
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/libc.so.6 b/data/stage3.1/openslx/lib/i386-linux-gnu/libc.so.6
deleted file mode 120000
index a8f42ce3..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/libc.so.6
+++ /dev/null
@@ -1 +0,0 @@
-libc-2.15.so
\ No newline at end of file
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/libdbus-1.so.3 b/data/stage3.1/openslx/lib/i386-linux-gnu/libdbus-1.so.3
deleted file mode 100644
index 14354c09..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/libdbus-1.so.3
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/libdl.so.2 b/data/stage3.1/openslx/lib/i386-linux-gnu/libdl.so.2
deleted file mode 100644
index 01235729..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/libdl.so.2
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/libpthread.so.0 b/data/stage3.1/openslx/lib/i386-linux-gnu/libpthread.so.0
deleted file mode 100755
index a4bfc228..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/libpthread.so.0
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/librt.so.1 b/data/stage3.1/openslx/lib/i386-linux-gnu/librt.so.1
deleted file mode 100644
index 4d3d88ad..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/librt.so.1
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/i386-linux-gnu/libtirpc.so.1 b/data/stage3.1/openslx/lib/i386-linux-gnu/libtirpc.so.1
deleted file mode 100644
index a1590656..00000000
--- a/data/stage3.1/openslx/lib/i386-linux-gnu/libtirpc.so.1
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/ld-linux.so.2 b/data/stage3.1/openslx/lib/ld-linux.so.2
deleted file mode 120000
index 2e367466..00000000
--- a/data/stage3.1/openslx/lib/ld-linux.so.2
+++ /dev/null
@@ -1 +0,0 @@
-i386-linux-gnu/ld-2.15.so
\ No newline at end of file
diff --git a/data/stage3.1/openslx/lib/libgssglue.so.1 b/data/stage3.1/openslx/lib/libgssglue.so.1
deleted file mode 100644
index 6bdfe13a..00000000
--- a/data/stage3.1/openslx/lib/libgssglue.so.1
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/libhal.so.1 b/data/stage3.1/openslx/lib/libhal.so.1
deleted file mode 100644
index a4a4a9f9..00000000
--- a/data/stage3.1/openslx/lib/libhal.so.1
+++ /dev/null
diff --git a/data/stage3.1/openslx/lib/libhd.so.16 b/data/stage3.1/openslx/lib/libhd.so.16
deleted file mode 100644
index c7764846..00000000
--- a/data/stage3.1/openslx/lib/libhd.so.16
+++ /dev/null
diff --git a/data/stage3.1/sbin/hwinfo b/data/stage3.1/sbin/hwinfo
deleted file mode 100755
index cd3cc22f..00000000
--- a/data/stage3.1/sbin/hwinfo
+++ /dev/null
diff --git a/data/stage3.1/sbin/mount.nfs b/data/stage3.1/sbin/mount.nfs
deleted file mode 100755
index c764652e..00000000
--- a/data/stage3.1/sbin/mount.nfs
+++ /dev/null
diff --git a/data/stage3.1/sbin/mount.nfs4 b/data/stage3.1/sbin/mount.nfs4
deleted file mode 100755
index c764652e..00000000
--- a/data/stage3.1/sbin/mount.nfs4
+++ /dev/null
diff --git a/data/stage3.1/sbin/umount.nfs b/data/stage3.1/sbin/umount.nfs
deleted file mode 100755
index c764652e..00000000
--- a/data/stage3.1/sbin/umount.nfs
+++ /dev/null
diff --git a/data/stage3.1/sbin/umount.nfs4 b/data/stage3.1/sbin/umount.nfs4
deleted file mode 100755
index c764652e..00000000
--- a/data/stage3.1/sbin/umount.nfs4
+++ /dev/null
diff --git a/helper/binutil.inc b/helper/binutil.inc
index 35e35015..b34230de 100644
--- a/helper/binutil.inc
+++ b/helper/binutil.inc
@@ -17,6 +17,8 @@ BLACKLIST="ld-linux linux-gate linux-vdso libc.so"
 LOCALSEARCH=0
 LOCALSEARCHDIR=""
 
+CURRENT_BLACKLIST=$(echo ${BLACKLIST} | sed 's/ /\\|/g')
+
 get_dynamic_dependencies() {
 	
 	if [ "x$1" == "x-l" ]; then
@@ -38,20 +40,22 @@ get_dynamic_dependencies() {
 		local LDD_OUT="ldd_output"
 		if ldd $BINARY > $LDD_OUT; then
 			# Case 1: dynamic
-			for LIB in $(cat $LDD_OUT | grep -v $(echo $BLACKLIST|sed 's/ /\\|/g') | awk '{print $1 $2 $3}'); do
+			for LIB in $(cat $LDD_OUT | grep -v "${CURRENT_BLACKLIST}" | awk '{print $1 $2 $3}'); do
 				# split the entry into an array, ex:
 				# libm.so.6 => /lib/libm.so.6 would be split into:
 				# liblink[0]   liblink[1]
 				local liblink=(${LIB//=>/ })
 				lib_search
 			done
-			rm $LDD_OUT
 		else
 			# Case 2: not a dynamic
 			pdebug "$BINARY not a dynamic, skipping."
+			rm -f $LDD_OUT
 			continue
 		fi	
+		rm -f $LDD_OUT
 	done
+
 }
 
 lib_search(){
@@ -66,7 +70,8 @@ lib_search(){
         		for llib in ${LOCAL_MATCHES}; do
 	        	        pdebug "\t\tFound locally, copying ${LOCALSEARCHDIR}/${llib}"
 				get_link_chain "${LOCALSEARCHDIR}"/"${llib}" "${LOCALSEARCHDIR}"
-				
+				get_dynamic_dependencies -l "${LOCALSEARCHDIR}" "${llib}"
+				CURRENT_BLACKLIST+="\|${liblink[0]}"
 	                done
 			# found the libs, we are done
 			return
@@ -79,6 +84,7 @@ lib_search(){
 		pdebug "\t\tNot found locally but in system, copying ${liblink[1]}"
 		# get chain of symlink for that lib
                 get_link_chain ${liblink[1]}
+		CURRENT_BLACKLIST+="\|${liblink[1]}"
         else
                 pwarning "\t\tLib '${liblink[0]}' from required dir '$ENTRY' neither found in build directory nor on this system."
                 pwarning "\t\tIf this lib is not supplied by another module, this module will probably fail in your final system"
@@ -104,7 +110,7 @@ get_link_chain() {
 	if [ $# == 2 ] ; then
 		[ ! -d $2 ] && perror "get_link_chain: $2 is not a directory."
 		# got a prefix
-		local PREFIX=$2
+		local PREFIX=$(readlink -f $2)
 	else
 		# mark prefix as not set
 		local PREFIX="notset"
@@ -157,3 +163,12 @@ get_link_chain() {
 	done
 	pdebug "\t\tCHAIN: $CHAIN"
 }
+
+# Function to get libc and ld-linux
+list_basic_libs() {
+        for i in $(ldd ${SHELL})
+        do
+                [ $(echo $i | grep '^/' | grep -c ld) -eq 1 -o  $(echo $i | grep '^/' | grep -c libc.so) -eq 1 ] && get_link_chain $i
+        done
+}
+
diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index 63173258..19c9dd93 100644
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -23,6 +23,7 @@ tarcopy () {
 	local SHORT=$FROM
 	[ ${#SHORT} -gt 23 ] && SHORT=$(echo "$SHORT" | cut -c-18)...$(echo "$SHORT" | cut -c$[${#SHORT} - 4]-)
 	[ -z "$TO" ] && perror "tarcopy called with empty destination."
+	[ ! -d "$TO" ] && { mkdir -p "$TO" || perror "could not create destination "$TO" for tar-copy."; } 
 	tar -cp $FROM | tar -xp -C "$TO"
 	local PS=(${PIPESTATUS[*]})
 	[ "x${PS[0]}" != "x0" ] && perror "packing-part of tar-copy from '$SHORT' to '$TO' failed. (${PS[0]})"
@@ -31,7 +32,7 @@ tarcopy () {
 
 # get all files of required packages by a module
 list_packet_files() {
-	[ -z "$REQUIRED_PACKAGES" ] && return
+	[ -z "$REQUIRED_PACKAGES" ] && pinfo "No required packages for $TOOL"  && return 1
 	for PACKAGE in $REQUIRED_PACKAGES; do
 		local FILES=""
 		if [ "$PACKET_MANAGER" = "apt" ]; then
@@ -44,15 +45,16 @@ list_packet_files() {
 		#FILES=$(echo "$FILES" | sed 's/^\(.*\):###:[0-9]*$/\1/g')
 		local LPRET=$(echo "$FILES" | awk -F ':###:' '{printf $2}')
 		FILES=$(echo "$FILES" | awk -F ':###:' '{print $1}')
-		[ "x$LPRET" != "x0" ] && perror "list_packet_files exited with code '$LPRET' for packet ${PACKAGE}."
-		[ -z "$FILES" ] && perror "list_packet_files empty for packet ${PACKAGE}."
+		[ "x$LPRET" != "x0" ] && pwarning "dpkg/rpm exited with code '$LPRET' for packet ${PACKAGE}."
+		[ -z "$FILES" ] && pwarning "list_packet_files empty for packet ${PACKAGE}."
 		for FILE in $FILES; do
 			[ ! -d "$FILE" ] && echo "$FILE"
 		done
 	done
 }
-
+#
 # install all dependencies of a module
+# goes through all package as given in the variable REQUIRED_DEPENDENCIES
 install_dependencies() {
 	[ -z "$REQUIRED_DEPENDENCIES" ] && return
 	if [ "$PACKET_MANAGER" = "apt" ]; then
@@ -61,4 +63,40 @@ install_dependencies() {
 		zypper install -n $REQUIRED_DEPENDENCIES || perror "Could not zypper install $REQUIRED_DEPENDENCIES"
 	fi
 }
+#
+# copies static data files from <MODULE>/data/ to <TARGET_BUILD_DIR>
+#
+copy_static_data() {
+	[ ! -d "${MODULE_DIR}/data" ] && pinfo "${MODULE} has no static 'data' directory." && return
+	cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR} || perror "Could not copy static data of ${MODULE}"
+}
+
 
+######################################################################################################################
+#
+# generate initramfs of directory
+# usage:
+#	generate_initramfs <target_filename> <source_dir>
+#
+generate_initramfs() {
+	[ $# -ne 2 ] && perror "Sanity check failed: generate_initramfs needs exactly two params, but $# were given."
+        cd "$2" || perror "Cannot cd to '$2'"
+        find . | cpio --format="newc" --create | gzip -9 > "${MODULE_DIR}/$1"
+        local PS=(${PIPESTATUS[*]})
+        [ "x${PS[0]}" != "x0" ] && perror "'find .' in '$(pwd)' failed."
+        [ "x${PS[1]}" != "x0" ] && perror "cpio create failed."
+        [ "x${PS[2]}" != "x0" ] && perror "gzip to '${MODULE_DIR}/$1' failed."
+        cd -
+        pinfo "Created initramfs of $2 at ${MODULE_DIR}/$1"
+}
+
+# generates squashfs of directory
+# usage:
+#	generate_squashfs <target_filename> <source_dir>
+generate_squashfs() {
+	[ $# -ne 2 ] && perror "Sanity check failed: generate_squashfs needs exactly two params, but $# were given."
+	[ -d $2 ] || perror "$2 is not a directory."
+	mksquashfs "$2" "${MODULE_DIR}/$1" -comp xz -b 1M -no-recovery >&6 \
+	        || perror "mksquashfs failed ($?)."
+	pinfo "Created squashfs of $2 at ${MODULE_DIR}/$1"
+}
diff --git a/helper/logging.inc b/helper/logging.inc
index 42906e1e..eb20775c 100644
--- a/helper/logging.inc
+++ b/helper/logging.inc
@@ -19,7 +19,7 @@ set_quiet () {
 }
 
 unset_quiet () {
-	if [ "x$MLTK_QUIET" = "x1" ]; then
+	if [ "x$MLTK_QUIET" == "x1" ]; then
 		exec 1>&6 6>&-
 		exec 2>&7 7>&-
 		exec 6>&2
diff --git a/helper/system.inc b/helper/system.inc
new file mode 100644
index 00000000..1245687b
--- /dev/null
+++ b/helper/system.inc
@@ -0,0 +1,10 @@
+# Helper to determine various system information
+
+#
+# determine architecture triplet from the path of libc needed by the executing shell.
+ARCH_TRIPLET=$(ldd $SHELL|grep libc | awk -F "/" '{print $3}')
+[ ! -z $ARCH_TRIPLET ] || pwarning "Could not determine arch triplet."
+
+# determine kernel version
+KERNEL_VERSION=$(uname -r)
+[ ! -z $KERNEL_VERSION ] || pwarning "Could not determine kernel version."
diff --git a/helper/useradd.inc b/helper/useradd.inc
index bcbb25b2..3f54a24a 100644
--- a/helper/useradd.inc
+++ b/helper/useradd.inc
@@ -58,7 +58,7 @@ generate_gid()
 }
 
 add_user() {
-	[ -z "${INIT_DIR}" ] && perror "add_user: INIT_DIR not set"
+	[ -z "${TARGET_BUILD_DIR}" ] && perror "add_user: TARGET_BUILD_DIR not set"
 	if [ -z $USER -a $# -eq 0 ]
 	then
 		pwarning " ** add_user usage **"
@@ -67,9 +67,9 @@ add_user() {
 		pwarning "USER=<username> [GROUP=<groupname>] [USERID=<userid>] [GROUPID=<groupid>] [USERHOME=<homedir>] [USERSHELL=<shell>] [PASSWORD=<pass>] add_user"
 		perror "Aborting, please fix your script."
 	fi
-	local _PASSWD=${INIT_DIR}/etc/passwd
-	local _GROUP=${INIT_DIR}/etc/group
-	local _SHADOW=${INIT_DIR}/etc/shadow
+	local _PASSWD=${TARGET_BUILD_DIR}/etc/passwd
+	local _GROUP=${TARGET_BUILD_DIR}/etc/group
+	local _SHADOW=${TARGET_BUILD_DIR}/etc/shadow
 	init_users_and_groups
 	[ ! -f "${_PASSWD}" ] && perror "add_user: password file does not exist in target system. (build base first)"
 	[ ! -f "${_GROUP}" ] && perror "add_user: group file does not exist in target system. (build base first)"
@@ -154,10 +154,10 @@ add_user() {
 
 add_group () {
 	[ $# -lt 1 ] && perror "add_group called without argument."
-	[ -z "${INIT_DIR}" ] && perror "add_group: INIT_DIR not set"
-	local _PASSWD=${INIT_DIR}/etc/passwd
-	local _GROUP=${INIT_DIR}/etc/group
-	local _SHADOW=${INIT_DIR}/etc/shadow
+	[ -z "${TARGET_BUILD_DIR}" ] && perror "add_group: TARGET_BUILD_DIR not set"
+	local _PASSWD=${TARGET_BUILD_DIR}/etc/passwd
+	local _GROUP=${TARGET_BUILD_DIR}/etc/group
+	local _SHADOW=${TARGET_BUILD_DIR}/etc/shadow
 	init_users_and_groups
 	[ ! -f "${_GROUP}" ] && perror "add_user: group file does not exist in target system. (build base first)"
 	local GROUP=$1
@@ -183,10 +183,10 @@ add_group () {
 }
 
 init_users_and_groups() {
-	[ -z "${INIT_DIR}" ] && perror "Almost wrecked your local passwd, group and shadow file. phew."
-        local PASSWD=${INIT_DIR}/etc/passwd
-        local GROUP=${INIT_DIR}/etc/group
-        local SHADOW=${INIT_DIR}/etc/shadow
+	[ -z "${TARGET_BUILD_DIR}" ] && perror "Almost wrecked your local passwd, group and shadow file. phew."
+        local PASSWD=${TARGET_BUILD_DIR}/etc/passwd
+        local GROUP=${TARGET_BUILD_DIR}/etc/group
+        local SHADOW=${TARGET_BUILD_DIR}/etc/shadow
 	[ -s "${PASSWD}" -a -s "${GROUP}" -a -s "${SHADOW}" ] && return
 	pinfo "Creating users and groups based on local system...."
 	cp "/etc/passwd" "$PASSWD"
diff --git a/mltk b/mltk
index 3e399bd4..f5d72906 100755
--- a/mltk
+++ b/mltk
@@ -31,8 +31,8 @@ qnd_exit() {
 . "${ROOT_DIR}/helper/downloader.inc"
 . "${ROOT_DIR}/helper/fileutil.inc"
 . "${ROOT_DIR}/helper/binutil.inc"
+. "${ROOT_DIR}/helper/system.inc"
 
-pinfo "System's packet manager is $PACKET_MANAGER"
 
 banner () {
 	echo -e "\033[38;5;202m\t           __   __   __    "
@@ -47,31 +47,34 @@ banner () {
 
 print_usage() {
 	echo "Toolkit for creating preboot mini-linux for OpenSLX NG (mltk)"
-	echo "Usage: $(basename ${SELF}) tools [-d] [-c [module]*] [-b [module]*] [-p profile]"
-	echo "       $(basename ${SELF}) core [-d] [-c] [-b]"
+	echo "Usage: $(basename ${SELF}) remote target_dir [-d] [-c [module]*] [-b [module]*] [-p profile]"
+	echo "       $(basename ${SELF}) server [-d] [-c] [-b] [-n]"
 	echo -e ""
-	echo -e "  Target:"
-	echo -e "     core \t minimal initramfs (stage 3.1) to mount the system-container (stage 3.2)."
-	echo -e "     tools \t minimal systemd-based rootfs including basic tools (required for core)."
+	echo -e "  Mode:"
+	echo -e "     server \t server mode: packs stage3.1 and stage3.2 as initramfs/squashfs."
+	echo -e "     remote \t remote mode: builds a minimal systemd-based rootfs based on the activated modules in <target_dir>"
 	echo -e ""
-	echo -e "  Target options:"
-	echo -e "     -b            build target"
-	echo -e "     -c            clean target"
+	echo -e "  Mode options:"
+	echo -e "     -b            build module(s)."
+	echo -e "     -c            clean module(s)."
 	echo -e "     -d            activates debug output for current target"
 	echo -e "     -p profile    build all modules from given profile"
+	echo -e "     -n 	    don't generate squashfs from stage 3.2"
 	echo -e ""
-	echo -e "  For target 'tools', you can pass names of specific modules to clean/build."
+	echo -e "  In mode 'remote', you can pass names of specific modules to clean/build."
 	echo -e "  Otherwise, all modules will be built/cleaned."
 	echo -e ""
 	echo -e "  Examples:"
-	echo -e "     tools -c -b base policykit sshd   (clean all tools, build base, policykit and sshd)"
-	echo -e "     tools -c -b   (clean all tools, build all tools)"
-	echo -e "     tools -c base sshd -b sshd ldm -d   (clean base and sshd, build sshd and ldm, be verbose)"
-	echo -e "     tools -c -p default   (clean all tools, build modules listed in profile default)"
-	echo -e "     core -c -b   (clean and build core)"
+	echo -e "     remote stage3.1 -b   (build all the modules activated (linked) in remote/stage3.1 in remote/build/stage3.1"
+	echo -e "     remote stage3.1 -b plymouth    (build plymouth in remote/build/stage3.1)"
+	echo -e "     remote stage3.2 -c -b base policykit sshd   (clean all modules, build base, policykit and sshd in remote/build/stage3.2)"
+	echo -e "     remote stage3.2 -c -b   (clean all modules, build all modules in remote/build/stage3.2)"
+	echo -e "     remote stage3.2 -c base sshd -b sshd ldm -d   (clean base and sshd, build sshd and ldm, be verbose)"
+	echo -e "     remote stage3.2 -c -p default   (clean all modules, build modules listed in profile default)"
+	echo -e "     server -c -b   (clean and build the initramfs archives under /server/build)"
 	echo -e ""
-	echo -e "  Existing modules for tools are:"
-	echo -e "    $(echo $(ls ${ROOT_DIR}/remote/tools))"
+	echo -e "  Existing modules for remote are:"
+	echo -e "    $(echo $(ls ${ROOT_DIR}/remote/modules))"
 }
 
 initial_checks() {
@@ -81,13 +84,14 @@ initial_checks() {
 	else
 		banner
 	fi
+	# print system information
+	pinfo "Arch triplet of this machine: $ARCH_TRIPLET"
+	pinfo "Kernel version: $KERNEL_VERSION"
+	pinfo "System's packet manager is $PACKET_MANAGER"
 	
 	# setup_tools and build_core
-	BUILD_CORE="${ROOT_DIR}/server/build_core"
-	SETUP_TOOLS="${ROOT_DIR}/remote/setup_tools"
-
-	[ ! -e "${BUILD_CORE}" ] && perror "Missing script build_core, re-clone. Exiting."
-	[ ! -e "${SETUP_TOOLS}" ] && perror "Missing script setup_tools, re-clone. Exiting."
+	SETUP_TARGET="${ROOT_DIR}/remote/setup_target"
+	[ ! -e "${SETUP_TARGET}" ] && perror "Missing script 'remote/setup_target', re-clone git. Exiting."
 }
 
 read_params() {
@@ -95,19 +99,30 @@ read_params() {
 	local SUBMODE=""
 	# select target: core or tools
 	case "$1" in
-		core)
-			MODE="CORE"
+		server)
+			MODE="SERVER"
 			;;
-		tools)
-			MODE="TOOLS"
+		remote)
+			MODE="REMOTE"
 			;;
 		*)
-			pwarning "Unknown target: $1"
+			pwarning "Unknown mode: $1"
 			print_usage
 			exit 1
 			;;
 	esac
 	shift
+
+	# set the global TARGET if in remote mode.
+	if [[ $MODE == REMOTE ]]; then
+		if [[ $1 != "-"* ]]; then
+			TARGET=$1
+			shift
+		else
+			perror "Remote mode requires a target directory. None given."
+		fi
+	fi
+
 	# handle rest of arguments
 	while [ "$#" -gt "0" ]; do
 		local PARAM="$1"
@@ -128,14 +143,19 @@ read_params() {
 					;;
 				-p)
 					[ "$#" -lt "1" ] && perror "Missing argument to -p"
-					[ "$MODE" != "TOOLS" ] && perror "-p can only be used for target tools"
+					[ "$MODE" != "REMOTE" ] && perror "-p can only be used in remote mode"
 					. "remote/profiles/${1}.profile" || perror "Profile '$1' not found in remote/profiles/"
-					TOOLS_BUILD="1"
-					TOOLS_LIST_BUILD="$TOOLS_LIST_BUILD $MODULES"
+					REMOTE_BUILD="1"
+					REMOTE_LIST_BUILD="$REMOTE_LIST_BUILD $MODULES"
 					unset MODULES
 					shift
 					continue
 					;;
+				-n)						
+					[ "$MODE" != "SERVER" ] && perror "-n can only be used in server mode"
+					SERVER_NO_SQUASHFS="1"
+					continue
+					;;
 				*)
 					pwarning "Unknown flag to target: $PARAM"
 					print_usage
@@ -147,44 +167,40 @@ read_params() {
 		fi
 
 		# module name
-		[[ $MODE != TOOLS ]] && pwarning "You cannot specify module names for target CORE." && print_usage && exit 1
-		[[ $SUBMODE != CLEAN && $SUBMODE != BUILD ]] && pwarning "Module name given for --tools, but no action specified (eg. build)" && print_usage && exit 1
+		[[ $MODE != REMOTE ]] && pwarning "You cannot specify module names in server mode." && print_usage && exit 1
+		[[ $SUBMODE != CLEAN && $SUBMODE != BUILD ]] && pwarning "Module name given in remote mode, but no action specified (eg. build)" && print_usage && exit 1
 		eval "${MODE}_LIST_${SUBMODE}=\"\$${MODE}_LIST_${SUBMODE} \$PARAM\""
 	done
-
-	#pinfo "tools clean: $TOOLS_CLEAN -$TOOLS_LIST_CLEAN"
-	#pinfo "tools build: $TOOLS_BUILD -$TOOLS_LIST_BUILD"
-	#pinfo "core clean: $CORE_CLEAN"
-	#pinfo "core build: $CORE_BUILD"
-
+	
 	# exit if no command
-	[[ $CORE_CLEAN == 0 && $CORE_BUILD == 0 && $TOOLS_CLEAN == 0 && $TOOLS_BUILD == 0 ]] && print_usage && exit 1
+	[[ $SERVER_CLEAN == 0 && $SERVER_BUILD == 0 && $REMOTE_CLEAN == 0 && $REMOTE_BUILD == 0 ]] && print_usage && exit 1
 }
 
 run() {
-	if [[ $TOOLS_CLEAN == 1 || $TOOLS_BUILD == 1 ]]; then
-		[[ $TOOLS_DEBUG == 1 ]] && unset_quiet || set_quiet
-		. "${SETUP_TOOLS}" || perror "Cannot source ${SETUP_TOOLS}"
-	        [[ $TOOLS_CLEAN == 1 ]] && clean_tools $TOOLS_LIST_CLEAN
-	        [[ $TOOLS_BUILD == 1 ]] && generate_stage32 $TOOLS_LIST_BUILD
+	if [[ $REMOTE_CLEAN == 1 || $REMOTE_BUILD == 1 ]]; then
+		[[ $REMOTE_DEBUG == 1 ]] && unset_quiet || set_quiet
+		. "${SETUP_TARGET}" || perror "Cannot source ${SETUP_TARGET}"
+	        [[ $REMOTE_CLEAN == 1 ]] && clean_modules $REMOTE_LIST_CLEAN
+	        [[ $REMOTE_BUILD == 1 ]] && generate_target $REMOTE_LIST_BUILD
 	fi
-	if [[ $CORE_CLEAN == 1 || $CORE_BUILD == 1 ]]; then
-		[[ $CORE_DEBUG == 1 ]] && unset_quiet || set_quiet
+	if [[ $SERVER_CLEAN == 1 || $SERVER_BUILD == 1 ]]; then
+		[[ $SERVER_DEBUG == 1 ]] && unset_quiet || set_quiet
 		local TOOL_STR="[CORE]"
-		. "${BUILD_CORE}" || perror "Cannot source ${BUILD_CORE}"
-	        [[ $CORE_CLEAN == 1 ]] && clean_core
-	        [[ $CORE_BUILD == 1 ]] && generate_stage31
+		. "${SETUP_CORE}" || perror "Cannot source ${SETUP_CORE}"
+	        [[ $SERVER_CLEAN == 1 ]] && clean_core
+	        [[ $SERVER_BUILD == 1 ]] && generate_stage31
 	fi
 }
 
-CORE_DEBUG="0"
-CORE_BUILD="0"
-CORE_CLEAN="0"
-TOOLS_DEBUG="0"
-TOOLS_CLEAN="0"
-TOOLS_BUILD="0"
-TOOLS_LIST_CLEAN=""
-TOOLS_LIST_BUILD=""
+SERVER_DEBUG="0"
+SERVER_BUILD="0"
+SERVER_CLEAN="0"
+SERVER_NO_SQUASHFS="0"
+REMOTE_DEBUG="0"
+REMOTE_CLEAN="0"
+REMOTE_BUILD="0"
+REMOTE_LIST_CLEAN=""
+REMOTE_LIST_BUILD=""
 
 initial_checks
 read_params $@
diff --git a/remote/.gitignore b/remote/.gitignore
index eadce58a..78cfb992 100644
--- a/remote/.gitignore
+++ b/remote/.gitignore
@@ -1,2 +1,5 @@
 complete_file_list
 stage32.log
+stage31_firmware_list
+stage31_modules_list
+builds/
diff --git a/remote/modules/busybox/busybox.build b/remote/modules/busybox/busybox.build
new file mode 100644
index 00000000..bc2adc64
--- /dev/null
+++ b/remote/modules/busybox/busybox.build
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+fetch_source()
+{
+	[ ! -d src ] && mkdir src
+	if [ ! -e .fetched_source ]; then
+		git clone "${GIT}" src
+		touch .fetched_source
+	fi
+}
+
+build()
+{
+	if [ ! -e .built ]; then
+		cd src
+		pinfo "Running make"
+		make -j5 || perror "failed."
+		pinfo "Running make install"
+		make CONFIG_PREFIX="${MODULE_DIR}"/build/"${PREFIX}" install || perror "failed"
+		cd -
+		touch .built
+	fi
+}
+
+post_copy() {
+	:
+}
diff --git a/remote/modules/busybox/busybox.conf b/remote/modules/busybox/busybox.conf
new file mode 100644
index 00000000..f7c866f2
--- /dev/null
+++ b/remote/modules/busybox/busybox.conf
@@ -0,0 +1,6 @@
+GIT=git://git.openslx.org/openslx/tools/busybox
+PREFIX="/openslx"
+REQUIRED_BINARIES="	busybox"
+REQUIRED_DIRECTORIES="	${PREFIX}/bin
+			${PREFIX}/sbin
+			${PREFIX}/usr"
diff --git a/remote/modules/consolekit/consolekit.build b/remote/modules/consolekit/consolekit.build
new file mode 100644
index 00000000..ac31f9ed
--- /dev/null
+++ b/remote/modules/consolekit/consolekit.build
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+fetch_source() {
+	pinfo "Extracting from running system..."
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+
+        list_packet_files >> "${COPYLIST}"
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+	
+}
+post_copy() {
+	mkdir -p "${TARGET_BUILD_DIR}/usr/lib/ConsoleKit/run-seat.d"
+	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-seat.d"
+	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-session.d"
+	mkdir -p "${TARGET_BUILD_DIR}/var/log/ConsoleKit"
+}
diff --git a/remote/modules/consolekit/consolekit.conf b/remote/modules/consolekit/consolekit.conf
new file mode 100644
index 00000000..38f1718f
--- /dev/null
+++ b/remote/modules/consolekit/consolekit.conf
@@ -0,0 +1,11 @@
+REQUIRED_PACKAGES="consolekit"
+REQUIRED_BINARIES="	ck-history
+			ck-launch-session
+			ck-list-sessions
+			ck-log-system-start
+			ck-log-system-restart
+			ck-log-system-stop
+			console-kit-daemon"
+REQUIRED_DIRECTORIES="	/usr/lib/ConsoleKit /etc /lib/systemd/system"
+REQUIRED_FILES="	/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
+			/usr/share/polkit-1/actions/org.freedesktop.consolekit.policy"
diff --git a/remote/modules/dbus/dbus.build b/remote/modules/dbus/dbus.build
new file mode 100644
index 00000000..31c75fc9
--- /dev/null
+++ b/remote/modules/dbus/dbus.build
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+fetch_source() {
+	echo "Extracting from running system..."
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+
+        list_packet_files >> "${COPYLIST}"
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+
+}
+post_copy() {
+
+	# quick fix to get the unit files from the package
+	# moved them from lib/systemd to usr/lib/systemd
+	cd "${BUILDDIR}"
+	tarcopy lib/systemd "${TARGET_BUILD_DIR}"/usr
+	cd - &> /dev/null
+}
diff --git a/remote/tools/dbus/dbus.conf b/remote/modules/dbus/dbus.conf
index a8c97d9c..a8c97d9c 100644
--- a/remote/tools/dbus/dbus.conf
+++ b/remote/modules/dbus/dbus.conf
diff --git a/remote/tools/dbus/dbus.conf.zypper b/remote/modules/dbus/dbus.conf.zypper
index db7183c5..db7183c5 100644
--- a/remote/tools/dbus/dbus.conf.zypper
+++ b/remote/modules/dbus/dbus.conf.zypper
diff --git a/remote/modules/debug/debug.build b/remote/modules/debug/debug.build
new file mode 100644
index 00000000..e791d347
--- /dev/null
+++ b/remote/modules/debug/debug.build
@@ -0,0 +1,19 @@
+fetch_source() {
+	:
+}
+
+build() {
+
+	for BIN in $REQUIRED_BINARIES; do
+		BIN_LOCATION=$(which ${BIN})
+		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ]; then
+			tarcopy "$(get_link_chain ${BIN_LOCATION})" "${MODULE_BUILD_DIR}"
+		else
+			pwarning "'${BIN}' not found on the system."
+		fi
+	done
+}
+
+post_copy() {
+	:
+}
diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf
new file mode 100644
index 00000000..3eb13363
--- /dev/null
+++ b/remote/modules/debug/debug.conf
@@ -0,0 +1,2 @@
+REQUIRED_BINARIES="	strace
+			ldd"
diff --git a/remote/modules/hwinfo/hwinfo.build b/remote/modules/hwinfo/hwinfo.build
new file mode 100644
index 00000000..b2012a22
--- /dev/null
+++ b/remote/modules/hwinfo/hwinfo.build
@@ -0,0 +1,26 @@
+fetch_source() {
+	[ ! -d "${MODULE_DIR}/src" ] && mkdir -p "${MODULE_DIR}/src"
+	cd "${MODULE_DIR}/src"
+        git clone git://gitorious.org/opensuse/hwinfo.git
+	git clone git://gitorious.org/x86emu/libx86emu.git
+	cd - &> /dev/null
+}
+
+build() {
+	pdebug "Installing libx86emu in ${MODULE_DIR}/build..."
+	cd "${MODULE_DIR}/src/libx86emu"
+	EXTRA_FLAGS="-I${MODULE_DIR}/src/libx86emu/include" make || perror "libx86emu: make failed."
+	DESTDIR="${MODULE_DIR}"/build make install || perror "libx86emu: make install failed."
+	cd - &> /dev/null	
+
+	pdebug "Installing hwinfo in ${MODULE_DIR}/build..."
+	cd "${MODULE_DIR}/src/hwinfo"
+	make || perror "hwinfo: make failed."
+	DESTDIR="${MODULE_DIR}/build" make install || perror "hwinfo: make install failed."
+	cd - &> /dev/null
+
+}
+
+post_copy() {
+	:
+}
diff --git a/remote/modules/hwinfo/hwinfo.conf b/remote/modules/hwinfo/hwinfo.conf
new file mode 100644
index 00000000..af5783a2
--- /dev/null
+++ b/remote/modules/hwinfo/hwinfo.conf
@@ -0,0 +1 @@
+REQUIRED_BINARIES="	hwinfo"
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
new file mode 100644
index 00000000..88f478ea
--- /dev/null
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -0,0 +1,35 @@
+[General]
+PidFile=/var/run/kdm.pid
+ServerVTs=-7
+
+[X-*-Greeter]
+UseTheme=true
+Theme=/usr/share/desktop/themes/kdm/uni
+UseBackground=false
+GreetString=OpenSLX Workstation (%h)
+SelectedUsers=
+UserList=false
+
+[X-:*-Greeter]
+AllowClose=false
+UseAdminSession=true
+
+[X-:0-Core]
+AllowRootLogin=true
+AllowShutdown=All
+AutoLoginEnable=false
+Reset=/etc/kde4/kdm/Xreset
+ServerAttempts=2
+Session=/etc/kde4/kdm/Xsession
+SessionsDirs=/etc/X11/session,/usr/share/xsessions,/usr/share/apps/kdm/sessions
+#Setup=/etc/kde4/kdm/Xsetup
+Startup=/etc/kde4/kdm/Xstartup
+
+[X-:0-Greeter]
+LogSource=/dev/xconsole
+PreselectUser=None
+UseAdminSession=false
+
+[xdmcp]
+Enable=false
+
diff --git a/remote/modules/kdm/data/etc/systemd/system/display-manager.service b/remote/modules/kdm/data/etc/systemd/system/display-manager.service
new file mode 120000
index 00000000..640910e3
--- /dev/null
+++ b/remote/modules/kdm/data/etc/systemd/system/display-manager.service
@@ -0,0 +1 @@
+kdm.service
\ No newline at end of file
diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service
new file mode 100644
index 00000000..14ff7457
--- /dev/null
+++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=KDM Display Manager
+Conflicts=getty@tty7.service
+After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop
new file mode 100644
index 00000000..36242be4
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.xml
+Name=Uni KDM theme
+Description=Uni Theme based on Daemonic KDM theme for FreeBSD
+Author=aceph <aceph@ventcore.net> and modified by MJanc
+Copyright=Creative Commons
+Screenshot=screenshot.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png
new file mode 100644
index 00000000..c2e998e5
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png
new file mode 100644
index 00000000..b646e851
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png
new file mode 100644
index 00000000..e12cfb8e
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png
new file mode 100644
index 00000000..b9682822
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png
new file mode 100644
index 00000000..fde2787d
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png
new file mode 100644
index 00000000..d48b2b63
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png
new file mode 100644
index 00000000..00d05f29
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png
new file mode 100644
index 00000000..86bbe642
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png
new file mode 100644
index 00000000..f7b9e71f
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png
new file mode 100644
index 00000000..c3e1719b
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml
new file mode 100644
index 00000000..ab64ecfb
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<!--
+KDM-Uni-Theme
+-->
+<greeter id="theme">
+    <style font="Sans 11" window-text-color="#f0f0f0" base-color="#f0f0f0" text-color="#000000"/>
+
+    <!-- background -->
+	<item type="pixmap" id="background" background="true">
+		<normal file="color.png"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+	</item>
+
+    <!-- top / welcome, clock and big logo -->
+	<item type="rect" id="top" background="true">
+		<normal color="#000000" alpha="0.0"/>
+		<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
+		<box orientation="vertical" homogeneous="true">
+
+        		<item type="pixmap" background="true">
+        			<normal file="welcome-time-shadowed.png"/>
+        			<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
+	        		<box orientation="horizontal" homogeneous="true">
+                			<!-- Welcome on ... -->
+	        			<item type="label" background="true">
+	        				<pos anchor="w" x="10%" y="30%"/>
+	        				<normal color="#f0f0f0" font="Sans 11"/>
+	        				<stock type="welcome-label"/>
+	        			</item>
+	        			<!-- clock -->
+	        			<item type="label" id="clock">
+	        				<pos anchor="e" x="90%" y="30%"/>
+	        				<normal color="#f0f0f0" font="Sans 11"/>
+	        				<text>%c</text>
+	        			</item>
+	        		</box>
+	        	</item>
+
+        		<item type="rect" id="logo">
+        			<normal color="#000000" alpha="0.0"/>
+        			<pos anchor="c" x="50%" y="10%" width="100%" height="100%"/>
+        			<box orientation="vertical" homogeneous="true">
+        				<item type="pixmap">
+        					<normal file="uni-logo.png"/>
+        					<pos anchor="c" x="50%" y="50%"/>
+        				</item>
+        			</box>
+	        	</item>
+
+		</box>
+	</item>
+
+    <!-- main part / login, session, menu, ... -->
+	<item type="pixmap" id="main-runner" background="true">
+		<normal file="main-runner.png"/>
+		<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
+		<box orientation="horizontal" homogeneous="true">
+
+			<item type="rect" background="true">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="w" x="0%" y="50%" width="100%" height="100%"/>
+				<box orientation="horizontal" homogeneous="true">
+
+                    <!-- left part / login -->
+					<item type="rect" background="true">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="w" x="0" y="50%" width="100%" height="100%"/>
+						<box orientation="horizontal">
+
+                            <!-- small logo -->
+							<item type="pixmap" background="true">
+								<normal file="rz-logo.png"/>
+								<pos anchor="w" x="30" y="50%"/>
+							</item>
+
+                            <!-- login -->
+							<item type="rect">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="w" x="70" y="50%" width="box" height="box"/>
+								<box orientation="horizontal" spacing="10">
+
+									<item type="rect">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="sw" x="0" y="100%" width="box" height="100%"/>
+										<box homogeneous="true" spacing="10">
+											<!-- username-label -->
+											<item type="label">
+												<pos anchor="nw" x="0" y="0"/>
+												<normal color="#f0f0f0" font="Sans 11"/>
+												<stock type="username-label"/>
+											</item>
+											<!-- password-label -->
+											<item type="label">
+												<pos anchor="sw" x="0" y="-0"/>
+												<normal color="#f0f0f0" font="Sans 11"/>
+												<stock type="password-label"/>
+											</item>
+										</box>
+									</item>
+
+                                    <item type="rect">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="nw" x="0" y="0" width="box" height="box"/>
+										<box homogeneous="true" spacing="10">
+											<!-- username-entry -->
+											<item type="entry" id="user-entry">
+												<pos anchor="w" x="0" y="50%" height="20" width="100"/>
+											</item>
+											<!-- password-entry -->
+											<item type="entry" id="pw-entry">
+												<pos anchor="w" x="0" y="50%" height="20" width="100"/>
+											</item>
+										</box>
+                                    </item>
+ 
+                                    <item type="pixmap" button="true" id="login_button">
+                                        <pos anchor="sw" x="0" y="-0" height="20" width="20"/>
+                                        <normal file="enter_inactive.png"/>
+                                        <prelight file="enter.png"/>
+                                    </item>
+
+								</box>
+							</item>
+
+                        </box>
+					</item>
+
+                    <!-- middle part / errors, caps info, kdm logo -->
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="c" x="50%" y="50%" width="90%" height="100%"/>
+                                                <box orientation="vertical">
+
+                            <!-- Login-Error -->
+							<item type="rect">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="n" x="50%" y="10" width="100%" height="30"/>
+								<box>
+									<item type="label" id="pam-error">
+										<normal color="#ff8b00" font="Sans 11"/>
+										<pos anchor="c" x="50%" y="15"/>
+										<text/>
+									</item>
+								</box>
+							</item>
+
+							<item type="pixmap">
+								<normal file="environment.png"/>
+								<pos anchor="c" x="50%" y="50%"/>
+							</item>
+ 
+                            <!-- capslock-warning -->
+                            <item type="rect" id="caps-lock-warning">
+								<normal color="#000000" alpha="0.4"/>
+								<pos anchor="s" x="50%" y="-10" width="100%" height="30"/>
+								<box>
+									<item type="label">
+										<normal color="#ff8b00" font="Sans 11"/>
+										<pos anchor="c" x="50%" y="15"/>
+										<stock type="caps-lock-warning"/>
+									</item>			
+								</box>
+							</item>
+
+						</box>
+					</item>
+ 
+                    <!-- right part / sessions, menu -->
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="e" x="100%" y="50%" width="100%" height="100%"/>
+						<box orientation="vertical" homogeneous="true" spacing="10">
+
+							<!-- session-button -->
+							<item type="rect" id="session_button" button="true">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="se" x="-50" y="100%" width="box" height="box"/>
+								<box orientation="horizontal">
+									<item type="label">
+										<normal color="#bbbbbb" font="Sans 11"/>
+										<prelight color="#f0f0f0" font="Sans 11"/>
+										<active color="#ff8b00" font="Sans 11"/>
+										<pos anchor="e" x="100%" y="-24"/>
+										<stock type="session"/>
+									</item>
+									<item type="rect" id="session_button" button="true">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="c" x="50%" y="50%" width="10"/>
+									</item>
+									<item type="pixmap" id="session_button" button="true">
+										<normal file="sessions_inactive.png"/>
+										<prelight file="sessions.png"/>
+										<pos anchor="se" x="100%" y="100%"/>
+									</item>
+								</box>
+							</item>
+                                                
+                            <!-- menu-button -->
+							<item type="rect" id="system_button" button="true">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="ne" x="-50" y="0" width="box" height="box"/>
+								<box orientation="horizontal">
+									<item type="label">
+										<normal color="#bbbbbb" font="Sans 11"/>
+										<prelight color="#f0f0f0" font="Sans 11"/>
+										<active color="#ff8b00" font="Sans 11"/>
+										<pos anchor="e" x="100%" y="24"/>
+										<stock type="system"/>
+									</item>
+									<item type="rect" id="system_button" button="true">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="c" x="50%" y="50%" width="10"/>
+									</item>
+									<item type="pixmap" id="system_button" button="true">
+										<normal file="system_inactive.png"/>
+										<prelight file="system.png"/>
+										<pos anchor="ne" x="100%" y="0%"/>
+									</item>
+								</box>
+							</item>
+                                              
+                        </box>
+					</item>
+
+				</box>
+			</item>
+                      
+        </box>
+	</item>
+
+</greeter>
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png
new file mode 100644
index 00000000..45cef30e
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png
new file mode 100644
index 00000000..f9f34c5c
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png
diff --git a/remote/modules/kdm/data/usr/share/xsessions/default.desktop b/remote/modules/kdm/data/usr/share/xsessions/default.desktop
new file mode 100755
index 00000000..c6a0f825
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/xsessions/default.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=virtual machine chooser (default)
+Name[de]=Virtuelle Maschine auswählen
+Comment=This session starts the vm session chooser
+Comment[de]=Diese Sitzung startet das Auswahlmenü für die vorhandenen Sitzungen
+Exec=/openslx/bin/vmchooser
+TryExec=/openslx/bin/vmchooser
+Icon=
+Type=Application
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build
new file mode 100644
index 00000000..3a924380
--- /dev/null
+++ b/remote/modules/kdm/kdm.build
@@ -0,0 +1,33 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+	
+
+fetch_source () {
+        pinfo "Extracting from running system..."
+}	
+
+build () {
+        COPYLIST="list_dpkg_output"
+        [ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+
+        list_packet_files >> "${COPYLIST}"
+        tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+}
+
+post_copy() {
+	#create static kdm folders in stage3.2
+	mkdir -p ${TARGET_BUILD_DIR}/var/lib/kdm
+	mkdir -p ${TARGET_BUILD_DIR}/var/run/kdm 
+
+	
+	#copy required icons
+	tarcopy "/usr/share/icons/oxygen/16x16/actions/system-reboot.png
+		/usr/share/icons/oxygen/16x16/actions/system-shutdown.png
+		/usr/share/icons/oxygen/16x16/actions/dialog-cancel.png
+		/usr/share/icons/oxygen/index.theme
+		/usr/share/kde4/apps/kdm/pics/shutdown.png
+		/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+		/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
+		/usr/share/icons/default/index.theme" ${TARGET_BUILD_DIR}
+	gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/oxygen/" || perror "update-icon-cache-3.0 failed."
+}
+
diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/kdm.conf
new file mode 100644
index 00000000..85f4ae66
--- /dev/null
+++ b/remote/modules/kdm/kdm.conf
@@ -0,0 +1,15 @@
+REQUIRED_DEPENDENCIES="kdm"
+REQUIRED_PACKAGES="kdm kde-workspace-kgreet-plugins"
+REQUIRED_BINARIES=""
+REQUIRED_DIRECTORIES="	/etc/dbus-1
+			/etc/pam.d
+			/etc/logrotate.d
+			/etc/insserv.conf.d
+			/etc/kde4/kdm
+			/usr/lib/kde4
+			/usr/share/dbus-1
+			/usr/share/polkit-1
+			/usr/share/kde4/services
+			/usr/bin"
+REQUIRED_FILES=""
+REQUIRED_LIBRARIES=""
diff --git a/remote/tools/ldm-gtk-greeter/data/etc/fonts/fonts.conf b/remote/modules/ldm-gtk-greeter/data/etc/fonts/fonts.conf
index 5eb6afe1..5eb6afe1 100644
--- a/remote/tools/ldm-gtk-greeter/data/etc/fonts/fonts.conf
+++ b/remote/modules/ldm-gtk-greeter/data/etc/fonts/fonts.conf
diff --git a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf
index 50e5700b..50e5700b 100644
--- a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf
diff --git a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf
index 6cb2090c..6cb2090c 100644
--- a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf
+++ b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png b/remote/modules/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png
index b9e7b65a..b9e7b65a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf
index c0142fea..c0142fea 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf
index 12e4c7df..12e4c7df 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf
index 8d3e8676..8d3e8676 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf
index 7b7ac7dd..7b7ac7dd 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf
index e36de452..e36de452 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
index 45a038ba..45a038ba 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf
index 6f819f69..6f819f69 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf
index 7bd66657..7bd66657 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf
index 6c5b8ba0..6c5b8ba0 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf
index fdd309d7..fdd309d7 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf
index 18f81a29..18f81a29 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png
index de87c0b0..de87c0b0 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme
index 1c812195..1c812195 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg
index d6347d3c..d6347d3c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg
index e7882163..e7882163 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc
index d49aaf7d..d49aaf7d 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc
index ededd768..ededd768 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc
index 3f08b2e7..3f08b2e7 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc
index 7455cb7c..7455cb7c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc
index 4478befd..4478befd 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc
index 403991d8..403991d8 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png
index 459c8016..459c8016 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png
index fa6c44fb..fa6c44fb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png
index fa6c44fb..fa6c44fb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png
index 1766ef39..1766ef39 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png
index 3e8b9740..3e8b9740 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png
index 2fe0720a..2fe0720a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png
index e20f66b9..e20f66b9 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png
index fa7f3cf1..fa7f3cf1 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png
index fa68e6ba..fa68e6ba 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png
index d46ec888..d46ec888 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png
index d6aea289..d6aea289 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png
index 7fbcc146..7fbcc146 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png
index 8810e14f..8810e14f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png
index b309d8db..b309d8db 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png
index df63d807..df63d807 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png
index eea4adc7..eea4adc7 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc
index 1f5fd663..1f5fd663 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc
index 177b3bf8..177b3bf8 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc
index dc7d7798..dc7d7798 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css
index 37da3e12..37da3e12 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css
index 9efad7f3..9efad7f3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css
index 4b765831..4b765831 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css
index 3cfc7dcb..3cfc7dcb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png
index c8019d19..c8019d19 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png
index 69642719..69642719 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png
index dcb07eba..dcb07eba 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png
index 048d8b41..048d8b41 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png
index eea519f6..eea519f6 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png
index 6a9d409a..6a9d409a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css
index 1daf4833..1daf4833 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css
index 8c28389c..8c28389c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini
index ab8f3b00..ab8f3b00 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme
index 105dee69..105dee69 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png
index 9ef84eaf..9ef84eaf 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png
index 9ef84eaf..9ef84eaf 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png
index 9e09161a..9e09161a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png
index 04431b94..04431b94 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png
index 9be481d6..9be481d6 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png
index 63004d48..63004d48 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png
index 6732780f..6732780f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png
index c5f120f3..c5f120f3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png
index d3833110..d3833110 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png
index d3833110..d3833110 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png
index fc97526f..fc97526f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png
index 2e667f27..2e667f27 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png
index 6a9fd7fe..6a9fd7fe 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png
index 274c1831..274c1831 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png
index fc97526f..fc97526f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png
index 378d4a77..378d4a77 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png
index 7d2fff78..7d2fff78 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png
index efd98ccd..efd98ccd 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml
index cb2cb5f3..cb2cb5f3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png
index c15844e3..c15844e3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png
index c15844e3..c15844e3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png
index 96c0492a..96c0492a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png
index c8b69ee2..c8b69ee2 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png
index a1f34902..a1f34902 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png
index ab03287b..ab03287b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png
index 96c0492a..96c0492a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png
index c8b69ee2..c8b69ee2 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png
index 0c462416..0c462416 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png
index bbb3a0c4..bbb3a0c4 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png
index 90bca45b..90bca45b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png
index 44170155..44170155 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png
index 44170155..44170155 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png
index 2d79bf56..2d79bf56 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png
index dff681fc..dff681fc 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png
index f2c85846..f2c85846 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png
index a5c7093a..a5c7093a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png
index 2d79bf56..2d79bf56 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png
index dff681fc..dff681fc 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png
index 72e3b9cb..72e3b9cb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png
index 72e3b9cb..72e3b9cb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png
index 5768c54c..5768c54c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png
index 590a7c31..590a7c31 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png
index 03eb5a69..03eb5a69 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png
index 6e5ec3d9..6e5ec3d9 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png
index d8c52f10..d8c52f10 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png
index ae1d896b..ae1d896b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png
index ae1d896b..ae1d896b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png
index af33732b..af33732b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png
index 4e07a0cb..4e07a0cb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png
index 7a67f2fe..7a67f2fe 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png
index 3601d729..3601d729 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png
index c70e49bb..c70e49bb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png
index c5d7d21c..c5d7d21c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png
index c5d7d21c..c5d7d21c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png
index 6aa77c07..6aa77c07 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png
index 13b1b064..13b1b064 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png
index ab9cfa82..ab9cfa82 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png
index 6aa77c07..6aa77c07 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png
index 13b1b064..13b1b064 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png
index 45e915ef..45e915ef 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png
index 45e915ef..45e915ef 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png
index 8c9d888f..8c9d888f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png
index 240b9249..240b9249 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png
index d06a8452..d06a8452 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png
index 8c9d888f..8c9d888f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png
index 240b9249..240b9249 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png
diff --git a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
new file mode 100644
index 00000000..7f02e281
--- /dev/null
+++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
@@ -0,0 +1,39 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+
+fetch_source () {
+	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
+	touch .fetched_source
+}	
+
+build () {
+	if [ ! -e .built ]; then
+		cd "src/$VERSION"
+		pinfo "Running configure"
+		./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
+		pinfo "Running make"
+		make || perror "failed."
+		pinfo "Running make install"
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed."
+		
+		COPYLIST="list_dpkg_output"
+		[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+		list_packet_files >> "$COPYLIST"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+		cd -
+		touch .built
+
+	fi
+}
+
+post_copy() {
+	gdk-pixbuf-query-loaders > "${TARGET_BUILD_DIR}/usr/lib/${ARCH_TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
+	mkdir -p "${TARGET_BUILD_DIR}/etc/pango" || perror "Making etc/pango failed."
+	pango-querymodules > "${TARGET_BUILD_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed."
+	gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed."
+	update-mime-database "${TARGET_BUILD_DIR}/usr/share/mime" || perror "update-mime-database failed."
+	mkdir -p "${TARGET_BUILD_DIR}/var/lib"
+	cp -r "/var/lib/polkit-1" "${TARGET_BUILD_DIR}/var/lib/" || perror "Copying -r /var/lib/polkit-1 to '${TARGET_BUILD_DIR}/var/lib/' failed."
+}
+
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
index 800e5f79..58d189b7 100644
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf
+++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
@@ -1,9 +1,9 @@
 VERSION=lightdm-gtk-greeter-1.3.1
 URL=https://launchpad.net/lightdm-gtk-greeter/1.4/1.3.1/+download/lightdm-gtk-greeter-1.3.1.tar.gz
 REQUIRED_DEPENDENCIES="gtk+-3.0 liblightdm-gobject-1-dev libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
-REQUIRED_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard policykit-1"
+REQUIRED_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
 REQUIRED_BINARIES="lightdm-gtk-greeter"
-REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /usr/share/icons /usr/share/themes /etc /usr/bin /usr/share/polkit-1 /usr/share/dbus-1"
+REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /usr/share/icons /usr/share/themes /etc /usr/bin"
 REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
 REQUIRED_MODULES="ldm"
 
diff --git a/remote/tools/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service b/remote/modules/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
index c7aaa65a..c7aaa65a 120000
--- a/remote/tools/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
+++ b/remote/modules/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
diff --git a/remote/tools/ldm/data/etc/systemd/system/lightdm.service b/remote/modules/ldm/data/etc/systemd/system/lightdm.service
index 99911bff..99911bff 100644
--- a/remote/tools/ldm/data/etc/systemd/system/lightdm.service
+++ b/remote/modules/ldm/data/etc/systemd/system/lightdm.service
diff --git a/remote/modules/ldm/ldm.build b/remote/modules/ldm/ldm.build
new file mode 100644
index 00000000..0e73148c
--- /dev/null
+++ b/remote/modules/ldm/ldm.build
@@ -0,0 +1,38 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+
+fetch_source () {
+	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
+	touch .fetched_source
+}	
+
+build () {
+	if [ ! -e .built ]; then
+		cd "src/$VERSION"
+		pinfo "Running configure"
+		./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
+		pinfo "Running make"
+		make || perror "failed."
+		pinfo "Running make install"
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed."
+		
+		COPYLIST="list_dpkg_output"
+
+		[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+		list_packet_files >> "$COPYLIST"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+		cd -
+		touch .built
+	fi
+}
+
+post_copy() {
+	mkdir -p "${TARGET_BUILD_DIR}/var/lib/lightdm"
+	touch "${TARGET_BUILD_DIR}/var/lib/lightdm/.Xauthority" || perror "Cannot touch '${TARGET_BUILD_DIR}/var/lib/lightdm/.Xauthority'"
+	local LDMUID=$(add_user "lightdm")
+	local LDMGID=$(add_group "lightdm")
+	pinfo "lightdm user and group is $LDMUID $LDMGID"
+	chown -R "${LDMUID}:${LDMGID}" "${TARGET_BUILD_DIR}/var/lib/lightdm/" || perror "chowning '${TARGET_BUILD_DIR}/var/lib/lightdm/' failed."
+}
+
diff --git a/remote/tools/ldm/ldm.conf b/remote/modules/ldm/ldm.conf
index d40aab7f..d40aab7f 100644
--- a/remote/tools/ldm/ldm.conf
+++ b/remote/modules/ldm/ldm.conf
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-halt.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-halt.service
index d01ba9b8..d01ba9b8 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-halt.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-halt.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-kexec.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-kexec.service
index 1fe6e47f..1fe6e47f 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-kexec.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-kexec.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-poweroff.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-poweroff.service
index 49742f6e..49742f6e 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-poweroff.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-poweroff.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit-wait.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit-wait.service
index 56af45a7..56af45a7 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit-wait.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit-wait.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit.service
index be3c1888..be3c1888 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-read-write.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-read-write.service
index caa3973b..caa3973b 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-read-write.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-read-write.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-reboot.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-reboot.service
index dbedd00d..dbedd00d 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-reboot.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-reboot.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-start.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-start.service
index 09243001..09243001 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-start.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-start.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path
index c2ee4206..c2ee4206 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path
+++ b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path
diff --git a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service
index aa9ffc21..aa9ffc21 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/default.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth
index bc669108..8499e451 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/default.plymouth
+++ b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth
@@ -4,5 +4,5 @@ Description=Uni-Freiburg simple blue-ish theme with simple progress bar
 ModuleName=script
 
 [script]
-ImageDir=/lib/plymouth/themes/unifr-rz
-ScriptFile=/lib/plymouth/themes/unifr-rz/unifr-rz.script
+ImageDir=/share/plymouth/themes/unifr-rz
+ScriptFile=/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png
index 9cb68040..9cb68040 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png
index 16b069cc..16b069cc 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
index 0f300f6b..0f300f6b 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script
index f2d8bd28..f2d8bd28 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png
index 4fd4be30..4fd4be30 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png
diff --git a/remote/modules/plymouth/plymouth.build b/remote/modules/plymouth/plymouth.build
new file mode 100644
index 00000000..fbaa428a
--- /dev/null
+++ b/remote/modules/plymouth/plymouth.build
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+fetch_source() {
+	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
+	touch .fetched_source
+}
+
+build() {
+	if [ ! -e .built ]; then
+		cd src/$VERSION
+		pinfo "Running configure" 
+		./configure --enable-systemd-integration --disable-gtk --disable-static --prefix=""|| perror "failed."
+		pinfo "Running make"
+		make -j5 || perror "failed"
+		pinfo "Running make install" 
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed"
+		cd -
+		touch .built
+	fi
+}
+
+post_copy() {
+	:
+}
diff --git a/remote/tools/plymouth/plymouth.conf b/remote/modules/plymouth/plymouth.conf
index 04144a0f..026aff9c 100644
--- a/remote/tools/plymouth/plymouth.conf
+++ b/remote/modules/plymouth/plymouth.conf
@@ -9,9 +9,6 @@ REQUIRED_BINARIES="	plymouth
 			plymouthd"
 REQUIRED_DIRECTORIES="  /bin
 			/etc
-			/include
 			/lib
-			/libexec
 			/sbin
-			/share/plymouth
 			/var"
diff --git a/remote/modules/policykit-src/policykit.build b/remote/modules/policykit-src/policykit.build
new file mode 100644
index 00000000..811d9b0c
--- /dev/null
+++ b/remote/modules/policykit-src/policykit.build
@@ -0,0 +1,42 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+	
+
+fetch_source () {
+	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
+	touch .fetched_source
+}	
+
+build () {
+	if [ ! -e .built ]; then
+		cd src/$VERSION
+
+		[ ! -d "${MODULES_DIR}/systemd/build" ] && perror "systemd build directory not found. Build it first."
+		SYSTEMD_BUILD_DIR="${MODULES_DIR}/systemd/build"
+		pinfo "configuring..."
+		LIBSYSTEMD_LOGIN_LIBS="-L${SYSTEMD_BUILD_DIR}/usr/lib/" \
+			LIBSYSTEMD_LOGIN_CFLAGS="-I${SYSTEMD_BUILD_DIR}/usr/include -I${SYSTEMD_BUILD_DIR}/usr/include/systemd -lsystemd-login -lsystemd-daemon" \
+			./configure --enable-libsystemd-login=yes --with-systemdsystemunitdir=/etc/systemd/system -prefix="/" --datarootdir="/usr/share" --enable-man-pages=no --enable-gtk-doc-html=no --enable-examples=no --enable-static=no
+		pinfo "calling make..."
+		make || perror "make failed."
+		[ ! -d "${MODULE_BUILD_DIR}" ] && mkdir -p "${MODULE_BUILD_DIR}"
+		pinfo "installing to ${MODULE_BUILD_DIR}..."
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed..."
+		
+		COPYLIST="list_dpkg_output"
+		[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+		list_packet_files >> "$COPYLIST"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+		cd -
+		touch .built
+	fi
+}
+
+post_copy() {
+
+	#Add Polkit User/Group/Shadow to Stage3.2
+	pinfo "Adding polkitd user to target system..."
+	add_user "polkitd"
+}
+
diff --git a/remote/tools/policykit/policykit.conf b/remote/modules/policykit-src/policykit.conf
index fbf997f6..73b04015 100644
--- a/remote/tools/policykit/policykit.conf
+++ b/remote/modules/policykit-src/policykit.conf
@@ -1,9 +1,10 @@
 VERSION=polkit-0.110
 URL=http://www.freedesktop.org/software/polkit/releases/polkit-0.110.tar.gz
-REQUIRED_DEPENDENCIES="libmozjs185-dev"
-REQUIRED_PACKAGES=""
+REQUIRED_DEPENDENCIES="libmozjs185-1.0"
+REQUIRED_PACKAGES="libmozjs185-1.0"
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="/bin /etc /lib /usr/share/dbus-1 /usr/share/polkit-1"
 REQUIRED_FILES=""
+REQUIRED_LIBRARIES="libmozjs185"
 REQUIRED_MODULES="systemd"
 
diff --git a/remote/modules/policykit/data/lib/systemd/system/polkitd.service b/remote/modules/policykit/data/lib/systemd/system/polkitd.service
new file mode 100644
index 00000000..d3f192d1
--- /dev/null
+++ b/remote/modules/policykit/data/lib/systemd/system/polkitd.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Authenticate and Authorize Users to Run Privileged Tasks
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.PolicyKit1
+ExecStart=/usr/lib/policykit-1/polkitd --no-debug
diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build
new file mode 100644
index 00000000..b6b70b7f
--- /dev/null
+++ b/remote/modules/policykit/policykit.build
@@ -0,0 +1,22 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+	
+
+fetch_source () {
+        pinfo "Extracting from running system..."
+}	
+
+build () {
+        COPYLIST="list_dpkg_output"
+        [ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+
+        list_packet_files >> "${COPYLIST}"
+        tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+}
+
+post_copy() {
+
+	#Add Polkit User/Group/Shadow to Stage3.2
+	pinfo "Adding polkitd user to target system..."
+	add_user "polkitd"
+}
+
diff --git a/remote/modules/policykit/policykit.conf b/remote/modules/policykit/policykit.conf
new file mode 100644
index 00000000..3dcfd8d9
--- /dev/null
+++ b/remote/modules/policykit/policykit.conf
@@ -0,0 +1,11 @@
+REQUIRED_DEPENDENCIES="libmozjs185-1.0"
+REQUIRED_PACKAGES="libmozjs185-1.0 policykit-1"
+REQUIRED_BINARIES=""
+REQUIRED_DIRECTORIES="	/etc/pam.d /etc/dbus-1 /etc/polkit-1
+			/usr/bin 
+			/usr/share/dbus-1
+			/usr/share/polkit-1
+			/usr/lib/policykit-1
+			/usr/lib/${ARCH_TRIPLET}/polkit-1"
+REQUIRED_FILES=""
+REQUIRED_LIBRARIES="libmozjs185"
diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build
new file mode 100644
index 00000000..43aa112d
--- /dev/null
+++ b/remote/modules/rsyslogd/rsyslogd.build
@@ -0,0 +1,38 @@
+fetch_source() {
+	:
+}
+
+build() {
+
+	FILELIST="list_binaries_and_files"
+	BIN_LOCATION=$(which rsyslogd)
+	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
+	then
+		get_link_chain "${BIN_LOCATION}" >> "${FILELIST}"
+	else
+		perror "${BIN} not found on the system! Please install it."
+		exit 1
+	fi
+
+	for ENTRY in ${REQUIRED_FILES} ${REQUIRED_DIRECTORIES}; do
+		get_link_chain "${ENTRY}" >> "${FILELIST}"
+	done
+	
+	tarcopy "$(cat ${FILELIST}|sort -u)" "${MODULE_BUILD_DIR}"
+
+}
+
+post_copy() {	
+	mkdir -p "${TARGET_BUILD_DIR}"/var/spool/rsyslog
+	
+	[ -e /lib/systemd/system/rsyslog.service ] \
+		&& cp /lib/systemd/system/rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/
+	sed -i 's/\/bin\/systemctl/-\/usr\/bin\/systemctl/g' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
+	sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
+	
+	# activate the service
+        ln -s rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/syslog.service
+	[ ! -d "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants ] && mkdir -p "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants
+	ln -s ../syslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants/syslog.service
+	
+}
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
new file mode 100644
index 00000000..20b5df1b
--- /dev/null
+++ b/remote/modules/rsyslogd/rsyslogd.conf
@@ -0,0 +1,4 @@
+REQUIRED_BINARIES="	rsyslogd"
+REQUIRED_FILES="	/etc/rsyslog.conf"
+REQUIRED_DIRECTORIES="	/etc/rsyslog.d
+			/usr/lib/rsyslog"
diff --git a/remote/tools/sshd/data/etc/issue.net b/remote/modules/sshd/data/etc/issue.net
index 7dfbddb5..7dfbddb5 100644
--- a/remote/tools/sshd/data/etc/issue.net
+++ b/remote/modules/sshd/data/etc/issue.net
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key
index 0132fe84..0132fe84 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key.pub b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key.pub
index 97af5cb0..97af5cb0 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key.pub
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key.pub
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key
index 1fea2717..1fea2717 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub
index 0ef413ba..0ef413ba 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key
index b37b5a74..b37b5a74 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key.pub b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key.pub
index e6fd0588..e6fd0588 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key.pub
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key.pub
diff --git a/remote/tools/sshd/data/etc/ssh/sshd_config b/remote/modules/sshd/data/etc/ssh/sshd_config
index da9e5e01..da9e5e01 100644
--- a/remote/tools/sshd/data/etc/ssh/sshd_config
+++ b/remote/modules/sshd/data/etc/ssh/sshd_config
diff --git a/remote/tools/sshd/data/etc/systemd/system/sshd.service b/remote/modules/sshd/data/etc/systemd/system/sshd.service
index fc711808..fc711808 100644
--- a/remote/tools/sshd/data/etc/systemd/system/sshd.service
+++ b/remote/modules/sshd/data/etc/systemd/system/sshd.service
diff --git a/remote/modules/sshd/sshd.build b/remote/modules/sshd/sshd.build
new file mode 100644
index 00000000..aa4241e6
--- /dev/null
+++ b/remote/modules/sshd/sshd.build
@@ -0,0 +1,18 @@
+fetch_source() {
+	:
+}
+
+build() {
+
+	BIN_LOCATION=$(which sshd)
+	[ ! -z ${BIN_LOCATION} ] && BIN_LOCATION=$(readlink -f "$BIN_LOCATION")
+	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ]; then
+		tarcopy "${BIN_LOCATION}" "${MODULE_BUILD_DIR}"
+	else
+		perror "'sshd' not found on the system! Please install it."
+	fi
+}
+
+post_copy() {	
+	mkdir -p "${TARGET_BUILD_DIR}/var/run/sshd"
+}
diff --git a/remote/tools/sshd/sshd.conf b/remote/modules/sshd/sshd.conf
index 25793c72..25793c72 100644
--- a/remote/tools/sshd/sshd.conf
+++ b/remote/modules/sshd/sshd.conf
diff --git a/remote/tools/systemd/data/etc/systemd/system/activate-swap b/remote/modules/systemd/data/etc/systemd/system/activate-swap
index 10cb42e9..10cb42e9 100644
--- a/remote/tools/systemd/data/etc/systemd/system/activate-swap
+++ b/remote/modules/systemd/data/etc/systemd/system/activate-swap
diff --git a/remote/tools/systemd/data/etc/systemd/system/analyse-disk.sh b/remote/modules/systemd/data/etc/systemd/system/analyse-disk.sh
index 0c152dbf..0c152dbf 100644
--- a/remote/tools/systemd/data/etc/systemd/system/analyse-disk.sh
+++ b/remote/modules/systemd/data/etc/systemd/system/analyse-disk.sh
diff --git a/remote/tools/systemd/data/etc/systemd/system/debug-shell.service b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service
index 063d4995..063d4995 100644
--- a/remote/tools/systemd/data/etc/systemd/system/debug-shell.service
+++ b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/fetch-config b/remote/modules/systemd/data/etc/systemd/system/fetch-config
index 556f0f41..556f0f41 100644
--- a/remote/tools/systemd/data/etc/systemd/system/fetch-config
+++ b/remote/modules/systemd/data/etc/systemd/system/fetch-config
diff --git a/remote/tools/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service b/remote/modules/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service
index d329f45a..d329f45a 120000
--- a/remote/tools/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service
+++ b/remote/modules/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/ip-dns-conf b/remote/modules/systemd/data/etc/systemd/system/ip-dns-conf
index f14ecd88..f14ecd88 100644
--- a/remote/tools/systemd/data/etc/systemd/system/ip-dns-conf
+++ b/remote/modules/systemd/data/etc/systemd/system/ip-dns-conf
diff --git a/remote/tools/systemd/data/etc/systemd/system/load-german-keymap.service b/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service
index 74753259..74753259 100644
--- a/remote/tools/systemd/data/etc/systemd/system/load-german-keymap.service
+++ b/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/network-interface@.service b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service
index 137b3af6..137b3af6 100644
--- a/remote/tools/systemd/data/etc/systemd/system/network-interface@.service
+++ b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/nfs-mount.service b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
index 727ff2ed..727ff2ed 100644
--- a/remote/tools/systemd/data/etc/systemd/system/nfs-mount.service
+++ b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service b/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
index 699b56ac..699b56ac 120000
--- a/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
+++ b/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
index e7d4d170..e7d4d170 100644
--- a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service
+++ b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
diff --git a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
index 387a5754..387a5754 100644
--- a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
+++ b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
new file mode 100644
index 00000000..bb58fc1c
--- /dev/null
+++ b/remote/modules/systemd/systemd.build
@@ -0,0 +1,47 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+
+fetch_source () {
+	if [ ! -e .fetched_source ]; then 
+		download_untar "$URL" "src/"
+		local LIBKMOD_VERSION="kmod-12"
+		download_untar "http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz" "src/"
+		touch .fetched_source
+	fi
+}	
+
+build () {
+	if [ ! -e .built ]; then
+		#build libkmod
+		cd "src/$LIBKMOD_VERSION/"
+		./configure
+		make -j5
+		make install
+		cd -
+
+		#build systemd
+		cd "src/$VERSION/"
+		pinfo "calling configure"
+		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
+		pinfo "calling make"
+		make -j5 || perror "make failed."
+		pinfo "calling make install"
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed."
+		cd -
+		touch .built
+	fi
+}
+
+post_copy() {
+	# dont clear systemd log at startup
+	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
+
+	#old agetty version doesn't support --noclear option in getty service
+	if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ];
+	then
+		sed -i.bak "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
+	fi
+
+	# add nfs to modules-load list
+	echo "nfs" > "${TARGET_BUILD_DIR}/etc/modules-load.d/nfs.conf"
+}
+
diff --git a/remote/tools/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index c5e72aeb..c5e72aeb 100644
--- a/remote/tools/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
diff --git a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf
new file mode 100644
index 00000000..3dd30ebc
--- /dev/null
+++ b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf
@@ -0,0 +1,4 @@
+pool=default
+theme=unifr
+pvs=0
+path=/var/lib/virt
diff --git a/remote/modules/vmchooser/data/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/openslx/bin/run-virt.sh
new file mode 100755
index 00000000..b3863a2e
--- /dev/null
+++ b/remote/modules/vmchooser/data/openslx/bin/run-virt.sh
@@ -0,0 +1,440 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Copyright (c) 2007..2010 - RZ Uni FR
+# Copyright (c) 2007..2011 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# run-virt.sh
+#    - This is the generic wrapper for the several virtualization solutions.
+#      The idea is to setup a set of variables used by at least two different
+#      tools and then include the specific plugin which configures the speci-
+#      fied virtualization tool.
+################################################################################
+
+. /etc/opt/openslx/openslx.conf
+
+################################################################################
+### Define default dirs / get configs
+################################################################################
+
+PLUGINCONFROOT=${OPENSLX_DEFAULT_CONFDIR}/plugins
+PLUGINCONFDIR=${PLUGINCONFROOT}/vmchooser
+# include general configuration from vmchooser
+[ -f ${PLUGINCONFROOT}/vmchooser/vmchooser.conf ] && \
+  . ${PLUGINCONFROOT}/vmchooser/vmchooser.conf
+# load general virtualization information
+[ -f ${PLUGINCONFROOT}/virtualization/virtualization.conf ] && \
+  . ${PLUGINCONFROOT}/virtualization/virtualization.conf
+
+################################################################################
+### Functions used throughout the script
+################################################################################
+
+# function to write to stdout and logfile
+LOGFILE=${OPENSLX_DEFAULT_LOGDIR}/run-virt.${USER}.$$.log
+writelog () {
+  # write to stdout
+  echo -e "$1"
+  # log into file
+  echo -e "$1" >> ${LOGFILE}
+}
+
+# remove config dirs when exit
+cleanexit () {
+  if echo "${RMDIRS}" 2>/dev/null | grep -q ${xmlvirt}; then
+    writelog "${xmlvirt} exited. Cleanning up... \c"
+    rm -rf ${RMDIRS} >/dev/null 2>&1
+    writelog "done"
+  fi
+
+  exit "$1"
+}
+
+# check for important files used
+filecheck ()
+{
+  filecheck=$(LANG=us ls -lh ${diskfile} 2>&1)
+  writelog "Filecheck:\n${filecheck}\n"
+  noimage=$(echo ${filecheck} | grep -i "no such file or directory" | wc -l)
+  rightsfile=${diskfile}
+
+  # check if link
+  if [ -L "${diskfile}" ]; then
+    # take link target
+    rightsfile=$(ls -lh ${diskfile} 2>&1 | awk -F '-> *' '{print $2}')
+    rightsfile=${vmdir}/${rightsfile}
+    filecheck=$(LANG=us ls -lh ${rightsfile} 2>&1)
+  fi
+
+  # does file exist
+  if [ "${noimage}" -ge "1" ]; then
+    writelog "Virtual Machine Image Problem:\c "
+    writelog "\tThe image you've specified doesn't exist."
+    writelog "Filecheck says:\c "
+    writelog "\t\t${diskfile}:\n\t\t\tNo such file or directory"
+    writelog "Hint:\c "
+    writelog "\t\t\tCompare spelling of the image with your options.\n"
+    exit 1
+  fi
+
+  # readable by calling user
+  if ! [ -r "${diskfile}" >/dev/null 2>&1 \
+    -o -r "${diskfile}" >/dev/null 2>&1 ]; then
+    writelog "Vmware Image Problem:\c "
+    writelog "\tThe image you've specified has wrong rights."
+    writelog "Filecheck says:\t\t$(echo ${filecheck} \
+      | awk '{print $1" "$3" "$4}') ${rightsfile}"
+    writelog "Hint:\t\t\tChange rights with: chmod a+r ${rightsfile}\n"
+    exit 1
+  fi
+
+  # writable (for persistent-mode)?
+  if ! [ -w "${diskfile}" >/dev/null 2>&1 \
+    -o -w "${diskfile}" >/dev/null 2>&1 ] \
+    && [ "${np}" = "independent-persistent" ]; then
+    writelog "Vmware Image Problem:\c "
+    writelog "\tThe image you have specified has wrong rights."
+    writelog "Filecheck says:\t\t$(echo ${filecheck} \
+      | awk '{print $1" "$3" "$4}') ${rightsfile}"
+    writelog "Hint:\t\t\tUse nonpersistent-mode or change rights to rw\n"
+    exit 1
+  fi
+}
+
+################################################################################
+### Get XML file and dir
+################################################################################
+
+# absolute or relative path?
+xmlfile=$1
+if ls ${xmlfile} 2>/dev/null | grep '/' >/dev/null 2>&1; then
+  xmlpath=$(dirname ${xmlfile})
+  xmlfile=$(basename ${xmlfile})
+else
+  xmlpath=${vmchooser_xmlpath}
+fi
+# full path
+xmlfile="${xmlpath}/${xmlfile%.xml}.xml"
+
+################################################################################
+### Sanity checks
+################################################################################
+
+# test if the xml file is valid
+if ! [ -r "${xmlfile}" ]; then
+  writelog "${xmlfile} not a readable XML file!"
+  exit 1
+fi
+
+# test if XML file
+if ! grep '<?xml' "${xmlfile}" >/dev/null 2>&1; then
+  writelog \
+    "Submitted configuration file ${xmlfile} seems to have wrong XML format"
+  exit 1
+fi
+
+# check for running in graphical environment otherwise no much use here
+[ -z "$DISPLAY" ] && echo -e "\n\tStart only within a graphical desktop!\n" \
+  && exit 1
+
+################################################################################
+###  Logo for console
+################################################################################
+
+cat <<EOL
+                                             __        __   
+                .----.--.--.-----.___.--.--.|__|.----.|  |_ 
+                |   _|  |  |     |___|  |  ||  ||   _||   _|
+                |__| |_____|__|__|    \___/ |__||__|  |____|
+          OpenSLX virtual machine environment preparation script ...
+
+EOL
+
+################################################################################
+### Read needed variables from XML file
+################################################################################
+
+writelog "Starting configuration..."
+writelog "\tLogfile:\t\t${LOGFILE}"
+writelog "\t/tmp info:\t\t$(df -h | grep " /tmp$" | awk '{print $2}') \c"
+writelog "$(grep "/tmp " /proc/mounts | awk '{print $1" "$2" "$3" "$4}')"
+writelog "\tVM XML dir:\t\t$(dirname ${xmlfile})"
+writelog "\tXML file:\t\t${xmlfile}"
+writelog "VM config:"
+
+# Name of the virt image
+imgname=$(grep -io '<image_name param=.*"' ${xmlfile} \
+          | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
+
+# Imagename /w full path
+if echo ${imgname} 2>/dev/null | grep -q '^/' >/dev/null 2>&1; then
+  imgpath=$(dirname ${imgname})
+  imgname=$(basename ${imgname})
+  vmpath=${imgpath}/${imgname}
+# If old vmchooser binary stuff
+# We do not need folder name as it is already included by vmchooser
+elif echo ${xmlfile} 2>/dev/null | grep -q '^/tmp/' >/dev/null 2>&1; then
+  vmpath=$imgname
+  imgname=$(basename ${imgname})
+# Else use same path as xml
+else
+  imgpath=${xmlpath}
+  vmpath=${imgpath}/${imgname}
+fi
+
+# Check if virtual machine container file exists
+if ! [ -e "${vmpath}" ]; then
+  writelog "Virtual machine image ${vmpath} not found!"
+  exit 1
+fi
+
+# Name of the virt machine, sed because of Windows formatting
+vm_name=$(grep -o 'short_description param=.*"' ${xmlfile} \
+          | sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}')
+# If ${vm_name} not defined use ${xmlfile}
+vm_name=${vm_name:-${xmlfile%.xml}}
+
+# Define vm_shortname since vm_name can be very long
+vm_shortname=$(basename ${xmlfile%.xml} | sed -e "s, ,-,g")
+
+# vm_name = displayname, define for old scripts
+displayname=${vm_name}
+
+# image is for the following virtual machine 
+xmlvirt=$(grep -o 'virtualmachine param=.*"' ${xmlfile} \
+          | sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}')
+
+# choose the proper virtualization/emulator plugin
+[ "x${xmlvirt}" != "x" -a "x${xmlvirt}" != "xqemukvm" -a \
+  "x${xmlvirt}" != "xvirtualbox" -a "x${xmlvirt}" != "xvmware" ] && \
+  xmlvirt="emufe"
+
+# make a guess from the filename extension if ${xmlvirt} is empty
+# (not set within the XML file)
+# TODO: implement possibility to submit own configuration files
+if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
+  writelog "No virtual machine parameter defined in ${xmlfile}"
+  writelog "Trying to guess VM...\c"
+  case "$(cat ${additional_config} | tr \"[A-Z]\" \"[a-z]\")" in
+    *config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*)
+      xmlvirt="vmware"
+    ;;
+    *innotek*|*virtualbox*)
+      xmlvirt="virtualbox"
+    ;;
+    *qemu*|*kvm*)
+      xmlvirt="qemukvm"
+    ;;
+    *)
+      xmlvirt="none"
+    ;;
+  esac
+elif [ -z "${xmlvirt}" ]; then
+  case "$(echo ${imgname##*.} | tr \"[A-Z]\" \"[a-z]\")" in
+    vmdk)
+      xmlvirt="vmware"
+    ;;
+    vbox|vdi)
+      xmlvirt="virtualbox"
+    ;;
+    qcow*)
+      xmlvirt="qemukvm"
+    ;;
+    *)
+      xmlvirt="emufe"
+    ;;
+  esac
+  writelog "result:\t${xmlvirt}"
+fi
+
+# Definition of the client system
+vmostype=$(grep -io '<os param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' |\
+  tr "[A-Z]" "[a-z]")
+
+# Definition of the networking the client system is connected to
+network_kind=$(grep -io '<network param=.*"' ${xmlfile} \
+               | awk -F '"' '{ print $2 }' | tr "[A-Z]" "[a-z]")
+network_card=$(grep -io '<netcard param=.*"' ${xmlfile} \
+               | awk -F '"' '{ print $2 }'| tr "[A-Z]" "[a-z]")
+
+# Set redirects to 0, see vmgrid if you want to define some
+redirects=0
+
+# Serial/parallel ports defined (e.g. "ttyS0" or "autodetect")
+serial=$(grep -io '<serialport param=.*"' ${xmlfile} \
+         | awk -F '"' '{ print $2 }')
+parallel=$(grep -io '<parport param=.*"' ${xmlfile} \
+         | awk -F '"' '{ print $2 }')
+
+writelog "\tVirtualization:\t\t$xmlvirt"
+writelog "\tVM name:\t\t$vm_name"
+writelog "\tVM short name:\t\t$vm_shortname"
+
+###############################################################################
+### Declaration of default variables
+###############################################################################
+
+# VM-ID static (00)
+VM_ID="00"
+# take last two digits of current pid...
+VM_ID=$(expr substr $$ $(expr ${#$} - 1) 2)
+
+# Make sure cpu_cores is not empty
+cpu_cores=${cpu_cores:-"1"}
+
+# Total amount of memory defined in stage 3
+# TODO: Should be dependent on the setup (if diff is written to RAM ...)
+permem=60
+if [ "x${VMCHOOSER_FORCE_HALF_MEM}" == "x1" ]; then
+    permem=30
+fi
+# Get a result which can be divided through 4
+mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4)
+if [ -n "${mainvirtmem}" ]; then
+  forcemem=$(expr ${mainvirtmem} / 4 \* 4)
+  mem=${forcemem}
+fi
+hostmem=$(expr ${totalmem} - ${mem})
+
+# Configuring ethernet mac address: first 3 bytes are fixed (00:50:56) 
+# 4th byte is the VM-ID (0D)
+# last two bytes are taken from the bridge of the host
+# define one MAC per guest
+macguestpart="00:50:56:${VM_ID}"
+machostpart=$(echo ${hostmacaddr} | awk -F ":" '{print $(NF-1)":"$NF}')
+macaddr=$(echo "${macguestpart}:${machostpart}" | tr "[a-z]" "[A-Z]")
+
+# Virtual fd/cd/dvd and drive devices, floppy b: for configuration
+# if $floppy_0 from run-virt.include set then fdtest="TRUE"
+fdtest=
+fdtest=${floppy_0:+"TRUE"}
+# if $fdtest not set floppy0="FALSE", else "TRUE"
+floppy0=${fdtest:-"FALSE"}
+floppy1="TRUE"
+floppy1name="${PLUGINCONFDIR}/loopimg/fd.img"
+# if $cdrom_0 from run-virt.include set then cdtest="TRUE"
+cdtest=
+cdtest=${cdrom_0:+"TRUE"}
+# if $cdtest not set cdrom0="FALSE", else "TRUE"
+cdrom0=${cdtest:-"FALSE"}
+# if $cdrom_1 from run-virt.include set then cdtest="TRUE"
+cdtest=
+cdtest=${cdrom_1:+"TRUE"}
+# if $cdtest not set cdrom1="FALSE", else "TRUE"
+cdrom1=${cdtest:-"FALSE"}
+# IDE is expected default, test for the virtual disk image type should
+# be done while creating the runscripts ...
+ide="TRUE"
+scsi="FALSE"
+hddrv="ide"
+audio="true"
+remotedesktopport="590${VM_ID}"
+
+# Display resolution within the host system
+hostres=$(xvidtune -show 2>/dev/null| grep -ve "^$")
+xres=$(echo "${hostres}" | awk '{print $3}')
+yres=$(echo "${hostres}" | awk '{print $7}')
+
+# Resolution defined via xml parameter: fullscreen, full/X*Y/depth; windowed, 
+# win/X*Y/depth
+userres=$(grep -io '<screen param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' | \
+  tr "A-Z" "a-z")
+case "${userres}" in
+  full*)
+    res=$(echo "${hostres}" | awk -F "/" '{print $2}')
+    uxres=${res%\**}
+    uyres=${#*\*}
+    userres="full"
+  ;;
+  win*)
+    res=$(echo "${hostres}" | awk -F "/" '{print $2}')
+    uxres=${res%\**}
+    uyres=${#*\*}
+    userres="win"
+  ;;
+esac
+
+
+# Enable 3D
+enable3d=$(grep -i "<enable3d param=.*" ${xmlfile} 2>/dev/null | \
+           awk -F '=' {'print $2'} | tr "[A-Z]" "[a-z]")
+
+# Add rw share
+sharepath="${HOME}"
+sharename="home"
+
+# Set hostname: using original hostname and adding string
+hostname="virt-$(hostname)"
+
+writelog "\tVM Hostname:\t\t$hostname"
+
+################################################################################
+### Setup the rest of the environment and run the configured vm
+################################################################################
+
+# Adjust sound volume
+writelog "Unmuting sound...\c "
+amixer -q sset Master 80% unmute 2>/dev/null
+amixer -q sset PCM 80% unmute 2>/dev/null
+amixer -q sset CD 80% unmute 2>/dev/null
+amixer -q sset Headphone 80% unmute 2>/dev/null
+amixer -q sset Front 80% unmute 2>/dev/null      # in SUSE 11.0 it's headphone
+amixer -q sset Speaker 80% unmute 2>/dev/null       # annoying built-in speaker
+writelog "finished\n"
+
+# Copy guest configuration (with added information) config.xml to be accessed
+# via virtual floppy
+# fixme -> to be changed (vmchooser adapts the file content!?)
+#TODO: wozu echo?
+#echo "Please fix the config.xml generation"
+cp ${xmlfile} ${PLUGINCONFDIR}/fd-loop/config.xml
+
+# Get all virtual machine specific stuff from the respective include file
+if [ -e ${PLUGINCONFROOT}/${xmlvirt}/run-virt.include ] ; then
+  self=${xmlvirt}
+  . ${PLUGINCONFROOT}/${xmlvirt}/run-virt.include
+  # start a windowmanager for easier handling
+  # (expect problems /w windows opening in background /w vmware without wm)
+  for dm in xfwm4 metacity openbox blackbox kwin fvwm2 ; do
+    if which $dm >/dev/null 2>&1 ; then
+      if [ "$dm" = "fvwm2" ] ; then
+        echo "EdgeScroll 0 0" > ${redodir}/fvwm
+        fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 &
+      else
+        $dm >/dev/null 2>&1 &
+      fi
+      break
+    fi
+  done
+  # Start poolvideoswitch if we find the autostarter file
+  if [ -e /etc/xdg/autostart/pvsgui.desktop ]; then
+    /usr/local/bin/pvsgui -p 2 -b >/dev/null 2>&1 &
+  fi
+  eval ${VIRTCMD} ${VIRTCMDOPTS}
+  writelog "Bye."
+
+  # Postrun for commands after virtualization finishes
+  if [ -n "${POSTRUN}" ]; then
+    eval ${POSTRUN}  >/dev/null 2>&1
+  fi
+
+  cleanexit 0
+else
+  writelog "Failed because of missing ${xmlvirt} plugin."
+  cleanexit 1
+fi
+
+# Postrun for commands after virtualization finishes
+if [ -n "${POSTRUN}" ]; then
+  eval ${POSTRUN}  >/dev/null 2>&1
+fi
+
+cleanexit 0
+exit 0
diff --git a/remote/modules/vmchooser/data/openslx/bin/vmchooser b/remote/modules/vmchooser/data/openslx/bin/vmchooser
new file mode 100755
index 00000000..d8ec07f9
--- /dev/null
+++ b/remote/modules/vmchooser/data/openslx/bin/vmchooser
diff --git a/remote/modules/vmchooser/data/openslx/bin/xmlfilter.sh b/remote/modules/vmchooser/data/openslx/bin/xmlfilter.sh
new file mode 100755
index 00000000..ded5d114
--- /dev/null
+++ b/remote/modules/vmchooser/data/openslx/bin/xmlfilter.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Copyright (c) 2007..2009 - RZ Uni FR
+# Copyright (c) 2007..2011 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# xmlfilter.sh
+#    - This script is invoked by the vmchooser tool. It simply filters xml-
+#      files (taking the path to these files in $1). You might modify it in any
+#      way to match your needs, e.g. ask some database instead. You can re-
+#      implement it in any other programming language too. You simply have to
+#      return a list of proper xml files to be interpreted by the vmchooser
+#      binary). Please check for vmchooser.sh too ...
+# -----------------------------------------------------------------------------
+
+# This script .
+#
+# currently:
+#     - filter for slxgrp (which comes from /etc/machine-setup)
+#
+
+# include default directories
+. /etc/opt/openslx/openslx.conf
+
+if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf ]; then
+  . ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf
+fi
+
+for FILE in $(find $1 -iname "*.xml"); do
+  # filter all xmls which aren't set active
+  if [ $(grep "<active param=.*true.*" ${FILE} | wc -l) -eq 1 ]; then
+    if [ -n ${vmchooser_env} ]; then
+      # filter all xmls with pool-param not equal to vmchooser::env
+      if [ $(grep "<pools param=\"${vmchooser_env}\"" ${FILE} | wc -l) -eq 1 ];\
+      then
+        echo ${FILE};
+      fi
+    else
+      # if there is no pool set, just take all available xmls
+      echo -e ${active}
+    fi
+  fi
+done
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png
new file mode 100644
index 00000000..900dd867
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png
new file mode 100644
index 00000000..8ca9347b
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini
new file mode 100644
index 00000000..57a22821
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini
@@ -0,0 +1,4 @@
+background-color=#ffffff
+image-right=openslx-right.png
+image-left=openslx-left.png
+
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png
new file mode 100644
index 00000000..c8736b72
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png
new file mode 100644
index 00000000..e21f0d8b
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini
new file mode 100644
index 00000000..d9aa17f6
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini
@@ -0,0 +1,4 @@
+background-color=#ffffff
+image-right=planets-right.png
+image-left=planets-left.png
+
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png
new file mode 100644
index 00000000..e602ccd1
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png
new file mode 100644
index 00000000..3edbcb0c
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini
new file mode 100644
index 00000000..dadcb4e1
--- /dev/null
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini
@@ -0,0 +1,4 @@
+background-color=#003592
+image-right=title_r.png
+image-left=title_l.png
+
diff --git a/remote/modules/vmchooser/data/vmchooser/default.desktop b/remote/modules/vmchooser/data/vmchooser/default.desktop
new file mode 100755
index 00000000..91540228
--- /dev/null
+++ b/remote/modules/vmchooser/data/vmchooser/default.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=virtual machine chooser (default)
+Name[de]=Virtuelle Maschine auswählen
+Comment=This session starts the vm session chooser
+Comment[de]=Diese Sitzung startet das Auswahlmenü für die vorhandenen Sitzungen
+Exec=/opt/openslx/plugin-repo/vmchooser/vmchooser
+TryExec=/opt/openslx/plugin-repo/vmchooser/vmchooser
+Icon=
+Type=Application
diff --git a/remote/modules/vmchooser/data/vmchooser/mesgdisp b/remote/modules/vmchooser/data/vmchooser/mesgdisp
new file mode 100755
index 00000000..41e3721c
--- /dev/null
+++ b/remote/modules/vmchooser/data/vmchooser/mesgdisp
diff --git a/remote/modules/vmchooser/data/vmchooser/printer.sh b/remote/modules/vmchooser/data/vmchooser/printer.sh
new file mode 100755
index 00000000..8f1d5ffa
--- /dev/null
+++ b/remote/modules/vmchooser/data/vmchooser/printer.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#echo "<printer name=\"info\" path=\"//printserver/info\"> some pseudo printer </printer>"
+
+for(( i=0; $i<10; i=$i+1)); do
+  echo -e "printserver$i\tprinter$i\tPrinter Description $i"
+done
+
+echo -e "printserver.ruf.uni-freiburg.de\treal-printer-name\tSome really long printer Description"
+
diff --git a/remote/modules/vmchooser/data/vmchooser/scanner.sh b/remote/modules/vmchooser/data/vmchooser/scanner.sh
new file mode 100755
index 00000000..dcb94c68
--- /dev/null
+++ b/remote/modules/vmchooser/data/vmchooser/scanner.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+echo -e "scanserver\tscanner1hp\tThis is a test Scanner"
diff --git a/remote/modules/vmchooser/data/vmchooser/smb.conf b/remote/modules/vmchooser/data/vmchooser/smb.conf
new file mode 100755
index 00000000..ec757ce4
--- /dev/null
+++ b/remote/modules/vmchooser/data/vmchooser/smb.conf
@@ -0,0 +1,25 @@
+# basic samba configuration file for OpenSLX host-internal networking
+[global]
+  workgroup = OPENSLX
+  netbios name = HOMESERVER
+  security = SHARE
+  server string = Home and Print Provider
+  bind interfaces only = Yes
+  interfaces = NWIF
+  pid directory = PIDDIR
+
+[userhome]
+  comment = Home Directory of USER
+  path = /home/USER
+  create mask = 0700
+  guest ok = No
+  read only = No
+
+[scratch]
+  comment = Host System Temp Folder
+  path = /tmp
+  create mask = 0700
+  guest ok = Yes
+  read only = No
+  browseable = Yes
+
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build
new file mode 100644
index 00000000..536aa5d3
--- /dev/null
+++ b/remote/modules/vmchooser/vmchooser.build
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+fetch_source()
+{
+        [ ! -d src ] && mkdir src
+        if [ ! -e .fetched_source ]; then
+                git clone "${GIT}" src
+                touch .fetched_source
+        fi
+}
+
+build()
+{
+        if [ ! -e .built ]; then
+                cd src
+                pinfo "Running vmchooser buildscript"
+                . build.sh
+                pinfo ""
+                cd -
+                touch .built
+        fi
+}
+
+post_copy() {	
+	:
+}
+
diff --git a/remote/modules/vmchooser/vmchooser.conf b/remote/modules/vmchooser/vmchooser.conf
new file mode 100644
index 00000000..ec1ceb86
--- /dev/null
+++ b/remote/modules/vmchooser/vmchooser.conf
@@ -0,0 +1,5 @@
+GIT=git://git.openslx.org/openslx/tools/vmchooser.git
+REQUIRED_DEPENDENCIES="	cmake
+			libqt4-dev"
+TARGET_DIR="openslx"
+REQUIRED_BINARIES="vmchooser"
diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build
new file mode 100644
index 00000000..4adcd214
--- /dev/null
+++ b/remote/modules/xorg/xorg.build
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+}
+
+post_copy() {
+	mkdir -p "${TARGET_BUILD_DIR}/etc/X11"
+	[ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X	
+	mkdir -p "${TARGET_BUILD_DIR}/var/lib/xkb"
+	cp /var/lib/xkb/server* "${TARGET_BUILD_DIR}/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '${TARGET_BUILD_DIR}/var/lib/xkb/' failed."
+}
+
diff --git a/remote/tools/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index e41c25a5..e41c25a5 100644
--- a/remote/tools/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
diff --git a/remote/profiles/default.profile b/remote/profiles/default.profile
index 8bda62c5..9a83ed76 100644
--- a/remote/profiles/default.profile
+++ b/remote/profiles/default.profile
@@ -6,5 +6,6 @@ MODULES="
 	systemd
 	ldm
 	ldm-gtk-greeter
+	xorg
 "
 
diff --git a/data/stage3.1/init b/remote/rootfs/rootfs-stage31/data/init
index d5df6995..0f522ef9 100755
--- a/data/stage3.1/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -12,8 +12,8 @@
 # First script for initial ramfs for OpenSLX linux stateless clients
 #############################################################################
 
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/openslx/bin:/openslx/sbin
-export LD_LIBRARY_PATH=/openslx/lib
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export LD_LIBRARY_PATH=/usr/lib64
 
 mount -n -t tmpfs -o 'mode=755' run "/run"
 
@@ -22,38 +22,40 @@ mount -n -t tmpfs -o 'mode=755' run "/run"
 [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys
 
 echo "/sbin/mdev" > /proc/sys/kernel/hotplug
+# read graphic and network adaptor configuration (without proprietary drivers yet)
 
-# read primary graphic adaptor configuration (without proprietary drivers yet)
 ( hwinfo --gfxcard > /etc/hwinfo ) &
+( hwinfo --netcard > /etc/netcard ) &
 
-# load local file systems
-insmod /lib/modules.0/aufs.ko 
-insmod /lib/modules.0/squashfs.ko
-
-mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs
-mount -n /mnt/openslx.sqfs /rorootfs
-mount -n -t tmpfs none /dev/shm/uniontmp
-
-mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt
-mkdir -p /mnt/uniontmp /mnt/tmp
-mount -n --move /dev/shm/uniontmp /mnt/uniontmp
-
-mount --bind /mnt/lib /lib
-#ln -sf /mnt/lib /
-
-cat /proc/uptime >/mnt/tmp/runtime
+# read kernel command line for debugging switch
+read KCL < /proc/cmdline
+export KCL
+for opts in ${KCL}; do
+	case ${opts} in
+		debug*)
+			DEBUG=1;;
+		splash*)
+			SPLASH=1;;
+		ip=*)
+			# process IP info
+			ipinfo=${opts#ip=};;
+		nfs=*)
+      			nfs=${opts#nfs=}
+      			nfspath=${nfs#*:}
+      			nfsserver=${nfs%:/*}
+    		;;
+	esac
+done
 
-( hwinfo --netcard > /etc/netcard ) &
 while ps | grep -v grep | grep -q "  hwinfo --gfxcard" ; do usleep 10 ; done
 
-
 case $(cat /etc/hwinfo) in
 	*i915*)
 	 	modprobe -a i915 2>/dev/null
 		;;
        *intel*|*Intel*)
 	        modprobe -a i810 i830 i915 2>/dev/null
-        	;;
+		;;
        *nvidia*|*NVidia*|*nouveau*)
 	        modprobe -q nouveau 2>/dev/null
         	;;
@@ -63,15 +65,20 @@ case $(cat /etc/hwinfo) in
        *mga*|*matrox*|*Matrox*)
 	        modprobe -q mga 2>/dev/null
 	        ;;
-       *VMWARE*)
-                ;;
-       *)
+	*VMWARE*)
+		modprobe -q uvesafb mode_option=1024x768-32 mtrr=3 scroll=ywrap 2>/dev/null
+		modprove -q vmwgfx 2>/dev/null
+		;;
+	*)
 	        modprobe -qa r128 savage sis tdfx ttm via viafb
         	;;
 esac
-( modprobe -a drm fbcon; mdev -s ) &
+(modprobe -a drm; mdev -s ) &
 
-#ln -s /mnt/share /
+if [ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ]; then
+	# start plymouth
+	plymouthd && plymouth show-splash
+fi
 
 # load required network and usb controller drivers, filter out wireless adaptors
 while ps | grep -v grep | grep -q "  hwinfo --netcard" ; do usleep 10 ; done
@@ -86,26 +93,13 @@ if [ $(grep -ic "virtio_pci" /etc/modprobe.base) -ge 1 ]; then
 fi
 /bin/sh /etc/modprobe.base; mdev -s
 
-# read kernel command line for debugging switch
-read KCL < /proc/cmdline
-export KCL
-for opts in ${KCL}; do
-	case ${opts} in
-		debug)
-			DEBUG=1;;
-		ip=*)
-			# process IP info
-			ipinfo=${opts#ip=};;
-	esac
-done
-
 # setup network
 nwif="eth0"
 # set up loopback networking
 [ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)"
 ip link set dev lo up 2>/dev/null
 ip addr add 127.0.0.1/8 dev lo 2>/dev/null
-ip link set dev $nwif up  2>/dev/null || error "$init_noeth"
+ip link set dev $nwif up  2>/dev/null || { echo "No link for $nwif, dropping to shell.."; setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'; }
 
 # analyze ip information from the kernel command line and put parts
 # of it into several variables
@@ -136,11 +130,30 @@ else
   noipyet="yes"
 fi
 
-cat /proc/uptime >>/mnt/tmp/runtime
+
+# load local file systems
+modprobe aufs
+modprobe squashfs
+
+mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs
+mount -n -t tmpfs none /dev/shm/uniontmp
+
+if [ -n "$nfs" ] ; then
+	mount -t nfs -o ro,async,nolock ${nfsserver}:${nfspath} /rorootfs ||  { echo "Problem mounting NFS-Directory from ${nfsserver}:${nfspath}. Dropping to DEBUG shell."; DEBUG=1; } 	
+else
+	mount -n /mnt/openslx.sqfs /rorootfs || { echo "Problem mounting Squashfs. Dropping to DEBUG shell."; DEBUG=1; }
+fi
+			
+mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt
+mkdir -p /mnt/uniontmp /mnt/tmp
+mount -n --move /dev/shm/uniontmp /mnt/uniontmp
 
 if [ $DEBUG -ge 1 ]; then
 	echo "Starting debug shell, CTRL + D will start Stage 3.2."
 	setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+else
+	#Debug is not set so hide kernel debug output
+	echo "0 0 0 0" >/proc/sys/kernel/printk
 fi
 
 for mnt in proc sys run ; do
@@ -148,5 +161,6 @@ for mnt in proc sys run ; do
 done
 
 unset BOOT_IMAGE initrd
+[ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ] && plymouth update-root-fs --new-root-dir=/mnt
 # new style of pivoting (switch_root or run-init)
 exec /sbin/switch_root -c /dev/console /mnt /usr/lib/systemd/systemd
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
new file mode 100644
index 00000000..e660b0ff
--- /dev/null
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
@@ -0,0 +1,120 @@
+#!/bin/bash
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_binaries_and_files"
+	[ -e $COPYLIST ] && rm -f $COPYLIST
+	for BIN in $REQUIRED_BINARIES; do
+		BIN_LOCATION=$(which ${BIN})
+		[ ! -z "${BIN_LOCATION}" -a -e "${BIN_LOCATION}" ] \
+			&& get_link_chain "${BIN_LOCATION}" >> "${COPYLIST}"
+	done
+	for FILE in $REQUIRED_FILES; do
+		get_link_chain "${FILE}" >> "${COPYLIST}"
+	done
+
+	tarcopy "$(cat $COPYLIST|sort -u)" "${MODULE_BUILD_DIR}"
+}
+
+post_copy() {
+        generate_rootfs
+        copy_kernel_modules
+        generate_modules_map_files
+        copy_firmware
+
+	# copy busybox that has been under /openslx back to /
+	cp -r "${TARGET_BUILD_DIR}"/openslx/* "${TARGET_BUILD_DIR}"
+	#rm -rf "${TARGET_BUILD_DIR}/openslx"
+}
+
+#
+# helper functions to generate the base rootfs
+#
+generate_rootfs() {
+        # create basic directory structure
+        mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,run,etc,mnt,sys} \
+                || perror "Cannot create basic directory structure in '${TARGET_BUILD_DIR}'"
+
+        # copy device files from running system
+        cp -a /dev/{console,kmsg,mem,null,tty,tty0,tty1,tty9,urandom,zero} \
+                "${TARGET_BUILD_DIR}"/dev || perror "Cannot copy devices from running system"
+        
+        # copy libc and ld-linux
+        tarcopy "$(list_basic_libs)" "${TARGET_BUILD_DIR}"
+
+        # copy required files
+        tarcopy "${REQUIRED_FILES}" "${TARGET_BUILD_DIR}"
+
+        # copy static data
+        cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" 
+}
+
+copy_kernel_modules() {
+
+        local MODLIST="stage31_modules_list"
+        [ -e $MODLIST ] && rm -f $MODLIST
+
+        # process modules list
+        for MOD in ${REQUIRED_KERNEL_MODULES}; do
+                local MOD_PATH="/lib/modules/${KERNEL_VERSION}/${MOD}"
+                if [ ! -e "${MOD_PATH}" ]; then
+                        pwarning "Module $MOD not found. Skipping. (might cause problem on certain clients!)"
+                        continue
+                else
+                        pdebug "Copying "${MOD_PATH}""
+                        echo "${MOD_PATH}" >> "${MODLIST}"
+                fi
+        done
+
+        if [ -s "$MODLIST" ]; then
+                local MODLISTCOUNT=$(cat "$MODLIST" | wc -l)
+                pinfo "Copying $MODLISTCOUNT modules to stage 3.1 target directory."
+                tarcopy "$(cat "$MODLIST")" "${TARGET_BUILD_DIR}"
+        fi
+	rm -rf $MODLIST
+}
+
+generate_modules_map_files() {
+
+        # first strip modules.order of all the modules we don't use
+        cat /lib/modules/"${KERNEL_VERSION}"/modules.order | grep -E $(echo ${REQUIRED_KERNEL_MODULES} | tr '\ ' '|') \
+                >> "${TARGET_BUILD_DIR}"/lib/modules/"${KERNEL_VERSION}"/modules.order
+
+        # copy list of builtin kernel modules
+        cp /lib/modules/"${KERNEL_VERSION}"/modules.builtin "${TARGET_BUILD_DIR}"/lib/modules/"${KERNEL_VERSION}"
+        # with modules.order and modules.builtin, we can run depmod for the rest of the files
+        depmod -b "${TARGET_BUILD_DIR}"
+}
+
+copy_firmware() {
+
+        local FWLIST="stage31_firmware_list"
+        [ -e $FWLIST ] && rm -f $FWLIST
+
+        local FW_PATH="/lib/firmware"
+
+        # process firmware list
+        for FW in ${REQUIRED_FIRMWARE}; do
+                local FOUND=0
+                if [ -e "${FW_PATH}"/"${FW}" ]; then
+                        pdebug "Copying "${FW_PATH}"/"${FW}""
+                        echo "${FW_PATH}"/"${FW}" >> "$FWLIST"
+                        FOUND=1
+                fi
+                if [ -e "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}" ]; then
+                        pdebug "Copying "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}""
+                        echo "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}" >> "$FWLIST"
+                        FOUND=1
+                fi
+                [ $FOUND -ne 1 ] && pwarning "Neither "${FW_PATH}"/"${FW}" nor "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}" found on the system."
+        done
+
+        if [ -s "${FWLIST}" ]; then
+                local FWLISTCOUNT=$(cat "$FWLIST"|wc -l)
+                pinfo "Copying $FWLISTCOUNT firmware to stage 3.1 target directory."
+                tarcopy "$(cat "$FWLIST")" "${TARGET_BUILD_DIR}"
+        fi
+	rm -f $FWLIST
+}
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
new file mode 100644
index 00000000..422f9b43
--- /dev/null
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -0,0 +1,69 @@
+REQUIRED_MODULES="		busybox"
+REQUIRED_BINARIES="		v86d"
+REQUIRED_KERNEL_MODULES="	kernel/drivers/video/sis/sisfb.ko
+				kernel/drivers/video/via/viafb.ko
+				kernel/drivers/video/uvesafb.ko
+        	               	kernel/drivers/acpi/video.ko
+                	       	kernel/drivers/ssb/ssb.ko
+	                       	kernel/drivers/gpu/drm/ttm/ttm.ko
+        	               	kernel/drivers/gpu/drm/via/via.ko
+                	       	kernel/drivers/gpu/drm/drm.ko
+                       	       	kernel/drivers/gpu/drm/tdfx/tdfx.ko
+	                       	kernel/drivers/gpu/drm/nouveau/nouveau.ko
+	                       	kernel/drivers/gpu/drm/savage/savage.ko
+				kernel/drivers/gpu/drm/radeon/radeon.ko
+				kernel/drivers/gpu/drm/drm_kms_helper.ko
+				kernel/drivers/gpu/drm/i810/i810.ko
+				kernel/drivers/gpu/drm/i2c/ch7006.ko
+				kernel/drivers/gpu/drm/i2c/sil164.ko
+				kernel/drivers/gpu/drm/sis/sis.ko
+				kernel/drivers/gpu/drm/mga/mga.ko
+				kernel/drivers/gpu/drm/i915/i915.ko
+				kernel/drivers/gpu/drm/r128/r128.ko
+				kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko
+				kernel/drivers/i2c/algos/i2c-algo-bit.ko
+				kernel/drivers/net/netconsole.ko
+				kernel/drivers/net/ethernet/realtek/8139too.ko
+				kernel/drivers/net/ethernet/realtek/r8169.ko
+				kernel/drivers/net/ethernet/nvidia/forcedeth.ko
+				kernel/drivers/net/ethernet/via/via-rhine.ko
+				kernel/drivers/net/ethernet/amd/pcnet32.ko
+				kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+				kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+				kernel/drivers/net/ethernet/sis/sis900.ko
+				kernel/drivers/net/ethernet/broadcom/tg3.ko
+				kernel/drivers/net/ethernet/broadcom/b44.ko
+				kernel/drivers/net/ethernet/intel/e1000/e1000.ko
+				kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
+				kernel/drivers/net/ethernet/intel/e100.ko
+				kernel/drivers/net/ethernet/marvell/skge.ko
+				kernel/drivers/net/ethernet/3com/3c59x.ko
+				kernel/drivers/net/ethernet/dec/tulip/tulip.ko
+				kernel/drivers/hid/hid.ko
+				kernel/drivers/hid/usbhid/usbhid.ko
+				kernel/drivers/platform/x86/wmi.ko
+				kernel/drivers/platform/x86/mxm-wmi.ko
+				kernel/fs/configfs/configfs.ko
+				kernel/fs/nfs_common/nfs_acl.ko
+				kernel/fs/nfs/nfs.ko
+				kernel/fs/fscache/fscache.ko
+				kernel/fs/lockd/lockd.ko
+				kernel/fs/squashfs/squashfs.ko
+				kernel/net/sunrpc/sunrpc.ko
+				kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
+				kernel/net/802/stp.ko
+				kernel/net/bridge/bridge.ko
+				kernel/ubuntu/aufs/aufs.ko"
+REQUIRED_FIRMWARE="     3com/
+                        e100/
+                        matrox/
+                        r128/
+                        radeon/
+                        RTL8192E/
+                        RTL8192SE/
+                        rtl_nic/
+                        tigon/"
+REQUIRED_FILES="        /etc/netconfig
+                        /etc/networks
+                        /etc/protocols
+                        /etc/services"
diff --git a/remote/tools/base/data/etc/keymaps/de_DE b/remote/rootfs/rootfs-stage32/data/etc/keymaps/de_DE
index 375c2012..375c2012 100644
--- a/remote/tools/base/data/etc/keymaps/de_DE
+++ b/remote/rootfs/rootfs-stage32/data/etc/keymaps/de_DE
diff --git a/remote/tools/base/data/etc/profile b/remote/rootfs/rootfs-stage32/data/etc/profile
index 3784e784..3784e784 100644
--- a/remote/tools/base/data/etc/profile
+++ b/remote/rootfs/rootfs-stage32/data/etc/profile
diff --git a/remote/tools/base/data/etc/udhcpc.openslx.script b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
index bff430ef..bff430ef 100755
--- a/remote/tools/base/data/etc/udhcpc.openslx.script
+++ b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
new file mode 100644
index 00000000..c704752b
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -0,0 +1,103 @@
+#!/bin/bash
+fetch_source() {
+	:
+}
+
+build() {
+
+	FILELIST="list_binaries_and_files"
+	[ -e "${FILELIST}" ] && rm "${FILELIST}"
+
+	for BIN in ${REQUIRED_BINARIES}
+	do
+		BIN_LOCATION=$(which ${BIN})
+		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
+		then
+			pdebug "Processing $BIN at $BIN_LOCATION ..."
+			get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
+		else
+			perror "${BIN} not found on the system! Please install it."
+		fi
+	done
+
+	for LIB in ${REQUIRED_LIBRARIES}
+	do
+		for LIB_LOCATION in $(find /lib/ -name "${LIB}.so*")
+		do
+			get_link_chain "${LIB_LOCATION}" >> "${FILELIST}"
+		done
+	done
+
+	for FILE in ${REQUIRED_DIRECTORIES}
+	do
+		[ ! -d ${FILE} ] && perror "Missing required directory $FILE"
+		echo ${FILE} >> "${FILELIST}"
+	done
+	for FILE in ${REQUIRED_FILES}
+	do
+		[ ! -f ${FILE} ] && perror "Missing required file $FILE"
+		echo ${FILE} >> "${FILELIST}"
+	done
+
+	local NUMFILES=$(cat "${FILELIST}" | wc -l)
+	if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
+		pinfo "File list generated at ${MODULE_BUILD_DIR}/${FILELIST} ($NUMFILES entries)"
+		tarcopy "$(cat "${FILELIST}")" "${MODULE_BUILD_DIR}"
+	fi
+}
+
+post_copy() {
+	
+	# make basic directory structure
+	mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,openslx/mnt}
+
+	# copy devices from running system
+	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \
+		"${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed."
+
+	# set /etc/environment to include /openslx/bin and /openslx/sbin
+	echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin\"" \
+        	> "${TARGET_BUILD_DIR}/etc/environment"
+
+	# copy static files
+	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "Copying static files from data/* failed."
+
+	# quick fix for /etc/fstab
+	echo "# no configuration" >> "${TARGET_BUILD_DIR}/etc/fstab"
+
+	# link /etc/mtab, needed for systemd
+	[ ! -e ${TARGET_BUILD_DIR}/etc/mtab ] && ln -s /proc/self/mounts ${TARGET_BUILD_DIR}/etc/mtab
+
+	# passwd, group, shadow
+	init_users_and_groups
+
+	# quick fix for missing group in /etc/group
+	add_group "lock"
+
+	# setup root accoun
+	USER=root PASSWORD='!r00t' add_user
+
+	mkdir -p ${TARGET_BUILD_DIR}/root
+
+	echo "minilinux-$(hostname)" > "${TARGET_BUILD_DIR}/etc/hostname"
+	#check for kernel modules, if not present copy from system
+	if [ ! -d ${TARGET_BUILD_DIR}/lib/modules ];
+	then
+		pinfo "Copying modules for kernel $(uname -r)..."
+		mkdir -p "${TARGET_BUILD_DIR}/lib/modules" || perror "Cannot create '${TARGET_BUILD_DIR}/lib/modules'"
+		cp -r "/lib/modules/$(uname -r)" "${TARGET_BUILD_DIR}/lib/modules/" || perror "Cannot copy kernel modules from '/lib/modules/$(uname -r)' '${TARGET_BUILD_DIR}/lib/modules/'"
+	else
+		pinfo "Not copying kernel modules from system, as '${TARGET_BUILD_DIR}/lib/modules/' already exists."
+	fi
+
+	#check for firmware, if not present copy from system
+	if [ ! -d ${TARGET_BUILD_DIR}/lib/firmware ];
+	then
+		pinfo "Copying firmware for kernel $(uname -r)..."
+		cp -r "/lib/firmware" "${TARGET_BUILD_DIR}/lib/" || perror "Cannot copy kernel modules from '/lib/firmware' '${TARGET_BUILD_DIR}/lib/'"
+	else
+		pinfo "Not copying firmware from system, as '${TARGET_BUILD_DIR}/lib/firmware' already exists."
+	fi	
+
+}
+
diff --git a/remote/tools/base/base.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 22e91214..9f8f822d 100644
--- a/remote/tools/base/base.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,4 +1,4 @@
-REQUIRED_DEPENDENCIES="nfs-common aufs-tools squashfs-tools"
+REQUIRED_DEPENDENCIES="nfs-common aufs-tools squashfs-tools whois"
 REQUIRED_BINARIES="	bash
 			agetty
 			cat
@@ -13,14 +13,12 @@ REQUIRED_BINARIES="	bash
 			umount.nfs4
 			mount.aufs
 			rm
-			ldd
-			strace
 			blkid
 			modprobe
-			rsyslogd
 			ps
 			scp
-			ssh"
+			ssh
+			xterm"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
@@ -39,7 +37,9 @@ REQUIRED_LIBRARIES="	libcap
 			libresolv
 			libau"
 REQUIRED_DIRECTORIES="	/etc/pam.d
-			/etc/security"
+			/etc/security
+			/lib/security
+			/lib/$ARCH_TRIPLET/security"
 REQUIRED_FILES="	/etc/environment
 			/etc/pam.conf
 			/etc/issue
@@ -53,4 +53,5 @@ REQUIRED_FILES="	/etc/environment
 			/etc/protocols
 			/etc/services
 			/etc/networks
-			/etc/netconfig"
+			/etc/netconfig
+			/etc/modprobe.d/blacklist.conf"
diff --git a/remote/tools/base/base.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 084bff5c..084bff5c 100644
--- a/remote/tools/base/base.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
diff --git a/remote/setup_target b/remote/setup_target
new file mode 100755
index 00000000..e3273f4d
--- /dev/null
+++ b/remote/setup_target
@@ -0,0 +1,263 @@
+#!/bin/bash
+
+MODE_DIR="${ROOT_DIR}/remote"
+MODULES_DIR="${MODE_DIR}/modules"
+
+# check for target directory
+TARGET_DIR="${MODE_DIR}/targets/${TARGET}"
+[ -d $TARGET_DIR ] || perror "Given target directory does not exist: $TARGET"
+TARGET_BUILD_DIR="${MODE_DIR}/builds/${TARGET}"
+
+# Keep track of processed modules
+PROCESSED_MODULES=""
+
+initial_checks () {
+	# check for required tools
+	for BIN in git locate depmod
+	do
+		local TEST=$(which ${BIN})
+		[ -z "$TEST" ] && pinfo "Installing $BIN..." && apt-get install $BIN
+	done
+}
+
+
+read_config () {
+	unset REQUIRED_BINARIES
+	unset REQUIRED_LIBRARIES
+	unset REQUIRED_DIRECTORIES
+	unset REQUIRED_FILES
+	unset REQUIRED_MODULES
+	unset REQUIRED_PACKAGES
+	unset REQUIRED_DEPENDENCIES
+
+	local MODULE_CONFIG="${MODULE_DIR}/${MODULE}.conf"
+
+	if [ -e "${MODULE_CONFIG}.${PACKET_MANAGER}" ]; then
+		# a specific tool.conf seems to exist, try to use that one
+		# TODO: Maybe move this down right after loading the generic one, to allow "overloading".... but might be a bit confusing
+		. "${MODULE_CONFIG}.${PACKET_MANAGER}" || perror "Sourcing '${MODULE_CONFIG}.${PACKET_MANAGER}' failed."
+	else
+		# otherwise, use the generic one
+		[ ! -e "${MODULE_CONFIG}" ] && perror "Config for '$MODULE' not found."
+		. "${MODULE_CONFIG}" || perror "Sourcing '${MODULE_CONFIG}' failed."
+	fi
+}
+
+read_build () {
+	local BUILD_SCRIPT="${MODULE_DIR}/${MODULE}.build"
+
+	[ ! -e "${BUILD_SCRIPT}" ] && perror "Build script for specified tool not found."
+
+	. "${BUILD_SCRIPT}" || perror "Sourcing '${BUILD_SCRIPT}' failed."
+}
+
+
+copy_files_with_deps () {
+
+	[ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0
+	cd $MODULE_BUILD_DIR
+
+	COPYFILES_LIST="list_wanted_stage3.2"
+	[ -e ${COPYFILES_LIST} ] && rm ${COPYFILES_LIST}
+
+		
+	[ ! -z "${REQUIRED_BINARIES}" ] && pinfo "Gathering required binaries from config file..."
+	for FILENAME in ${REQUIRED_BINARIES}
+	do
+		local FILE_CANDIDATES=$( find . -name "${FILENAME}" -a \( -type f -o -type l \) )
+		pdebug "Candidates for $FILENAME are: $FILE_CANDIDATES"
+		local FINAL_LIST=""
+		for FILE in $FILE_CANDIDATES; do
+			local TESTFILE="$(readlink -f "$FILE")"
+			pdebug "  $FILE leads to $TESTFILE"
+			[ -f "$TESTFILE" -a -x "$TESTFILE" ] && [ "x$(grep -l -E '^(.ELF|#!)' "$TESTFILE")" != "x" ] && FINAL_LIST="$FINAL_LIST $FILE"
+		done
+		FINAL_LIST=$(trim "$FINAL_LIST")
+		pdebug "    Final list is $FINAL_LIST"
+		if [ -z "$FINAL_LIST" ]; then
+			pwarning "\tNo Binary found for ${FILENAME}. Skipping." 
+			continue
+		fi
+		if [[ "$FINAL_LIST" == *" "* ]]; then
+			pwarning "Found more than one match for required file '$FILENAME': $FINAL_LIST"
+		else
+			pdebug "\tFound ${FILENAME} at ${FILE}"
+		fi
+		for FILE in $FINAL_LIST; do
+			strip $FILE || pwarning "Could not strip '${FILE}'"
+			get_link_chain "${MODULE_BUILD_DIR}/${FILE}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}"
+			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${FILE}" >> "${COPYFILES_LIST}"
+		done
+	done
+
+	[ ! -z "${REQUIRED_LIBRARIES}" ] && pinfo "Gathering required libraries from config file..."
+	for LIB in ${REQUIRED_LIBRARIES}
+	do
+		for LOCATION in $(find . -name ${LIB}.so\*)
+		do
+			pdebug "* $LOCATION"
+			strip $LOCATION || pwarning "Could not strip '${LOCATION}'"
+			get_link_chain "${MODULE_BUILD_DIR}/${LOCATION}" "${MODULE_BUILD_DIR}"  >> "${COPYFILES_LIST}"
+			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${LOCATION}" >> "${COPYFILES_LIST}"
+		done
+	done
+
+	[ ! -z "${REQUIRED_DIRECTORIES}" ] && pinfo "Gathering required directories from config file..."
+	local CURRENT_PWD=$(pwd) # Prevent calling pwd 50000 times inside the loop below
+	for ENTRY in ${REQUIRED_DIRECTORIES}
+	do
+		pdebug "* ./$ENTRY"
+		echo "./${ENTRY}" >> "${COPYFILES_LIST}"
+		for BIN in $(find "./${ENTRY}" -type f -not -name '*.a' | xargs grep -l '^.ELF')
+		do
+			pdebug "   Searching libs for ${BIN}..."
+			get_link_chain "${MODULE_BUILD_DIR}/${BIN}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}"
+			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${BIN}" >> "${COPYFILES_LIST}"
+		done
+	done
+
+	[ ! -z "${REQUIRED_FILES}" ] && pinfo "Gathering required files from config file..."
+	for ENTRY in ${REQUIRED_FILES}
+	do
+		get_link_chain "${MODULE_BUILD_DIR}/${ENTRY}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}"
+		get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${MODULE_BUILD_DIR}/.${ENTRY}" >> "${COPYFILES_LIST}"
+	done
+
+
+	#copy to initramfsdir
+	pdebug "[stage32] File list generated at ${MODULE_BUILD_DIR}/${COPYFILES_LIST}."
+	if [ -s "$COPYFILES_LIST" ]; then
+		local CLISTCOUNT=$(cat "$COPYFILES_LIST" | wc -l)
+		pinfo "Copying $CLISTCOUNT files to '${TARGET_BUILD_DIR}'."
+		tarcopy "$(cat "$COPYFILES_LIST"|sort -u)" "${TARGET_BUILD_DIR}"
+	fi
+}
+
+generate_target() {
+
+	initial_checks
+
+	[[ $TARGET == builds || $TARGET == modules ]] && \
+		perror "Target directory cannot be named 'builds' nor 'modules'."
+
+	pinfo "Generating '$TARGET_BUILD_DIR' for '$TARGET'"
+
+	# if no arguments assume all.
+	if [ "x$1" = "x" -o "x$1" = "xall" ]; then
+		MODULES=$(ls ${TARGET_DIR})
+		set -- $MODULES
+	else
+		# tools = arguments given
+		MODULES=$@
+	fi
+
+	pinfo "Activated modules in '${TARGET}':"
+	pinfo "\t$(echo ${MODULES})"
+
+	# copy basic libs
+	pinfo "Copying libc and ld-linux used by ${SHELL}"
+	tarcopy "$(list_basic_libs)" "${TARGET_BUILD_DIR}"
+
+	# now iterate over given tools and copy them
+	while (( "$#" )); do
+		process_module "$1"
+		shift
+	done
+	TOOL_STR=""
+}
+
+process_module() {
+	[ "$#" -ne "1" ] && perror "process_module: want 1 param."
+	local MODULE="$1"
+	[[ "$PROCESSED_MODULES" == *"!${MODULE}!"* ]] && return # Already processed this module
+	PROCESSED_MODULES="${PROCESSED_MODULES}!${MODULE}!"
+	local MODULE_DIR="${TARGET_DIR}/${MODULE}"
+	local MODULE_BUILD_DIR="${MODULE_DIR}/build"
+	local TOOL_STR=""
+	pinfo ">>>>>>>>>>>>>>>>> Processing module [ $MODULE ]"
+	TOOL_STR="[${MODULE}]"
+	if [ -d "${MODULE_DIR}" ]; then
+
+		#[ "x$DEBUG" != "x1" ] \
+		#	&& echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \
+		#	&& exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log
+		# TODO: Make above work with the new logging system (add function to logging.inc to switch logfile)
+		cd "${MODULE_DIR}" || perror "Module dir '${MODULE_DIR}' seems to exist, but cd to it failed."
+		pinfo "## Reading config"
+		read_config
+		# Check if this module has a dependency that wasn't built yet:
+		if [ ! -z "$REQUIRED_MODULES" ]; then
+			pinfo "$MODULE depends on ${REQUIRED_MODULES}...."
+			for DEP in $REQUIRED_MODULES; do
+				process_module "$DEP"
+			done
+			# Read old config again, as it got overwritten by the deps
+			cd "${MODULE_DIR}" || perror "Tool dir '${MODULE_DIR}' seems to exist, but cd to it failed (after building deps)."
+			read_config
+			pinfo "<<<<<<<<<<<<<<<<< Dependency modules processed, back to module [ $MODULE ]"
+		fi
+		pinfo "## Reading build"
+		read_build
+		pinfo "## Installing dependencies"
+		install_dependencies
+		pinfo "## Fetching source"
+		fetch_source
+		pinfo "## Building"
+		build
+		# remove *.la files as they might confuse libtool/linker of other tool packages
+		find "${MODULE_DIR}/build" -name '*.la' -exec rm -f {} \;
+		pinfo "## Copying files with dependencies"
+		copy_files_with_deps
+		pinfo "## Copying static module files"
+		copy_static_data
+		pinfo "## Post copy"
+		post_copy
+
+		# reset pipes
+		#[ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- 
+		# TODO
+		pinfo "Module completed."
+	else
+		pwarning "Module directory for '$MODULE' not found."
+	fi
+}
+
+clean_modules() {
+	if [ "x$1" = "x" -o "x$1" = "xall" ]; then
+		if [ -d ${TARGET_BUILD_DIR} ]; then
+			pinfo "Cleaning '${TARGET_BUILD_DIR}'" \
+				&& rm -rf "${TARGET_BUILD_DIR}"/* \
+				|| perror "Error deleting $TARGET_BUILD_DIR"
+		fi
+		set -- $(ls ${TARGET_DIR})
+	fi
+	cd ${TARGET_DIR}
+	while (( "$#" )); do
+		clean_module $(readlink -f $1)
+		shift
+	done
+	cd - &> /dev/null
+}
+
+clean_module() {
+	pinfo "Cleaning '$1'..."
+	local MODULE_DIR=$1
+	if [ -e ${MODULE_DIR}/.built ]; then
+		rm "${MODULE_DIR}/.built" || perror "Could not clear built flag"
+	fi
+	if [ -e ${MODULE_DIR}/.fetched_source ]; then
+		rm "${MODULE_DIR}/.fetched_source" || perror "Could not clear fetched_source flag"
+	fi
+	if [ -d ${MODULE_DIR}/build ]; then
+		rm -rf "${MODULE_DIR}/build" || perror "Could not delete build path"
+	fi
+	if [ -d ${MODULE_DIR}/src ]; then
+		rm -rf "${MODULE_DIR}/src" || perror "Could not delete src path"
+	fi
+	if [ -e ${MODULE_DIR}/list_binaries_and_files ]; then
+		rm "${MODULE_DIR}/list_binaries_and_files" || perror "Could not delete list_binaries_and_files"
+	fi
+	if [ -e ${MODULE_DIR}/stage32.log ]; then
+		rm "${MODULE_DIR}/stage32.log" || perror "Could not delete stage32.log"
+	fi
+}
diff --git a/remote/setup_tools b/remote/setup_tools
deleted file mode 100755
index 2af8abe5..00000000
--- a/remote/setup_tools
+++ /dev/null
@@ -1,270 +0,0 @@
-#!/bin/bash
-
-MODULE_DIR="${ROOT_DIR}/remote"
-
-#Create tools directory if not exists
-TOOL_DIR="${MODULE_DIR}/tools"
-INIT_DIR="${MODULE_DIR}/stage3.2"
-
-# Keep track of processed modules
-PROCESSED_MODULES=""
-
-initial_checks ()
-{
-	for BIN in git locate
-	do
-		local TEST=$(which ${BIN})
-		[ -z "$TEST" ] && pinfo "Installing $BIN..." && apt-get install $BIN
-	done
-}
-
-
-read_config () 
-{
-	unset REQUIRED_BINARIES
-	unset REQUIRED_LIBRARIES
-	unset REQUIRED_DIRECTORIES
-	unset REQUIRED_FILES
-	unset REQUIRED_MODULES
-	unset REQUIRED_PACKAGES
-	unset REQUIRED_DEPENDENCIES
-
-	local TOOL_CONFIG="${TOOL_DIR}/${TOOL}/${TOOL}.conf"
-
-	if [ -e "${TOOL_CONFIG}.${PACKET_MANAGER}" ]; then
-		# a specific tool.conf seems to exist, try to use that one
-		# TODO: Maybe move this down right after loading the generic one, to allow "overloading".... but might be a bit confusing
-		. "${TOOL_CONFIG}.${PACKET_MANAGER}" || perror "Sourcing '${TOOL_CONFIG}.${PACKET_MANAGER}' failed."
-	else
-		# otherwise, use the generic one
-		[ ! -e "${TOOL_CONFIG}" ] && perror "Config for '$TOOL' not found."
-		. "${TOOL_CONFIG}" || perror "Sourcing '${TOOL_CONFIG}' failed."
-	fi
-}
-
-read_build () 
-{
-	local BUILD_SCRIPT="${TOOL_DIR}/${TOOL}/${TOOL}.build"
-
-	[ ! -e "${BUILD_SCRIPT}" ] && perror "Build script for specified tool not found."
-
-	. "${BUILD_SCRIPT}" || perror "Sourcing '${BUILD_SCRIPT}' failed."
-}
-
-copyfileswithdependencies ()
-{
-	[ ! -d build ] && pinfo "No build directory found, skipping dependency copying" && return 0
-	cd build
-
-
-	COPYFILES_LIST="list_wanted_stage3.2"
-	[ -e ${COPYFILES_LIST} ] && rm ${COPYFILES_LIST}
-
-		
-	[ ! -z "${REQUIRED_BINARIES}" ] && pinfo "Gathering required binaries from config file..."
-	for FILENAME in ${REQUIRED_BINARIES}
-	do
-		local FILE_CANDIDATES=$( find . -name "${FILENAME}" -a \( -type f -o -type l \) )
-		pdebug "Candidates for $FILENAME are: $FILE_CANDIDATES"
-		local FINAL_LIST=""
-		for FILE in $FILE_CANDIDATES; do
-			local TESTFILE="$(readlink -f "$FILE")"
-			pdebug "  $FILE leads to $TESTFILE"
-			[ -f "$TESTFILE" -a -x "$TESTFILE" ] && [ "x$(grep -l -E '^(.ELF|#!)' "$TESTFILE")" != "x" ] && FINAL_LIST="$FINAL_LIST $FILE"
-		done
-		FINAL_LIST=$(trim "$FINAL_LIST")
-		pdebug "    Final list is $FINAL_LIST"
-		if [ -z "$FINAL_LIST" ]; then
-			pwarning "\tNo Binary found for ${FILENAME}. Skipping." 
-			continue
-		fi
-		if [[ "$FINAL_LIST" == *" "* ]]; then
-			pwarning "Found more than one match for required file '$FILENAME': $FINAL_LIST"
-		else
-			pdebug "\tFound ${FILENAME} at ${FILE}"
-		fi
-		for FILE in $FINAL_LIST; do
-			get_link_chain "${TOOL_DIR}/${TOOL}/build/${FILE}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
-			get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${FILE}" >> "${COPYFILES_LIST}"
-		done
-	done
-
-	[ ! -z "${REQUIRED_LIBRARIES}" ] && pinfo "Gathering required libraries from config file..."
-	for LIB in ${REQUIRED_LIBRARIES}
-	do
-		for LOCATION in $(find . -name ${LIB}.so\*)
-		do
-			pdebug "* $LOCATION"
-			get_link_chain "${TOOL_DIR}/${TOOL}/build/${LOCATION}" "${TOOL_DIR}/${TOOL}/build"  >> "${COPYFILES_LIST}"
-			get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${LOCATION}" >> "${COPYFILES_LIST}"
-		done
-	done
-
-	[ ! -z "${REQUIRED_DIRECTORIES}" ] && pinfo "Gathering required directories from config file..."
-	local CURRENT_PWD=$(pwd) # Prevent calling pwd 50000 times inside the loop below
-	for ENTRY in ${REQUIRED_DIRECTORIES}
-	do
-		pdebug "* ./$ENTRY"
-		echo "./${ENTRY}" >> "${COPYFILES_LIST}"
-		for BIN in $(find "./${ENTRY}" -type f -not -name '*.a' | xargs grep -l '^.ELF')
-		do
-			pdebug "   Searching libs for ${BIN}..."
-			get_link_chain "${TOOL_DIR}/${TOOL}/build/${BIN}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
-			get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${BIN}" >> "${COPYFILES_LIST}"
-		done
-	done
-
-	[ ! -z "${REQUIRED_FILES}" ] && pinfo "Gathering required files from config file..."
-	for ENTRY in ${REQUIRED_FILES}
-	do
-		get_link_chain "${TOOL_DIR}/${TOOL}/build/${ENTRY}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
-		get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${TOOL_DIR}/${TOOL}/build/.${ENTRY}" >> "${COPYFILES_LIST}"
-	done
-
-
-	#copy to initramfsdir
-	pdebug "[stage32] Completed file list generation at ${TOOL_DIR}/${TOOL}/build/${COPYFILES_LIST}."
-	if [ -s "$COPYFILES_LIST" ]; then
-		local CLISTCOUNT=$(cat "$COPYFILES_LIST" | wc -l)
-		pinfo "Copying $CLISTCOUNT files to stage 3.2 target directory."
-		tar -cp $(cat ${COPYFILES_LIST}|sort -u) | tar -xp -C "${INIT_DIR}"
-		local RET=$?
-		[ "x$RET" != "x0" ] && perror "Could not tar-copy to $INIT_DIR"
-	fi
-}
-
-get_basic_libs () {
-	
-	[ ! -d ${INIT_DIR} ] && mkdir ${INIT_DIR}
-	
-	# copy libc and ld-linux separatly
-	pinfo "Adding basic libs"
-	BASICLIBS=""
-	for i in $(ldd ${SHELL})
-	do
-        	if [ $(echo $i | grep '^/' | grep -c ld) -eq 1 -o  $(echo $i | grep '^/' | grep -c libc.so) -eq 1 ];
-	        then
-        	        pdebug "Adding $i"
-	                BASICLIBS="${BASICLIBS} $i $(readlink -f "$i")"
-	        fi
-	done
-	tar -cp ${BASICLIBS} | tar -xp -C ${INIT_DIR}
-	local RET=$?
-	[ "x$RET" != "x0" ] && perror "Could not tar-copy to $INIT_DIR"
-}
-
-generate_stage32 () {
-
-	initial_checks
-
-	get_basic_libs
-
-	# if no arguments assume all.
-	if [ "x$1" = "x" -o "x$1" = "xall" ]; then
-		tools=$(ls ${TOOL_DIR})
-		set -- $tools
-	fi	
-
-	# now iterate over given tools and copy them
-	while (( "$#" )); do
-		process_module "$1"
-		shift
-	done
-	TOOL_STR=""
-}
-
-process_module() {
-	[ "$#" -ne "1" ] && perror "process_module: want 1 param."
-	local TOOL="$1"
-	[[ "$PROCESSED_MODULES" == *"!${TOOL}!"* ]] && return # Already processed this module
-	PROCESSED_MODULES="${PROCESSED_MODULES}!${TOOL}!"
-	local TOOL_STR=""
-	pinfo ">>>>>>>>>>>>>>>>> Processing module [ $TOOL ]"
-	TOOL_STR="[${TOOL}]"
-	if [ -d "${TOOL_DIR}/${TOOL}" ];
-	then
-
-		#[ "x$DEBUG" != "x1" ] \
-		#	&& echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \
-		#	&& exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log
-		# TODO: Make above work with the new logging system (add function to logging.inc to switch logfile)
-		cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed."
-		pinfo "## Reading config"
-		read_config
-		# Check if this module has a dependency that wasn't built yet:
-		if [ ! -z "$REQUIRED_MODULES" ]; then
-			pinfo "$TOOL depends on ${REQUIRED_MODULES}...."
-			for DEP in $REQUIRED_MODULES; do
-				#[[ "$DESIRED_MODULES" != *"!${DEP}!"* ]] && perror "$TOOL has dependency $DEP, but $DEP is not in current profile."
-				process_module "$DEP"
-			done
-			# Read old config again, as it got overwritten by the deps
-			cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed (after building deps)."
-			read_config
-			pinfo "<<<<<<<<<<<<<<<<< Dependency modules processed, back to module [ $TOOL ]"
-		fi
-		pinfo "## Reading build"
-		read_build
-		pinfo "## Installing dependencies"
-		install_dependencies
-		pinfo "## Fetching source"
-		fetch_source
-		pinfo "## Building"
-		build
-		# remove *.la files as they might confuse libtool/linker of other tool packages
-		find "${TOOL_DIR}/${TOOL}/build" -name '*.la' -exec rm -f {} \;
-		pinfo "## Copying files with dependencies"
-		copyfileswithdependencies
-		pinfo "## Post copy"
-		post_copy
-
-		# reset pipes
-		#[ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- 
-		# TODO
-		pinfo "Module completed."
-	else
-		perror "Tool directory for '$TOOL' not found."
-		# maybe make this a warning instead of error?
-	fi
-}
-
-clean_tools() {
-	if [ "x$1" = "x" -o "x$1" = "xall" ]; then
-		#clean all
-		if [ -d ${INIT_DIR} ]; then
-			rm -rf "${INIT_DIR}" || perror "Error deleting $INIT_DIR"
-		fi
-	        for TOOL in $(ls ${TOOL_DIR}); do
-			clean_tool $TOOL
-        	done
-	else 
-		while (( "$#" )); do
-			clean_tool $1
-			shift
-		done
-	fi
-}
-
-clean_tool() {
-        TOOLDIR=${TOOL_DIR}/$1
-	pinfo "Cleaning ${TOOLDIR}..."
-	#[ -e ${TOOLDIR}/build/list_wanted_stage3.2 ] && cd ${INIT_DIR} \
-	#	&& xargs rm < ${TOOLDIR}/build/list_wanted_stage3.2
-	#[ -d ${TOOLDIR}/data ] && cd ${INIT_DIR} \
-#		&& xargs rm < $(find ${TOOLDIR}/data -type f)
-	if [ -e ${TOOLDIR}/.built ]; then
-		rm "${TOOLDIR}/.built" || perror "Could not clear built flag"
-	fi
-	if [ -e ${TOOLDIR}/.fetched_source ]; then
-		rm "${TOOLDIR}/.fetched_source" || perror "Could not clear fetched_source flag"
-	fi
-	if [ -d ${TOOLDIR}/build ]; then
-		rm -rf "${TOOLDIR}/build" || perror "Could not delete build path"
-	fi
-	if [ -d ${TOOLDIR}/src ]; then
-		rm -rf "${TOOLDIR}/src" || perror "Could not delete src path"
-	fi
-	if [ -e ${TOOLDIR}/list_binaries_and_files ]; then
-		rm "${TOOLDIR}/list_binaries_and_files" || perror "Could not delete list_binaries_and_files"
-	fi
-}
diff --git a/remote/targets/stage3.1/busybox b/remote/targets/stage3.1/busybox
new file mode 120000
index 00000000..4f45cedf
--- /dev/null
+++ b/remote/targets/stage3.1/busybox
@@ -0,0 +1 @@
+../../modules/busybox
\ No newline at end of file
diff --git a/remote/targets/stage3.1/debug b/remote/targets/stage3.1/debug
new file mode 120000
index 00000000..c05237d6
--- /dev/null
+++ b/remote/targets/stage3.1/debug
@@ -0,0 +1 @@
+../../modules/debug
\ No newline at end of file
diff --git a/remote/targets/stage3.1/hwinfo b/remote/targets/stage3.1/hwinfo
new file mode 120000
index 00000000..6007a018
--- /dev/null
+++ b/remote/targets/stage3.1/hwinfo
@@ -0,0 +1 @@
+../../modules/hwinfo
\ No newline at end of file
diff --git a/remote/targets/stage3.1/plymouth b/remote/targets/stage3.1/plymouth
new file mode 120000
index 00000000..66a16832
--- /dev/null
+++ b/remote/targets/stage3.1/plymouth
@@ -0,0 +1 @@
+../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage3.1/rootfs-stage31 b/remote/targets/stage3.1/rootfs-stage31
new file mode 120000
index 00000000..05a91970
--- /dev/null
+++ b/remote/targets/stage3.1/rootfs-stage31
@@ -0,0 +1 @@
+../../rootfs/rootfs-stage31
\ No newline at end of file
diff --git a/remote/targets/stage3.2/busybox b/remote/targets/stage3.2/busybox
new file mode 120000
index 00000000..4f45cedf
--- /dev/null
+++ b/remote/targets/stage3.2/busybox
@@ -0,0 +1 @@
+../../modules/busybox
\ No newline at end of file
diff --git a/remote/targets/stage3.2/consolekit b/remote/targets/stage3.2/consolekit
new file mode 120000
index 00000000..261968c7
--- /dev/null
+++ b/remote/targets/stage3.2/consolekit
@@ -0,0 +1 @@
+../../modules/consolekit
\ No newline at end of file
diff --git a/remote/targets/stage3.2/dbus b/remote/targets/stage3.2/dbus
new file mode 120000
index 00000000..dd148715
--- /dev/null
+++ b/remote/targets/stage3.2/dbus
@@ -0,0 +1 @@
+../../modules/dbus
\ No newline at end of file
diff --git a/remote/targets/stage3.2/debug b/remote/targets/stage3.2/debug
new file mode 120000
index 00000000..c05237d6
--- /dev/null
+++ b/remote/targets/stage3.2/debug
@@ -0,0 +1 @@
+../../modules/debug
\ No newline at end of file
diff --git a/remote/targets/stage3.2/kdm b/remote/targets/stage3.2/kdm
new file mode 120000
index 00000000..727ed5b5
--- /dev/null
+++ b/remote/targets/stage3.2/kdm
@@ -0,0 +1 @@
+../../modules/kdm
\ No newline at end of file
diff --git a/remote/targets/stage3.2/plymouth b/remote/targets/stage3.2/plymouth
new file mode 120000
index 00000000..66a16832
--- /dev/null
+++ b/remote/targets/stage3.2/plymouth
@@ -0,0 +1 @@
+../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage3.2/policykit b/remote/targets/stage3.2/policykit
new file mode 120000
index 00000000..39b77c7f
--- /dev/null
+++ b/remote/targets/stage3.2/policykit
@@ -0,0 +1 @@
+../../modules/policykit
\ No newline at end of file
diff --git a/remote/targets/stage3.2/rootfs-stage32 b/remote/targets/stage3.2/rootfs-stage32
new file mode 120000
index 00000000..96dcbb86
--- /dev/null
+++ b/remote/targets/stage3.2/rootfs-stage32
@@ -0,0 +1 @@
+../../rootfs/rootfs-stage32
\ No newline at end of file
diff --git a/remote/targets/stage3.2/rsyslogd b/remote/targets/stage3.2/rsyslogd
new file mode 120000
index 00000000..339d02f8
--- /dev/null
+++ b/remote/targets/stage3.2/rsyslogd
@@ -0,0 +1 @@
+../../modules/rsyslogd
\ No newline at end of file
diff --git a/remote/targets/stage3.2/sshd b/remote/targets/stage3.2/sshd
new file mode 120000
index 00000000..56b4e4b5
--- /dev/null
+++ b/remote/targets/stage3.2/sshd
@@ -0,0 +1 @@
+../../modules/sshd
\ No newline at end of file
diff --git a/remote/targets/stage3.2/systemd b/remote/targets/stage3.2/systemd
new file mode 120000
index 00000000..2dc58bd3
--- /dev/null
+++ b/remote/targets/stage3.2/systemd
@@ -0,0 +1 @@
+../../modules/systemd
\ No newline at end of file
diff --git a/remote/targets/stage3.2/xorg b/remote/targets/stage3.2/xorg
new file mode 120000
index 00000000..a9494860
--- /dev/null
+++ b/remote/targets/stage3.2/xorg
@@ -0,0 +1 @@
+../../modules/xorg
\ No newline at end of file
diff --git a/remote/tools.conf b/remote/tools.conf
deleted file mode 100644
index 7fccb297..00000000
--- a/remote/tools.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-default="	base
-			busybox
-			dbus
-			systemd
-			kdm"
-
-basic="		base
-			busybox
-			dbus
-			systemd"
-
-lightdm="	base
-			busybox
-			dbus
-			systemd
-			ldm
-			gtk-greeter"
diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
deleted file mode 100644
index 71886d8a..00000000
--- a/remote/tools/base/base.build
+++ /dev/null
@@ -1,98 +0,0 @@
-fetch_source() {
-	:
-}
-
-build() {
-
-	BUILDDIR="${TOOL_DIR}/${TOOL}/build"
-        mkdir -p "${BUILDDIR}"
-
-	FILELIST="list_binaries_and_files"
-	[ -e "${FILELIST}" ] && rm "${FILELIST}"
-
-	for BIN in ${REQUIRED_BINARIES}
-	do
-		BIN_LOCATION=$(which ${BIN})
-		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
-		then
-			pdebug "Processing $BIN at $BIN_LOCATION ..."
-			get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
-		else
-			perror "${BIN} not found on the system! Please install it."
-		fi
-	done
-
-	for LIB in ${REQUIRED_LIBRARIES}
-	do
-		for LIB_LOCATION in $(find /lib/ -name "${LIB}.so*")
-		do
-			get_link_chain "${LIB_LOCATION}" >> "${FILELIST}"
-		done
-	done
-
-	for FILE in ${REQUIRED_DIRECTORIES}
-	do
-		[ ! -d ${FILE} ] && perror "Missing required directory $FILE"
-		echo ${FILE} >> "${FILELIST}"
-	done
-	for FILE in ${REQUIRED_FILES}
-	do
-		[ ! -f ${FILE} ] && perror "Missing required file $FILE"
-		echo ${FILE} >> "${FILELIST}"
-	done
-
-	local NUMFILES=$(cat "${FILELIST}" | wc -l)
-	if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
-		pinfo "File list generated at ${BUILDDIR}/${FILELIST} ($NUMFILES entries)"
-		tarcopy "$(cat "${FILELIST}")" "${BUILDDIR}"
-	fi
-}
-
-post_copy() {
-	
-	# make basic directory structure
-	mkdir -p "${INIT_DIR}"/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,openslx/mnt}
-
-	# copy devices from running system
-	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \
-		"${INIT_DIR}"/dev || perror "Copying devices from running system failed."
-
-	# set /etc/environment to include /openslx/bin and /openslx/sbin
-	echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin\"" \
-        	> "${INIT_DIR}/etc/environment"
-
-	# copy static files
-	cp -r "${TOOL_DIR}/${TOOL}"/data/* "${INIT_DIR}" || perror "Copying static files from data/* failed."
-
-	# better: dirname $(ldd $SHELL|grep libc | awk -F " " '{print $3}')
-	# copy pam modules, TODO: better way to find arch-dependant interfix...
-        tarcopy "$(dirname $(locate pam_unix.so | grep ^/lib/))" "${INIT_DIR}"
-
-	# quick fix for /etc/fstab
-	echo "# no configuration" >> "${INIT_DIR}/etc/fstab"
-
-	# link /etc/mtab, needed for systemd
-	[ ! -e ${INIT_DIR}/etc/mtab ] && ln -s /proc/self/mounts ${INIT_DIR}/etc/mtab
-
-	# passwd, group, shadow
-	init_users_and_groups
-
-	# quick fix for missing group in /etc/group
-	add_group "lock"
-
-	# setup root accoun
-	USER=root PASSWORD='!r00t' add_user
-
-	mkdir -p ${INIT_DIR}/root
-
-	echo "minilinux-$(hostname)" > "${INIT_DIR}/etc/hostname"
-
-	# copy kernel modules
-	#[ ! -d ${INIT_DIR}/lib/modules/$(uname -r) ] && mkdir -p ${INIT_DIR}/lib/modules/$(uname -r)
-	#cp -r /lib/modules/$(uname -r) ${INIT_DIR}/lib/modules/$(uname -r)
-
-	#quick fix xterm symlink 
-	[ -e /usr/lib/libXaw7.so.7.0.0 ] && \
-		ln -s "/usr/lib/libXaw7.so.7.0.0" "${INIT_DIR}/usr/lib/libXaw7.so.7"
-}
-
diff --git a/remote/tools/base/data/etc/systemd/system/basic.target.wants/rsyslog.service b/remote/tools/base/data/etc/systemd/system/basic.target.wants/rsyslog.service
deleted file mode 100644
index 8e253ee1..00000000
--- a/remote/tools/base/data/etc/systemd/system/basic.target.wants/rsyslog.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=System Logging Service
-Before=udev.service
-
-[Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
-ExecStart=/usr/sbin/rsyslogd -n -c5
-Sockets=syslog.socket
-StandardOutput=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/remote/tools/base/data/etc/udhcpc.default.script b/remote/tools/base/data/etc/udhcpc.default.script
deleted file mode 100755
index 4a3403bc..00000000
--- a/remote/tools/base/data/etc/udhcpc.default.script
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-# Busybox udhcpc dispatcher script. Copyright (C) 2009 by Axel Beckert.
-#
-# Based on the busybox example scripts and the old udhcp source
-# package default.* scripts.
-
-RESOLV_CONF="/etc/resolv.conf"
-IP_CONF="/tmp/udhcpc_ip_config"
-
-export PATH=$PATH:/openslx/sbin:/openslx/bin
-
-case $1 in
-    bound|renew)
-
-	[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
-	[ -n "$subnet" ] && NETMASK="netmask $subnet"
-
-	ip addr add $ip/$(ipcalc -s -p $ip $subnet|sed s/.*=//) dev $interface
-	ip route add default via $router
-
-	echo "ip=$ip" > $IP_CONF
-        echo "subnet=$subnet" >> $IP_CONF
-        echo "broadcast=$broadcast" >> $IP_CONF
-	echo "gateway=$router" >> $IP_CONF
-
-	# Update resolver configuration file
-	R=""
-	[ -n "$domain" ] && R="domain $domain
-"
-	count=1;
-	for i in $dns; do
-	    echo "$0: Adding DNS $i"
-	    R="${R}nameserver $i
-"
-	    count=$((count+1));
-	done
-
-	if [ -x /sbin/resolvconf ]; then
-	    echo -n "$R" | resolvconf -a "${interface}.udhcpc"
-	else
-	    echo -n "$R" > "$RESOLV_CONF"
-	fi
-	;;
-
-    deconfig)
-
-	;;
-
-    leasefail)
-	echo "$0: Lease failed: $message"
-	;;
-
-    nak)
-	echo "$0: Received a NAK: $message"
-	;;
-
-    *)
-	echo "$0: Unknown udhcpc command: $1";
-	exit 1;
-	;;
-esac
diff --git a/remote/tools/busybox/busybox.build b/remote/tools/busybox/busybox.build
deleted file mode 100644
index 936f0730..00000000
--- a/remote/tools/busybox/busybox.build
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-fetch_source()
-{
-  [ ! -d src ] && mkdir src
-  if [ ! -e .fetched_source ]; then
-    git clone ${GIT} src
-    touch .fetched_source
-  fi
-}
-
-build()
-{
-  if [ ! -e .built ]; then
-    cd src
-    make -j5
-	[ ! -d $TOOL_DIR/$TOOL/build/$TARGET_DIR ] && mkdir -p $TOOL_DIR/$TOOL/build/$TARGET_DIR
-    make CONFIG_PREFIX=$TOOL_DIR/$TOOL/build/$TARGET_DIR install 
-    cd -
-    touch .built
-  fi
-}
-
-post_copy() {
-        :
-}
diff --git a/remote/tools/busybox/busybox.conf b/remote/tools/busybox/busybox.conf
deleted file mode 100644
index b0c1f886..00000000
--- a/remote/tools/busybox/busybox.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-GIT=git://git.openslx.org/openslx/tools/busybox
-TARGET_DIR="openslx"
-REQUIRED_BINARIES="	busybox"
-REQUIRED_DIRECTORIES="	/$TARGET_DIR/bin
-			/$TARGET_DIR/sbin
-			/$TARGET_DIR/usr"
diff --git a/remote/tools/dbus/data/etc/systemd/system/dbus.service b/remote/tools/dbus/data/etc/systemd/system/dbus.service
deleted file mode 100644
index 5e22c812..00000000
--- a/remote/tools/dbus/data/etc/systemd/system/dbus.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=D-Bus System Message Bus
-Requires=dbus.socket
-After=syslog.target
-
-[Service]
-ExecStartPre=//bin/dbus-uuidgen --ensure
-ExecStartPre=-/bin/rm -f /var/run/dbus/pid
-ExecStart=//bin/dbus-daemon --system --address=systemd: --nofork --activation=systemd
-ExecReload=//bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
-OOMScoreAdjust=-900
diff --git a/remote/tools/dbus/data/etc/systemd/system/dbus.socket b/remote/tools/dbus/data/etc/systemd/system/dbus.socket
deleted file mode 100644
index 0303bfbd..00000000
--- a/remote/tools/dbus/data/etc/systemd/system/dbus.socket
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=D-Bus System Message Bus Socket
-
-[Socket]
-ListenStream=/var/run/dbus/system_bus_socket
diff --git a/remote/tools/dbus/data/etc/systemd/system/dbus.target.wants/dbus.socket b/remote/tools/dbus/data/etc/systemd/system/dbus.target.wants/dbus.socket
deleted file mode 120000
index fe02d162..00000000
--- a/remote/tools/dbus/data/etc/systemd/system/dbus.target.wants/dbus.socket
+++ /dev/null
@@ -1 +0,0 @@
-../dbus.socket
\ No newline at end of file
diff --git a/remote/tools/dbus/data/etc/systemd/system/multi-user.target.wants/dbus.service b/remote/tools/dbus/data/etc/systemd/system/multi-user.target.wants/dbus.service
deleted file mode 120000
index 224df24b..00000000
--- a/remote/tools/dbus/data/etc/systemd/system/multi-user.target.wants/dbus.service
+++ /dev/null
@@ -1 +0,0 @@
-../dbus.service
\ No newline at end of file
diff --git a/remote/tools/dbus/data/etc/systemd/system/sockets.target.wants/dbus.socket b/remote/tools/dbus/data/etc/systemd/system/sockets.target.wants/dbus.socket
deleted file mode 120000
index fe02d162..00000000
--- a/remote/tools/dbus/data/etc/systemd/system/sockets.target.wants/dbus.socket
+++ /dev/null
@@ -1 +0,0 @@
-../dbus.socket
\ No newline at end of file
diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build
deleted file mode 100644
index e0e03943..00000000
--- a/remote/tools/dbus/dbus.build
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-	echo "Extracting from running system..."
-}
-
-build() {
-	BUILDDIR="${TOOL_DIR}/${TOOL}/build"
-
-	COPYLIST="list_dpkg_output"
-	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
-
-        list_packet_files >> "${COPYLIST}"
-
-	# prepare target dir & copy there
-	[ ! -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR}
-	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
-
-}
-post_copy() {
-        # copy static dbus systemd unit files to stage3.2
-  	SYSTEMDDIR="${INIT_DIR}/etc/systemd/system"
-	mkdir -p "${SYSTEMDDIR}"
-	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/* failed."
-}
-
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
deleted file mode 100644
index 23895580..00000000
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ /dev/null
@@ -1,55 +0,0 @@
-#tool/distro specific functions for fetching, building and installing dependencies
-
-fetch_source () {
-	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
-	touch .fetched_source
-}	
-
-build () {
-	BUILDDIR="$TOOL_DIR/$TOOL/build"
-
-	if [ ! -e .built ]; then
-		cd "src/$VERSION"
-		pinfo "Running configure"
-		./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
-		pinfo "Running make"
-		make || perror "failed."
-		mkdir -p "$BUILDDIR"
-		pinfo "Running make install"
-		DESTDIR="$BUILDDIR" make install || perror "failed."
-		
-		COPYLIST="list_dpkg_output"
-		[ -e "$COPYLIST" ] && rm "$COPYLIST"
-
-		for PACKAGE in ${REQUIRED_PACKAGES} 
-		do
-			for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
-			do
-				 [ ! -d $FILE ] && echo $FILE >> "$COPYLIST"
-			done
-		done
-
-		# prepare target dir & copy there
-		mkdir -p "$BUILDDIR"
-		tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
-
-		cd -
-		touch .built
-
-	fi
-}
-
-post_copy() {
-	#copy static data files
-	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/* failed."
-	# TODO: FIX PATH TO TRIPLET...
-	TRIPLET="$(basename "$(dirname "$(ldd "$SHELL" | grep libc | awk -F " " '{print $3}')")")"
-	gdk-pixbuf-query-loaders > "${INIT_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
-	mkdir -p "${INIT_DIR}/etc/pango" || perror "Making etc/pango failed."
-	pango-querymodules > "${INIT_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed."
-	gtk-update-icon-cache-3.0 "${INIT_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed."
-	update-mime-database "${INIT_DIR}/usr/share/mime" || perror "update-mime-database failed."
-	mkdir -p "${INIT_DIR}/var/lib"
-	cp -r "/var/lib/polkit-1" "${INIT_DIR}/var/lib/" || perror "Copying -r /var/lib/polkit-1 to '${INIT_DIR}/var/lib/' failed."
-}
-
diff --git a/remote/tools/ldm/ldm.build b/remote/tools/ldm/ldm.build
deleted file mode 100644
index c1bc08e8..00000000
--- a/remote/tools/ldm/ldm.build
+++ /dev/null
@@ -1,52 +0,0 @@
-#tool/distro specific functions for fetching, building and installing dependencies
-
-fetch_source () {
-	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
-	touch .fetched_source
-}	
-
-build () {
-	BUILDDIR="$TOOL_DIR/$TOOL/build"
-	if [ ! -e .built ]; then
-		cd "src/$VERSION"
-		pinfo "Running configure"
-		./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
-		pinfo "Running make"
-		make || perror "failed."
-		mkdir -p "$BUILDDIR"
-		pinfo "Running make install"
-		DESTDIR="$BUILDDIR" make install || perror "failed."
-
-		COPYLIST="list_dpkg_output"
-		[ -e "$COPYLIST" ] && rm "$COPYLIST"
-
-		for PACKAGE in ${REQUIRED_PACKAGES} 
-		do
-			for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
-			 do
-				[ ! -d $FILE ] && echo $FILE >> "$COPYLIST"
-			 done
-		done
-		
-		#prepare target dir & copy there
-		mkdir -p "$BUILDDIR"
-		tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
-
-		cd -
-		touch .built
-
-	fi
-}
-
-post_copy() {
-	mkdir -p "${INIT_DIR}/var/lib/lightdm"
-	touch "${INIT_DIR}/var/lib/lightdm/.Xauthority" || perror "Cannot touch '${INIT_DIR}/var/lib/lightdm/.Xauthority'"
-	local LDMUID=$(add_user "lightdm")
-	local LDMGID=$(add_group "lightdm")
-	pinfo "lightdm user and group is $LDMUID $LDMGID"
-	chown -R "${LDMUID}:${LDMGID}" "${INIT_DIR}/var/lib/lightdm/" || perror "chowning '${INIT_DIR}/var/lib/lightdm/' failed."
-	#copyi static data files
-	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/ failed."
-
-}
-
diff --git a/remote/tools/plymouth/plymouth.build b/remote/tools/plymouth/plymouth.build
deleted file mode 100644
index b7302971..00000000
--- a/remote/tools/plymouth/plymouth.build
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-  if [ ! -e .fetched_source ]; then
-    # download and extract tarball
-    [ ! -d src ] && mkdir src
-    wget -q $URL
-    TARBALL=`basename $URL`
-    tar xvf $TARBALL -C src/
-    rm $TARBALL
-    touch .fetched_source
-  fi
-}
-
-build() {
-  if [ ! -e .built ]; then
-
-    BUILDDIR=$TOOL_DIR/$TOOL/build
-
-    cd src/$VERSION
-    ./configure --enable-systemd-integration --disable-gtk --prefix=""
-    make -j5
-	[ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
-	DESTDIR=$BUILDDIR make install
-    cd -
-    touch .built
-  fi
-
-}
-
-post_copy() {
-        # copy static dbus systemd unit files to stage3.2
-        SYSTEMDDIR=${INIT_DIR}/etc/systemd/system
-        [ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR}
-        cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
-}
diff --git a/remote/tools/policykit/policykit.build b/remote/tools/policykit/policykit.build
deleted file mode 100644
index 079985ac..00000000
--- a/remote/tools/policykit/policykit.build
+++ /dev/null
@@ -1,62 +0,0 @@
-#tool/distro specific functions for fetching, building and installing dependencies
-	
-
-fetch_source () {
-	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
-	touch .fetched_source
-}	
-
-build () {
-	BUILDDIR=$TOOL_DIR/$TOOL/build
-
-	if [ ! -e .built ]; then
-		cd src/$VERSION
-
-		[ ! -d "${TOOL_DIR}/systemd/build" ] && perror "systemd build directory not found. Build it first."
-		pinfo "configuring..."
-		LIBSYSTEMD_LOGIN_LIBS="-L${TOOL_DIR}/systemd/build/usr/lib/" \
-			LIBSYSTEMD_LOGIN_CFLAGS="-I${TOOL_DIR}/systemd/build/usr/include -I${TOOL_DIR}/systemd/build/usr/include/systemd -lsystemd-login -lsystemd-daemon" \
-			./configure --enable-libsystemd-login=yes --with-systemdsystemunitdir=/etc/systemd/system -prefix="/" --datarootdir="/usr/share" --enable-man-pages=no --enable-gtk-doc-html=no --enable-examples=no --enable-static=no
-		pinfo "calling make..."
-		make || perror "make failed."
-		[ ! -d "$BUILDDIR" ] && mkdir -p "$BUILDDIR"
-		pinfo "installing to $BUILDDIR..."
-		DESTDIR="$BUILDDIR" make install || perror "make install failed..."
-		
-		COPYLIST="list_dpkg_output"
-		[ -e "$COPYLIST" ] && rm "$COPYLIST"
-		touch "$COPYLIST"
-
-		pinfo "determining required packages..."
-		if [ ! -z ${REQUIRED_PACKAGES} ]
-		then
-			for PACKAGE in ${REQUIRED_PACKAGES}
-			do
-				for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
-				do
-					 [ ! -d $FILE ] && echo $FILE >> "$COPYLIST"
-				done
-			done
-
-			# prepare target dir & copy there
-			if [ -s "$COPYLIST" ]; then
-				pinfo "using tar to copy all dependencies to $BUILDDIR"
-				tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
-			else
-				pinfo "no dependencies found!"
-			fi
-		fi	
-
-		cd -
-		touch .built
-
-	fi
-}
-
-post_copy() {
-
-	#Add Polkit User/Group/Shadow to Stage3.2
-	pinfo "Adding polkitd user to target system..."
-	add_user "polkitd"
-}
-
diff --git a/remote/tools/sshd/sshd.build b/remote/tools/sshd/sshd.build
deleted file mode 100644
index efd4f728..00000000
--- a/remote/tools/sshd/sshd.build
+++ /dev/null
@@ -1,25 +0,0 @@
-fetch_source() {
-	:
-}
-
-build() {
-
-	BUILDDIR=${TOOL_DIR}/${TOOL}/build/usr/sbin
-        mkdir -p "${BUILDDIR}"
-
-	BIN_LOCATION=$(which sshd)
-	[ ! -z ${BIN_LOCATION} ] && BIN_LOCATION=$(readlink -f "$BIN_LOCATION")
-	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
-	then
-		cp "${BIN_LOCATION}" "${BUILDDIR}/"
-	else
-		echo "[$TOOL] ${BIN} not found on the system! Please install it."
-		exit 1
-	fi
-
-}
-
-post_copy() {	
-	mkdir -p "${INIT_DIR}/var/run/sshd"
-	cp -r "${TOOL_DIR}"/${TOOL}/data/* "${INIT_DIR}/"
-}
diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build
deleted file mode 100644
index 1d5a9a87..00000000
--- a/remote/tools/systemd/systemd.build
+++ /dev/null
@@ -1,50 +0,0 @@
-#tool/distro specific functions for fetching, building and installing dependencies
-
-fetch_source () {
-	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
-	touch .fetched_source
-}	
-
-build () {
-	if [ ! -e .built ]; then
-		local libkmodversion=kmod-12
-		if [ ! -d $libkmodversion ]; then
-			wget http://www.kernel.org/pub/linux/utils/kernel/kmod/${libkmodversion}.tar.gz
-			tar xf $libkmodversion.tar.gz
-			rm ${libkmodversion}.tar.gz
-			cd $libkmodversion
-			./configure
-			make -j5
-			make install
-			cd -
-		fi
-		cd "src/$VERSION/"
-		pinfo "calling configure"
-		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
-		pinfo "calling make"
-		make -j5 || perror "make failed."
-		mkdir -p $TOOL_DIR/$TOOL/build
-		pinfo "calling make install"
-		DESTDIR=$TOOL_DIR/$TOOL/build make install || perror "make install failed."
-		cd -
-		touch .built
-	fi
-}
-
-post_copy() {
-	# copy static data files
-	cp -r $TOOL_DIR/$TOOL/data/* $INIT_DIR || perror "copying data files failed."
-		
-	# dont clear systemd log at startup
-	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" $INIT_DIR/usr/lib/systemd/system/getty@.service
-
-	#old agetty version doesn't support --noclear option in getty service
-	if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ];
-	then
-		sed -i.bak "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" $INIT_DIR/usr/lib/systemd/system/getty@.service
-	fi
-
-	# add nfs to modules-load list
-	echo "nfs" > "$INIT_DIR/etc/modules-load.d/nfs.conf"
-}
-
diff --git a/remote/tools/xorg/xorg.build b/remote/tools/xorg/xorg.build
deleted file mode 100644
index 9cd90db9..00000000
--- a/remote/tools/xorg/xorg.build
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-	:
-}
-
-build() {
-
-  BUILDDIR="$TOOL_DIR/$TOOL/build"
-
-  COPYLIST="list_dpkg_output"
-  [ -e "$COPYLIST" ] && rm "$COPYLIST"
-
-  for PACKAGE in ${REQUIRED_PACKAGES} 
-  do
-	for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
-	do
-		[ ! -d $FILE ] && echo $FILE >> "$COPYLIST"
-	done
-  done
-
-  # prepare target dir & copy there
-  mkdir -p "$BUILDDIR"
-  tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
-  
-}
-
-post_copy() {
-	mkdir -p "$INIT_DIR/etc/X11"
-	[ ! -e ${INIT_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${INIT_DIR}/etc/X11/X	
-	mkdir -p "$INIT_DIR/var/lib/xkb"
-	cp /var/lib/xkb/server* "$INIT_DIR/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '$INIT_DIR/var/lib/xkb/' failed."
-}
-
diff --git a/server/build_core b/server/build_core
index 03ff6eca..cf748428 100755
--- a/server/build_core
+++ b/server/build_core
@@ -20,106 +20,52 @@
 
 MODULE_DIR=${ROOT_DIR}/server
 
-STAGE31_STATIC_DIR=${ROOT_DIR}/data/stage3.1
-STAGE31_DIR=${MODULE_DIR}/stage3.1
+STAGE31_DIR=${ROOT_DIR}/remote/stage3.1
 STAGE32_DIR=${ROOT_DIR}/remote/stage3.2
 
 # initial checks
 initial_checks() {
 	local TOOL_STR="$TOOL_STR initial_checks:"
-	[ -d "${STAGE32_DIR}" ] || perror "No stage3.2 directory found. Please run './mltk --tools -b' first."
+	[ -d "${STAGE31_DIR}" ] || perror "No stage3.1 directory found. Please run './mltk core -b' first."
+	[ -d "${STAGE32_DIR}" ] || perror "No stage3.2 directory found. Please run './mltk tools -b' first."
 
-	[ -e "${STAGE32_DIR}/openslx/bin/busybox" ] || perror "Busybox not found, run './mltk --tools -b busybox' first."
-
-	# shouldn't squashfs-tools be automatically installed as we need them nevertheless!?
-	# what if it is already on the machine? faster to check with which than the apt-get check?
 	[ -z $(which mksquashfs) ] && perror "mksquashfs not found, please install squashfs-tools first."
-
-	#check for kernel modules, if not present copy from system
-	if [ ! -d "${STAGE32_DIR}/lib/modules" ];
-	then
-		pinfo "Couldn't find kernel modules in stage3.2."
-		pinfo "Copying modules for kernel $(uname -r)..."
-		mkdir -p "${STAGE32_DIR}/lib/modules" || perror "Cannot create '${STAGE32_DIR}/lib/modules'"
-		cp -r "/lib/modules/$(uname -r)" "${STAGE32_DIR}/lib/modules/" || perror "Cannot copy kernel modules from '/lib/modules/$(uname -r)' '${STAGE32_DIR}/lib/modules/'"
-	else
-		pinfo "Not copying kernel modules from system, as '${STAGE32_DIR}/lib/modules/' already exists."
-	fi
-
-	# TODO: check for aufs and squaskfs modules
-}
-
-generate_rootfs() {
-	local TOOL_STR="$TOOL_STR generate_rootfs:"
-
-	# produce stage3.1
-	mkdir -p "${STAGE31_DIR}" || perror "Cannot create stage3.1 dir '${STAGE31_DIR}'"
-
-	# create basic directory structure
-	mkdir -p "${STAGE31_DIR}"/{bin,dev,proc,run,etc,mnt,sys} || perror "Cannot create basic directory structure in '${STAGE31_DIR}'"
-
-	# copy device files from running system
-	cp -a /dev/{console,kmsg,mem,null,tty,tty0,tty1,tty9,urandom,zero} \
-		"${STAGE31_DIR}"/dev || perror "Cannot copy devices from running system"
-
-	# copy busybox, its libs and static data to stage3.1
-	cp -r "${STAGE32_DIR}"/openslx/* "${STAGE31_STATIC_DIR}"/* "${STAGE31_DIR}" || perror "Copying busybox, its libs and static data failed."
-
-	# fix for aufs & squashfs modules needed for stage 3.1
-	mkdir -p "${STAGE31_DIR}/lib/modules.0/" || perror "Creating modules.0 dir for aufs & squashfs in stage 3.1 failed."
-	cp "/lib/modules/$(uname -r)/kernel/fs/squashfs/squashfs.ko" "${STAGE31_DIR}/lib/modules.0/" || perror "Copying squashfs.ko failed."
-	cp "/lib/modules/$(uname -r)/kernel/ubuntu/aufs/aufs.ko" "${STAGE31_DIR}/lib/modules.0/" || perror "Copying aufs.ko failed."
-
-	# fetch the libraries needed for busybox
-	BASICLIBS=""
-	for i in $(ldd "${STAGE31_DIR}/bin/busybox");
-	do
-		if [ $(echo $i | grep '^/' | grep -c ld) -eq 1 \
-		-o  $(echo $i | grep '^/' | grep -c libc.so) -eq 1 ];
-        	then
-	                BASICLIBS="$BASICLIBS $i $(readlink -f "$i")"
-        	fi	
-	done
-	tarcopy "$BASICLIBS" "${STAGE31_DIR}"
 }
 
 generate_squashfs() {
+	[[ $CORE_NO_SQUASHFS == 1 ]] && return
 	local TOOL_STR="$TOOL_STR generate_squashfs:"
-	# finalize the initramfs target
-	[ -e "${STAGE31_DIR}/mnt/openslx.sqfs" ] && rm "${STAGE31_DIR}/mnt/openslx.sqfs"
-
-	mksquashfs "${STAGE32_DIR}" "${STAGE31_DIR}/mnt/openslx.sqfs" -comp xz -b 1M -no-recovery >&6 || perror "mksquashfs failed ($?)."
-
-}
-
-generate_initramfs() {
-	local TOOL_STR="$TOOL_STR generate_initramfs:"
-	cd "${STAGE31_DIR}" || perror "Cannot cd to '${STAGE31_DIR}'"
-	find . | cpio --format="newc" --create | gzip -9 > "${MODULE_DIR}/initramfs"
-	local PS=(${PIPESTATUS[*]})
-	[ "x${PS[0]}" != "x0" ] && perror "'find .' in '$(pwd)' failed."
-	[ "x${PS[1]}" != "x0" ] && perror "cpio create failed."
-	[ "x${PS[2]}" != "x0" ] && perror "gzip to '${MODULE_DIR}/initramfs' failed."
-	cd -
-	pinfo "initramfs created at ${MODULE_DIR}/initramfs"
+	[ -e "${MODULE_DIR}/openslx/mnt/openslx.sqfs" ] && rm "${MODULE_DIR}/openslx/mnt/openslx.sqfs"
+	pinfo "Writing openslx.sqfs to '${MODULE_DIR}/openslx/mnt/'"
+	mksquashfs "${STAGE32_DIR}" "${MODULE_DIR}/openslx/mnt/openslx.sqfs" -comp xz -b 1M -no-recovery >&6 || perror "mksquashfs failed ($?)."
+	generate_initramfs "initramfs2" "${MODULE_DIR}/openslx"
 }
 
 generate_stage31() {
 	initial_checks
 	generate_rootfs
 	generate_squashfs
-	generate_initramfs
 
-	# TODO better kernel copy
-	cp "/boot/vmlinuz-$(uname -r)" "${MODULE_DIR}/kernel" || perror "Cannot copy kernel from '/boot/vmlinuz-$(uname -r)' to '${MODULE_DIR}/kernel'"
-	pinfo "kernel $(uname -r) copied to ${MODULE_DIR}/kernel"
+	if [ ! -e ${MODULE_DIR}/kernel ]; then
+		local TOOL_STR="$TOOL_STR copy_kernel:"
+		pinfo "Copying Kernel $(uname -r) to ${MODULE_DIR}/kernel"
+		cp "/boot/vmlinuz-$(uname -r)" "${MODULE_DIR}/kernel" || perror "Cannot copy kernel from '/boot/vmlinuz-$(uname -r)' to '${MODULE_DIR}/kernel'"
+	else
+		pinfo "Not copying kernel from system, as it already exists."
+	fi
 }
 
 clean_core() {
 	local TOOL_STR="$TOOL_STR clean_core:"
 	pinfo "Cleaning '${STAGE31_DIR}'..."
 	[ -d ${STAGE31_DIR} ] && { rm -rf ${STAGE31_DIR} || perror "rm -rf failed."; }
+	pinfo "Cleaning '${MODULE_DIR}/kernel'..."
+	[ -e ${MODULE_DIR}/kernel ] && { rm ${MODULE_DIR}/kernel || perror "rm failed."; }
 	pinfo "Cleaning '${MODULE_DIR}/initramfs'..."
 	[ -e ${MODULE_DIR}/initramfs ] && { rm ${MODULE_DIR}/initramfs || perror "rm failed."; }
+	pinfo "Cleaning '${MODULE_DIR}/openslx'..."
+	[ -d ${MODULE_DIR}/openslx ] && { rm -rf ${MODULE_DIR}/openslx || perror "rm failed."; }
+	pinfo "Cleaning '${MODULE_DIR}/initramfs2'..."
+	[ -d ${MODULE_DIR}/initramfs2 ] && { rm ${MODULE_DIR}/initramfs2 || perror "rm failed."; }
 }