# HG changeset patch
# User drewp@bigasterisk.com
# Date 2016-06-13 02:06:11
# Node ID cd8f8a4dd8e49aa4f205f6a235d3087e720b1512
# Parent  646bb4797d62d47a5faf8271c19e2c3c2bb591d4

checkpoint show data
Ignore-this: 58c5bffa2184d120e9d7fd2fef33ef1a

diff --git a/show/dance2016/effect.n3 b/show/dance2016/effect.n3
--- a/show/dance2016/effect.n3
+++ b/show/dance2016/effect.n3
@@ -17,26 +17,30 @@
 
 
 effect:animRainbow a :Effect; rdfs:label "animRainbow"; :publishAttr :strength, :rate ; :group "anim".
+effect:pulseRainbow a :Effect; rdfs:label "pulseRainbow"; :publishAttr :strength, :rate ; :group "main"; :order 6.
 
 effect:orangeSearch a :Effect; :publishAttr :strength ; :group "anim".
-effect:lightning a :Effect; :publishAttr :strength ; :group "anim".
+effect:lightning a :Effect; :publishAttr :strength ; :group "main"; :order 7.
 
 effect:strobewarm :group "anim".
 
-effect:house :group "main" .
-effect:cyc :group "main" .
+effect:house :group "main"; :order 3 .
+effect:houseside :group "main"; :order 4 .
+effect:cyc :group "main"; :order 3 .
+effect:qwidecenter :group "main"; rdfs:label "qwidecenter [18]"; :order 5 .
+effect:curtain2  :group "main"; :order 2 .
 
 effect:centerSpot a :Effect; rdfs:label "center spot";
-     :group "main"; :order 3; :publishAttr :strength;
+     :group "main"; :order 1; :publishAttr :strength;
      :setting effect:centerSpots0, effect:centerSpots1, effect:centerSpots2, effect:centerSpots3, effect:centerSpots4 .
 effect:centerSpots0 :device dev:q2; :deviceAttr :color;
-     :scaledValue "#ffffff" .
+     :scaledValue "#ffefdf" .
 effect:centerSpots1 :device dev:q2; :deviceAttr :focus;
      :value 0.31 .
 effect:centerSpots2 :device dev:q2; :deviceAttr :rx;
      :value 0.50 .
 effect:centerSpots3 :device dev:q2; :deviceAttr :ry;
-     :value 0.26 .
+     :value 0.01 .
 effect:centerSpots4 :device dev:q2; :deviceAttr :zoom;
      :value 0.42 .
 
diff --git a/show/dance2016/effect/curtain2.n3 b/show/dance2016/effect/curtain2.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/effect/curtain2.n3
@@ -0,0 +1,43 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+
+effect:curtain2 a :Effect; rdfs:label "curtain2"; :publishAttr :strength;
+     :setting effect:curtain2_set0, effect:curtain2_set1, effect:curtain2_set10, effect:curtain2_set11, effect:curtain2_set12, effect:curtain2_set13, effect:curtain2_set14, effect:curtain2_set15, effect:curtain2_set2, effect:curtain2_set3, effect:curtain2_set4, effect:curtain2_set5, effect:curtain2_set6, effect:curtain2_set7, effect:curtain2_set8, effect:curtain2_set9 .
+effect:curtain2_set0 :device dev:lowPattern301; :deviceAttr :color;
+     :scaledValue "#67daf1" .
+effect:curtain2_set1 :device dev:lowPattern302; :deviceAttr :color;
+     :scaledValue "#527fe9" .
+effect:curtain2_set10 :device dev:down2; :deviceAttr :color;
+     :scaledValue "#3e3e3e" .
+effect:curtain2_set11 :device dev:down5Edge; :deviceAttr :color;
+     :scaledValue "#3e3e3e" .
+effect:curtain2_set12 :device dev:down4; :deviceAttr :color;
+     :scaledValue "#515151" .
+effect:curtain2_set13 :device dev:lip1; :deviceAttr :color;
+     :scaledValue "#929090" .
+effect:curtain2_set14 :device dev:postL1; :deviceAttr :color;
+     :scaledValue "#0e03a5" .
+effect:curtain2_set15 :device dev:postR1; :deviceAttr :color;
+     :scaledValue "#051093" .
+effect:curtain2_set2 :device dev:lowPattern304; :deviceAttr :color;
+     :scaledValue "#2e43ea" .
+effect:curtain2_set3 :device dev:lowPattern305; :deviceAttr :color;
+     :scaledValue "#4c39f1" .
+effect:curtain2_set4 :device dev:lowPattern308; :deviceAttr :color;
+     :scaledValue "#3967e7" .
+effect:curtain2_set5 :device dev:lowPattern307; :deviceAttr :color;
+     :scaledValue "#456cee" .
+effect:curtain2_set6 :device dev:lowPattern306; :deviceAttr :color;
+     :scaledValue "#364aec" .
+effect:curtain2_set7 :device dev:lowPattern303; :deviceAttr :color;
+     :scaledValue "#376cdc" .
+effect:curtain2_set8 :device dev:hexSlant; :deviceAttr :color;
+     :scaledValue "#4d4678" .
+effect:curtain2_set9 :device dev:down3; :deviceAttr :color;
+     :scaledValue "#454545" .
diff --git a/show/dance2016/effect/houseside.n3 b/show/dance2016/effect/houseside.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/effect/houseside.n3
@@ -0,0 +1,11 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+
+effect:houseside a :Effect; rdfs:label "houseside";
+     :publishAttr :strength .
diff --git a/show/dance2016/effect/lowdancers.n3 b/show/dance2016/effect/lowdancers.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/effect/lowdancers.n3
@@ -0,0 +1,19 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+
+effect:lowdancers a :Effect; rdfs:label "lowdancers";
+     :publishAttr :strength; :setting effect:lowdancers_set0, effect:lowdancers_set1, effect:lowdancers_set2, effect:lowdancers_set3 .
+effect:lowdancers_set0 :device dev:veryLow5; :deviceAttr :color;
+     :scaledValue "#ffffff" .
+effect:lowdancers_set1 :device dev:veryLow1; :deviceAttr :color;
+     :scaledValue "#ffffff" .
+effect:lowdancers_set2 :device dev:hexLowBacklight1;
+     :deviceAttr :color; :scaledValue "#ffffff" .
+effect:lowdancers_set3 :device dev:hexLowBacklight6;
+     :deviceAttr :color; :scaledValue "#ffffff" .
diff --git a/show/dance2016/song1.n3 b/show/dance2016/song1.n3
--- a/show/dance2016/song1.n3
+++ b/show/dance2016/song1.n3
@@ -9,19 +9,37 @@
 
 :a01 :effectAttr :chaseOffset; :value 0.12 .
 :ao0 :effectAttr :chaseTempo; :value 100 .
