1 files changed, 58 insertions, 22 deletions

diff --git a/config.yml b/config.yml
index 36c804b..2e89a0f 100644
--- a/config.yml
+++ b/config.yml
@@ -92,6 +92,42 @@ key_properties:
       - 
       - Noise
     include: light_blue
+  'q':
+    description:
+      -  
+      - Load
+      - Music 1
+    include: light_blue
+  's':
+    description:
+      -  
+      - Load
+      - Music 2
+    include: light_blue
+  'd':
+    description:
+      - 
+      - Load
+      - Noise
+    include: light_blue
+  'w':
+    description:
+      -  
+      - Unload
+      - Music 1
+    include: light_blue
+  'x':
+    description:
+      -  
+      - Unload
+      - Music 2
+    include: light_blue
+  'c':
+    description:
+      - 
+      - Unload
+      - Noise
+    include: light_blue
   't':
     description:
       - 
@@ -105,12 +141,6 @@ key_properties:
       - Stop wait
       - music 2
     include: green
-  'u':
-    description:
-      - 
-      - Noise
-      - + Music 2
-    include: green
 
   'g':
     description:
@@ -266,6 +296,28 @@ keys:
     - play:
         include: noise
 
+# Load the songs
+  'q':
+    - load_music:
+        include: music1
+  's': 
+    - load_music:
+        include: music2
+  'd':
+    - load_music:
+        include: noise
+
+# Unload the songs
+  'w':
+    - unload_music:
+        include: music1
+  'x': 
+    - unload_music:
+        include: music2
+  'c':
+    - unload_music:
+        include: noise
+
 # Crossfade from any music to music 2
   't':
     - stop:
@@ -276,26 +328,10 @@ keys:
 
 # Fade out, then wait and start music 2
   'y':
-    - stop: 
-        fade_out: 3
-        wait: true
     - wait:
-        duration: 3
-    - play: 
         include: music2
 
 # Play the noise, stop music 1, wait a bit then start music 2
-  'u':
-    - play:
-        include: noise
-    - wait:
-        duration: 0.2
-    - stop:
-        include: music1
-    - wait:
-        duration: 3
-    - play: 
-        include: music2
 
 # Play music 1, starting at 30 seconds then seeks at 60 after 5 seconds
   'g':