153 files changed, 21 insertions, 26 deletions

diff --git a/USR-master/.disk/base_installable b/templates/.disk/base_installable
index e69de29..e69de29 100644
--- a/USR-master/.disk/base_installable
+++ b/templates/.disk/base_installable
diff --git a/USR-master/.disk/casper-uuid-generic b/templates/.disk/casper-uuid-generic
index b30f3b3..b30f3b3 100644
--- a/USR-master/.disk/casper-uuid-generic
+++ b/templates/.disk/casper-uuid-generic
diff --git a/USR-master/.disk/cd_type b/templates/.disk/cd_type
index daab660..daab660 100644
--- a/USR-master/.disk/cd_type
+++ b/templates/.disk/cd_type
diff --git a/USR-master/.disk/info b/templates/.disk/info
index f967b56..f967b56 100644
--- a/USR-master/.disk/info
+++ b/templates/.disk/info
diff --git a/USR-master/.disk/release_notes_url b/templates/.disk/release_notes_url
index 8c57512..8c57512 100644
--- a/USR-master/.disk/release_notes_url
+++ b/templates/.disk/release_notes_url
diff --git a/USR-master/README.TXT b/templates/iso/README.TXT
index 13bb03c..13bb03c 100644
--- a/USR-master/README.TXT
+++ b/templates/iso/README.TXT
diff --git a/USR-master/README.diskdefines b/templates/iso/README.diskdefines
index 1e64ca6..1e64ca6 100644
--- a/USR-master/README.diskdefines
+++ b/templates/iso/README.diskdefines
diff --git a/USR-master/dists/lucid/Release b/templates/iso/dists/lucid/Release
index c1c57bf..c1c57bf 100644
--- a/USR-master/dists/lucid/Release
+++ b/templates/iso/dists/lucid/Release
diff --git a/USR-master/dists/lucid/Release.gpg b/templates/iso/dists/lucid/Release.gpg
index 2947852..2947852 100644
--- a/USR-master/dists/lucid/Release.gpg
+++ b/templates/iso/dists/lucid/Release.gpg
diff --git a/USR-master/dists/lucid/main/binary-i386/Packages.gz b/templates/iso/dists/lucid/main/binary-i386/Packages.gz
index df5fff0..df5fff0 100644
--- a/USR-master/dists/lucid/main/binary-i386/Packages.gz
+++ b/templates/iso/dists/lucid/main/binary-i386/Packages.gz
diff --git a/USR-master/dists/lucid/main/binary-i386/Release b/templates/iso/dists/lucid/main/binary-i386/Release
index 2f3a46c..2f3a46c 100644
--- a/USR-master/dists/lucid/main/binary-i386/Release
+++ b/templates/iso/dists/lucid/main/binary-i386/Release
diff --git a/USR-master/dists/lucid/restricted/binary-i386/Packages.gz b/templates/iso/dists/lucid/restricted/binary-i386/Packages.gz
index f9d1208..f9d1208 100644
--- a/USR-master/dists/lucid/restricted/binary-i386/Packages.gz
+++ b/templates/iso/dists/lucid/restricted/binary-i386/Packages.gz
diff --git a/USR-master/dists/lucid/restricted/binary-i386/Release b/templates/iso/dists/lucid/restricted/binary-i386/Release
index 444c0f7..444c0f7 100644
--- a/USR-master/dists/lucid/restricted/binary-i386/Release
+++ b/templates/iso/dists/lucid/restricted/binary-i386/Release
diff --git a/USR-master/dists/stable b/templates/iso/dists/stable
index d5a19a3..d5a19a3 120000
--- a/USR-master/dists/stable
+++ b/templates/iso/dists/stable
diff --git a/USR-master/dists/unstable b/templates/iso/dists/unstable
index d5a19a3..d5a19a3 120000
--- a/USR-master/dists/unstable
+++ b/templates/iso/dists/unstable
diff --git a/USR-master/install/README.sbm b/templates/iso/install/README.sbm
index 4087670..4087670 100644
--- a/USR-master/install/README.sbm
+++ b/templates/iso/install/README.sbm
diff --git a/USR-master/install/mt86plus b/templates/iso/install/mt86plus
index cf2b847..cf2b847 100644
--- a/USR-master/install/mt86plus
+++ b/templates/iso/install/mt86plus
diff --git a/USR-master/install/sbm.bin b/templates/iso/install/sbm.bin
index b6e2415..b6e2415 100644
--- a/USR-master/install/sbm.bin
+++ b/templates/iso/install/sbm.bin
diff --git a/USR-master/isolinux/16x16.fnt b/templates/iso/isolinux/16x16.fnt
index d392957..d392957 100644
--- a/USR-master/isolinux/16x16.fnt
+++ b/templates/iso/isolinux/16x16.fnt
diff --git a/USR-master/isolinux/adtext.cfg b/templates/iso/isolinux/adtext.cfg
index e69de29..e69de29 100644
--- a/USR-master/isolinux/adtext.cfg
+++ b/templates/iso/isolinux/adtext.cfg
diff --git a/USR-master/isolinux/am.tr b/templates/iso/isolinux/am.tr
index cdf4c3c..cdf4c3c 100644
--- a/USR-master/isolinux/am.tr
+++ b/templates/iso/isolinux/am.tr
diff --git a/USR-master/isolinux/ast.hlp b/templates/iso/isolinux/ast.hlp
index 269d314..269d314 100644
--- a/USR-master/isolinux/ast.hlp
+++ b/templates/iso/isolinux/ast.hlp
diff --git a/USR-master/isolinux/ast.tr b/templates/iso/isolinux/ast.tr
index a9909c8..a9909c8 100644
--- a/USR-master/isolinux/ast.tr
+++ b/templates/iso/isolinux/ast.tr
diff --git a/USR-master/isolinux/back.jpg b/templates/iso/isolinux/back.jpg
index a60504c..a60504c 100644
--- a/USR-master/isolinux/back.jpg
+++ b/templates/iso/isolinux/back.jpg
diff --git a/USR-master/isolinux/be.tr b/templates/iso/isolinux/be.tr
index 1c69047..1c69047 100644
--- a/USR-master/isolinux/be.tr
+++ b/templates/iso/isolinux/be.tr
diff --git a/USR-master/isolinux/bg.hlp b/templates/iso/isolinux/bg.hlp
index e69de29..e69de29 100644
--- a/USR-master/isolinux/bg.hlp
+++ b/templates/iso/isolinux/bg.hlp
diff --git a/USR-master/isolinux/bg.tr b/templates/iso/isolinux/bg.tr
index f85bcf5..f85bcf5 100644
--- a/USR-master/isolinux/bg.tr
+++ b/templates/iso/isolinux/bg.tr
diff --git a/USR-master/isolinux/boot.cat b/templates/iso/isolinux/boot.cat
index 7407c27..7407c27 100644
--- a/USR-master/isolinux/boot.cat
+++ b/templates/iso/isolinux/boot.cat
diff --git a/USR-master/isolinux/bootlogo b/templates/iso/isolinux/bootlogo
index cdd895c..cdd895c 100644
--- a/USR-master/isolinux/bootlogo
+++ b/templates/iso/isolinux/bootlogo
diff --git a/USR-master/isolinux/bs.tr b/templates/iso/isolinux/bs.tr
index c94b887..c94b887 100644
--- a/USR-master/isolinux/bs.tr
+++ b/templates/iso/isolinux/bs.tr
diff --git a/USR-master/isolinux/ca.hlp b/templates/iso/isolinux/ca.hlp
index 255ab01..255ab01 100644
--- a/USR-master/isolinux/ca.hlp
+++ b/templates/iso/isolinux/ca.hlp
diff --git a/USR-master/isolinux/ca.tr b/templates/iso/isolinux/ca.tr
index a576c86..a576c86 100644
--- a/USR-master/isolinux/ca.tr
+++ b/templates/iso/isolinux/ca.tr
diff --git a/USR-master/isolinux/cs.tr b/templates/iso/isolinux/cs.tr
index 7c6e612..7c6e612 100644
--- a/USR-master/isolinux/cs.tr
+++ b/templates/iso/isolinux/cs.tr
diff --git a/USR-master/isolinux/da.tr b/templates/iso/isolinux/da.tr
index 7796af1..7796af1 100644
--- a/USR-master/isolinux/da.tr
+++ b/templates/iso/isolinux/da.tr
diff --git a/USR-master/isolinux/de.hlp b/templates/iso/isolinux/de.hlp
index b6b39f3..b6b39f3 100644
--- a/USR-master/isolinux/de.hlp
+++ b/templates/iso/isolinux/de.hlp
diff --git a/USR-master/isolinux/de.tr b/templates/iso/isolinux/de.tr
index 69fccbb..69fccbb 100644
--- a/USR-master/isolinux/de.tr
+++ b/templates/iso/isolinux/de.tr
diff --git a/USR-master/isolinux/el.hlp b/templates/iso/isolinux/el.hlp
index 43fba86..43fba86 100644
--- a/USR-master/isolinux/el.hlp
+++ b/templates/iso/isolinux/el.hlp
diff --git a/USR-master/isolinux/el.tr b/templates/iso/isolinux/el.tr
index b53530d..b53530d 100644
--- a/USR-master/isolinux/el.tr
+++ b/templates/iso/isolinux/el.tr
diff --git a/USR-master/isolinux/en.hlp b/templates/iso/isolinux/en.hlp
index 68f16c4..68f16c4 100644
--- a/USR-master/isolinux/en.hlp
+++ b/templates/iso/isolinux/en.hlp
diff --git a/USR-master/isolinux/en.tr b/templates/iso/isolinux/en.tr
index 376c2e8..376c2e8 100644
--- a/USR-master/isolinux/en.tr
+++ b/templates/iso/isolinux/en.tr
diff --git a/USR-master/isolinux/eo.tr b/templates/iso/isolinux/eo.tr
index 3eba887..3eba887 100644
--- a/USR-master/isolinux/eo.tr
+++ b/templates/iso/isolinux/eo.tr
diff --git a/USR-master/isolinux/es.hlp b/templates/iso/isolinux/es.hlp
index d0a031c..d0a031c 100644
--- a/USR-master/isolinux/es.hlp
+++ b/templates/iso/isolinux/es.hlp
diff --git a/USR-master/isolinux/es.tr b/templates/iso/isolinux/es.tr
index e9d21a1..e9d21a1 100644
--- a/USR-master/isolinux/es.tr
+++ b/templates/iso/isolinux/es.tr
diff --git a/USR-master/isolinux/et.tr b/templates/iso/isolinux/et.tr
index abdec9f..abdec9f 100644
--- a/USR-master/isolinux/et.tr
+++ b/templates/iso/isolinux/et.tr
diff --git a/USR-master/isolinux/eu.hlp b/templates/iso/isolinux/eu.hlp
index 75686fe..75686fe 100644
--- a/USR-master/isolinux/eu.hlp
+++ b/templates/iso/isolinux/eu.hlp
diff --git a/USR-master/isolinux/eu.tr b/templates/iso/isolinux/eu.tr
index c392b8a..c392b8a 100644
--- a/USR-master/isolinux/eu.tr
+++ b/templates/iso/isolinux/eu.tr
diff --git a/USR-master/isolinux/f1.txt b/templates/iso/isolinux/f1.txt
index 60a4d1c..60a4d1c 100644
--- a/USR-master/isolinux/f1.txt
+++ b/templates/iso/isolinux/f1.txt
diff --git a/USR-master/isolinux/f10.txt b/templates/iso/isolinux/f10.txt
index 51c563d..51c563d 100644
--- a/USR-master/isolinux/f10.txt
+++ b/templates/iso/isolinux/f10.txt
diff --git a/USR-master/isolinux/f2.txt b/templates/iso/isolinux/f2.txt
index 690faaa..690faaa 100644
--- a/USR-master/isolinux/f2.txt
+++ b/templates/iso/isolinux/f2.txt
diff --git a/USR-master/isolinux/f3.txt b/templates/iso/isolinux/f3.txt
index 40d8e53..40d8e53 100644
--- a/USR-master/isolinux/f3.txt
+++ b/templates/iso/isolinux/f3.txt
diff --git a/USR-master/isolinux/f4.txt b/templates/iso/isolinux/f4.txt
index 37b0f49..37b0f49 100644
--- a/USR-master/isolinux/f4.txt
+++ b/templates/iso/isolinux/f4.txt
diff --git a/USR-master/isolinux/f5.txt b/templates/iso/isolinux/f5.txt
index aa74f9a..aa74f9a 100644
--- a/USR-master/isolinux/f5.txt
+++ b/templates/iso/isolinux/f5.txt
diff --git a/USR-master/isolinux/f6.txt b/templates/iso/isolinux/f6.txt
index 7f75c34..7f75c34 100644
--- a/USR-master/isolinux/f6.txt
+++ b/templates/iso/isolinux/f6.txt
diff --git a/USR-master/isolinux/f7.txt b/templates/iso/isolinux/f7.txt
index b794df4..b794df4 100644
--- a/USR-master/isolinux/f7.txt
+++ b/templates/iso/isolinux/f7.txt
diff --git a/USR-master/isolinux/f8.txt b/templates/iso/isolinux/f8.txt
index 9212bb6..9212bb6 100644
--- a/USR-master/isolinux/f8.txt
+++ b/templates/iso/isolinux/f8.txt
diff --git a/USR-master/isolinux/f9.txt b/templates/iso/isolinux/f9.txt
index cf99c25..cf99c25 100644
--- a/USR-master/isolinux/f9.txt
+++ b/templates/iso/isolinux/f9.txt
diff --git a/USR-master/isolinux/fi.hlp b/templates/iso/isolinux/fi.hlp
index eca1ca8..eca1ca8 100644
--- a/USR-master/isolinux/fi.hlp
+++ b/templates/iso/isolinux/fi.hlp
diff --git a/USR-master/isolinux/fi.tr b/templates/iso/isolinux/fi.tr
index 8c5fce3..8c5fce3 100644
--- a/USR-master/isolinux/fi.tr
+++ b/templates/iso/isolinux/fi.tr
diff --git a/USR-master/isolinux/fr.hlp b/templates/iso/isolinux/fr.hlp
index 7f2d1a2..7f2d1a2 100644
--- a/USR-master/isolinux/fr.hlp
+++ b/templates/iso/isolinux/fr.hlp
diff --git a/USR-master/isolinux/fr.tr b/templates/iso/isolinux/fr.tr
index 27d35fd..27d35fd 100644
--- a/USR-master/isolinux/fr.tr
+++ b/templates/iso/isolinux/fr.tr
diff --git a/USR-master/isolinux/ga.tr b/templates/iso/isolinux/ga.tr
index b537363..b537363 100644
--- a/USR-master/isolinux/ga.tr
+++ b/templates/iso/isolinux/ga.tr
diff --git a/USR-master/isolinux/gfxboot.cfg b/templates/iso/isolinux/gfxboot.cfg
index 2aebaf3..2aebaf3 100644
--- a/USR-master/isolinux/gfxboot.cfg
+++ b/templates/iso/isolinux/gfxboot.cfg
diff --git a/USR-master/isolinux/gl.hlp b/templates/iso/isolinux/gl.hlp
index fc17e14..fc17e14 100644
--- a/USR-master/isolinux/gl.hlp
+++ b/templates/iso/isolinux/gl.hlp
diff --git a/USR-master/isolinux/gl.tr b/templates/iso/isolinux/gl.tr
index d3e0b9a..d3e0b9a 100644
--- a/USR-master/isolinux/gl.tr
+++ b/templates/iso/isolinux/gl.tr
diff --git a/USR-master/isolinux/hr.tr b/templates/iso/isolinux/hr.tr
index c9ed1a3..c9ed1a3 100644
--- a/USR-master/isolinux/hr.tr
+++ b/templates/iso/isolinux/hr.tr
diff --git a/USR-master/isolinux/hu.hlp b/templates/iso/isolinux/hu.hlp
index 1c555a1..1c555a1 100644
--- a/USR-master/isolinux/hu.hlp
+++ b/templates/iso/isolinux/hu.hlp
diff --git a/USR-master/isolinux/hu.tr b/templates/iso/isolinux/hu.tr
index 184e587..184e587 100644
--- a/USR-master/isolinux/hu.tr
+++ b/templates/iso/isolinux/hu.tr
diff --git a/USR-master/isolinux/id.hlp b/templates/iso/isolinux/id.hlp
index 6333d93..6333d93 100644
--- a/USR-master/isolinux/id.hlp
+++ b/templates/iso/isolinux/id.hlp
diff --git a/USR-master/isolinux/id.tr b/templates/iso/isolinux/id.tr
index 3d577b8..3d577b8 100644
--- a/USR-master/isolinux/id.tr
+++ b/templates/iso/isolinux/id.tr
diff --git a/USR-master/isolinux/isolinux.bin b/templates/iso/isolinux/isolinux.bin
index b4f22f5..b4f22f5 100644
--- a/USR-master/isolinux/isolinux.bin
+++ b/templates/iso/isolinux/isolinux.bin
diff --git a/USR-master/isolinux/isolinux.cfg b/templates/iso/isolinux/isolinux.cfg
index 00cac5b..00cac5b 100644
--- a/USR-master/isolinux/isolinux.cfg
+++ b/templates/iso/isolinux/isolinux.cfg
diff --git a/USR-master/isolinux/it.tr b/templates/iso/isolinux/it.tr
index ed1a384..ed1a384 100644
--- a/USR-master/isolinux/it.tr
+++ b/templates/iso/isolinux/it.tr
diff --git a/USR-master/isolinux/ja.tr b/templates/iso/isolinux/ja.tr
index 8730817..8730817 100644
--- a/USR-master/isolinux/ja.tr
+++ b/templates/iso/isolinux/ja.tr
diff --git a/USR-master/isolinux/ka.tr b/templates/iso/isolinux/ka.tr
index 645d835..645d835 100644
--- a/USR-master/isolinux/ka.tr
+++ b/templates/iso/isolinux/ka.tr
diff --git a/USR-master/isolinux/kk.tr b/templates/iso/isolinux/kk.tr
index 1790162..1790162 100644
--- a/USR-master/isolinux/kk.tr
+++ b/templates/iso/isolinux/kk.tr
diff --git a/USR-master/isolinux/ko.tr b/templates/iso/isolinux/ko.tr
index 4984c26..4984c26 100644
--- a/USR-master/isolinux/ko.tr
+++ b/templates/iso/isolinux/ko.tr
diff --git a/USR-master/isolinux/ku.tr b/templates/iso/isolinux/ku.tr
index 8b6b7e8..8b6b7e8 100644
--- a/USR-master/isolinux/ku.tr
+++ b/templates/iso/isolinux/ku.tr
diff --git a/USR-master/isolinux/langlist b/templates/iso/isolinux/langlist
index c20bc99..c20bc99 100644
--- a/USR-master/isolinux/langlist
+++ b/templates/iso/isolinux/langlist
diff --git a/USR-master/isolinux/lt.tr b/templates/iso/isolinux/lt.tr
index f98a866..f98a866 100644
--- a/USR-master/isolinux/lt.tr
+++ b/templates/iso/isolinux/lt.tr
diff --git a/USR-master/isolinux/lv.tr b/templates/iso/isolinux/lv.tr
index 7f6d869..7f6d869 100644
--- a/USR-master/isolinux/lv.tr
+++ b/templates/iso/isolinux/lv.tr
diff --git a/USR-master/isolinux/menu.cfg b/templates/iso/isolinux/menu.cfg
index cc123d1..cc123d1 100644
--- a/USR-master/isolinux/menu.cfg
+++ b/templates/iso/isolinux/menu.cfg
diff --git a/USR-master/isolinux/mk.tr b/templates/iso/isolinux/mk.tr
index 6154358..6154358 100644
--- a/USR-master/isolinux/mk.tr
+++ b/templates/iso/isolinux/mk.tr
diff --git a/USR-master/isolinux/nb.hlp b/templates/iso/isolinux/nb.hlp
index 31bd080..31bd080 100644
--- a/USR-master/isolinux/nb.hlp
+++ b/templates/iso/isolinux/nb.hlp
diff --git a/USR-master/isolinux/nb.tr b/templates/iso/isolinux/nb.tr
index a310d15..a310d15 100644
--- a/USR-master/isolinux/nb.tr
+++ b/templates/iso/isolinux/nb.tr
diff --git a/USR-master/isolinux/nl.hlp b/templates/iso/isolinux/nl.hlp
index 4534b62..4534b62 100644
--- a/USR-master/isolinux/nl.hlp
+++ b/templates/iso/isolinux/nl.hlp
diff --git a/USR-master/isolinux/nl.tr b/templates/iso/isolinux/nl.tr
index 302a384..302a384 100644
--- a/USR-master/isolinux/nl.tr
+++ b/templates/iso/isolinux/nl.tr
diff --git a/USR-master/isolinux/nn.tr b/templates/iso/isolinux/nn.tr
index f443d2d..f443d2d 100644
--- a/USR-master/isolinux/nn.tr
+++ b/templates/iso/isolinux/nn.tr
diff --git a/USR-master/isolinux/pl.tr b/templates/iso/isolinux/pl.tr
index 0794f8d..0794f8d 100644
--- a/USR-master/isolinux/pl.tr
+++ b/templates/iso/isolinux/pl.tr
diff --git a/USR-master/isolinux/po4a.cfg b/templates/iso/isolinux/po4a.cfg
index 75f6788..75f6788 100644
--- a/USR-master/isolinux/po4a.cfg
+++ b/templates/iso/isolinux/po4a.cfg
diff --git a/USR-master/isolinux/prompt.cfg b/templates/iso/isolinux/prompt.cfg
index a12b19f..a12b19f 100644
--- a/USR-master/isolinux/prompt.cfg
+++ b/templates/iso/isolinux/prompt.cfg
diff --git a/USR-master/isolinux/pt.hlp b/templates/iso/isolinux/pt.hlp
index 84d7b1d..84d7b1d 100644
--- a/USR-master/isolinux/pt.hlp
+++ b/templates/iso/isolinux/pt.hlp
diff --git a/USR-master/isolinux/pt.tr b/templates/iso/isolinux/pt.tr
index 5e0cf17..5e0cf17 100644
--- a/USR-master/isolinux/pt.tr
+++ b/templates/iso/isolinux/pt.tr
diff --git a/USR-master/isolinux/pt_BR.hlp b/templates/iso/isolinux/pt_BR.hlp
index 2861085..2861085 100644
--- a/USR-master/isolinux/pt_BR.hlp
+++ b/templates/iso/isolinux/pt_BR.hlp
diff --git a/USR-master/isolinux/pt_BR.tr b/templates/iso/isolinux/pt_BR.tr
index c94b48d..c94b48d 100644
--- a/USR-master/isolinux/pt_BR.tr
+++ b/templates/iso/isolinux/pt_BR.tr
diff --git a/USR-master/isolinux/ro.hlp b/templates/iso/isolinux/ro.hlp
index cff8a18..cff8a18 100644
--- a/USR-master/isolinux/ro.hlp
+++ b/templates/iso/isolinux/ro.hlp
diff --git a/USR-master/isolinux/ro.tr b/templates/iso/isolinux/ro.tr
index 3e580dd..3e580dd 100644
--- a/USR-master/isolinux/ro.tr
+++ b/templates/iso/isolinux/ro.tr
diff --git a/USR-master/isolinux/ru.hlp b/templates/iso/isolinux/ru.hlp
index c2d8eca..c2d8eca 100644
--- a/USR-master/isolinux/ru.hlp
+++ b/templates/iso/isolinux/ru.hlp
diff --git a/USR-master/isolinux/ru.tr b/templates/iso/isolinux/ru.tr
index e2384e9..e2384e9 100644
--- a/USR-master/isolinux/ru.tr
+++ b/templates/iso/isolinux/ru.tr
diff --git a/USR-master/isolinux/sk.hlp b/templates/iso/isolinux/sk.hlp
index 6cd481d..6cd481d 100644
--- a/USR-master/isolinux/sk.hlp
+++ b/templates/iso/isolinux/sk.hlp
diff --git a/USR-master/isolinux/sk.tr b/templates/iso/isolinux/sk.tr
index a086f01..a086f01 100644
--- a/USR-master/isolinux/sk.tr
+++ b/templates/iso/isolinux/sk.tr
diff --git a/USR-master/isolinux/sl.tr b/templates/iso/isolinux/sl.tr
index 8fff837..8fff837 100644
--- a/USR-master/isolinux/sl.tr
+++ b/templates/iso/isolinux/sl.tr
diff --git a/USR-master/isolinux/splash.pcx b/templates/iso/isolinux/splash.pcx
index 257645c..257645c 100644
--- a/USR-master/isolinux/splash.pcx
+++ b/templates/iso/isolinux/splash.pcx
diff --git a/USR-master/isolinux/splash.png b/templates/iso/isolinux/splash.png
index 5f7effb..5f7effb 100644
--- a/USR-master/isolinux/splash.png
+++ b/templates/iso/isolinux/splash.png
diff --git a/USR-master/isolinux/sq.tr b/templates/iso/isolinux/sq.tr
index fc57dd2..fc57dd2 100644
--- a/USR-master/isolinux/sq.tr
+++ b/templates/iso/isolinux/sq.tr
diff --git a/USR-master/isolinux/sr.tr b/templates/iso/isolinux/sr.tr
index 0fda19e..0fda19e 100644
--- a/USR-master/isolinux/sr.tr
+++ b/templates/iso/isolinux/sr.tr
diff --git a/USR-master/isolinux/stdmenu.cfg b/templates/iso/isolinux/stdmenu.cfg
index e70017c..e70017c 100644
--- a/USR-master/isolinux/stdmenu.cfg
+++ b/templates/iso/isolinux/stdmenu.cfg
diff --git a/USR-master/isolinux/sv.hlp b/templates/iso/isolinux/sv.hlp
index b581572..b581572 100644
--- a/USR-master/isolinux/sv.hlp
+++ b/templates/iso/isolinux/sv.hlp
diff --git a/USR-master/isolinux/sv.tr b/templates/iso/isolinux/sv.tr
index 802148c..802148c 100644
--- a/USR-master/isolinux/sv.tr
+++ b/templates/iso/isolinux/sv.tr
diff --git a/USR-master/isolinux/text.cfg b/templates/iso/isolinux/text.cfg
index 3b9975d..3b9975d 100644
--- a/USR-master/isolinux/text.cfg
+++ b/templates/iso/isolinux/text.cfg
diff --git a/USR-master/isolinux/tl.tr b/templates/iso/isolinux/tl.tr
index e322c34..e322c34 100644
--- a/USR-master/isolinux/tl.tr
+++ b/templates/iso/isolinux/tl.tr
diff --git a/USR-master/isolinux/tr.tr b/templates/iso/isolinux/tr.tr
index a478153..a478153 100644
--- a/USR-master/isolinux/tr.tr
+++ b/templates/iso/isolinux/tr.tr
diff --git a/USR-master/isolinux/uk.hlp b/templates/iso/isolinux/uk.hlp
index e69de29..e69de29 100644
--- a/USR-master/isolinux/uk.hlp
+++ b/templates/iso/isolinux/uk.hlp
diff --git a/USR-master/isolinux/uk.tr b/templates/iso/isolinux/uk.tr
index bcc8a15..bcc8a15 100644
--- a/USR-master/isolinux/uk.tr
+++ b/templates/iso/isolinux/uk.tr
diff --git a/USR-master/isolinux/vesamenu.c32 b/templates/iso/isolinux/vesamenu.c32
index a932bd4..a932bd4 100644
--- a/USR-master/isolinux/vesamenu.c32
+++ b/templates/iso/isolinux/vesamenu.c32
diff --git a/USR-master/isolinux/vi.tr b/templates/iso/isolinux/vi.tr
index 564114e..564114e 100644
--- a/USR-master/isolinux/vi.tr
+++ b/templates/iso/isolinux/vi.tr
diff --git a/USR-master/isolinux/zh_CN.hlp b/templates/iso/isolinux/zh_CN.hlp
index 2f66ad6..2f66ad6 100644
--- a/USR-master/isolinux/zh_CN.hlp
+++ b/templates/iso/isolinux/zh_CN.hlp
diff --git a/USR-master/isolinux/zh_CN.tr b/templates/iso/isolinux/zh_CN.tr
index 5c05580..5c05580 100644
--- a/USR-master/isolinux/zh_CN.tr
+++ b/templates/iso/isolinux/zh_CN.tr
diff --git a/USR-master/isolinux/zh_TW.tr b/templates/iso/isolinux/zh_TW.tr
index 9ea0f4c..9ea0f4c 100644
--- a/USR-master/isolinux/zh_TW.tr
+++ b/templates/iso/isolinux/zh_TW.tr
diff --git a/USR-master/pics/blue-lowerleft.png b/templates/iso/pics/blue-lowerleft.png
index 2a2245e..2a2245e 100644
--- a/USR-master/pics/blue-lowerleft.png
+++ b/templates/iso/pics/blue-lowerleft.png
diff --git a/USR-master/pics/blue-lowerright.png b/templates/iso/pics/blue-lowerright.png
index 7e66271..7e66271 100644
--- a/USR-master/pics/blue-lowerright.png
+++ b/templates/iso/pics/blue-lowerright.png
diff --git a/USR-master/pics/blue-upperleft.png b/templates/iso/pics/blue-upperleft.png
index a58d0ec..a58d0ec 100644
--- a/USR-master/pics/blue-upperleft.png
+++ b/templates/iso/pics/blue-upperleft.png
diff --git a/USR-master/pics/blue-upperright.png b/templates/iso/pics/blue-upperright.png
index 2f36849..2f36849 100644
--- a/USR-master/pics/blue-upperright.png
+++ b/templates/iso/pics/blue-upperright.png
diff --git a/USR-master/pics/debian.jpg b/templates/iso/pics/debian.jpg
index db62d7a..db62d7a 100644
--- a/USR-master/pics/debian.jpg
+++ b/templates/iso/pics/debian.jpg
diff --git a/USR-master/pics/logo-50.jpg b/templates/iso/pics/logo-50.jpg
index 542f0a4..542f0a4 100644
--- a/USR-master/pics/logo-50.jpg
+++ b/templates/iso/pics/logo-50.jpg
diff --git a/USR-master/pics/red-lowerleft.png b/templates/iso/pics/red-lowerleft.png
index caca9c5..caca9c5 100644
--- a/USR-master/pics/red-lowerleft.png
+++ b/templates/iso/pics/red-lowerleft.png
diff --git a/USR-master/pics/red-lowerright.png b/templates/iso/pics/red-lowerright.png
index c27056c..c27056c 100644
--- a/USR-master/pics/red-lowerright.png
+++ b/templates/iso/pics/red-lowerright.png
diff --git a/USR-master/pics/red-upperleft.png b/templates/iso/pics/red-upperleft.png
index c1e3301..c1e3301 100644
--- a/USR-master/pics/red-upperleft.png
+++ b/templates/iso/pics/red-upperleft.png
diff --git a/USR-master/pics/red-upperright.png b/templates/iso/pics/red-upperright.png
index 54d17ca..54d17ca 100644
--- a/USR-master/pics/red-upperright.png
+++ b/templates/iso/pics/red-upperright.png
diff --git a/USR-master/pool/main/b/b43-fwcutter/b43-fwcutter_012-1_i386.deb b/templates/iso/pool/main/b/b43-fwcutter/b43-fwcutter_012-1_i386.deb
index a736068..a736068 100644
--- a/USR-master/pool/main/b/b43-fwcutter/b43-fwcutter_012-1_i386.deb
+++ b/templates/iso/pool/main/b/b43-fwcutter/b43-fwcutter_012-1_i386.deb
diff --git a/USR-master/pool/main/b/build-essential/build-essential_11.4_i386.deb b/templates/iso/pool/main/b/build-essential/build-essential_11.4_i386.deb
index d7696d1..d7696d1 100644
--- a/USR-master/pool/main/b/build-essential/build-essential_11.4_i386.deb
+++ b/templates/iso/pool/main/b/build-essential/build-essential_11.4_i386.deb
diff --git a/USR-master/pool/main/d/dkms/dkms_2.1.1.1-0ubuntu3_all.deb b/templates/iso/pool/main/d/dkms/dkms_2.1.1.1-0ubuntu3_all.deb
index 772c696..772c696 100644
--- a/USR-master/pool/main/d/dkms/dkms_2.1.1.1-0ubuntu3_all.deb
+++ b/templates/iso/pool/main/d/dkms/dkms_2.1.1.1-0ubuntu3_all.deb
diff --git a/USR-master/pool/main/d/dpkg/dpkg-dev_1.15.4.1ubuntu1_all.deb b/templates/iso/pool/main/d/dpkg/dpkg-dev_1.15.4.1ubuntu1_all.deb
index 67018c7..67018c7 100644
--- a/USR-master/pool/main/d/dpkg/dpkg-dev_1.15.4.1ubuntu1_all.deb
+++ b/templates/iso/pool/main/d/dpkg/dpkg-dev_1.15.4.1ubuntu1_all.deb
diff --git a/USR-master/pool/main/f/fakeroot/fakeroot_1.14.4-1ubuntu1_i386.deb b/templates/iso/pool/main/f/fakeroot/fakeroot_1.14.4-1ubuntu1_i386.deb
index 753d5a8..753d5a8 100644
--- a/USR-master/pool/main/f/fakeroot/fakeroot_1.14.4-1ubuntu1_i386.deb
+++ b/templates/iso/pool/main/f/fakeroot/fakeroot_1.14.4-1ubuntu1_i386.deb
diff --git a/USR-master/pool/main/g/gcc-4.4/g++-4.4_4.4.3-2ubuntu1_i386.deb b/templates/iso/pool/main/g/gcc-4.4/g++-4.4_4.4.3-2ubuntu1_i386.deb
index 1a9cb04..1a9cb04 100644
--- a/USR-master/pool/main/g/gcc-4.4/g++-4.4_4.4.3-2ubuntu1_i386.deb
+++ b/templates/iso/pool/main/g/gcc-4.4/g++-4.4_4.4.3-2ubuntu1_i386.deb
diff --git a/USR-master/pool/main/g/gcc-4.4/libstdc++6-4.4-dev_4.4.3-2ubuntu1_i386.deb b/templates/iso/pool/main/g/gcc-4.4/libstdc++6-4.4-dev_4.4.3-2ubuntu1_i386.deb
index f185752..f185752 100644
--- a/USR-master/pool/main/g/gcc-4.4/libstdc++6-4.4-dev_4.4.3-2ubuntu1_i386.deb
+++ b/templates/iso/pool/main/g/gcc-4.4/libstdc++6-4.4-dev_4.4.3-2ubuntu1_i386.deb
diff --git a/USR-master/pool/main/g/gcc-defaults/g++_4.4.2-3ubuntu1_i386.deb b/templates/iso/pool/main/g/gcc-defaults/g++_4.4.2-3ubuntu1_i386.deb
index 990244e..990244e 100644
--- a/USR-master/pool/main/g/gcc-defaults/g++_4.4.2-3ubuntu1_i386.deb
+++ b/templates/iso/pool/main/g/gcc-defaults/g++_4.4.2-3ubuntu1_i386.deb
diff --git a/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng-doc_0.2.9+dfsg-2ubuntu2_all.deb b/templates/iso/pool/main/l/linux-wlan-ng/linux-wlan-ng-doc_0.2.9+dfsg-2ubuntu2_all.deb
index 2c03040..2c03040 100644
--- a/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng-doc_0.2.9+dfsg-2ubuntu2_all.deb
+++ b/templates/iso/pool/main/l/linux-wlan-ng/linux-wlan-ng-doc_0.2.9+dfsg-2ubuntu2_all.deb
diff --git a/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng_0.2.9+dfsg-2ubuntu2_i386.deb b/templates/iso/pool/main/l/linux-wlan-ng/linux-wlan-ng_0.2.9+dfsg-2ubuntu2_i386.deb
index 428aed9..428aed9 100644
--- a/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng_0.2.9+dfsg-2ubuntu2_i386.deb
+++ b/templates/iso/pool/main/l/linux-wlan-ng/linux-wlan-ng_0.2.9+dfsg-2ubuntu2_i386.deb
diff --git a/USR-master/pool/main/l/lupin/lupin-support_0.27_all.deb b/templates/iso/pool/main/l/lupin/lupin-support_0.27_all.deb
index f92eae3..f92eae3 100644
--- a/USR-master/pool/main/l/lupin/lupin-support_0.27_all.deb
+++ b/templates/iso/pool/main/l/lupin/lupin-support_0.27_all.deb
diff --git a/USR-master/pool/main/m/mouseemu/mouseemu_0.16-0ubuntu4_i386.deb b/templates/iso/pool/main/m/mouseemu/mouseemu_0.16-0ubuntu4_i386.deb
index 1e71e7d..1e71e7d 100644
--- a/USR-master/pool/main/m/mouseemu/mouseemu_0.16-0ubuntu4_i386.deb
+++ b/templates/iso/pool/main/m/mouseemu/mouseemu_0.16-0ubuntu4_i386.deb
diff --git a/USR-master/pool/main/n/ndisgtk/ndisgtk_0.8.4-1_i386.deb b/templates/iso/pool/main/n/ndisgtk/ndisgtk_0.8.4-1_i386.deb
index 27fbe8b..27fbe8b 100644
--- a/USR-master/pool/main/n/ndisgtk/ndisgtk_0.8.4-1_i386.deb
+++ b/templates/iso/pool/main/n/ndisgtk/ndisgtk_0.8.4-1_i386.deb
diff --git a/USR-master/pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2ubuntu1_all.deb b/templates/iso/pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2ubuntu1_all.deb
index af9e7df..af9e7df 100644
--- a/USR-master/pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2ubuntu1_all.deb
+++ b/templates/iso/pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2ubuntu1_all.deb
diff --git a/USR-master/pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2ubuntu1_i386.deb b/templates/iso/pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2ubuntu1_i386.deb
index a6cbb4b..a6cbb4b 100644
--- a/USR-master/pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2ubuntu1_i386.deb
+++ b/templates/iso/pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2ubuntu1_i386.deb
diff --git a/USR-master/pool/main/p/patch/patch_2.6-2_i386.deb b/templates/iso/pool/main/p/patch/patch_2.6-2_i386.deb
index bfdd526..bfdd526 100644
--- a/USR-master/pool/main/p/patch/patch_2.6-2_i386.deb
+++ b/templates/iso/pool/main/p/patch/patch_2.6-2_i386.deb
diff --git a/USR-master/pool/main/p/pptp-linux/pptp-linux_1.7.2-4_i386.deb b/templates/iso/pool/main/p/pptp-linux/pptp-linux_1.7.2-4_i386.deb
index 610da72..610da72 100644
--- a/USR-master/pool/main/p/pptp-linux/pptp-linux_1.7.2-4_i386.deb
+++ b/templates/iso/pool/main/p/pptp-linux/pptp-linux_1.7.2-4_i386.deb
diff --git a/USR-master/pool/main/s/setserial/setserial_2.17-45.2_i386.deb b/templates/iso/pool/main/s/setserial/setserial_2.17-45.2_i386.deb
index a448b9b..a448b9b 100644
--- a/USR-master/pool/main/s/setserial/setserial_2.17-45.2_i386.deb
+++ b/templates/iso/pool/main/s/setserial/setserial_2.17-45.2_i386.deb
diff --git a/USR-master/pool/main/u/ubiquity/oem-config-gtk_2.1.15_all.deb b/templates/iso/pool/main/u/ubiquity/oem-config-gtk_2.1.15_all.deb
index 5153476..5153476 100644
--- a/USR-master/pool/main/u/ubiquity/oem-config-gtk_2.1.15_all.deb
+++ b/templates/iso/pool/main/u/ubiquity/oem-config-gtk_2.1.15_all.deb
diff --git a/USR-master/pool/main/u/ubiquity/oem-config_2.1.15_all.deb b/templates/iso/pool/main/u/ubiquity/oem-config_2.1.15_all.deb
index 6903188..6903188 100644
--- a/USR-master/pool/main/u/ubiquity/oem-config_2.1.15_all.deb
+++ b/templates/iso/pool/main/u/ubiquity/oem-config_2.1.15_all.deb
diff --git a/USR-master/pool/restricted/b/bcmwl/bcmwl-kernel-source_5.10.91.9+bdcom-0ubuntu5_i386.deb b/templates/iso/pool/restricted/b/bcmwl/bcmwl-kernel-source_5.10.91.9+bdcom-0ubuntu5_i386.deb
index 7b9eea7..7b9eea7 100644
--- a/USR-master/pool/restricted/b/bcmwl/bcmwl-kernel-source_5.10.91.9+bdcom-0ubuntu5_i386.deb
+++ b/templates/iso/pool/restricted/b/bcmwl/bcmwl-kernel-source_5.10.91.9+bdcom-0ubuntu5_i386.deb
diff --git a/USR-master/pool/restricted/s/sl-modem/sl-modem-daemon_2.9.11~20080817-3ubuntu4_i386.deb b/templates/iso/pool/restricted/s/sl-modem/sl-modem-daemon_2.9.11~20080817-3ubuntu4_i386.deb
index 33d6572..33d6572 100644
--- a/USR-master/pool/restricted/s/sl-modem/sl-modem-daemon_2.9.11~20080817-3ubuntu4_i386.deb
+++ b/templates/iso/pool/restricted/s/sl-modem/sl-modem-daemon_2.9.11~20080817-3ubuntu4_i386.deb
diff --git a/USR-master/preseed/USR.seed b/templates/iso/preseed/USR.seed
index f7e98ff..f7e98ff 100644
--- a/USR-master/preseed/USR.seed
+++ b/templates/iso/preseed/USR.seed
diff --git a/USR-master/ubuntu b/templates/iso/ubuntu
index e69de29..e69de29 100644
--- a/USR-master/ubuntu
+++ b/templates/iso/ubuntu
diff --git a/usr-scratch.sh b/usr-scratch.sh
index 0a7ec5f..5e81569 100755
--- a/usr-scratch.sh
+++ b/usr-scratch.sh
@@ -6,20 +6,19 @@
 ## Login   <dfarning@acer>
 ## 
 ## Started on  Sat Jan  9 03:45:30 2010 David Farning