-<http://light9.bigasterisk.com/show/dance2016/song1> :note song:n0, song:n3 .
+<http://light9.bigasterisk.com/show/dance2016/song1> :note song:n1, song:n2 .
 
 song:n0 a :Note; :curve song:n0c0; :effectClass effect:centerSpot;
      :originTime 30.836 .
 
+song:n3 a :Note; :curve song:n3c0; :effectClass effect:Curtain;
+     :originTime 32.932 .
+
 song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
 song:n0c0p0 :time 0.000; :value 0.000 .
 song:n0c0p1 :time 1.000; :value 1.000 .
 song:n0c0p2 :time 4.170; :value 1.000 .
 song:n0c0p3 :time 5.772; :value 0.000 .
 
-song:n3 a :Note; :curve song:n3c0; :effectClass effect:Curtain;
-     :originTime 32.932 .
+song:n1 a :Note; :curve song:n1c0; :effectClass effect:qfill;
+     :originTime 4.168 .
+
+song:n1c0 a :Curve; :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 .
+song:n1c0p0 :time -1.018; :value 0.000 .
+song:n1c0p1 :time 0.294; :value 1.000 .
+song:n1c0p2 :time 202.106; :value 1.000 .
+song:n1c0p3 :time 204.953; :value 0.000 .
+
+song:n2 a :Note; :curve song:n2c0; :effectClass effect:lowdancers;
+     :originTime 86.515 .
+
+song:n2c0 a :Curve; :attr :strength; :point song:n2c0p0, song:n2c0p1, song:n2c0p2, song:n2c0p3 .
+song:n2c0p0 :time 0.000; :value 0.000 .
+song:n2c0p1 :time 4.357; :value 1.000 .
+song:n2c0p2 :time 120.051; :value 1.000 .
+song:n2c0p3 :time 122.376; :value 0.000 .
 
 song:n3c0 a :Curve; :attr :strength; :point song:n3c0p0, song:n3c0p1, song:n3c0p2, song:n3c0p3 .
 song:n3c0p0 :time 0.153; :value 0.000 .
diff --git a/show/dance2016/song12.n3 b/show/dance2016/song12.n3
--- a/show/dance2016/song12.n3
+++ b/show/dance2016/song12.n3
@@ -6,7 +6,7 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2016/song12> :note <http://light9.bigasterisk.com/show/dance2016/song12/n0>, <http://light9.bigasterisk.com/show/dance2016/song12/n1> .
+<http://light9.bigasterisk.com/show/dance2016/song12> :note <http://light9.bigasterisk.com/show/dance2016/song12/n1>, <http://light9.bigasterisk.com/show/dance2016/song12/n2>, <http://light9.bigasterisk.com/show/dance2016/song12/n3> .
 
 <http://light9.bigasterisk.com/show/dance2016/song12/n0> a :Note;
      :curve <http://light9.bigasterisk.com/show/dance2016/song12/n0c0>;
@@ -25,15 +25,53 @@
 
 <http://light9.bigasterisk.com/show/dance2016/song12/n1> a :Note;
      :curve <http://light9.bigasterisk.com/show/dance2016/song12/n1c0>;
-     :effectClass effect:cyc; :originTime 67.564 .
+     :effectClass effect:cyc; :originTime 67.564; :setting <http://light9.bigasterisk.com/show/dance2016/song12/n1set0> .
 
 <http://light9.bigasterisk.com/show/dance2016/song12/n1c0> a :Curve;
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song12/n1c0p0>, <http://light9.bigasterisk.com/show/dance2016/song12/n1c0p1>, <http://light9.bigasterisk.com/show/dance2016/song12/n1c0p2>, <http://light9.bigasterisk.com/show/dance2016/song12/n1c0p3> .
-<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p0> :time -43.153;
+<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p0> :time -65.162;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p1> :time -58.617;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p2> :time 72.295;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p3> :time 75.511;
      :value 0.000 .
-<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p1> :time -37.714;
+<http://light9.bigasterisk.com/show/dance2016/song12/n1set0> :effectAttr :colorScale;
+     :value "#ffffff" .
+
+<http://light9.bigasterisk.com/show/dance2016/song12/n2> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song12/n2c0>;
+     :effectClass effect:aurafill; :originTime 40.161;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song12/n2set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song12/n2c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song12/n2c0p0>, <http://light9.bigasterisk.com/show/dance2016/song12/n2c0p1>, <http://light9.bigasterisk.com/show/dance2016/song12/n2c0p2>, <http://light9.bigasterisk.com/show/dance2016/song12/n2c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song12/n2c0p0> :time -36.558;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n2c0p1> :time -28.371;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p2> :time 7.550;
+<http://light9.bigasterisk.com/show/dance2016/song12/n2c0p2> :time 99.406;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song12/n1c0p3> :time 8.578;
+<http://light9.bigasterisk.com/show/dance2016/song12/n2c0p3> :time 103.018;
      :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n2set0> :effectAttr :colorScale;
