diff --git a/snippets/hbass b/snippets/hbass
index 80cc245..8882d1c 100644
--- a/snippets/hbass
+++ b/snippets/hbass
@@ -8,7 +8,7 @@
 let s = striate 16
   in d'bass $
      slow 8 $ stack [
-       s $ sound "bass",
-       s $ sound "sine"
+       s $ sound "${1:bass}",
+       s $ sound "${2:sine}"
        ]
      # gain 0.9
diff --git a/snippets/hbass2 b/snippets/hbass2
index 3c62b6e..bab43c8 100644
--- a/snippets/hbass2
+++ b/snippets/hbass2
@@ -6,6 +6,6 @@
 # --
 -- @hbass2
 d'bass2 $ swing 0.14 $
-  n "[~ [~ 1] [~!! 0] [~ 0 1 ~]]/4" # s "bass2"
+  n "[~ [~ 1] [~!! 0] [~ 0 1 ~]]/4" # s "${1:bass2}"
   # speed (0.5 ~> "[2 1]")
   # gain 0.82
diff --git a/snippets/hdorr1 b/snippets/hdorr1
index 8fe1977..4c8bb8c 100644
--- a/snippets/hdorr1
+++ b/snippets/hdorr1
@@ -7,7 +7,7 @@
 -- @hdorr1
 d'fx1 $ -- mt $ -- (1)
   (2 ~>) $ chop 16 $
-  s "dorr/4"
+  s "${1:dorr}/4"
   # hresonance 0.05
   # hcutoff 200
   # gain 0.8
diff --git a/snippets/hdorr2 b/snippets/hdorr2
index 00e284d..a936d0a 100644
--- a/snippets/hdorr2
+++ b/snippets/hdorr2
@@ -7,7 +7,7 @@
 -- @hdorr2
 d'fx1 $
   -- superimpose (slow 2) $ -- (1)
-  (2 ~>) $ chop 16 $ s "dorr/4"
+  (2 ~>) $ chop 16 $ s "${1:dorr}/4"
   # hresonance 0.05
   # hcutoff 200
   # gain 0.8
diff --git a/snippets/hdrum0 b/snippets/hdrum0
index 46318d4..76d864d 100644
--- a/snippets/hdrum0
+++ b/snippets/hdrum0
@@ -6,7 +6,7 @@
 # --
 -- @hdrum0
 d'drum $ stack [
-  n "1/4" # s "drum" -- (2) remove
-  -- n "[1*2, 0*8]/8" # s "drum", -- (2)
-  -- n "[~ 0]" # s "kit" -- (1)
+  n "1/4" # s "${1:drum}" -- (2) remove
+  -- n "[1*2, 0*8]/8" # s "$1", -- (2)
+  -- n "[~ 0]" # s "${2:kit}" -- (1)
   ]
diff --git a/snippets/hdrum1 b/snippets/hdrum1
index eacb575..62cf09d 100644
--- a/snippets/hdrum1
+++ b/snippets/hdrum1
@@ -6,9 +6,9 @@
 # --
 -- @hdrum1
 d'drum $ stack [
-  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
+  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "${1:drum}",
   -- whenmod 3 2 (density 2) $ -- (3)
   -- withmod 11 5 0.5 1 (density 2) $ -- (2)
-  n "~ 0" # s "kit"
-  -- n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit" -- (1)
+  n "~ 0" # s "${2:kit}"
+  -- n "[[~ 0] [[2!! ~]/4 0]]/2" # s "$2" -- (1)
   ]
diff --git a/snippets/hdrum2 b/snippets/hdrum2
index f9d5643..e01e23d 100644
--- a/snippets/hdrum2
+++ b/snippets/hdrum2
@@ -6,8 +6,8 @@
 # --
 -- @hdrum2
 d'drum $ mt $ stack [
-  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
+  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "${1:drum}",
   whenmod 3 2 (density 2) $
   withmod 11 5 0.5 1 (density 2) $
-  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit"
+  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "${2:kit}"
   ]
diff --git a/snippets/hdrum23 b/snippets/hdrum23
index 9d0b51f..1dded7f 100644
--- a/snippets/hdrum23
+++ b/snippets/hdrum23
@@ -5,4 +5,4 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @hdrum23
-d'drum $ n "0*4" # s "kit" # gain 0.9 -- (1) s "drum"
+d'drum $ n "0*4" # s "${2:kit}" # gain 0.9 -- (1) s "${1:drum}"
diff --git a/snippets/hdrum3 b/snippets/hdrum3
index 1206668..0600202 100644
--- a/snippets/hdrum3
+++ b/snippets/hdrum3
@@ -6,10 +6,10 @@
 # --
 -- @hdrum3
 d'drum $ swing 0.14 $ stack [
-  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
+  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "${1:drum}",
   whenmod 3 2 (density 2) $
   withmod 11 5 0.5 1 (density 2) $
-  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit"
-  -- n "[~ 1]/2" # s "sn" # gain 0.85 -- (1)
-  -- n "[~ [1 0/8 1/2 0/2]]/2" # s "sn" # gain 0.85 -- (2)
+  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "${3:kit}"
+  -- n "[~ 1]/2" # s "${2:sn}" # gain 0.85 -- (1)
+  -- n "[~ [1 0/8 1/2 0/2]]/2" # s "$2" # gain 0.85 -- (2)
   ]
