diff --git a/show/dance2016/effect.n3 b/show/dance2016/effect.n3
--- a/show/dance2016/effect.n3
+++ b/show/dance2016/effect.n3
@@ -15,18 +15,12 @@ effect:RedStrip a :Effect; rdfs:label "r
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: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" .
@@ -38,38 +32,6 @@ effect:Curtain a :Effect; rdfs:label "cu
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 .
effect:centerSpot a :Effect; rdfs:label "center spot";
:group "main"; :order 3; :publishAttr :strength;
@@ -84,23 +46,8 @@ effect:centerSpots3 :device dev:q2; :dev
: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 .
diff --git a/show/dance2016/effect/blacklight.n3 b/show/dance2016/effect/blacklight.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/effect/blacklight.n3
@@ -0,0 +1,42 @@
+@prefix : .
+@prefix dev: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+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: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 .
diff --git a/show/dance2016/effect/down.n3 b/show/dance2016/effect/down.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/effect/down.n3
@@ -0,0 +1,16 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+
+ a ns1:Effect;
+ rdfs:label "down"; ns1:publishAttr ns1:strength;
+ ns1:setting , , .
+ 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" .
diff --git a/show/dance2016/effect/qfill.n3 b/show/dance2016/effect/qfill.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2016/effect/qfill.n3
@@ -0,0 +1,25 @@
+@prefix : .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+@prefix effect: .
+@prefix dev: .
+
+
+effect:qfill a :Effect;
+ rdfs:label "qfill"; :publishAttr :strength;
+ :setting effect:qfill_set0, effect:qfill_set1, effect:qfill_set10, effect:qfill_set11, effect:qfill_set12, effect:qfill_set2, effect:qfill_set3, effect:qfill_set4, effect:qfill_set5, effect:qfill_set6, effect:qfill_set7, effect:qfill_set8, effect:qfill_set9 .
+effect:qfill_set0 :device dev:q1; :deviceAttr :rx; :value 0.248 .
+effect:qfill_set1 :device dev:q1; :deviceAttr :ry; :value 0.475 .
+effect:qfill_set10 :device dev:q3; :deviceAttr :color; :scaledValue "#f3deb7" .
+effect:qfill_set11 :device dev:q2; :deviceAttr :color; :scaledValue "#f3deb7" .
+effect:qfill_set12 :device dev:q2; :deviceAttr :focus; :value 0.971 .
+effect:qfill_set2 :device dev:q2; :deviceAttr :rx; :value 0.513 .
+effect:qfill_set3 :device dev:q2; :deviceAttr :ry; :value 0.482 .
+effect:qfill_set4 :device dev:q2; :deviceAttr :zoom; :value 0.405 .
+effect:qfill_set5 :device dev:q3; :deviceAttr :rx; :value 0.738 .
+effect:qfill_set6 :device dev:q3; :deviceAttr :ry; :value 0.032 .
+effect:qfill_set7 :device dev:q3; :deviceAttr :zoom; :value 0.395 .
+effect:qfill_set8 :device dev:q1; :deviceAttr :zoom; :value 0.319 .
+effect:qfill_set9 :device dev:q1; :deviceAttr :color; :scaledValue "#f3deb7" .