+     :value "#c98383" .
+
+<http://light9.bigasterisk.com/show/dance2016/song12/n3> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song12/n3c0>;
+     :effectClass effect:aurafill; :originTime 35.193;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song12/n3set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song12/n3c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song12/n3c0p0>, <http://light9.bigasterisk.com/show/dance2016/song12/n3c0p1>, <http://light9.bigasterisk.com/show/dance2016/song12/n3c0p2>, <http://light9.bigasterisk.com/show/dance2016/song12/n3c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song12/n3c0p0> :time 0.000;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n3c0p1> :time 8.295;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n3c0p2> :time 40.478;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n3c0p3> :time 60.717;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song12/n3set0> :effectAttr :colorScale;
+     :value "#2922bc" .
diff --git a/show/dance2016/song13.n3 b/show/dance2016/song13.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/song13.n3
@@ -0,0 +1,72 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://light9.bigasterisk.com/show/dance2016/song13> :note <http://light9.bigasterisk.com/show/dance2016/song13/n0>, <http://light9.bigasterisk.com/show/dance2016/song13/n1>, <http://light9.bigasterisk.com/show/dance2016/song13/n2>, <http://light9.bigasterisk.com/show/dance2016/song13/n3> .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n0> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song13/n0c0>;
+     :effectClass effect:downmagenta; :originTime 9.892 .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n0c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song13/n0c0p0>, <http://light9.bigasterisk.com/show/dance2016/song13/n0c0p1>, <http://light9.bigasterisk.com/show/dance2016/song13/n0c0p2>, <http://light9.bigasterisk.com/show/dance2016/song13/n0c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song13/n0c0p0> :time -9.541;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n0c0p1> :time -4.478;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n0c0p2> :time 20.489;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n0c0p3> :time 72.785;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n1> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song13/n1c0>;
+     :effectClass effect:aurafill; :originTime 36.965;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song13/n1set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n1c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song13/n1c0p0>, <http://light9.bigasterisk.com/show/dance2016/song13/n1c0p1>, <http://light9.bigasterisk.com/show/dance2016/song13/n1c0p2>, <http://light9.bigasterisk.com/show/dance2016/song13/n1c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song13/n1c0p0> :time -20.305;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n1c0p1> :time -6.456;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n1c0p2> :time 147.655;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n1c0p3> :time 151.838;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n1set0> :effectAttr :colorScale;
+     :value "#f590cd" .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n2> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song13/n2c0>;
+     :effectClass effect:qfill; :originTime 230.891 .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n2c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song13/n2c0p0>, <http://light9.bigasterisk.com/show/dance2016/song13/n2c0p1>, <http://light9.bigasterisk.com/show/dance2016/song13/n2c0p2>, <http://light9.bigasterisk.com/show/dance2016/song13/n2c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song13/n2c0p0> :time -14.372;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n2c0p1> :time -6.980;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n2c0p2> :time 9.366;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n2c0p3> :time 11.254;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n3> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song13/n3c0>;
+     :effectClass effect:pulseRainbow; :originTime 186.689 .
+
+<http://light9.bigasterisk.com/show/dance2016/song13/n3c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song13/n3c0p0>, <http://light9.bigasterisk.com/show/dance2016/song13/n3c0p1>, <http://light9.bigasterisk.com/show/dance2016/song13/n3c0p2>, <http://light9.bigasterisk.com/show/dance2016/song13/n3c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song13/n3c0p0> :time -2.420;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n3c0p1> :time 3.694;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n3c0p2> :time 33.882;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song13/n3c0p3> :time 44.518;
+     :value 0.000 .
diff --git a/show/dance2016/song14.n3 b/show/dance2016/song14.n3
--- a/show/dance2016/song14.n3
+++ b/show/dance2016/song14.n3
@@ -7,7 +7,7 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2016/song14> :note song:n0, song:n1 .
+<http://light9.bigasterisk.com/show/dance2016/song14> :note song:n0, song:n1, song:n2 .
 
 song:n0 a :Note; :curve song:n0c0; :effectClass effect:qfill;
      :originTime 272.735 .
@@ -15,14 +15,24 @@ song:n0 a :Note; :curve song:n0c0; :effe
 song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
 song:n0c0p0 :time 0.000; :value 0.000 .
 song:n0c0p1 :time 1.000; :value 1.000 .
-song:n0c0p2 :time 2.000; :value 1.000 .
-song:n0c0p3 :time 3.000; :value 0.000 .
+song:n0c0p2 :time 16.949; :value 1.000 .
+song:n0c0p3 :time 21.021; :value 0.000 .
 
 song:n1 a :Note; :curve song:n1c0; :effectClass effect:song14rainbow;
      :originTime 5.603 .
 
 song:n1c0 a :Curve; :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 .
-song:n1c0p0 :time 0.000; :value 0.000 .
-song:n1c0p1 :time 1.000; :value 1.000 .
-song:n1c0p2 :time 230.000; :value 1.000 .
-song:n1c0p3 :time 235.000; :value 0.000 .
+song:n1c0p0 :time -5.104; :value 0.000 .
+song:n1c0p1 :time -1.760; :value 1.000 .
+song:n1c0p2 :time 283.916; :value 1.000 .
+song:n1c0p3 :time 287.594; :value 0.000 .
+
+song:n2 a :Note; :curve song:n2c0; :effectClass effect:qfill;
+     :originTime 144.595; :setting song:n2set0 .
+
+song:n2c0 a :Curve; :attr :strength; :point song:n2c0p0, song:n2c0p1, song:n2c0p2, song:n2c0p3 .
+song:n2c0p0 :time 0.000; :value 0.000 .
+song:n2c0p1 :time 28.810; :value 1.000 .
+song:n2c0p2 :time 133.393; :value 1.000 .
+song:n2c0p3 :time 140.267; :value 0.000 .
+song:n2set0 :effectAttr :colorScale; :value "#a19e9e" .
diff --git a/show/dance2016/song16.n3 b/show/dance2016/song16.n3
--- a/show/dance2016/song16.n3
+++ b/show/dance2016/song16.n3
@@ -7,7 +7,7 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2016/song16> :note song:n0, song:n1, song:n10, song:n11, song:n12, song:n2, song:n3, song:n4, song:n5, song:n6, song:n8, song:n9 .
+<http://light9.bigasterisk.com/show/dance2016/song16> :note song:n0, song:n1, song:n10, song:n11, song:n12, song:n13, song:n14, song:n15, song:n16, song:n2, song:n3, song:n4, song:n5, song:n6, song:n8, song:n9 .
 
 song:n7 a :Note; :curve song:n7c0; :effectClass effect:qwidecenter;
      :originTime 316.925 .
