diff --git a/show/dance2016/effect.n3 b/show/dance2016/effect.n3
--- a/show/dance2016/effect.n3
+++ b/show/dance2016/effect.n3
@@ -1,68 +1,109 @@
@prefix : .
+@prefix dev: .
@prefix effect: .
+@prefix rdf: .
@prefix rdfs: .
-@prefix dev: .
+@prefix xml: .
+@prefix xsd: .
-effect:RedStrip a :Effect;
- rdfs:label "red";
- :publishAttr :strength;
- :deviceSetting :ds1, :ds2 .
-:ds1 :device dev:colorStrip; :attr :red; :value "strength" .
-:ds2 :device dev:moving1; :attr :red; :value "strength" .
+effect:BlueStrip a :Effect; rdfs:label "blue"; :deviceSetting :ds3;
+ :publishAttr :strength .
+
+effect:RedStrip a :Effect; rdfs:label "red"; :deviceSetting :ds1, :ds2;
+ :publishAttr :strength .
+
+effect:Strobe a :Effect; rdfs:label "strobe"; :publishAttr :duty, :offset, :rate, :strength .
+
+effect:blacklight a :Effect; rdfs:label "blacklight";
+ :publishAttr :strength; :setting effect:blacklight_set0, effect:blacklight_set1, effect:blacklight_set10, effect:blacklight_set11, effect:blacklight_set12, effect:blacklight_set13, effect:blacklight_set14, effect:blacklight_set15, effect:blacklight_set2, effect:blacklight_set3, effect:blacklight_set4, effect:blacklight_set5, effect:blacklight_set6, effect:blacklight_set7, effect:blacklight_set8, effect:blacklight_set9 .
+
+effect:down a :Effect; rdfs:label "down"; :publishAttr :strength;
+ :setting effect:down_set0, effect:down_set1, effect:down_set2, effect:down_set3 .
-effect:BlueStrip a :Effect;
- rdfs:label "blue";
- :publishAttr :strength;
- :deviceSetting :ds3 .
-:ds3 :device dev:colorStrip; :attr :blue; :value "strength" .
+effect:usa a :mockupEffect; rdfs:label "USA"; :chaseOffset 0;
+ :chaseTempo 120; :code "chase()"; :devices dev:colorStrip, dev:moving1;
+ :fadeShape :fadeCurve1; :palette "#0000ff", "#ff0000", "#ffffff";
+ :publishAttr :strength .
+:live :controls effect:Curtain, effect:WorkLight, effect:centerSpot, effect:uv1 .
+:ds1 :attr :red; :device dev:colorStrip; :value "strength" .
+:ds2 :attr :red; :device dev:moving1; :value "strength" .
+:ds3 :attr :blue; :device dev:colorStrip; :value "strength" .
+:ds4 :attr :color; :device dev:colorStrip; :value "#00ff00" .
+:ds5 :attr :color; :device dev:colorStrip; :value "#300030" .
-:strength rdfs:label "strength" .
+effect:Curtain a :Effect; rdfs:label "curtain"; :deviceSetting :ds5;
+ :group "main"; :order 2; :publishAttr :strength .
-effect:usa a :mockupEffect;
- rdfs:label "USA";
- :publishAttr :strength;
- :code "chase()";
- :devices dev:colorStrip, dev:moving1;
- :fadeShape :fadeCurve1;
- :chaseTempo 120;
- :chaseOffset 0;
- :palette "#ff0000", "#ffffff", "#0000ff" .
+effect:WorkLight a :Effect; rdfs:label "work light";
+ :deviceSetting :ds4; :group "main"; :order 1; :publishAttr :strength .
+effect:blacklight_set0 :device dev:down2; :deviceAttr :uv;
+ :scaledValue 0.988 .
+effect:blacklight_set1 :device dev:down3; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set10 :device dev:upCenter; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set11 :device dev:lip1; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set12 :device dev:lip2; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set13 :device dev:lip3; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set14 :device dev:lip4; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set15 :device dev:lip5; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set2 :device dev:down4; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set3 :device dev:down5Edge; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set4 :device dev:backlight1; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set5 :device dev:backlight2; :deviceAttr :uv;
+ :scaledValue 0.999 .
+effect:blacklight_set6 :device dev:backlight3; :deviceAttr :uv;
+ :scaledValue 0.996 .
+effect:blacklight_set7 :device dev:backlight4; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set8 :device dev:backlight5; :deviceAttr :uv;
+ :scaledValue 1.000 .
+effect:blacklight_set9 :device dev:hexLow3; :deviceAttr :uv;
+ :scaledValue 0.008 .
-:fadeCurve1 a :Curve;
- :point :fc1p0, :fc1p1, :fc1p2, :fc1p3 .
+effect:centerSpot a :Effect; rdfs:label "center spot";
+ :group "main"; :order 3; :publishAttr :strength;
+ :setting effect:centerSpots0, effect:centerSpots1, effect:centerSpots2, effect:centerSpots3, effect:centerSpots4 .
+effect:centerSpots0 :device dev:q2; :deviceAttr :color;
+ :scaledValue "#ffffff" .
+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 .
+effect:centerSpots4 :device dev:q2; :deviceAttr :zoom;
+ :value 0.42 .
+effect:down_set0 :device dev:down3; :deviceAttr :color;
+ :scaledValue "#ffffff" .
+effect:down_set1 :device dev:down2; :deviceAttr :color;
+ :scaledValue "#ffffff" .
+effect:down_set2 :device dev:down4; :deviceAttr :color;
+ :scaledValue "#ffffff" .
+effect:down_set3 :device dev:down2; :deviceAttr :uv;
+ :scaledValue 0.003 .
+
+
+effect:uv1 a :Effect; rdfs:label "uv1"; :publishAttr :strength;
+ :setting effect:uv1_set0, effect:uv1_set1 .
+effect:uv1_set0 :device dev:down2; :deviceAttr :uv;
+ :scaledValue 0.315 .
+effect:uv1_set1 :device dev:down3; :deviceAttr :uv;
+ :scaledValue 0.397 .
+
+:fadeCurve1 a :Curve; :point :fc1p0, :fc1p1, :fc1p2, :fc1p3 .
:fc1p0 :time 0.00; :value 0 .
:fc1p1 :time 0.02; :value 1 .
:fc1p2 :time 0.10; :value 1 .
:fc1p3 :time 0.15; :value 0 .
-
-
-effect:centerSpot a :Effect; rdfs:label "center spot";
- :publishAttr :strength;
- :setting effect:centerSpots0, effect:centerSpots1, effect:centerSpots2, effect:centerSpots3, effect:centerSpots4 .
-effect:centerSpots0 :device dev:q2; :deviceAttr :color; :scaledValue "#f3d4d4" .
-effect:centerSpots1 :device dev:q2; :deviceAttr :focus; :value 0.31 .
-effect:centerSpots2 :device dev:q2; :deviceAttr :rx; :value 0.49 .
-effect:centerSpots3 :device dev:q2; :deviceAttr :ry; :value 0.26 .
-effect:centerSpots4 :device dev:q2; :deviceAttr :zoom; :value 0.42 .
-
-
-effect:Strobe a :Effect; rdfs:label "strobe";
- :publishAttr :strength, :rate, :offset, :duty .
-
-
-effect:WorkLight a :Effect;
- rdfs:label "work light";
- :publishAttr :strength;
- :deviceSetting :ds4 .
-:ds4 :device dev:colorStrip; :attr :color; :value "#00ff00" .
-
-effect:Curtain a :Effect; rdfs:label "curtain"; :publishAttr :strength;
- :deviceSetting :ds5 .
-:ds5 :device dev:colorStrip; :attr :color; :value "#300030" .
-
-:live :controls effect:WorkLight, effect:Curtain, effect:centerSpot .
-effect:WorkLight :group "main"; :order 1 .
-effect:Curtain :group "main"; :order 2 .
-effect:centerSpot :group "main"; :order 3 .
\ No newline at end of file
+:strength rdfs:label "strength" .
diff --git a/show/dance2016/effect/downback.n3 b/show/dance2016/effect/downback.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/effect/downback.n3
@@ -0,0 +1,20 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+
+ a ns1:Effect;
+ rdfs:label "downback"; ns1:publishAttr ns1:strength;
+ ns1:setting , , , , .
+ ns1:device ;
+ ns1:deviceAttr ns1:color; ns1:scaledValue "#aeaeae" .
+ ns1:device ;
+ ns1:deviceAttr ns1:color; ns1:scaledValue "#ffffff" .
+ ns1:device ;
+ ns1:deviceAttr ns1:color; ns1:scaledValue "#ffffff" .
+ ns1:device ;
+ ns1:deviceAttr ns1:color; ns1:scaledValue "#ffffff" .
+ ns1:device ;
+ ns1:deviceAttr ns1:color; ns1:scaledValue "#a7a7a7" .
diff --git a/show/dance2016/song1.n3 b/show/dance2016/song1.n3
--- a/show/dance2016/song1.n3
+++ b/show/dance2016/song1.n3
@@ -8,10 +8,10 @@
:a01 :effectAttr :chaseOffset; :value 0.12 .
:ao0 :effectAttr :chaseTempo; :value 100 .
- :note song:n0, song:n1, song:n2, song:n3 .
+ :note song:n0, song:n3 .
-song:n0 a :Note; :curve song:n0c0; :effectClass effect:Curtain;
- :originTime 35.653 .
+song:n0 a :Note; :curve song:n0c0; :effectClass effect:centerSpot;
+ :originTime 30.398 .
song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
song:n0c0p0 :time 0.000; :value 0.000 .
@@ -19,29 +19,11 @@ 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:n1 a :Note; :curve song:n1c0; :effectClass effect:Curtain;
- :originTime 39.152 .
-
-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 2.000; :value 1.000 .
-song:n1c0p3 :time 3.000; :value 0.000 .
-
-song:n2 a :Note; :curve song:n2c0; :effectClass effect:Curtain;
- :originTime 43.806 .
-
-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 1.000; :value 1.000 .
-song:n2c0p2 :time 2.000; :value 1.000 .
-song:n2c0p3 :time 3.000; :value 0.000 .
-
song:n3 a :Note; :curve song:n3c0; :effectClass effect:Curtain;
:originTime 32.297 .
song:n3c0 a :Curve; :attr :strength; :point song:n3c0p0, song:n3c0p1, song:n3c0p2, song:n3c0p3 .
-song:n3c0p0 :time 0.000; :value 0.000 .
+song:n3c0p0 :time 0.153; :value 0.000 .
song:n3c0p1 :time 1.000; :value 1.000 .
song:n3c0p2 :time 2.000; :value 1.000 .
song:n3c0p3 :time 2.928; :value 0.000 .
diff --git a/show/dance2016/song2.n3 b/show/dance2016/song2.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/song2.n3
@@ -0,0 +1,23 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+ ns1:note .
+
+ a ns1:Note;
+ ns1:curve ;
+ ns1:effectClass ;
+ ns1:originTime 27.567 .
+
+ a ns1:Curve;
+ ns1:attr ns1:strength; ns1:point , , , .
+ ns1:time 0.000;
+ ns1:value 0.000 .
+ ns1:time 1.000;
+ ns1:value 1.000 .
+ ns1:time 2.000;
+ ns1:value 1.000 .
+ ns1:time 3.000;
+ ns1:value 0.000 .
diff --git a/show/dance2016/theaterLightConfig.n3 b/show/dance2016/theaterLightConfig.n3
--- a/show/dance2016/theaterLightConfig.n3
+++ b/show/dance2016/theaterLightConfig.n3
@@ -31,38 +31,38 @@ dev:aura4 a :MacAura; :dmxUniverse udmxB
dev:aura5 a :MacAura; :dmxUniverse udmxB:; :dmxBase 462 .
dev:auraStage a :MacAura; :dmxUniverse udmxB:; :dmxBase 476; rdfs:comment "rx=.5 ry<.45" .
-dev:hexBacklight1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 241 .
-dev:hexBacklight2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 247 .
-dev:hexBacklight3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 253 .
-dev:hexBacklight4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 259 .
-dev:hexBacklight5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 265 .
-dev:hexDown2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 157 .
-dev:hexDown3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 193 .
-dev:hexDown4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 169 .
-dev:hexDown5Edge a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 175 .
-dev:hexLip1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 121 .
-dev:hexLip2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 127 .
-dev:hexLip3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 133 .
-dev:hexLip4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 139 .
-dev:hexLip5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 145 .
+dev:down2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 157 .
+dev:down3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 193 .
+dev:down4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 169 .
+dev:down5Edge a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 175 .
+dev:backlight1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 241 .
+dev:backlight2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 247 .
+dev:backlight3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 253 .
+dev:backlight4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 259 .
+dev:backlight5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 265 .
dev:hexLow3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 223 .
dev:hexLow5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 229 .
dev:hexLowBacklight1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 211 .
dev:hexLowBacklight6 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 235 .
dev:hexSlant a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 319 .
-dev:hexUpCenter a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 313 .
-dev:hexPostL1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 289 .
-dev:hexPostL2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 295 .
-dev:hexPostL3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 301 .
-dev:hexPostR1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 271 .
-dev:hexPostR2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 277 .
-dev:hexPostR3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 283 .
-dev:hexVeryLow1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 151 .
-dev:hexVeryLow2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 187 .
-dev:hexVeryLow22 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 217 .
-dev:hexVeryLow3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 163 .
-dev:hexVeryLow4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 199 .
-dev:hexVeryLow5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 205 .
+dev:lip1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 121 .
+dev:lip2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 127 .
+dev:lip3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 133 .
+dev:lip4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 139 .
+dev:lip5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 145 .
+dev:postL1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 289 .
+dev:postL2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 295 .
+dev:postL3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 301 .
+dev:postR1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 271 .
+dev:postR2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 277 .
+dev:postR3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 283 .
+dev:upCenter a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 313 .
+dev:veryLow1 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 151 .
+dev:veryLow2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 187 .
+dev:veryLow22 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 217 .
+dev:veryLow3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 163 .
+dev:veryLow4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 199 .
+dev:veryLow5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 205 .
dev:lowPattern301 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 1 .