diff --git a/show/dance2018/effect/blacklight.n3 b/show/dance2018/effect/blacklight.n3
--- a/show/dance2018/effect/blacklight.n3
+++ b/show/dance2018/effect/blacklight.n3
@@ -3,48 +3,34 @@
@prefix effect: .
@prefix rdf: .
@prefix rdfs: .
+@prefix show: .
@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_set20, effect:blacklight_set21, effect:blacklight_set22, effect:blacklight_set23, effect:blacklight_set24, effect:blacklight_set25.
-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: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_set16, effect:blacklight_set2, effect:blacklight_set20, effect:blacklight_set21, effect:blacklight_set22, effect:blacklight_set23, effect:blacklight_set24, effect:blacklight_set25, 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_set16 :device dev:q2; :deviceAttr :quantumGoboChoice;
+ :value :whirlpool .
+effect:blacklight_set2 :device dev:down4; :deviceAttr :uv; :scaledValue 1.000 .
effect:blacklight_set20 :device dev:upCenter; :deviceAttr :color; :scaledValue "#040074" .
effect:blacklight_set21 :device dev:q2; :deviceAttr :color; :scaledValue "#0000ff" .
effect:blacklight_set22 :device dev:q2; :deviceAttr :rx; :value 0.485 .
effect:blacklight_set23 :device dev:q2; :deviceAttr :ry; :value 0.358 .
effect:blacklight_set24 :device dev:q2; :deviceAttr :zoom; :value 0.111 .
effect:blacklight_set25 :device dev:q2; :deviceAttr :focus; :value 0.076 .
+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/dance2018/effect/discostars.n3 b/show/dance2018/effect/discostars.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/discostars.n3
@@ -0,0 +1,21 @@
+@prefix : .
+@prefix dev: .
+@prefix eff: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+
+effect:discostars a :Effect; rdfs:label "discostars"; :publishAttr :strength;
+ :setting eff:set1084225, eff:set1248505, eff:set654288, eff:set7472121, eff:set8031815, eff:set9500881, eff:set9687305, eff:set9721122 .
+eff:set1084225 :device dev:q2; :deviceAttr :quantumGoboChoice; :value :stars .
+eff:set1248505 :device dev:q2; :deviceAttr :focus; :value 5.93e-01 .
+eff:set654288 :device dev:q2; :deviceAttr :goboSpeed; :value 8e-02 .
+eff:set7472121 :device dev:q2; :deviceAttr :ry; :value 1.06e-01 .
+eff:set8031815 :device dev:q2; :deviceAttr :rx; :value 5.06e-01 .
+eff:set9500881 :device dev:q2; :deviceAttr :prism; :value 5.82e-01 .
+eff:set9687305 :device dev:q2; :deviceAttr :zoom; :value 1.38e-01 .
+eff:set9721122 :device dev:q2; :deviceAttr :color; :scaledValue "#f7f7f7" .
diff --git a/show/dance2018/effect/effect0.n3 b/show/dance2018/effect/effect0.n3
--- a/show/dance2018/effect/effect0.n3
+++ b/show/dance2018/effect/effect0.n3
@@ -8,10 +8,5 @@
@prefix xsd: .
-effect:effect0 a :Effect; rdfs:label "effect0"; :publishAttr :strength;
- :setting effect:effect0_set1, effect:effect0_set21, effect:effect0_set22, effect:effect0_set23, effect:effect0_set24 .
-effect:effect0_set1 :device dev:dim41; :deviceAttr :brightness; :scaledValue 5.53e-01 .
-effect:effect0_set21 :device dev:dim43; :deviceAttr :brightness; :scaledValue 4.73e-01 .
-effect:effect0_set22 :device dev:dim45; :deviceAttr :brightness; :scaledValue 7.07e-01 .
-effect:effect0_set23 :device dev:dim44; :deviceAttr :brightness; :scaledValue 7.08e-01 .
-effect:effect0_set24 :device dev:dim42; :deviceAttr :brightness; :scaledValue 5.33e-01 .
+effect:effect0 a :Effect; rdfs:label "effect0"; :publishAttr :strength .
+effect:effect0_set19 :value 4.65e-01 .
diff --git a/show/dance2018/effect/floordots.n3 b/show/dance2018/effect/floordots.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/floordots.n3
@@ -0,0 +1,28 @@
+@prefix : .
+@prefix dev: .
+@prefix eff: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+
+effect:floordots a :Effect; rdfs:label "floordots"; :publishAttr :strength;
+ :setting eff:set102225, eff:set2206570, eff:set2667445, eff:set2711622, eff:set3194982, eff:set3297533, eff:set3840733, eff:set5139322, eff:set638498, eff:set6504290, eff:set7631269, eff:set8144495, eff:set8172692, eff:set8845077, eff:set8993438 .
+eff:set102225 :device dev:q3; :deviceAttr :color; :scaledValue "#a58c66" .
+eff:set2206570 :device dev:q2; :deviceAttr :rx; :value 5.03e-01 .
+eff:set2667445 :device dev:q2; :deviceAttr :color; :scaledValue "#dadad9" .
+eff:set2711622 :device dev:q2; :deviceAttr :focus; :value 5.31e-01 .
+eff:set3194982 :device dev:q3; :deviceAttr :zoom; :value 8.59e-01 .
+eff:set3297533 :device dev:q1; :deviceAttr :rx; :value 2.56e-01 .
+eff:set3840733 :device dev:q3; :deviceAttr :rx; :value 7.5e-01 .
+eff:set5139322 :device dev:q1; :deviceAttr :ry; :value 4.43e-01 .
+eff:set638498 :device dev:q2; :deviceAttr :ry; :value 2.8e-02 .
+eff:set6504290 :device dev:q1; :deviceAttr :focus; :value 5.65e-01 .
+eff:set7631269 :device dev:q3; :deviceAttr :ry; :value 4.56e-01 .
+eff:set8144495 :device dev:q1; :deviceAttr :color; :scaledValue "#b78c67" .
+eff:set8172692 :device dev:q3; :deviceAttr :focus; :value 5.07e-01 .
+eff:set8845077 :device dev:q2; :deviceAttr :zoom; :value 6.35e-01 .
+eff:set8993438 :device dev:q1; :deviceAttr :zoom; :value 8.95e-01 .
diff --git a/show/dance2018/effect/qfill.n3 b/show/dance2018/effect/qfill.n3
--- a/show/dance2018/effect/qfill.n3
+++ b/show/dance2018/effect/qfill.n3
@@ -1,28 +1,27 @@
@prefix : .
+@prefix dev: .
+@prefix effect: .
@prefix rdf: .
@prefix rdfs: .
+@prefix show: .
@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_set13, effect:qfill_set14, 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 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_set13, effect:qfill_set15, 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 2.92e-01 .
effect:qfill_set1 :device dev:q1; :deviceAttr :ry; :value 0.475 .
-effect:qfill_set10 :device dev:q3; :deviceAttr :color; :scaledValue "#f2a58f" .
+effect:qfill_set10 :device dev:q3; :deviceAttr :color; :scaledValue "#f0a58e" .
effect:qfill_set11 :device dev:q2; :deviceAttr :color; :scaledValue "#f2a58f" .
+effect:qfill_set12 :device dev:q1; :deviceAttr :focus; :value 0.971 .
+effect:qfill_set13 :device dev:q2; :deviceAttr :focus; :value 0.971 .
+effect:qfill_set15 :device dev:q3; :deviceAttr :focus; :value 1e+00 .
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_set5 :device dev:q3; :deviceAttr :rx; :value 7.1e-01 .
+effect:qfill_set6 :device dev:q3; :deviceAttr :ry; :value 3.37e-01 .
+effect:qfill_set7 :device dev:q3; :deviceAttr :zoom; :value 3.65e-01 .
effect:qfill_set8 :device dev:q1; :deviceAttr :zoom; :value 0.319 .
effect:qfill_set9 :device dev:q1; :deviceAttr :color; :scaledValue "#f2a58f" .
-
-effect:qfill_set12 :device dev:q1; :deviceAttr :focus; :value 0.971 .
-effect:qfill_set13 :device dev:q2; :deviceAttr :focus; :value 0.971 .
-effect:qfill_set14 :device dev:q3; :deviceAttr :focus; :value 0.971 .
diff --git a/show/dance2018/effect/qfilltighter.n3 b/show/dance2018/effect/qfilltighter.n3
--- a/show/dance2018/effect/qfilltighter.n3
+++ b/show/dance2018/effect/qfilltighter.n3
@@ -3,33 +3,22 @@
@prefix effect: .
@prefix rdf: .
@prefix rdfs: .
+@prefix show: .
@prefix xml: .
@prefix xsd: .
-effect:qfilltighter a :Effect; rdfs:label "qfilltighter";
- :publishAttr :strength; :setting effect:qfilltighter_set0, effect:qfilltighter_set1, effect:qfilltighter_set10, effect:qfilltighter_set11, effect:qfilltighter_set2, effect:qfilltighter_set3, effect:qfilltighter_set4, effect:qfilltighter_set5, effect:qfilltighter_set6, effect:qfilltighter_set7, effect:qfilltighter_set8, effect:qfilltighter_set9 .
-effect:qfilltighter_set0 :device dev:q1; :deviceAttr :color;
- :scaledValue "#ffffff" .
-effect:qfilltighter_set1 :device dev:q1; :deviceAttr :zoom;
- :value 0.478 .
-effect:qfilltighter_set10 :device dev:q2; :deviceAttr :ry;
- :value 0.353 .
-effect:qfilltighter_set11 :device dev:q2; :deviceAttr :zoom;
- :value 0.331 .
-effect:qfilltighter_set2 :device dev:q1; :deviceAttr :rx;
- :value 0.314 .
-effect:qfilltighter_set3 :device dev:q1; :deviceAttr :ry;
- :value 0.491 .
-effect:qfilltighter_set4 :device dev:q3; :deviceAttr :color;
- :scaledValue "#ffffff" .
-effect:qfilltighter_set5 :device dev:q3; :deviceAttr :zoom;
- :value 0.425 .
-effect:qfilltighter_set6 :device dev:q3; :deviceAttr :rx;
- :value 0.653 .
-effect:qfilltighter_set7 :device dev:q3; :deviceAttr :ry;
- :value 0.028 .
-effect:qfilltighter_set8 :device dev:q2; :deviceAttr :color;
- :scaledValue "#ffffff" .
-effect:qfilltighter_set9 :device dev:q2; :deviceAttr :rx;
- :value 0.525 .
+effect:qfilltighter a :Effect; rdfs:label "qfilltighter"; :publishAttr :strength;
+ :setting effect:qfilltighter_set0, effect:qfilltighter_set1, effect:qfilltighter_set10, effect:qfilltighter_set11, effect:qfilltighter_set2, effect:qfilltighter_set3, effect:qfilltighter_set4, effect:qfilltighter_set5, effect:qfilltighter_set6, effect:qfilltighter_set7, effect:qfilltighter_set8, effect:qfilltighter_set9 .
+effect:qfilltighter_set0 :device dev:q1; :deviceAttr :color; :scaledValue "#ffffff" .
+effect:qfilltighter_set1 :device dev:q1; :deviceAttr :zoom; :value 0.478 .
+effect:qfilltighter_set10 :device dev:q2; :deviceAttr :ry; :value 3.72e-01 .
+effect:qfilltighter_set11 :device dev:q2; :deviceAttr :zoom; :value 0.331 .
+effect:qfilltighter_set2 :device dev:q1; :deviceAttr :rx; :value 0.314 .
+effect:qfilltighter_set3 :device dev:q1; :deviceAttr :ry; :value 4.25e-01 .
+effect:qfilltighter_set4 :device dev:q3; :deviceAttr :color; :scaledValue "#ffffff" .
+effect:qfilltighter_set5 :device dev:q3; :deviceAttr :zoom; :value 0.425 .
+effect:qfilltighter_set6 :device dev:q3; :deviceAttr :rx; :value 0.653 .
+effect:qfilltighter_set7 :device dev:q3; :deviceAttr :ry; :value 4.18e-01 .
+effect:qfilltighter_set8 :device dev:q2; :deviceAttr :color; :scaledValue "#ffffff" .
+effect:qfilltighter_set9 :device dev:q2; :deviceAttr :rx; :value 0.525 .
diff --git a/show/dance2018/effect/song01.n3 b/show/dance2018/effect/song01.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/song01.n3
@@ -0,0 +1,56 @@
+@prefix : .
+@prefix dev: .
+@prefix eff: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+
+effect:song01 a :Effect; rdfs:label "song01"; :publishAttr :strength;
+ :setting eff:set1221215, eff:set1299011, eff:set2104776, eff:set2190596, eff:set245704, eff:set2594550, eff:set2819637, eff:set2936667, eff:set2982282, eff:set3277939, eff:set3431339, eff:set3578278, eff:set3678906, eff:set4119240, eff:set4126262, eff:set4170229, eff:set4287203, eff:set4316334, eff:set4491079, eff:set4522274, eff:set4769765, eff:set483929, eff:set5459708, eff:set6118038, eff:set6341982, eff:set659163, eff:set6627541, eff:set6984907, eff:set7107727, eff:set7124305, eff:set7201437, eff:set7303799, eff:set736249, eff:set7567737, eff:set7587193, eff:set765082, eff:set772091, eff:set7733708, eff:set9069241, eff:set9286536, eff:set9456829, eff:set971885, eff:set9725281 .
+eff:set1221215 :device dev:aura3; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set1299011 :device dev:aura2; :deviceAttr :ry; :value 1.73e-01 .
+eff:set2104776 :device dev:cycL; :deviceAttr :brightness; :scaledValue 3.895e-01 .
+eff:set2190596 :device dev:q1; :deviceAttr :color; :scaledValue "#f2a58f" .
+eff:set245704 :device dev:down4; :deviceAttr :color; :scaledValue "#e5caa7" .
+eff:set2594550 :device dev:f2; :deviceAttr :brightness; :scaledValue 9.5e-01 .
+eff:set2819637 :device dev:q1; :deviceAttr :focus; :value 0.971 .
+eff:set2936667 :device dev:q2; :deviceAttr :rx; :value 5.13e-01 .
+eff:set2982282 :device dev:cycR; :deviceAttr :brightness; :scaledValue 3.895e-01 .
+eff:set3277939 :device dev:q3; :deviceAttr :ry; :value 1.845e-01 .
+eff:set3431339 :device dev:q1; :deviceAttr :zoom; :value 3.19e-01 .
+eff:set3578278 :device dev:q2; :deviceAttr :focus; :value 9.71e-01 .
+eff:set3678906 :device dev:aura4; :deviceAttr :ry; :value 8.6e-02 .
+eff:set4119240 :device dev:q2; :deviceAttr :ry; :value 4.82e-01 .
+eff:set4126262 :device dev:down2; :deviceAttr :color; :scaledValue "#e5caa7" .
+eff:set4170229 :device dev:aura5; :deviceAttr :ry; :value 8.2e-02 .
+eff:set4287203 :device dev:q2; :deviceAttr :color; :scaledValue "#f2a58f" .
+eff:set4316334 :device dev:aura5; :deviceAttr :rx; :value 7.745e-01 .
+eff:set4491079 :device dev:aura5; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set4522274 :device dev:aura5; :deviceAttr :zoom; :value 4.17e-01 .
+eff:set4769765 :device dev:f1; :deviceAttr :brightness; :scaledValue 9.5e-01 .
+eff:set483929 :device dev:q3; :deviceAttr :focus; :value 1e+00 .
+eff:set5459708 :device dev:aura3; :deviceAttr :ry; :value 7.7e-02 .
+eff:set6118038 :device dev:q2; :deviceAttr :zoom; :value 4.05e-01 .
+eff:set6341982 :device dev:aura4; :deviceAttr :zoom; :value 4.19e-01 .
+eff:set659163 :device dev:aura4; :deviceAttr :rx; :value 6.59e-01 .
+eff:set6627541 :device dev:q3; :deviceAttr :zoom; :value 3.8e-01 .
+eff:set6984907 :device dev:aura1; :deviceAttr :ry; :value 1.75e-01 .
+eff:set7107727 :device dev:aura1; :deviceAttr :zoom; :value 4.35e-01 .
+eff:set7124305 :device dev:q3; :deviceAttr :color; :scaledValue "#f0a58e" .
+eff:set7201437 :device dev:aura4; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set7303799 :device dev:q1; :deviceAttr :ry; :value 4.75e-01 .
+eff:set736249 :device dev:f3; :deviceAttr :brightness; :scaledValue 6.099e-01 .
+eff:set7567737 :device dev:aura3; :deviceAttr :rx; :value 5.57e-01 .
+eff:set7587193 :device dev:aura1; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set765082 :device dev:q1; :deviceAttr :rx; :value 2.7e-01 .
+eff:set772091 :device dev:down3; :deviceAttr :color; :scaledValue "#e5caa7" .
+eff:set7733708 :device dev:aura1; :deviceAttr :rx; :value 1.955e-01 .
+eff:set9069241 :device dev:aura2; :deviceAttr :zoom; :value 4.25e-01 .
+eff:set9286536 :device dev:aura3; :deviceAttr :zoom; :value 4.35e-01 .
+eff:set9456829 :device dev:aura2; :deviceAttr :rx; :value 4.45e-01 .
+eff:set971885 :device dev:q3; :deviceAttr :rx; :value 7.24e-01 .
+eff:set9725281 :device dev:aura2; :deviceAttr :color; :scaledValue "#ffffff" .
diff --git a/show/dance2018/effect/song01b.n3 b/show/dance2018/effect/song01b.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/song01b.n3
@@ -0,0 +1,56 @@
+@prefix : .
+@prefix dev: .
+@prefix eff: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+
+effect:song01b a :Effect; rdfs:label "song01b"; :publishAttr :strength;
+ :setting eff:set1221215, eff:set1299011, eff:set2190596, eff:set2785726, eff:set2819637, eff:set2936667, eff:set3270897, eff:set3277939, eff:set3431339, eff:set3578278, eff:set3678906, eff:set4027558, eff:set4119240, eff:set4170229, eff:set4287203, eff:set4316334, eff:set4491079, eff:set4522274, eff:set483929, eff:set5459708, eff:set6118038, eff:set6127440, eff:set6341982, eff:set6430654, eff:set6510639, eff:set6512093, eff:set659163, eff:set6619580, eff:set6627541, eff:set6984907, eff:set6986505, eff:set7107727, eff:set7201437, eff:set7303799, eff:set7567737, eff:set7587193, eff:set765082, eff:set7733708, eff:set9069241, eff:set9286536, eff:set9456829, eff:set971885, eff:set9725281 .
+eff:set1221215 :device dev:aura3; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set1299011 :device dev:aura2; :deviceAttr :ry; :value 1.73e-01 .
+eff:set2190596 :device dev:q1; :deviceAttr :color; :scaledValue "#f2a58f" .
+eff:set2785726 :device dev:f2; :deviceAttr :brightness; :scaledValue 1e+00 .
+eff:set2819637 :device dev:q1; :deviceAttr :focus; :value 0.971 .
+eff:set2936667 :device dev:q2; :deviceAttr :rx; :value 5.13e-01 .
+eff:set3270897 :device dev:q3; :deviceAttr :color; :scaledValue "#f2a58f" .
+eff:set3277939 :device dev:q3; :deviceAttr :ry; :value 1.845e-01 .
+eff:set3431339 :device dev:q1; :deviceAttr :zoom; :value 3.19e-01 .
+eff:set3578278 :device dev:q2; :deviceAttr :focus; :value 9.71e-01 .
+eff:set3678906 :device dev:aura4; :deviceAttr :ry; :value 8.6e-02 .
+eff:set4027558 :device dev:f1; :deviceAttr :brightness; :scaledValue 1e+00 .
+eff:set4119240 :device dev:q2; :deviceAttr :ry; :value 4.82e-01 .
+eff:set4170229 :device dev:aura5; :deviceAttr :ry; :value 8.2e-02 .
+eff:set4287203 :device dev:q2; :deviceAttr :color; :scaledValue "#f2a58f" .
+eff:set4316334 :device dev:aura5; :deviceAttr :rx; :value 7.745e-01 .
+eff:set4491079 :device dev:aura5; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set4522274 :device dev:aura5; :deviceAttr :zoom; :value 4.17e-01 .
+eff:set483929 :device dev:q3; :deviceAttr :focus; :value 1e+00 .
+eff:set5459708 :device dev:aura3; :deviceAttr :ry; :value 7.7e-02 .
+eff:set6118038 :device dev:q2; :deviceAttr :zoom; :value 4.05e-01 .
+eff:set6127440 :device dev:down2; :deviceAttr :color; :scaledValue "#f2d5b0" .
+eff:set6341982 :device dev:aura4; :deviceAttr :zoom; :value 4.19e-01 .
+eff:set6430654 :device dev:cycR; :deviceAttr :brightness; :scaledValue 4.1e-01 .
+eff:set6510639 :device dev:cycL; :deviceAttr :brightness; :scaledValue 4.1e-01 .
+eff:set6512093 :device dev:f3; :deviceAttr :brightness; :scaledValue 6.42e-01 .
+eff:set659163 :device dev:aura4; :deviceAttr :rx; :value 6.59e-01 .
+eff:set6619580 :device dev:down4; :deviceAttr :color; :scaledValue "#f2d5b0" .
+eff:set6627541 :device dev:q3; :deviceAttr :zoom; :value 3.8e-01 .
+eff:set6984907 :device dev:aura1; :deviceAttr :ry; :value 1.75e-01 .
+eff:set6986505 :device dev:down3; :deviceAttr :color; :scaledValue "#f2d5b0" .
+eff:set7107727 :device dev:aura1; :deviceAttr :zoom; :value 4.35e-01 .
+eff:set7201437 :device dev:aura4; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set7303799 :device dev:q1; :deviceAttr :ry; :value 4.75e-01 .
+eff:set7567737 :device dev:aura3; :deviceAttr :rx; :value 5.57e-01 .
+eff:set7587193 :device dev:aura1; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set765082 :device dev:q1; :deviceAttr :rx; :value 2.7e-01 .
+eff:set7733708 :device dev:aura1; :deviceAttr :rx; :value 1.955e-01 .
+eff:set9069241 :device dev:aura2; :deviceAttr :zoom; :value 4.25e-01 .
+eff:set9286536 :device dev:aura3; :deviceAttr :zoom; :value 4.35e-01 .
+eff:set9456829 :device dev:aura2; :deviceAttr :rx; :value 4.45e-01 .
+eff:set971885 :device dev:q3; :deviceAttr :rx; :value 7.24e-01 .
+eff:set9725281 :device dev:aura2; :deviceAttr :color; :scaledValue "#ffffff" .
diff --git a/show/dance2018/effect/whirls3.n3 b/show/dance2018/effect/whirls3.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/whirls3.n3
@@ -0,0 +1,33 @@
+@prefix : .
+@prefix dev: .
+@prefix eff: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+
+effect:whirls3 a :Effect; rdfs:label "whirls3"; :publishAttr :strength;
+ :setting eff:set1664388, eff:set2039773, eff:set303911, eff:set3050030, eff:set305271, eff:set3094458, eff:set3427708, eff:set4468697, eff:set4809550, eff:set5058139, eff:set5616592, eff:set5954089, eff:set6756130, eff:set716575, eff:set7338692, eff:set8421183, eff:set8713318, eff:set9234937, eff:set9680690, eff:set9771769 .
+eff:set1664388 :device dev:q3; :deviceAttr :quantumGoboChoice; :value :whirlpool .
+eff:set2039773 :device dev:q1; :deviceAttr :goboSpeed; :value 3.1e-02 .
+eff:set303911 :device dev:q1; :deviceAttr :zoom; :value 3.7e-02 .
+eff:set3050030 :device dev:q3; :deviceAttr :goboSpeed; :value 4.2e-02 .
+eff:set305271 :device dev:q1; :deviceAttr :color; :scaledValue "#ff898d" .
+eff:set3094458 :device dev:q3; :deviceAttr :ry; :value 4.6e-02 .
+eff:set3427708 :device dev:dim42; :deviceAttr :brightness; :scaledValue 5.33e-01 .
+eff:set4468697 :device dev:dim45; :deviceAttr :brightness; :scaledValue 7.07e-01 .
+eff:set4809550 :device dev:q3; :deviceAttr :rx; :value 4.35e-01 .
+eff:set5058139 :device dev:q3; :deviceAttr :focus; :value 5.46e-01 .
+eff:set5616592 :device dev:q1; :deviceAttr :rx; :value 5.5e-01 .
+eff:set5954089 :device dev:dim41; :deviceAttr :brightness; :scaledValue 5.53e-01 .
+eff:set6756130 :device dev:q1; :deviceAttr :ry; :value 5.15e-01 .
+eff:set716575 :device dev:q3; :deviceAttr :zoom; :value 9.5e-02 .
+eff:set7338692 :device dev:dim43; :deviceAttr :brightness; :scaledValue 4.73e-01 .
+eff:set8421183 :device dev:q1; :deviceAttr :focus; :value 5.4e-01 .
+eff:set8713318 :device dev:q3; :deviceAttr :color; :scaledValue "#f78dff" .
+eff:set9234937 :device dev:q1; :deviceAttr :quantumGoboChoice; :value :whirlpool .
+eff:set9680690 :device dev:dim44; :deviceAttr :brightness; :scaledValue 7.08e-01 .
+eff:set9771769 :device dev:q2; :deviceAttr :quantumGoboChoice; :value :whirlpool .
diff --git a/show/dance2018/song1.n3 b/show/dance2018/song1.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/song1.n3
@@ -0,0 +1,40 @@
+@prefix : .
+@prefix dev: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+show:song1 :note .
+
+ a :Note; :curve ;
+ :effectClass effect:allwide; :originTime 2.1079e+01; :setting .
+
+ a :Curve;
+ :attr :strength; :point , , , .
+ :time -1.7756e+01;
+ :value 0e+00 .
+ :time -1.244e+01;
+ :value 1e+00 .
+ :time 1.88979e+02;
+ :value 1e+00 .
+ :time 1.91622e+02;
+ :value 0e+00 .
+ :effectAttr :colorScale;
+ :value "#ffffff" .
+
+ a :Note; :curve ;
+ :effectClass effect:song01b; :originTime 1.24363e+02 .
+
+ a :Curve;
+ :attr :strength; :point , , , .
+ :time -1.2249e+02;
+ :value 0e+00 .
+ :time -1.17748e+02;
+ :value 1e+00 .
+ :time 8.5951e+01;
+ :value 1e+00 .
+ :time 8.7761e+01;
+ :value 0e+00 .
diff --git a/show/dance2018/song16.n3 b/show/dance2018/song16.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/song16.n3
@@ -0,0 +1,106 @@
+@prefix : .
+@prefix dev: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix song: .
+@prefix xml: .
+@prefix xsd: .
+
+show:song16 :note song:n11 .
+
+song:n1 a :Note; :curve song:n1c1; :effectClass effect:blacklight;
+ :originTime 6.7851e+01; :setting song:n1set0 .
+
+song:n10 a :Note; :curve song:n10c1; :effectClass effect:blacklight;
+ :originTime 6.8123e+01 .
+
+song:n2 a :Note; :curve song:n2c1; :effectClass effect:cyc; :originTime 1.00681e+02 .
+
+song:n3 a :Note; :curve song:n3c1; :effectClass effect:discostars;
+ :originTime 8.1975e+01 .
+
+song:n4 a :Note; :curve song:n4c1; :effectClass effect:down; :originTime 9.8296e+01 .
+
+song:n5 a :Note; :curve song:n5c1; :effectClass effect:downback; :originTime 6.006914e+01 .
+
+song:n6 a :Note; :curve song:n6c1; :effectClass effect:curtain2; :originTime 6.006914e+01 .
+
+song:n7 a :Note; :curve song:n7c1; :effectClass effect:chase1; :originTime 6.006914e+01 .
+
+song:n8 a :Note; :curve song:n8c1; :effectClass effect:centerSpot;
+ :originTime 6.006914e+01 .
+
+song:n9 a :Note; :curve song:n9c1; :effectClass effect:centerSpot;
+ :originTime 6.006914e+01 .
+
+song:n10c1 a :Curve; :attr :strength; :point song:n10c1p1, song:n10c1p2, song:n10c1p3, song:n10c1p4 .
+song:n10c1p1 :time -2e+00; :value 0e+00 .
+song:n10c1p2 :time 0e+00; :value 1e+00 .
+song:n10c1p3 :time 2e+01; :value 1e+00 .
+song:n10c1p4 :time 2.2e+01; :value 0e+00 .
+
+song:n11 a :Note; :curve song:n11c1; :effectClass effect:aurayellow;
+ :originTime 5.0211e+01 .
+
+song:n11c1 a :Curve; :attr :strength; :point song:n11c1p1, song:n11c1p2, song:n11c1p3, song:n11c1p4 .
+song:n11c1p1 :time -2e+00; :value 0e+00 .
+song:n11c1p2 :time 0e+00; :value 1e+00 .
+song:n11c1p3 :time 2.6248e+01; :value 1e+00 .
+song:n11c1p4 :time 2.8248e+01; :value 0e+00 .
+
+song:n1c1 a :Curve; :attr :strength; :point song:n1c1p1, song:n1c1p2, song:n1c1p3, song:n1c1p4 .
+song:n1c1p1 :time -1.4898e+01; :value 0e+00 .
+song:n1c1p2 :time 0e+00; :value 1e+00 .
+song:n1c1p3 :time 8.3213e+01; :value 1e+00 .
+song:n1c1p4 :time 8.5213e+01; :value 0e+00 .
+song:n1set0 :effectAttr :colorScale; :value "#ffdcff" .
+
+song:n2c1 a :Curve; :attr :strength; :point song:n2c1p1, song:n2c1p2, song:n2c1p3, song:n2c1p4 .
+song:n2c1p1 :time -2e+00; :value 0e+00 .
+song:n2c1p2 :time 0e+00; :value 1e+00 .
+song:n2c1p3 :time 7.9476e+01; :value 1e+00 .
+song:n2c1p4 :time 8.1476e+01; :value 0e+00 .
+
+song:n3c1 a :Curve; :attr :strength; :point song:n3c1p1, song:n3c1p2, song:n3c1p3, song:n3c1p4 .
+song:n3c1p1 :time -2e+00; :value 0e+00 .
+song:n3c1p2 :time 0e+00; :value 1e+00 .
+song:n3c1p3 :time 4.1578e+01; :value 1e+00 .
+song:n3c1p4 :time 4.6426e+01; :value 0e+00 .
+
+song:n4c1 a :Curve; :attr :strength; :point song:n4c1p1, song:n4c1p2, song:n4c1p3, song:n4c1p4 .
+song:n4c1p1 :time -2e+00; :value 0e+00 .
+song:n4c1p2 :time 0e+00; :value 1e+00 .
+song:n4c1p3 :time 5.8337e+01; :value 1e+00 .
+song:n4c1p4 :time 6.0337e+01; :value 0e+00 .
+
+song:n5c1 a :Curve; :attr :strength; :point song:n5c1p1, song:n5c1p2, song:n5c1p3, song:n5c1p4 .
+song:n5c1p1 :time -2e+00; :value 0e+00 .
+song:n5c1p2 :time 0e+00; :value 1e+00 .
+song:n5c1p3 :time 2e+01; :value 1e+00 .
+song:n5c1p4 :time 2.2e+01; :value 0e+00 .
+
+song:n6c1 a :Curve; :attr :strength; :point song:n6c1p1, song:n6c1p2, song:n6c1p3, song:n6c1p4 .
+song:n6c1p1 :time -2e+00; :value 0e+00 .
+song:n6c1p2 :time 0e+00; :value 1e+00 .
+song:n6c1p3 :time 2e+01; :value 1e+00 .
+song:n6c1p4 :time 2.1861e+01; :value 0e+00 .
+
+song:n7c1 a :Curve; :attr :strength; :point song:n7c1p1, song:n7c1p2, song:n7c1p3, song:n7c1p4 .
+song:n7c1p1 :time -2e+00; :value 0e+00 .
+song:n7c1p2 :time 0e+00; :value 1e+00 .
+song:n7c1p3 :time 2e+01; :value 1e+00 .
+song:n7c1p4 :time 2.2e+01; :value 0e+00 .
+
+song:n8c1 a :Curve; :attr :strength; :point song:n8c1p1, song:n8c1p2, song:n8c1p3, song:n8c1p4 .
+song:n8c1p1 :time -2e+00; :value 0e+00 .
+song:n8c1p2 :time 0e+00; :value 1e+00 .
+song:n8c1p3 :time 2e+01; :value 1e+00 .
+song:n8c1p4 :time 2.2e+01; :value 0e+00 .
+
+song:n9c1 a :Curve; :attr :strength; :point song:n9c1p1, song:n9c1p2, song:n9c1p3, song:n9c1p4 .
+song:n9c1p1 :time -2e+00; :value 0e+00 .
+song:n9c1p2 :time 0e+00; :value 1e+00 .
+song:n9c1p3 :time 2e+01; :value 1e+00 .
+song:n9c1p4 :time 2.2e+01; :value 0e+00 .
diff --git a/show/dance2018/song7.n3 b/show/dance2018/song7.n3
--- a/show/dance2018/song7.n3
+++ b/show/dance2018/song7.n3
@@ -54,7 +54,7 @@ show:song7 :note a :Note; :curve ;
- :effectClass effect:aurayellow; :originTime 2.49082e+02 .
+ :effectClass effect:aurayellow; :originTime 2.49082e+02; :setting .
a :Curve;
:attr :strength; :point , , , .
@@ -66,3 +66,5 @@ show:song7 :note :time 1.12366e+02;
:value 0e+00 .
+ :effectAttr :colorScale;
+ :value "#ff140c" .
diff --git a/show/dance2018/theaterLightConfig.n3 b/show/dance2018/theaterLightConfig.n3
--- a/show/dance2018/theaterLightConfig.n3
+++ b/show/dance2018/theaterLightConfig.n3
@@ -33,7 +33,7 @@ dev:q2 :outputAttrRange dev:q2rx . dev:q
dev:q2 :outputAttrRange dev:q2ry . dev:q2ry :outputAttr :ry; :start 0.739; :end 0.824 .
dev:q3 a :MacQuantum; :dmxUniverse dmxB:; :dmxBase 379 .
dev:q3 :outputAttrRange dev:q3rx . dev:q3rx :outputAttr :rx; :start 0.064; :end 0.198 .
-dev:q3 :outputAttrRange dev:q3ry . dev:q3ry :outputAttr :ry; :start 0.765; :end 0.822 .
+dev:q3 :outputAttrRange dev:q3ry . dev:q3ry :outputAttr :ry; :start 0.705; :end 0.822 .
dev:aura1 a :MacAura; :dmxUniverse dmxB:; :dmxBase 406 .
dev:aura2 a :MacAura; :dmxUniverse dmxB:; :dmxBase 420 .