@@ -40,8 +40,8 @@ song:n11 a :Note; :curve song:n11c0; :ef
 song:n11c0 a :Curve; :attr :strength; :point song:n11c0p0, song:n11c0p1, song:n11c0p2, song:n11c0p3 .
 song:n11c0p0 :time 6.631; :value 0.000 .
 song:n11c0p1 :time 14.831; :value 1.000 .
-song:n11c0p2 :time 139.278; :value 1.000 .
-song:n11c0p3 :time 147.665; :value 0.000 .
+song:n11c0p2 :time 156.480; :value 1.000 .
+song:n11c0p3 :time 159.408; :value 0.000 .
 song:n11set0 :effectAttr :colorScale; :value "#f3dcdc" .
 
 song:n12 a :Note; :curve song:n12c0; :effectClass effect:strobewarm;
@@ -53,6 +53,45 @@ song:n12c0p1 :time -0.933; :value 1.000 
 song:n12c0p2 :time 13.958; :value 1.000 .
 song:n12c0p3 :time 14.641; :value 0.000 .
 
+song:n13 a :Note; :curve song:n13c0; :effectClass effect:qwidecenter;
+     :originTime 147.970; :setting song:n13set0 .
+
+song:n13c0 a :Curve; :attr :strength; :point song:n13c0p0, song:n13c0p1, song:n13c0p2, song:n13c0p3 .
+song:n13c0p0 :time 0.000; :value 0.000 .
+song:n13c0p1 :time 3.326; :value 1.000 .
+song:n13c0p2 :time 17.009; :value 1.000 .
+song:n13c0p3 :time 25.267; :value 0.000 .
+song:n13set0 :effectAttr :colorScale; :value "#817676" .
+
+song:n14 a :Note; :curve song:n14c0; :effectClass effect:animRainbow;
+     :originTime 193.005; :setting song:n14set0 .
+
+song:n14c0 a :Curve; :attr :strength; :point song:n14c0p0, song:n14c0p1, song:n14c0p2, song:n14c0p3 .
+song:n14c0p0 :time -20.996; :value 0.000 .
+song:n14c0p1 :time -14.707; :value 1.000 .
+song:n14c0p2 :time 38.845; :value 1.000 .
+song:n14c0p3 :time 44.002; :value 0.000 .
+song:n14set0 :effectAttr :colorScale; :value "#212121" .
+
+song:n15 a :Note; :curve song:n15c0; :effectClass effect:qfill;
+     :originTime 432.472; :setting song:n15set0 .
+
+song:n15c0 a :Curve; :attr :strength; :point song:n15c0p0, song:n15c0p1, song:n15c0p2, song:n15c0p3 .
+song:n15c0p0 :time -77.336; :value 0.000 .
+song:n15c0p1 :time -75.231; :value 1.000 .
+song:n15c0p2 :time 22.373; :value 1.000 .
+song:n15c0p3 :time 41.300; :value 0.000 .
+song:n15set0 :effectAttr :colorScale; :value "#6a075e" .
+
+song:n16 a :Note; :curve song:n16c0; :effectClass effect:animRainbow;
+     :originTime 557.596 .
+
+song:n16c0 a :Curve; :attr :strength; :point song:n16c0p0, song:n16c0p1, song:n16c0p2, song:n16c0p3 .
+song:n16c0p0 :time -68.071; :value 0.000 .
+song:n16c0p1 :time -61.998; :value 1.000 .
+song:n16c0p2 :time 2.679; :value 1.000 .
+song:n16c0p3 :time 66.927; :value 0.000 .
+
 song:n1c0 a :Curve; :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 .
 song:n1c0p0 :time -2.322; :value 0.000 .
 song:n1c0p1 :time 0.829; :value 1.000 .
@@ -76,7 +115,7 @@ song:n3 a :Note; :curve song:n3c0; :effe
 song:n3c0 a :Curve; :attr :strength; :point song:n3c0p0, song:n3c0p1, song:n3c0p2, song:n3c0p3 .
 song:n3c0p0 :time 0.000; :value 0.000 .
 song:n3c0p1 :time 4.333; :value 1.000 .
-song:n3c0p2 :time 58.451; :value 1.000 .
+song:n3c0p2 :time 64.937; :value 1.000 .
 song:n3c0p3 :time 66.959; :value 0.000 .
 song:n3set0 :effectAttr :colorScale; :value "#a846d1" .
 
@@ -84,8 +123,8 @@ song:n4 a :Note; :curve song:n4c0; :effe
      :originTime 70.624; :setting song:n4set0 .
 
 song:n4c0 a :Curve; :attr :strength; :point song:n4c0p0, song:n4c0p1, song:n4c0p2, song:n4c0p3 .
-song:n4c0p0 :time -4.604; :value 0.000 .
-song:n4c0p1 :time -0.251; :value 1.000 .
+song:n4c0p0 :time -2.348; :value 0.000 .
+song:n4c0p1 :time -0.194; :value 1.000 .
 song:n4c0p2 :time 75.376; :value 1.000 .
 song:n4c0p3 :time 82.182; :value 0.000 .
 song:n4set0 :effectAttr :colorScale; :value "#eae333" .
@@ -130,5 +169,5 @@ song:n9 a :Note; :curve song:n9c0; :effe
 song:n9c0 a :Curve; :attr :strength; :point song:n9c0p0, song:n9c0p1, song:n9c0p2, song:n9c0p3 .
 song:n9c0p0 :time 0.000; :value 0.000 .
 song:n9c0p1 :time 5.892; :value 1.000 .