-## Last update Tue Feb  2 20:22:01 2010 David Farning
+## Last update Mon Feb  8 18:13:17 2010 David Farning
 ##
 
 set -eu
 
 function usage()
 {
-    echo "The script needs 3 parameters:
+    echo "The script needs 2 parameters:
 
     * Action to do: debootstrap|iso|squash|all
     * Architecture to build: i386|amd64
-    * build date
 
-    Usage: $0 debootstrap|iso|squash|source|all|torrent i386|amd64 XXXX"
+    Usage: $0 debootstrap|iso|squash|source|all|torrent i386|amd64"
 }
 
 function failure()
@@ -125,8 +124,7 @@ function prepare_filesystem_directory()
 
 
 function do_debootstrap() {
-    date
-    echo "DIST=${DIST}
+    echo "    DIST=${DIST}
     ARCH=${ARCH}
     CHROOT=${CHROOT}"
 
@@ -137,14 +135,11 @@ function do_debootstrap() {
     prepare_filesystem_directory
     debootstrap --arch=${ARCH} lucid ${CHROOT} ${MIRROR}
 
-#    replace_ssd
+#   replace_ssd
     prepare_chroot
     in_chroot
-
-    #cp casper $CHROOT/etc/init.d/casper
-
     clean_chroot
-#    restore_ssd
+#   restore_ssd
 }
 
 function prepare_image_directory()
@@ -154,7 +149,7 @@ function prepare_image_directory()
     	rm -rf ${IMAGE} || failure "Failed to remove directory ${IMAGE}"
     fi
     mkdir -p ${IMAGE}
-    cp -a USR-master/* ${IMAGE}/ 
+    cp -a ${ISOTEMPLATE}/* ${IMAGE}/ 
 }
 
 function pack_squashfs()
@@ -204,11 +199,6 @@ function pack_iso(){
 function build_vm(){
     VM=${DIST}-${ARCH}-${DATE}
 
-#if ! VBoxManage list runningvms | grep -qs "^\"${VM}\""; then
-#        break
-#    fi
-
-
     VBoxManage createvm --name ${VM} --ostype Ubuntu --register
     VBoxManage modifyvm ${VM} --memory 2048
     VBoxManage modifyvm ${VM} --cpus 3
@@ -236,14 +226,18 @@ function build_vm(){
 
 function upload_files(){
     RELEASE=${DIST}-${ARCH}-${DATE}
+    LOGIN=dfarning@sunjammer.sugarlabs.org
+    for TYPE in iso vmdk ovf mf; do
+	FILE=${RELEASE}.${TYPE}
+        chown dfarning:dfarning ~/usr/output/${FILE}
+        chmod 0777 ~/usr/output/${FILE}
+        rsync --compress --verbose --progress ~/usr/output/${FILE} ${LOGIN}:staging/${FILE}
+    done
     for TYPE in iso vmdk ovf mf; do
-        chown dfarning:dfarning ~/usr/output/${RELEASE}.${TYPE}
-        chmod 0777 ~/usr/output/${RELEASE}.${TYPE}
-        rsync --compress --verbose --progress ~/usr/output/${RELEASE}.${TYPE} dfarning@sunjammer.sugarlabs.org:public_html/${RELEASE}.${TYPE}
+	FILE=${RELEASE}.${TYPE}
+	ssh ${LOGIN}  "mv stagingmkdir/'${FILE}'public_html/'${FILE}'"
+	#ssh ${LOGIN} "ln -s public_html/'${FILE}' public_html/'${DIST}'-'${ARCH}'-current.'${TYPE}'"
     done
-#    for TYPE in iso vmdk ovf mf; do
-#	ssh dfarning@sunjammer.sugarlabs.org 'cp staging/${RELEASE}.${TYPE} public_html/${RELELASE}.${TYPE}'
-#    done
 }
 
 case $1 in
@@ -262,14 +256,15 @@ i386|amd64)	ARCH=$2
 		;;
 esac
 
-DATE=$3
+DATE=$(date +"%Y%m%d")
 
 export DEBIAN_FRONTEND=noninteractive
 
 MIRROR="http://10.0.02:3142/archive.ubuntu.com/ubuntu"
 DIST="USR"
-CHROOT=build/${ARCH}-FS
-IMAGE=build/${ARCH}-IMAGE
+CHROOT=build/${ARCH}-fs
+IMAGE=build/${ARCH}-image
+ISOTEMPLATE=templates/iso
 ISO=output/${DIST}-${ARCH}-${DATE}.iso
 LOG=logs/${DIST}-${ARCH}-${DATE}.log
 CCMD="chroot ${CHROOT}"