diff --git a/show/dance2018/effect/3lightmix.n3 b/show/dance2018/effect/3lightmix.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/3lightmix.n3
@@ -0,0 +1,27 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix eff: <http://light9.bigasterisk.com/effect/3lightmix/> .
+@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 show: <http://light9.bigasterisk.com/show/dance2018/> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+
+<http://light9.bigasterisk.com/effect/3lightmix> a :Effect; rdfs:label "3lightmix";
+     :publishAttr :strength; :setting eff:set4098615, eff:set439603, eff:set5541401, eff:set5761032, eff:set5817987, eff:set7191068, eff:set8380095, eff:set8434384, eff:set8559252, eff:set9766549, eff:set9789133, eff:set9967420, eff:set9986050, eff:set9987257 .
+eff:set4098615 :device dev:q1; :deviceAttr :zoom; :value 8.17e-01 .
+eff:set439603 :device dev:q2; :deviceAttr :ry; :value 1.84e-01 .
+eff:set5541401 :device dev:q1; :deviceAttr :focus; :value 4.61e-01 .
+eff:set5761032 :device dev:q3; :deviceAttr :rx; :value 6.6e-01 .
+eff:set5817987 :device dev:q3; :deviceAttr :zoom; :value 6.68e-01 .
+eff:set7191068 :device dev:q1; :deviceAttr :color; :scaledValue "#1905f6" .
+eff:set8380095 :device dev:q3; :deviceAttr :focus; :value 4.85e-01 .
+eff:set8434384 :device dev:q1; :deviceAttr :rx; :value 3.06e-01 .
+eff:set8559252 :device dev:q2; :deviceAttr :rx; :value 4.98e-01 .
+eff:set9766549 :device dev:q2; :deviceAttr :zoom; :value 5.99e-01 .
+eff:set9789133 :device dev:q2; :deviceAttr :color; :scaledValue "#f73d2f" .
+eff:set9967420 :device dev:q1; :deviceAttr :ry; :value 3.65e-01 .
+eff:set9986050 :device dev:q3; :deviceAttr :color; :scaledValue "#3cf65e" .
+eff:set9987257 :device dev:q2; :deviceAttr :focus; :value 4.89e-01 .
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,5 +8,11 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 
-effect:effect0 a :Effect; rdfs:label "effect0"; :publishAttr :strength .
+effect:effect0 a :Effect; rdfs:label "effect0"; :publishAttr :strength;
+     :setting effect:effect0_set0, effect:effect0_set1, effect:effect0_set13, effect:effect0_set16, effect:effect0_set8 .
 effect:effect0_set19 :value 4.65e-01 .
+effect:effect0_set0 :device dev:q2; :deviceAttr :color; :scaledValue "#ffffff" .
+effect:effect0_set1 :device dev:q2; :deviceAttr :focus; :value 5.89e-01 .
+effect:effect0_set13 :device dev:q2; :deviceAttr :ry; :value 3.83e-01 .
+effect:effect0_set16 :device dev:q2; :deviceAttr :zoom; :value 7.14e-01 .
+effect:effect0_set8 :device dev:q2; :deviceAttr :rx; :value 4.29e-01 .
diff --git a/show/dance2018/effect/qcenter.n3 b/show/dance2018/effect/qcenter.n3
--- a/show/dance2018/effect/qcenter.n3
+++ b/show/dance2018/effect/qcenter.n3
@@ -18,7 +18,7 @@ effect:qcenter_set12 :device dev:q3; :de
 effect:qcenter_set14 :device dev:q1; :deviceAttr :focus; :value 3.95e-01 .
 effect:qcenter_set15 :device dev:q1; :deviceAttr :ry; :value 4.97e-01 .
 effect:qcenter_set16 :device dev:q3; :deviceAttr :ry; :value 4.47e-01 .