-song:n9c0p2 :time 87.932; :value 1.000 .
+song:n9c0p2 :time 89.859; :value 1.000 .
 song:n9c0p3 :time 98.920; :value 0.000 .
diff --git a/show/dance2016/song17.n3 b/show/dance2016/song17.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/song17.n3
@@ -0,0 +1,105 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://light9.bigasterisk.com/show/dance2016/song17> :note <http://light9.bigasterisk.com/show/dance2016/song17/n0>, <http://light9.bigasterisk.com/show/dance2016/song17/n1>, <http://light9.bigasterisk.com/show/dance2016/song17/n2>, <http://light9.bigasterisk.com/show/dance2016/song17/n3>, <http://light9.bigasterisk.com/show/dance2016/song17/n4>, <http://light9.bigasterisk.com/show/dance2016/song17/n5> .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n0> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song17/n0c0>;
+     :effectClass effect:downmagenta; :originTime 2.752 .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n0c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song17/n0c0p0>, <http://light9.bigasterisk.com/show/dance2016/song17/n0c0p1>, <http://light9.bigasterisk.com/show/dance2016/song17/n0c0p2>, <http://light9.bigasterisk.com/show/dance2016/song17/n0c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song17/n0c0p0> :time -1.659;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n0c0p1> :time 1.943;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n0c0p2> :time 20.285;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n0c0p3> :time 34.461;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n1> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song17/n1c0>;
+     :effectClass effect:aurayellow; :originTime 25.345;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song17/n1set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n1c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song17/n1c0p0>, <http://light9.bigasterisk.com/show/dance2016/song17/n1c0p1>, <http://light9.bigasterisk.com/show/dance2016/song17/n1c0p2>, <http://light9.bigasterisk.com/show/dance2016/song17/n1c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song17/n1c0p0> :time 0.000;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n1c0p1> :time 8.746;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n1c0p2> :time 185.779;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n1c0p3> :time 186.616;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n1set0> :effectAttr :colorScale;
+     :value "#685353" .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n2> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song17/n2c0>;
+     :effectClass effect:pulseRainbow; :originTime 46.830 .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n2c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song17/n2c0p0>, <http://light9.bigasterisk.com/show/dance2016/song17/n2c0p1>, <http://light9.bigasterisk.com/show/dance2016/song17/n2c0p2>, <http://light9.bigasterisk.com/show/dance2016/song17/n2c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song17/n2c0p0> :time -4.899;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n2c0p1> :time -2.379;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n2c0p2> :time 21.733;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n2c0p3> :time 24.264;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n3> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song17/n3c0>;
+     :effectClass effect:qfill; :originTime 68.944;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song17/n3set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n3c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song17/n3c0p0>, <http://light9.bigasterisk.com/show/dance2016/song17/n3c0p1>, <http://light9.bigasterisk.com/show/dance2016/song17/n3c0p2>, <http://light9.bigasterisk.com/show/dance2016/song17/n3c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song17/n3c0p0> :time 0.000;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n3c0p1> :time 8.746;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n3c0p2> :time 141.970;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n3c0p3> :time 142.772;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n3set0> :effectAttr :colorScale;
+     :value "#eaec8a" .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n4> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song17/n4c0>;
+     :effectClass effect:pulseRainbow; :originTime 106.911 .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n4c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song17/n4c0p0>, <http://light9.bigasterisk.com/show/dance2016/song17/n4c0p1>, <http://light9.bigasterisk.com/show/dance2016/song17/n4c0p2>, <http://light9.bigasterisk.com/show/dance2016/song17/n4c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song17/n4c0p0> :time -3.980;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n4c0p1> :time 0.223;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n4c0p2> :time 38.377;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n4c0p3> :time 39.456;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n5> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song17/n5c0>;
+     :effectClass effect:lightning; :originTime 168.073 .
+
+<http://light9.bigasterisk.com/show/dance2016/song17/n5c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song17/n5c0p0>, <http://light9.bigasterisk.com/show/dance2016/song17/n5c0p1>, <http://light9.bigasterisk.com/show/dance2016/song17/n5c0p2>, <http://light9.bigasterisk.com/show/dance2016/song17/n5c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song17/n5c0p0> :time 2.225;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n5c0p1> :time 2.432;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n5c0p2> :time 35.394;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song17/n5c0p3> :time 36.555;
+     :value 0.000 .
diff --git a/show/dance2016/song2.n3 b/show/dance2016/song2.n3
--- a/show/dance2016/song2.n3
+++ b/show/dance2016/song2.n3
@@ -1,15 +1,17 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
 @prefix ns1: <http://light9.bigasterisk.com/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2016/song2> ns1:note <http://light9.bigasterisk.com/show/dance2016/song2/n0> .
+<http://light9.bigasterisk.com/show/dance2016/song2> ns1:note <http://light9.bigasterisk.com/show/dance2016/song2/n1>, <http://light9.bigasterisk.com/show/dance2016/song2/n2> .
 
 <http://light9.bigasterisk.com/show/dance2016/song2/n0> a ns1:Note;
      ns1:curve <http://light9.bigasterisk.com/show/dance2016/song2/n0c0>;
-     ns1:effectClass <http://light9.bigasterisk.com/effect/Curtain>;
-     ns1:originTime 27.567 .
+     ns1:effectClass effect:Curtain; ns1:originTime 27.567 .
 
 <http://light9.bigasterisk.com/show/dance2016/song2/n0c0> a ns1:Curve;
      ns1:attr ns1:strength; ns1:point <http://light9.bigasterisk.com/show/dance2016/song2/n0c0p0>, <http://light9.bigasterisk.com/show/dance2016/song2/n0c0p1>, <http://light9.bigasterisk.com/show/dance2016/song2/n0c0p2>, <http://light9.bigasterisk.com/show/dance2016/song2/n0c0p3> .
