diff --git a/battery123.tidal b/battery123.tidal
index d58efe4..3ffcbd9 100644
--- a/battery123.tidal
+++ b/battery123.tidal
@@ -219,7 +219,7 @@ d'drum $ cf $
   -- every 3 rev $ -- (f4) and (f5) remove
   -- every' 8 8 rev $ -- (f3)
   stack [
-    -- slow 2 $ s "peri*2 [~ ~ ~ peri] [~ peri peri ~] ~", -- (2), (3) ^peri*2 -- (f5) remove
+    -- slow 2 $ s "peri [~ ~ ~ peri] [~ peri peri ~] ~", -- (2), (3) ^peri*2 -- (f5) remove
     -- whenmod 5 3 (density 2) $ -- (f1)
     -- iter 2 $ -- (f2)
     sound "[tok*2 [rm tok]] [psr:1 tok*2]"
diff --git a/snippets/b1setup b/snippets/b123setup
similarity index 90%
rename from snippets/b1setup
rename to snippets/b123setup
index bfb423b..4d1e377 100644
--- a/snippets/b1setup
+++ b/snippets/b123setup
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
-# name: b1setup
+# name: b123setup
 # group: battery123
-# key: b1setup
+# key: b123setup
 # expand-env: (yas-indent-line fixed)
 # --
 let bpm b = cps (b/60)
diff --git a/snippets/b1bass1 b/snippets/b1bass1
index 85829a6..c1b8ea7 100644
--- a/snippets/b1bass1
+++ b/snippets/b1bass1
@@ -5,7 +5,7 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @b1bass1
-d'bass $ slow 4 $ s "bass3 [~ bass3] ! ~"
+d'bass $ slow 4 $ s "${1:bass3} [~ $1] ! ~"
   # begin 0.2
   -- # n "0 1 0 0" -- (1)
   -- # speed (scale 1 (4/3) $ slow 8 sine1) -- (2)
diff --git a/snippets/b1bass2 b/snippets/b1bass2
index 7d2b08e..8a21872 100644
--- a/snippets/b1bass2
+++ b/snippets/b1bass2
@@ -8,7 +8,7 @@
 d'bass $
   spread slow [1,3] $
   striate 16 $
-  s "bass3 [~ bass3] ! ~"
+  s "${1:bass3} [~ $1}] ! ~"
   # begin 0.2
   # n "0 1 0 0"
   # speed (scale 1 1.5 $ slow 8 sine1)
diff --git a/snippets/b1drum1 b/snippets/b1drum1
index b8ec0e7..8862bb4 100644
--- a/snippets/b1drum1
+++ b/snippets/b1drum1
@@ -7,6 +7,6 @@
 -- @b1drum1
 d'drum $ cf $ stack [
   -- every 4 (density 1.5) $ -- (2)
-  -- slow 2 $ s "peri [~ peri] ! ~", -- (1)
-  sound "~ psr:1"
+  -- slow 2 $ s "${1:peri} [~ $1] ! ~", -- (1)
+  sound "~ ${2:psr:1}"
   ]
diff --git a/snippets/b1drum2 b/snippets/b1drum2
index e700e48..cd37cdd 100644
--- a/snippets/b1drum2
+++ b/snippets/b1drum2
@@ -7,8 +7,8 @@
 -- @b1drum2
 d'drum $ cf $
   stack [
-    s "peri*2", -- (-1) remove
+    s "${1:peri}*2", -- (-1) remove
     -- every' 8 8 (density 1.5) $ -- (2)
     -- every 2 (density 3) $ -- (1)
-    sound "~ psr:1"
+    sound "~ ${2:psr:1}"
     ]
diff --git a/snippets/b1hand b/snippets/b1hand
index 587cf8e..0e9f8e6 100644
--- a/snippets/b1hand
+++ b/snippets/b1hand
@@ -5,7 +5,7 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @b1hand
-d'hand $ slow 8 $ rev . striate 256 $ s "hand*8"
+d'hand $ slow 8 $ rev . striate 256 $ s "${1:hand}*8"
   # speed 0.7
   -- # shape (scale 0 0.5 $ slow (10/4) sine1) -- (1)
   -- # pan (scale 0.25 0.75 $ slow (8/3) sine1) -- (2)
diff --git a/snippets/b1perc b/snippets/b1perc
index c5f19c1..ac67fb8 100644
--- a/snippets/b1perc
+++ b/snippets/b1perc
@@ -9,5 +9,5 @@ d'perc $ cf $
   -- fastspread slow [2,1] $ -- (3)
   -- slow 2 . fastspread slow [2,4,2,3] $ -- (4) replace (3)
   -- jux (0.25 <~) $ -- (2)
-  slow 2 $ s "uxay [~ uxay] [psr uxay] ~"
+  slow 2 $ s "${1:uxay} [~ $1] [${2:psr} $1] ~"
   -- # n (density 3 $ run 2) -- (1)
diff --git a/snippets/b1tac b/snippets/b1tac
index 900b1e1..2e3c680 100644
--- a/snippets/b1tac
+++ b/snippets/b1tac
@@ -7,6 +7,6 @@
 -- @b1tac
 d'tac $ cf $
   -- whenmod 7 4 (density 1.5) $ -- (1)
-  s "[~ tacscan] ! ~ ~"
+  s "[~ ${1:tacscan}] ! ~ ~"
   # gain 0.8
   # vowel (slow 3 "e u")