diff --git a/snippets/hdrum4 b/snippets/hdrum4
index ff0c67d..fca4d6a 100644
--- a/snippets/hdrum4
+++ b/snippets/hdrum4
@@ -7,10 +7,10 @@
 -- @hdrum4
 d'drum $ swing 0.14 $ -- mt $ -- (3)
   stack [
-    n "[1*2, 0*8, [[~ 0] ~! [~!! 0] [~! 0!] ~!!]]/8" # s "drum",
-    -- every' 16 16 (const $ sound "kit:3") $ -- (2)
-    -- n "[~ 0]" # s "kit", -- (1)
-    n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit", -- (1) remove
-    n "[~ [1 0/8 1/2 0/2]]/2" # s "sn"
+    n "[1*2, 0*8, [[~ 0] ~! [~!! 0] [~! 0!] ~!!]]/8" # s "${1:drum}",
+    -- every' 16 16 (const $ sound "$3:3") $ -- (2)
+    -- n "[~ 0]" # s "$3", -- (1)
+    n "[[~ 0] [[2!! ~]/4 0]]/2" # s "${3:kit}", -- (1) remove
+    n "[~ [1 0/8 1/2 0/2]]/2" # s "${2:sn}"
     # gain 0.85
     ]
diff --git a/snippets/hduck b/snippets/hduck
index c47a3bf..c280a58 100644
--- a/snippets/hduck
+++ b/snippets/hduck
@@ -7,8 +7,8 @@
 -- @hduck
 d'fx2 $ mt $
   stack [
-    1.75 ~> s "tubal/4",
-    (3.75 ~>) $ chop 16 $ s "duck/4"
+    1.75 ~> s "${1:tubal}/4",
+    (3.75 ~>) $ chop 16 $ s "${2:duck}/4"
     # gain 0.6
     # speed 0.9
     ]
diff --git a/snippets/hduon b/snippets/hduon
index 2ee717e..99958c1 100644
--- a/snippets/hduon
+++ b/snippets/hduon
@@ -5,5 +5,5 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @hduon
-d'fx3 $ 3 ~> n "[0 1]/8" # s "duon"
+d'fx3 $ 3 ~> n "[0 1]/8" # s "${1:duon}"
   # gain 0.9
diff --git a/snippets/hhi b/snippets/hhi
index b153b66..39e0bad 100644
--- a/snippets/hhi
+++ b/snippets/hhi
@@ -12,5 +12,5 @@ d'hi $
   (0.5 ~>) $
   slow 8 $
   gap 64 $
-  n "[0 1]/2" # s "nimble"
-  # speed ((-4+).(*(-1)) <$> density 1.1 sine1)
+  n "[0 1]/2" # s "${1:nimble}"
+  # speed ((-4+).(*(-1)) <\$> density 1.1 sine1)
diff --git a/snippets/hic1 b/snippets/hic1
index fe7c96d..8fab2e2 100644
--- a/snippets/hic1
+++ b/snippets/hic1
@@ -5,4 +5,4 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @hic1
-d'wax $ slow 16 . striate 256 $ s "icarus"
+d'wax $ slow 16 . striate 256 $ s "${1:icarus}"
diff --git a/snippets/hic2 b/snippets/hic2
index 31a1e1f..d87070f 100644
--- a/snippets/hic2
+++ b/snippets/hic2
@@ -5,4 +5,4 @@
 # expand-env: (yas-indent-line fixed)
 # --
 -- @hic2
-d'wax $ retrig $ slow 20 $ sound "icarus:1"
+d'wax $ retrig $ slow 20 $ sound "${1:icarus}:1"
diff --git a/snippets/hnim1 b/snippets/hnim1
index c9115b7..ca829cf 100644
--- a/snippets/hnim1
+++ b/snippets/hnim1
@@ -10,4 +10,4 @@ d'nim $
   superimpose (iter 4 -- (3) iter 6
                -- .(# speed (scale 0.8 (0.8+(2/3)) $ slow 2.5 sine1)) -- (2)
               ) $ -- -}
-  slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
+  slow 16 . striate 256 $ n "[0 1]/2" # s "${1:nimble}"
diff --git a/snippets/hnim2 b/snippets/hnim2
index b52e8aa..add4249 100644
--- a/snippets/hnim2
+++ b/snippets/hnim2
@@ -14,4 +14,4 @@ d'nim $
   -- every 3 (density 2) $ -- (3)
   -- every' 2 2 (within (0, 0.5) (const silence)) $ -- (2)
   -- whenmod 5 3 rev $ -- (1)
-  slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
+  slow 16 . striate 256 $ n "[0 1]/2" # s "${1:nimble}"
diff --git a/snippets/hnim3 b/snippets/hnim3
index 257cd65..5310f67 100644
--- a/snippets/hnim3
+++ b/snippets/hnim3
@@ -18,4 +18,4 @@ d'nim $
                -- -}
               ) $ -- -}
   -- whenmod 16 12 (# vowel "[a i]/3") $ -- (1)
-  (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
+  (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "${1:nimble}"
diff --git a/snippets/hnim4 b/snippets/hnim4
index 352a1fb..a81ee82 100644
--- a/snippets/hnim4
+++ b/snippets/hnim4
@@ -8,5 +8,5 @@
 d'nim $ -- mt $ -- (2)
   (0.25 ~>) $
   whenmod 4 2 (const silence) $
-  slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
+  slow 16 . striate 256 $ n "[0 1]/2" # s "${1:nimble}"
   -- # vowel "o" -- (1)
diff --git a/snippets/hsnoo b/snippets/hsnoo
index 5d7899f..7dfb7c3 100644
--- a/snippets/hsnoo
+++ b/snippets/hsnoo
@@ -8,6 +8,6 @@
 d'fx3 $
   (1.5 ~>) $
   slow 4 $ chop 48 $
-  sound (samples "snoo" <$> slow 7 $ run 7)
+  sound (samples "${1:snoo}" <\$> slow 7 $ run 7)
   # gain 0.8
   # cut 10