@@ -21,3 +23,39 @@
      ns1:value 1.000 .
 <http://light9.bigasterisk.com/show/dance2016/song2/n0c0p3> ns1:time 3.000;
      ns1:value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song2/n1> a ns1:Note;
+     ns1:curve <http://light9.bigasterisk.com/show/dance2016/song2/n1c0>;
+     ns1:effectClass effect:downback; ns1:originTime 16.341;
+     ns1:setting <http://light9.bigasterisk.com/show/dance2016/song2/n1set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song2/n1c0> a ns1:Curve;
+     ns1:attr ns1:strength; ns1:point <http://light9.bigasterisk.com/show/dance2016/song2/n1c0p0>, <http://light9.bigasterisk.com/show/dance2016/song2/n1c0p1>, <http://light9.bigasterisk.com/show/dance2016/song2/n1c0p2>, <http://light9.bigasterisk.com/show/dance2016/song2/n1c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song2/n1c0p0> ns1:time -15.288;
+     ns1:value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n1c0p1> ns1:time 0.245;
+     ns1:value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n1c0p2> ns1:time 156.852;
+     ns1:value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n1c0p3> ns1:time 159.705;
+     ns1:value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n1set0> ns1:effectAttr ns1:colorScale;
+     ns1:value "#8c80dc" .
+
+<http://light9.bigasterisk.com/show/dance2016/song2/n2> a ns1:Note;
+     ns1:curve <http://light9.bigasterisk.com/show/dance2016/song2/n2c0>;
+     ns1:effectClass effect:qfill; ns1:originTime 18.499;
+     ns1:setting <http://light9.bigasterisk.com/show/dance2016/song2/n2set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song2/n2c0> a ns1:Curve;
+     ns1:attr ns1:strength; ns1:point <http://light9.bigasterisk.com/show/dance2016/song2/n2c0p0>, <http://light9.bigasterisk.com/show/dance2016/song2/n2c0p1>, <http://light9.bigasterisk.com/show/dance2016/song2/n2c0p2>, <http://light9.bigasterisk.com/show/dance2016/song2/n2c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song2/n2c0p0> ns1:time -17.426;
+     ns1:value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n2c0p1> ns1:time -1.673;
+     ns1:value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n2c0p2> ns1:time 154.624;
+     ns1:value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n2c0p3> ns1:time 157.514;
+     ns1:value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song2/n2set0> ns1:effectAttr ns1:colorScale;
+     ns1:value "#f3c8c8" .
diff --git a/show/dance2016/song3.n3 b/show/dance2016/song3.n3
--- a/show/dance2016/song3.n3
+++ b/show/dance2016/song3.n3
@@ -6,7 +6,7 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2016/song3> :note <http://light9.bigasterisk.com/show/dance2016/song3/n0>, <http://light9.bigasterisk.com/show/dance2016/song3/n1>, <http://light9.bigasterisk.com/show/dance2016/song3/n2>, <http://light9.bigasterisk.com/show/dance2016/song3/n3>, <http://light9.bigasterisk.com/show/dance2016/song3/n4>, <http://light9.bigasterisk.com/show/dance2016/song3/n5> .
+<http://light9.bigasterisk.com/show/dance2016/song3> :note <http://light9.bigasterisk.com/show/dance2016/song3/n0>, <http://light9.bigasterisk.com/show/dance2016/song3/n1>, <http://light9.bigasterisk.com/show/dance2016/song3/n2>, <http://light9.bigasterisk.com/show/dance2016/song3/n3>, <http://light9.bigasterisk.com/show/dance2016/song3/n4>, <http://light9.bigasterisk.com/show/dance2016/song3/n5>, <http://light9.bigasterisk.com/show/dance2016/song3/n6>, <http://light9.bigasterisk.com/show/dance2016/song3/n7>, <http://light9.bigasterisk.com/show/dance2016/song3/n8>, <http://light9.bigasterisk.com/show/dance2016/song3/n9> .
 
 <http://light9.bigasterisk.com/show/dance2016/song3/n0> a :Note;
      :curve <http://light9.bigasterisk.com/show/dance2016/song3/n0c0>;
@@ -34,9 +34,9 @@
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2016/song3/n1c0p1> :time 6.191;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song3/n1c0p2> :time 80.904;
+<http://light9.bigasterisk.com/show/dance2016/song3/n1c0p2> :time 90.449;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song3/n1c0p3> :time 85.249;
+<http://light9.bigasterisk.com/show/dance2016/song3/n1c0p3> :time 93.885;
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2016/song3/n1set0> :effectAttr :colorScale;
      :value "#f1b223" .
@@ -52,9 +52,9 @@
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2016/song3/n2c0p1> :time 3.326;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song3/n2c0p2> :time 69.080;
+<http://light9.bigasterisk.com/show/dance2016/song3/n2c0p2> :time 76.300;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song3/n2c0p3> :time 70.615;
+<http://light9.bigasterisk.com/show/dance2016/song3/n2c0p3> :time 79.505;
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2016/song3/n2set0> :effectAttr :colorScale;
      :value "#f3d155" .
@@ -70,9 +70,9 @@
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2016/song3/n3c0p1> :time 0.523;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song3/n3c0p2> :time 64.065;
+<http://light9.bigasterisk.com/show/dance2016/song3/n3c0p2> :time 71.752;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2016/song3/n3c0p3> :time 66.106;
+<http://light9.bigasterisk.com/show/dance2016/song3/n3c0p3> :time 74.775;
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2016/song3/n3set0> :effectAttr :colorScale;
      :value "#856e6e" .
@@ -94,7 +94,7 @@
 
 <http://light9.bigasterisk.com/show/dance2016/song3/n5> a :Note;
      :curve <http://light9.bigasterisk.com/show/dance2016/song3/n5c0>;