diff --git a/snippets/b1warbler b/snippets/b1warbler
index e07862f..53e79f7 100644
--- a/snippets/b1warbler
+++ b/snippets/b1warbler
@@ -5,6 +5,6 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @b1warbler
-d'warb $ slow 4 $ striate 32 $ s "warbler"
+d'warb $ slow 4 $ striate 32 $ s "${1:warbler}"
   # n (slow 7 $ run 7)
   # gain 0.8
diff --git a/snippets/b2arpy b/snippets/b2arpy
index 9552c6c..06fbae1 100644
--- a/snippets/b2arpy
+++ b/snippets/b2arpy
@@ -8,6 +8,6 @@
 d'arpy $ cf $
   -- whenmod 7 4 (# vowel "a") $ -- (2)
   -- iter 9 $ -- (1)
-  s "arpy*8"
+  s "${1:arpy}*8"
   # n "2 1 3 1"
   # gain 0.7
diff --git a/snippets/b2bass b/snippets/b2bass
index 2341978..c73facc 100644
--- a/snippets/b2bass
+++ b/snippets/b2bass
@@ -6,7 +6,7 @@
 # --
 -- @b2bass
 d'bass $ slow 8 $
-  s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbass]] [~ jvbass !]"
+  s "[${1:jvbass} ~] [$1 [~ ~ ~ ~ $1]] [~ [~ ~ ~ ~ $1]] [~ $1 !]"
   # n (slow 2.8 "0 1 2")
   # vowel "i"
   # speed 0.8
diff --git a/snippets/b2drum b/snippets/b2drum
index 39741ee..789bcc6 100644
--- a/snippets/b2drum
+++ b/snippets/b2drum
@@ -5,9 +5,9 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @b2drum
-d'drum $ -- overlay (s "peri") $ -- (3,4) toggle
+d'drum $ -- overlay (s "${1:peri}") $ -- (3,4) toggle
   cf $
   -- every 3 (0.125 <~) $ -- (2)
-  s "psr*4 psr*2"
-  -- s "[[psr*4 psr*2] ! ! psr*8]/4" -- (1)
+  s "${2:psr}*4 $2*2"
+  -- s "[[$2*4 $2*2] ! ! $2*8]/4" -- (1)
   # gain 0.6
diff --git a/snippets/b2perca b/snippets/b2perca
index e892b2d..c9f5969 100644
--- a/snippets/b2perca
+++ b/snippets/b2perca
@@ -5,6 +5,6 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @b2perca
-d'perc $ cf $ s "uxay*2" -- (1) uxay*4
+d'perc $ cf $ s "${1:uxay}*2" -- (1) $1*4
   # n "1 0 1 2"
   -- # speed "[0.7 1 1.2]/2" -- (2)
diff --git a/snippets/b2percb b/snippets/b2percb
index 55f1e23..b95f1e3 100644
--- a/snippets/b2percb
+++ b/snippets/b2percb
@@ -7,7 +7,7 @@
 -- @b2percb
 let -- b = brak . iter 4 -- (1)
     b = cf . brak
-  in d'perc $ b $ s "uxay*4"
+  in d'perc $ b $ s "${1:uxay}*4"
      # n "1 0 1 2"
      # gain 0.8
      # shape "0.4 0.3 0.6"
diff --git a/snippets/b2trump b/snippets/b2trump
index 86c73cc..40178f0 100644
--- a/snippets/b2trump
+++ b/snippets/b2trump
@@ -5,7 +5,7 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @b2trump
-d'tr $ cf $ whenmod 5 4 rev $ s "[~ trump ! !] ~"
+d'tr $ cf $ whenmod 5 4 rev $ s "[~ ${1:trump} ! !] ~"
   # n (slow 3.2 $ run 4)
   # gain 0.8
   # vowel (slow 3.2 "a e o")
diff --git a/snippets/b3bass b/snippets/b3bass
index 70d11f4..979bcfb 100644
--- a/snippets/b3bass
+++ b/snippets/b3bass
@@ -5,7 +5,7 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @b3bass
-let p = "bass*4" -- "{bass*4, wobble*3}" (4)
+let p = "${1:bass}*4" -- "{$1*4, ${2:wobble}*3}" (4)
   in d'bass $ cf $
      -- spread slow [2,(7/4)] $ -- (2)
      -- whenmod 7 6 (density 1.5) $ -- (1)
diff --git a/snippets/b3drum b/snippets/b3drum
index 22461b7..7086ac8 100644
--- a/snippets/b3drum
+++ b/snippets/b3drum
@@ -9,9 +9,9 @@ d'drum $ cf $
   -- every 3 rev $ -- (f4) and (f5) remove
   -- every' 8 8 rev $ -- (f3)
   stack [
-    -- slow 2 $ s "peri*2 [~ ~ ~ peri] [~ peri peri ~] ~", -- (2), (3) ^peri*2 -- (f5) remove
+    -- slow 2 $ s "${1:peri} [~ ~ ~ $1] [~ $1 $1 ~] ~", -- (2), (3) ^$1*2 -- (f5) remove
     -- whenmod 5 3 (density 2) $ -- (f1)
     -- iter 2 $ -- (f2)
-    sound "[tok*2 [rm tok]] [psr:1 tok*2]"
+    sound "[${4:tok}*2 [${3:rm} $4]] [${2:psr:1} $4*2]"
     -- # n (slow 3 $ run 4) -- (1)
     ]