--- a/show/dance2016/effect.n3	Sat Jun 11 21:13:01 2016 +0000
+++ b/show/dance2016/effect.n3	Sat Jun 11 21:13:34 2016 +0000
@@ -1,68 +1,109 @@
 @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 dev: <http://light9.bigasterisk.com/device/> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 
-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" .