-     :effectClass effect:down; :originTime 64.385 .
+     :effectClass effect:down; :originTime 64.385; :setting <http://light9.bigasterisk.com/show/dance2016/song3/n5set0> .
 
 <http://light9.bigasterisk.com/show/dance2016/song3/n5c0> a :Curve;
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song3/n5c0p0>, <http://light9.bigasterisk.com/show/dance2016/song3/n5c0p1>, <http://light9.bigasterisk.com/show/dance2016/song3/n5c0p2>, <http://light9.bigasterisk.com/show/dance2016/song3/n5c0p3> .
@@ -106,3 +106,68 @@
      :value 1.000 .
 <http://light9.bigasterisk.com/show/dance2016/song3/n5c0p3> :time 42.973;
      :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n5set0> :effectAttr :colorScale;
+     :value "#e87c7c" .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n6> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song3/n6c0>;
+     :effectClass effect:song14rainbow; :originTime 554.770 .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n6c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song3/n6c0p0>, <http://light9.bigasterisk.com/show/dance2016/song3/n6c0p1>, <http://light9.bigasterisk.com/show/dance2016/song3/n6c0p2>, <http://light9.bigasterisk.com/show/dance2016/song3/n6c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song3/n6c0p0> :time 0.000;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n6c0p1> :time 1.155;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n6c0p2> :time 2.311;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n6c0p3> :time 3.466;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n7> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song3/n7c0>;
+     :effectClass effect:song14rainbow; :originTime 10.697 .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n7c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song3/n7c0p0>, <http://light9.bigasterisk.com/show/dance2016/song3/n7c0p1>, <http://light9.bigasterisk.com/show/dance2016/song3/n7c0p2>, <http://light9.bigasterisk.com/show/dance2016/song3/n7c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song3/n7c0p0> :time -6.576;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n7c0p1> :time -5.037;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n7c0p2> :time 35.330;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n7c0p3> :time 35.865;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n8> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song3/n8c0>;
+     :effectClass effect:aurayellow; :originTime 115.814;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song3/n8set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n8c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song3/n8c0p0>, <http://light9.bigasterisk.com/show/dance2016/song3/n8c0p1>, <http://light9.bigasterisk.com/show/dance2016/song3/n8c0p2>, <http://light9.bigasterisk.com/show/dance2016/song3/n8c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song3/n8c0p0> :time -11.884;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n8c0p1> :time -9.024;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n8c0p2> :time 110.630;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n8c0p3> :time 110.824;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n8set0> :effectAttr :colorScale;
+     :value "#d9cb49" .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n9> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song3/n9c0>;
+     :effectClass effect:animRainbow; :originTime 200.599 .
+
+<http://light9.bigasterisk.com/show/dance2016/song3/n9c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song3/n9c0p0>, <http://light9.bigasterisk.com/show/dance2016/song3/n9c0p1>, <http://light9.bigasterisk.com/show/dance2016/song3/n9c0p2>, <http://light9.bigasterisk.com/show/dance2016/song3/n9c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song3/n9c0p0> :time -36.339;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n9c0p1> :time 5.977;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n9c0p2> :time 24.852;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song3/n9c0p3> :time 25.951;
+     :value 0.000 .
diff --git a/show/dance2016/song5.n3 b/show/dance2016/song5.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/song5.n3
@@ -0,0 +1,39 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://light9.bigasterisk.com/show/dance2016/song5> :note <http://light9.bigasterisk.com/show/dance2016/song5/n0>, <http://light9.bigasterisk.com/show/dance2016/song5/n1> .
+
+<http://light9.bigasterisk.com/show/dance2016/song5/n0> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song5/n0c0>;
+     :effectClass effect:qfill; :originTime 62.512 .
+
+<http://light9.bigasterisk.com/show/dance2016/song5/n0c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song5/n0c0p0>, <http://light9.bigasterisk.com/show/dance2016/song5/n0c0p1>, <http://light9.bigasterisk.com/show/dance2016/song5/n0c0p2>, <http://light9.bigasterisk.com/show/dance2016/song5/n0c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song5/n0c0p0> :time -61.745;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song5/n0c0p1> :time -57.926;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song5/n0c0p2> :time 128.740;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song5/n0c0p3> :time 131.268;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song5/n1> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song5/n1c0>;
+     :effectClass effect:aurafill; :originTime 52.252 .
+
+<http://light9.bigasterisk.com/show/dance2016/song5/n1c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song5/n1c0p0>, <http://light9.bigasterisk.com/show/dance2016/song5/n1c0p1>, <http://light9.bigasterisk.com/show/dance2016/song5/n1c0p2>, <http://light9.bigasterisk.com/show/dance2016/song5/n1c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song5/n1c0p0> :time -51.582;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song5/n1c0p1> :time -47.023;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song5/n1c0p2> :time 138.883;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song5/n1c0p3> :time 141.089;
+     :value 0.000 .
diff --git a/show/dance2016/song7.n3 b/show/dance2016/song7.n3
--- a/show/dance2016/song7.n3
+++ b/show/dance2016/song7.n3
@@ -3,37 +3,43 @@
 @prefix effect: <http://light9.bigasterisk.com/effect/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix song: <http://light9.bigasterisk.com/show/dance2016/song7/> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix song: <http://light9.bigasterisk.com/show/dance2016/song7/> .
 
-<http://light9.bigasterisk.com/show/dance2016/song7> :note song:n2 .
+<http://light9.bigasterisk.com/show/dance2016/song7> :note song:n0, song:n1, song:n2 .
+
+song:n1c0 a :Curve; :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 .
 
-song:n1c0 a :Curve;
-     :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 .
-song:n1c0p0 :time -0.420;
-     :value 0.000 .
-song:n1c0p1 :time 12.472;
-     :value 1.000 .
-song:n1c0p2 :time 24.944;
-     :value 1.000 .
-song:n1c0p3 :time 37.416;
-     :value 0.000 .
+song:n0 a :Note; :curve song:n0c0; :effectClass effect:down;
+     :originTime 3.415; :setting song:n0set0 .
+
+song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
+song:n0c0p0 :time 0.000; :value 0.000 .
+song:n0c0p1 :time 2.702; :value 1.000 .
+song:n0c0p2 :time 219.002; :value 1.000 .
+song:n0c0p3 :time 222.379; :value 0.000 .
+song:n0set0 :effectAttr :colorScale; :value "#b1ad3f" .
 
