diff --git a/app-cdr/lightscribe-template/ChangeLog b/app-cdr/lightscribe-template/ChangeLog
index e91a19b..735aee5 100644
--- a/app-cdr/lightscribe-template/ChangeLog
+++ b/app-cdr/lightscribe-template/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Nov 2010; Mario Fetka <mario.fetka@gmail.com>
+  lightscribe-template-001.ebuild, lightscribe-template-001-r1.ebuild:
+  update comments and change license
+
   06 Nov 2010; Mario Fetka <mario.fetka@gmail.com>
   +lightscribe-template-001-r1.ebuild:
   add the new templates
diff --git a/app-cdr/lightscribe-template/Manifest b/app-cdr/lightscribe-template/Manifest
index 26f0759..c497fe2 100644
--- a/app-cdr/lightscribe-template/Manifest
+++ b/app-cdr/lightscribe-template/Manifest
@@ -36,7 +36,7 @@ DIST TL_UrbanPack001.tar.gz 2118780 RMD160 b63f37d420f0a253af0fdcd22bf4a7e3d45ca
 DIST TL_WeddingPack001.tar.gz 4959124 RMD160 f8b485f87dfe5565d358e9df0089ab6c878cf7f9 SHA1 92c5d3b74ff8765461a908d63ada74540977773c SHA256 ba3eaeaa59e4c939c0740dcc363139376daa376a95358317c33db26fc82a81d9
 DIST TL_WinterWhimsyPack001.tar.gz 2803776 RMD160 71c5938a467f4dfbcc996867ccdb320f4d9a0686 SHA1 5826d8eec4948e8cbd374eb5bb5fff0860039e89 SHA256 b3ee3b0d418cb0ec674ec2ee15780cf93c204c6bb567d037a0b706d9bc60357b
 DIST TL_WithTheBandPack001.tar.gz 989529 RMD160 6143305ae1f7a4f4f9572882bc34b4ddbd1c425c SHA1 dbc10d0ee1631a6bc94f60b586fc6fe6973a82b4 SHA256 4a493cb23f433948c252b6e35705d7ec88c0f3b575c7e12691632fea6faf240f
-EBUILD lightscribe-template-001-r1.ebuild 1687 RMD160 84c5abf5457bdbfdd1d79ef07efcd253fa02eafb SHA1 eb1bc65307f2d2d89715cafeab9a71f73a9c80f9 SHA256 93fee7f16c63697a013d7a727f28005a79d27e64a6cc4c7846d0bffd1d30f0ea
-EBUILD lightscribe-template-001.ebuild 1249 RMD160 387d1274f94651dc6dc6efaf5ad80ce07f476eb0 SHA1 c2ef438c852a2636b27734f5c73539a7c8e50eb7 SHA256 78818abf8d0ff44e76de59a0fc804471aa477d068df658362772f03097beb381
-MISC ChangeLog 598 RMD160 4e0ab2482b15e35def0f515c15a67abcdc9042b2 SHA1 e34022e6ef5b8afb2a65f59fe95bd3419558bfe0 SHA256 295313136314e2e7322e83b4aed2dff6afb47e3e7cf15bede1ee9e8c55295b62
+EBUILD lightscribe-template-001-r1.ebuild 2342 RMD160 7904a998e93e753e0bd60b198483133b9c0ba9fb SHA1 d9d55a9926cb01da325548a4a52ced52f89cef66 SHA256 3b65cbdda5882cc340dc28638fae771877d328376506183fd19c3a7f42e8a6c9
+EBUILD lightscribe-template-001.ebuild 1243 RMD160 a819261c0870551af5c5823a25eba6d83030b908 SHA1 33331fe1f253ee4a3a20a1c594de654506219b95 SHA256 92fadf79554cc6e54738f9f0e742c868826cd878dd2e0d25a456fa865065c828
+MISC ChangeLog 758 RMD160 57759f44aacfac0c997d04b1cd3fac21b2babe60 SHA1 ccfdc3ca85a75d98c1741f19d22ae14a06e6fd7f SHA256 8d2e51cff40cf5369ede8f0f14b2d947bdc81509aa3afe84fe5d9322b663451a
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild b/app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild
index d71098d..cff314a 100644
--- a/app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild
+++ b/app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild
@@ -8,12 +8,13 @@ inherit eutils
 
 # Don't change the order they are grouped by upstream categories:
 # (easyer to add new template packages)
-# Home & Family
-# At the Office
-# Creative Concepts
-# Fun Outdoors
-# Special Occasions
-# Odds and Ends
+
+# Home & Family (Food-n-Family Hobby Floral KidsKorner)
+# At the Office (Business 9-to-5 Architecture)
+# Creative Concepts (Art Fantasy Urban Tattoo Music Mythology Tribal StreetStyle KickinIt GrabBag WithTheBand Expressions)
+# Fun Outdoors (Sports Athletic Travel Animal Nature)
+# Special Occasions (Wedding SpecialOccasion Holiday Bridal Seasonal LifeEvents Celebration TieTheKnot WinterWhimsy)
+# Odds and Ends (Bonus QuickAndSimple)
 TL_OLD="Food-n-Family Hobby Floral KidsKorner
 	Business 9-to-5 Architecture
 	Art Fantasy Urban Tattoo Music Mythology Tribal StreetStyle KickinIt GrabBag WithTheBand Expressions
@@ -21,9 +22,21 @@ TL_OLD="Food-n-Family Hobby Floral KidsKorner
 	Wedding SpecialOccasion Holiday Bridal Seasonal LifeEvents Celebration TieTheKnot WinterWhimsy
 	Bonus QuickAndSimple"
 
+# Home & Family (Memories)
+# At the Office ()
+# Creative Concepts ()
+# Fun Outdoors (Adventure)
+# Special Occasions ()
+# Odds and Ends ()
 TL_NEW="Memories
 	Adventure"
 
+# Home & Family (Pets)
+# At the Office ()
+# Creative Concepts ()
+# Fun Outdoors ()
+# Special Occasions ()
+# Odds and Ends ()
 TL_VER="Pets"
 
 TL="${TL_OLD} ${TL_NEW} ${TL_VER}"
@@ -45,7 +58,9 @@ do
 	SRC_URI="${SRC_URI} http://download.lightscribe.com/ls/TL_${template}${PV}.tar.gz -> TL_${template}Pack${PV}.tar.gz "
 done
 
-LICENSE="lightscribe"
+# No details on the use of this Templates
+# so as-is was chosen
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-cdr/lightscribe-template/lightscribe-template-001.ebuild b/app-cdr/lightscribe-template/lightscribe-template-001.ebuild
index 153ac87..a52b27b 100644
--- a/app-cdr/lightscribe-template/lightscribe-template-001.ebuild
+++ b/app-cdr/lightscribe-template/lightscribe-template-001.ebuild
@@ -30,7 +30,7 @@ do
 	SRC_URI="${SRC_URI} http://download.lightscribe.com/ls/TL_${template}Pack${PV}.tar.gz"
 done
 
-LICENSE="lightscribe"
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""