-effect:qcenter_set17 :device dev:q2; :deviceAttr :ry; :value 4.44e-01 .
+effect:qcenter_set17 :device dev:q2; :deviceAttr :ry; :value 3.84e-01 .
 effect:qcenter_set18 :device dev:q2; :deviceAttr :rx; :value 5.2e-01 .
 effect:qcenter_set2 :device dev:q3; :deviceAttr :color; :scaledValue "#adadad" .
 effect:qcenter_set3 :device dev:q1; :deviceAttr :color; :scaledValue "#919191" .
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
@@ -18,7 +18,7 @@ effect:qfill_set12 :device dev:q1; :devi
 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_set3 :device dev:q2; :deviceAttr :ry; :value 3.22e-01 .
 effect:qfill_set4 :device dev:q2; :deviceAttr :zoom; :value 0.405 .
 effect:qfill_set5 :device dev:q3; :deviceAttr :rx; :value 7.1e-01 .
 effect:qfill_set6 :device dev:q3; :deviceAttr :ry; :value 3.37e-01 .
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
@@ -12,7 +12,7 @@ effect:qfilltighter a :Effect; rdfs:labe
      :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_set10 :device dev:q2; :deviceAttr :ry; :value 2.75e-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 .
diff --git a/show/dance2018/effect/whirls3.n3 b/show/dance2018/effect/whirls3.n3
--- a/show/dance2018/effect/whirls3.n3
+++ b/show/dance2018/effect/whirls3.n3
@@ -21,7 +21,7 @@ eff:set4468697 :device dev:dim45; :devic
 eff:set4809550 :device dev:q3; :deviceAttr :rx; :value 4.16e-01 .
 eff:set5058139 :device dev:q3; :deviceAttr :focus; :value 5.46e-01 .
 eff:set5954089 :device dev:dim41; :deviceAttr :brightness; :scaledValue 5.53e-01 .
-eff:set6756130 :device dev:q1; :deviceAttr :ry; :value 5.25e-01 .
+eff:set6756130 :device dev:q1; :deviceAttr :ry; :value 3.93e-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 .
@@ -29,5 +29,5 @@ eff:set8713318 :device dev:q3; :deviceAt
 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 .
-effect:whirls3_set0 :device dev:q3; :deviceAttr :ry; :value 5.41e-01 .
+effect:whirls3_set0 :device dev:q3; :deviceAttr :ry; :value 4.31e-01 .
 effect:whirls3_set1 :device dev:q1; :deviceAttr :rx; :value 5.63e-01 .
diff --git a/show/dance2018/song4.n3 b/show/dance2018/song4.n3
--- a/show/dance2018/song4.n3
+++ b/show/dance2018/song4.n3
@@ -13,8 +13,8 @@ show:song4 :note song:n0, song:n1 .
 song:n0 a :Note; :curve song:n0c0; :effectClass effect:qfill; :originTime 4.1842e+01 .
 
 song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
-song:n0c0p0 :time -3.9595e+01; :value 0e+00 .
-song:n0c0p1 :time -3.5525e+01; :value 1e+00 .
+song:n0c0p0 :time -3.7532e+01; :value 0e+00 .
+song:n0c0p1 :time -3.3462e+01; :value 1e+00 .
 song:n0c0p2 :time 1.80525e+02; :value 1e+00 .
 song:n0c0p3 :time 1.83606e+02; :value 0e+00 .
 
@@ -22,7 +22,7 @@ song:n1 a :Note; :curve song:n1c1; :effe
      :originTime 1.530205e+02 .
 
 song:n1c1 a :Curve; :attr :strength; :point song:n1c1p1, song:n1c1p2, song:n1c1p3, song:n1c1p4 .
-song:n1c1p1 :time -1.50154e+02; :value 0e+00 .
-song:n1c1p2 :time -1.46773e+02; :value 1e+00 .
+song:n1c1p1 :time -1.48638e+02; :value 0e+00 .
+song:n1c1p2 :time -1.45257e+02; :value 1e+00 .
 song:n1c1p3 :time 6.9357e+01; :value 1e+00 .
 song:n1c1p4 :time 7.2406e+01; :value 0e+00 .
diff --git a/show/dance2018/song5.n3 b/show/dance2018/song5.n3
--- a/show/dance2018/song5.n3
+++ b/show/dance2018/song5.n3
@@ -8,7 +8,7 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-show:song5 :note song:n0, song:n10, song:n11, song:n12, song:n2, song:n4, song:n5, song:n6, song:n7, song:n8, song:n9 .
+show:song5 :note song:n0, song:n10, song:n11, song:n12, song:n13, song:n14, song:n2, song:n4, song:n5, song:n6, song:n7, song:n8, song:n9 .
 
 song:n1 a :Note; :curve song:n1c1; :effectClass effect:cyc; :originTime 9.048746e+01 .
 