-song:n2 a :Note;
-     :curve song:n2c0;
-     :effectClass effect:qfill; :originTime 3.389 ; :setting song:n2set0 .
-song:n2set0  :effectAttr :colorScale; :value "#aa0000".
-
-
+song:n1 a :Note; :curve song:n1c1; :effectClass effect:qfill;
+     :originTime 185.498 .
+song:n1c0p0 :time -0.420; :value 0.000 .
+song:n1c0p1 :time 12.472; :value 1.000 .
+song:n1c0p2 :time 24.944; :value 1.000 .
+song:n1c0p3 :time 37.416; :value 0.000 .
 
-song:n2c0 a :Curve;
-     :attr :strength; :point song:n2c0p0, song:n2c0p1, song:n2c0p2, song:n2c0p3 .
-song:n2c0p0 :time -1.861;
-     :value 0.000 .
-song:n2c0p1 :time 2.312;
-     :value 1.000 .
-song:n2c0p2 :time 218.894;
-     :value 1.000 .
-song:n2c0p3 :time 224.995;
-     :value 0.000 .
+song:n1c1 a :Curve; :attr :strength; :point song:n1c1p0, song:n1c1p1, song:n1c1p2, song:n1c1p3 .
+song:n1c1p0 :time -12.985; :value 0.000 .
+song:n1c1p1 :time -5.396; :value 1.000 .
+song:n1c1p2 :time 36.677; :value 1.000 .
+song:n1c1p3 :time 40.277; :value 0.000 .
+
+song:n2 a :Note; :curve song:n2c0; :effectClass effect:qfill;
+     :originTime 3.389; :setting song:n2set0 .
+
+song:n2c0 a :Curve; :attr :strength; :point song:n2c0p0, song:n2c0p1, song:n2c0p2, song:n2c0p3 .
+song:n2c0p0 :time -1.861; :value 0.000 .
+song:n2c0p1 :time 2.312; :value 1.000 .
+song:n2c0p2 :time 218.894; :value 1.000 .
+song:n2c0p3 :time 222.454; :value 0.000 .
+song:n2set0 :effectAttr :colorScale; :value "#e37474" .
diff --git a/show/dance2016/song8.n3 b/show/dance2016/song8.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/song8.n3
@@ -0,0 +1,27 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://light9.bigasterisk.com/show/dance2016/song8> :note <http://light9.bigasterisk.com/show/dance2016/song8/n0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song8/n0> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song8/n0c0>;
+     :effectClass effect:aurafill; :originTime 26.653;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song8/n0set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song8/n0c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song8/n0c0p0>, <http://light9.bigasterisk.com/show/dance2016/song8/n0c0p1>, <http://light9.bigasterisk.com/show/dance2016/song8/n0c0p2>, <http://light9.bigasterisk.com/show/dance2016/song8/n0c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song8/n0c0p0> :time -27.058;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song8/n0c0p1> :time -21.924;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song8/n0c0p2> :time 180.038;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song8/n0c0p3> :time 181.918;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song8/n0set0> :effectAttr :colorScale;
+     :value "#fbe3e3" .
diff --git a/show/dance2016/song9.n3 b/show/dance2016/song9.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/song9.n3
@@ -0,0 +1,57 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://light9.bigasterisk.com/show/dance2016/song9> :note <http://light9.bigasterisk.com/show/dance2016/song9/n0>, <http://light9.bigasterisk.com/show/dance2016/song9/n1>, <http://light9.bigasterisk.com/show/dance2016/song9/n2> .
+
+<http://light9.bigasterisk.com/show/dance2016/song9/n0> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song9/n0c0>;
+     :effectClass effect:aurayellow; :originTime 4.390 .
+
+<http://light9.bigasterisk.com/show/dance2016/song9/n0c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song9/n0c0p0>, <http://light9.bigasterisk.com/show/dance2016/song9/n0c0p1>, <http://light9.bigasterisk.com/show/dance2016/song9/n0c0p2>, <http://light9.bigasterisk.com/show/dance2016/song9/n0c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song9/n0c0p0> :time -4.354;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n0c0p1> :time 3.290;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n0c0p2> :time 187.403;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n0c0p3> :time 192.081;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2016/song9/n1> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song9/n1c0>;
+     :effectClass effect:lightning; :originTime 86.772;
+     :setting <http://light9.bigasterisk.com/show/dance2016/song9/n1set0> .
+
+<http://light9.bigasterisk.com/show/dance2016/song9/n1c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song9/n1c0p0>, <http://light9.bigasterisk.com/show/dance2016/song9/n1c0p1>, <http://light9.bigasterisk.com/show/dance2016/song9/n1c0p2>, <http://light9.bigasterisk.com/show/dance2016/song9/n1c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song9/n1c0p0> :time -1.010;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n1c0p1> :time 11.736;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n1c0p2> :time 20.191;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n1c0p3> :time 24.078;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n1set0> :effectAttr :colorScale;
+     :value "#434343" .
+
+<http://light9.bigasterisk.com/show/dance2016/song9/n2> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2016/song9/n2c0>;
+     :effectClass effect:lightning; :originTime 183.402 .
+
+<http://light9.bigasterisk.com/show/dance2016/song9/n2c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2016/song9/n2c0p0>, <http://light9.bigasterisk.com/show/dance2016/song9/n2c0p1>, <http://light9.bigasterisk.com/show/dance2016/song9/n2c0p2>, <http://light9.bigasterisk.com/show/dance2016/song9/n2c0p3> .
+<http://light9.bigasterisk.com/show/dance2016/song9/n2c0p0> :time 1.037;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n2c0p1> :time 1.738;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n2c0p2> :time 3.951;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2016/song9/n2c0p3> :time 4.217;
+     :value 0.000 .