diff --git a/light9/subcomposer/index.html b/light9/subcomposer/index.html
--- a/light9/subcomposer/index.html
+++ b/light9/subcomposer/index.html
@@ -35,23 +35,20 @@
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/b34">b34</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/b35">b35</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/b36">b36</button>
-  
-
-
     <hr>
     
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f1-blue">f1-blue</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f2">f2</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f3">f3</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f4-pool-l">f4-pool-l</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f5-fill">f5-fill</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f1">f1-l</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f2-out">f2-c</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f3">f3-r</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f4">f4-purp</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f5">f5-rose-x2</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/sharlyn">sharlyn</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f7">f7</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f8-fill">f8-fill</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f9-pool-r">f9-pool-r</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f10">f10</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f11-blue">f11-blue</button>
-    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f12-purp">f12-purp</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f7">f7-c</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f8">f8-blue-x2</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f9">f9-purp</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f10">f10-l</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f11">f11-c</button>
+    <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f12-out">f12-r</button>
 
     <script src="/lib/jquery-2.1.1.min.js"></script>
     <script>