@@ -53,6 +53,25 @@ song:n12c0p2 :time 1.7715e+01; :value 1e
 song:n12c0p3 :time 2.1131e+01; :value 0e+00 .
 song:n12set0 :effectAttr :colorScale; :value "#8605ff" .
 
+song:n13 a :Note; :curve song:n13c1; :effectClass effect:whirlscolor;
+     :originTime 6.656458e+01 .
+
+song:n13c1 a :Curve; :attr :strength; :point song:n13c1p1, song:n13c1p2, song:n13c1p3, song:n13c1p4 .
+song:n13c1p1 :time -2.9038e+01; :value 0e+00 .
+song:n13c1p2 :time -2.7038e+01; :value 1e+00 .
+song:n13c1p3 :time 4.7842e+01; :value 1e+00 .
+song:n13c1p4 :time 4.9842e+01; :value 0e+00 .
+
+song:n14 a :Note; :curve song:n14c1; :effectClass effect:aurayellow;
+     :originTime 8.440163e+01; :setting song:n14set0 .
+
+song:n14c1 a :Curve; :attr :strength; :point song:n14c1p1, song:n14c1p2, song:n14c1p3, song:n14c1p4 .
+song:n14c1p1 :time -2e+00; :value 0e+00 .
+song:n14c1p2 :time -1.071e+00; :value 1e+00 .
+song:n14c1p3 :time 2.9147e+01; :value 1e+00 .
+song:n14c1p4 :time 3.8971e+01; :value 0e+00 .
+song:n14set0 :effectAttr :colorScale; :value "#203941" .
+
 song:n1c1 a :Curve; :attr :strength; :point song:n1c1p1, song:n1c1p2, song:n1c1p3, song:n1c1p4 .
 song:n1c1p1 :time -2e+00; :value 0e+00 .
 song:n1c1p2 :time 0e+00; :value 1e+00 .
diff --git a/show/dance2018/song7.n3 b/show/dance2018/song7.n3
--- a/show/dance2018/song7.n3
+++ b/show/dance2018/song7.n3
@@ -8,7 +8,7 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-show:song7 :note song:n2, song:n3, song:n4, song:n5, song:n6 .
+show:song7 :note song:n2, song:n3, song:n4, song:n5, song:n6, song:n8, song:n9 .
 
 song:n0 a :Note; :curve song:n0c0; :effectClass effect:effect0; :originTime 3.0927e+01 .
 
@@ -79,3 +79,21 @@ song:n7c0p0 :time 0e+00; :value 0e+00 .
 song:n7c0p1 :time 7.946e+00; :value 1e+00 .
 song:n7c0p2 :time 1.5891e+01; :value 1e+00 .
 song:n7c0p3 :time 2.3837e+01; :value 0e+00 .
+
+song:n8 a :Note; :curve song:n8c0; :effectClass effect:qpan; :originTime 3.07319e+02 .
+
+song:n8c0 a :Curve; :attr :strength; :point song:n8c0p0, song:n8c0p1, song:n8c0p2, song:n8c0p3 .
+song:n8c0p0 :time -6.93e-01; :value 0e+00 .
+song:n8c0p1 :time -4.23e-01; :value 1e+00 .
+song:n8c0p2 :time 3.406e+00; :value 1e+00 .
+song:n8c0p3 :time 4.348e+00; :value 0e+00 .
+
+song:n9 a :Note; :curve song:n9c0; :effectClass effect:qpan; :originTime 3.05774e+02;
+     :setting song:n9set0 .
+
+song:n9c0 a :Curve; :attr :strength; :point song:n9c0p0, song:n9c0p1, song:n9c0p2, song:n9c0p3 .
+song:n9c0p0 :time -9.04e-01; :value 0e+00 .
+song:n9c0p1 :time -8.38e-01; :value 1e+00 .
+song:n9c0p2 :time -7.25e-01; :value 1e+00 .
+song:n9c0p3 :time -5.88e-01; :value 0e+00 .
+song:n9set0 :effectAttr :colorScale; :value "#000000" .