diff --git a/faust-mode/declarelicense b/faust-mode/declarelicense
index 608f8a1f..40af4d99 100644
--- a/faust-mode/declarelicense
+++ b/faust-mode/declarelicense
@@ -4,13 +4,25 @@
 # --
 declare license "${1:$$
   (yas-choose-value '(
-    "AGPLv3"
-    "Apache"
-    "BSD 2-clause"
-    "BSD 3-clause"
-    "GPLv2"
-    "GPLv3"
-    "LGPLv3"
+    "AGPL-3.0-only"
+    "AGPL-3.0-or-later"
+    "Apache-2.0"
+    "BSD-2-Clause"
+    "BSD-3-Clause"
+    "CC-BY-4.0"
+    "CC0-1.0"
+    "EPL-2.0"
+    "GPL-2.0-only"
+    "GPL-2.0-or-later"
+    "GPL-3.0-only"
+    "GPL-3.0-or-later"
+    "ISC"
+    "LGPL-2.1-only"
+    "LGPL-2.1-or-later"
+    "LGPL-3.0-only"
+    "LGPL-3.0-or-later"
     "MIT"
+    "MPL-2.0"
+    "Unlicense"
   ))}";
 $0
\ No newline at end of file
diff --git a/faust-mode/header b/faust-mode/header
index fa447b50..33924fb1 100644
--- a/faust-mode/header
+++ b/faust-mode/header
@@ -7,13 +7,26 @@ declare version "${2:0.1}";
 declare author "$3";
 declare license "${4:$$
   (yas-choose-value '(
-    "AGPLv3"
-    "Apache"
-    "BSD 2-clause"
-    "BSD 3-clause"
-    "GPLv2"
-    "GPLv3"
-    "LGPLv3"
+    "AGPL-3.0-only"
+    "AGPL-3.0-or-later"
+    "Apache-2.0"
+    "BSD-2-Clause"
+    "BSD-3-Clause"
+    "CC-BY-4.0"
+    "CC0-1.0"
+    "EPL-2.0"
+    "GPL-2.0-only"
+    "GPL-2.0-or-later"
+    "GPL-3.0-only"
+    "GPL-3.0-or-later"
+    "ISC"
+    "LGPL-2.1-only"
+    "LGPL-2.1-or-later"
+    "LGPL-3.0-only"
+    "LGPL-3.0-or-later"
     "MIT"
+    "MPL-2.0"
+    "Unlicense"
   ))}";
-$0
+declare copyright "${5:starting year} - ${6:`(format-time-string "%Y")`$0}, ${7:$3}";
+$0
\ No newline at end of file