diff --git a/show/dance2018/effect/hexfill.n3 b/show/dance2018/effect/hexfill.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/hexfill.n3
@@ -0,0 +1,21 @@
+@prefix : .
+@prefix dev: .
+@prefix eff: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+
+effect:hexfill a :Effect; rdfs:label "hexfill"; :publishAttr :strength;
+ :setting eff:set3731580, eff:set478568, eff:set4994903, eff:set5502755, eff:set7193635, eff:set7443590, eff:set813044, eff:set825846 .
+eff:set3731580 :device dev:backlight4; :deviceAttr :color; :scaledValue "#efefef" .
+eff:set478568 :device dev:backlight2; :deviceAttr :color; :scaledValue "#bababa" .
+eff:set4994903 :device dev:backlight3; :deviceAttr :color; :scaledValue "#7d7d7d" .
+eff:set5502755 :device dev:down2; :deviceAttr :color; :scaledValue "#ffffff" .
+eff:set7193635 :device dev:down4; :deviceAttr :color; :scaledValue "#dedede" .
+eff:set7443590 :device dev:down3; :deviceAttr :color; :scaledValue "#c8c8c8" .
+eff:set813044 :device dev:backlight1; :deviceAttr :color; :scaledValue "#808080" .
+eff:set825846 :device dev:down5Edge; :deviceAttr :color; :scaledValue "#dddddd" .
diff --git a/show/dance2018/effect/windmill.n3 b/show/dance2018/effect/windmill.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2018/effect/windmill.n3
@@ -0,0 +1,20 @@
+@prefix : .
+@prefix dev: .
+@prefix eff: .
+@prefix effect: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix show: .
+@prefix xml: .
+@prefix xsd: .
+
+
+effect:windmill a :Effect; rdfs:label "windmill"; :publishAttr :strength;
+ :setting eff:set2936667, eff:set3378982, eff:set4819213, eff:set4892699, eff:set5123194, eff:set5650691, eff:set7420540 .
+eff:set2936667 :device dev:q2; :deviceAttr :rx; :value 5.13e-01 .
+eff:set3378982 :device dev:q2; :deviceAttr :zoom; :value 4.96e-01 .
+eff:set4819213 :device dev:q2; :deviceAttr :quantumGoboChoice; :value :windmill .
+eff:set4892699 :device dev:q2; :deviceAttr :focus; :value 4.96e-01 .
+eff:set5123194 :device dev:q2; :deviceAttr :goboSpeed; :value 9.6e-02 .
+eff:set5650691 :device dev:q2; :deviceAttr :ry; :value 3.5e-01 .
+eff:set7420540 :device dev:q2; :deviceAttr :color; :scaledValue "#ffffff" .
diff --git a/show/dance2018/song16.n3 b/show/dance2018/song16.n3
--- a/show/dance2018/song16.n3
+++ b/show/dance2018/song16.n3
@@ -8,7 +8,7 @@
@prefix xml: .
@prefix xsd: .
-show:song16 :note song:n11 .
+show:song16 :note song:n0, song:n13, song:n14, song:n15, song:n16, song:n17, song:n18 .
song:n1 a :Note; :curve song:n1c1; :effectClass effect:blacklight;
:originTime 6.7851e+01; :setting song:n1set0 .
@@ -16,6 +16,12 @@ song:n1 a :Note; :curve song:n1c1; :effe
song:n10 a :Note; :curve song:n10c1; :effectClass effect:blacklight;
:originTime 6.8123e+01 .
+song:n11 a :Note; :curve song:n11c1; :effectClass effect:aurayellow;
+ :originTime 5.0211e+01 .
+
+song:n12 a :Note; :curve song:n12c0; :effectClass effect:allcolor;
+ :originTime 3.1493e+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;
@@ -35,21 +41,85 @@ song:n8 a :Note; :curve song:n8c1; :effe
song:n9 a :Note; :curve song:n9c1; :effectClass effect:centerSpot;
:originTime 6.006914e+01 .
+song:n0 a :Note; :curve song:n0c0; :effectClass effect:floordots; :originTime 8.463e+00 .
+
+song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
+song:n0c0p0 :time -4.449e+00; :value 0e+00 .
+song:n0c0p1 :time -4.415e+00; :value 1e+00 .
+song:n0c0p2 :time 4.8989e+01; :value 1e+00 .
+song:n0c0p3 :time 5.4584e+01; :value 0e+00 .
+
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:n12c0 a :Curve; :attr :strength; :point song:n12c0p0, song:n12c0p1, song:n12c0p2, song:n12c0p3 .
+song:n12c0p0 :time 0e+00; :value 0e+00 .
+song:n12c0p1 :time 3.1178e+01; :value 1e+00 .
+song:n12c0p2 :time 6.2356e+01; :value 1e+00 .
+song:n12c0p3 :time 9.3533e+01; :value 0e+00 .
+
+song:n13 a :Note; :curve song:n13c0; :effectClass effect:chase2; :originTime 1.4739e+02 .
+
+song:n13c0 a :Curve; :attr :strength; :point song:n13c0p0, song:n13c0p1, song:n13c0p2, song:n13c0p3 .
+song:n13c0p0 :time -5.395e+00; :value 0e+00 .
+song:n13c0p1 :time -2.687e+00; :value 1e+00 .
+song:n13c0p2 :time 2.8214e+01; :value 1e+00 .
+song:n13c0p3 :time 4.2322e+01; :value 0e+00 .
+
+song:n14 a :Note; :curve song:n14c0; :effectClass effect:discostars;
+ :originTime 2.05369e+02 .
+
+song:n14c0 a :Curve; :attr :strength; :point song:n14c0p0, song:n14c0p1, song:n14c0p2, song:n14c0p3 .
+song:n14c0p0 :time -4.708e+00; :value 0e+00 .
+song:n14c0p1 :time -4.51e+00; :value 1e+00 .
+song:n14c0p2 :time 5.9806e+01; :value 1e+00 .
+song:n14c0p3 :time 6.0324e+01; :value 0e+00 .
+
+song:n15 a :Note; :curve song:n15c0; :effectClass effect:down; :originTime 3.0348e+02 .
+
+song:n15c0 a :Curve; :attr :strength; :point song:n15c0p0, song:n15c0p1, song:n15c0p2, song:n15c0p3 .
+song:n15c0p0 :time 7.543e+00; :value 0e+00 .
+song:n15c0p1 :time 1.1302e+01; :value 1e+00 .
+song:n15c0p2 :time 2.2603e+01; :value 1e+00 .
+song:n15c0p3 :time 2.4365e+01; :value 0e+00 .
+
+song:n16 a :Note; :curve song:n16c0; :effectClass effect:downback;
+ :originTime 3.18562e+02 .
+
+song:n16c0 a :Curve; :attr :strength; :point song:n16c0p0, song:n16c0p1, song:n16c0p2, song:n16c0p3 .
+song:n16c0p0 :time -7.361e+00; :value 0e+00 .
+song:n16c0p1 :time -3.873e+00; :value 1e+00 .
+song:n16c0p2 :time 5.261e+00; :value 1e+00 .
+song:n16c0p3 :time 1.1922e+01; :value 0e+00 .
+
+song:n17 a :Note; :curve song:n17c0; :effectClass effect:strobewarm;
+ :originTime 5.646e+02 .
+
+song:n17c0 a :Curve; :attr :strength; :point song:n17c0p0, song:n17c0p1, song:n17c0p2, song:n17c0p3 .
+song:n17c0p0 :time -1.4407e+01; :value 0e+00 .
+song:n17c0p1 :time -1.413e+01; :value 1e+00 .
+song:n17c0p2 :time 3.8147e+01; :value 1e+00 .
+song:n17c0p3 :time 3.8754e+01; :value 0e+00 .
+
+song:n18 a :Note; :curve song:n18c0; :effectClass effect:cyc; :originTime 6.1946e+02;
+ :setting song:n18set0 .
+
+song:n18c0 a :Curve; :attr :strength; :point song:n18c0p0, song:n18c0p1, song:n18c0p2, song:n18c0p3 .
+song:n18c0p0 :time -1.5985e+01; :value 0e+00 .
+song:n18c0p1 :time -1.4907e+01; :value 1e+00 .
+song:n18c0p2 :time 7.9925e+01; :value 1e+00 .
+song:n18c0p3 :time 1.19887e+02; :value 0e+00 .
+song:n18set0 :effectAttr :colorScale; :value "#ffffff" .
+
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 .
diff --git a/show/dance2018/song17.n3 b/show/dance2018/song17.n3
--- a/show/dance2018/song17.n3
+++ b/show/dance2018/song17.n3
@@ -7,7 +7,7 @@
@prefix xml: .
@prefix xsd: .
-show:song17 :note , , .
+show:song17 :note , , , , .
a :Note; :curve ;
:effectClass effect:lightning; :originTime 2.10965e+02 .
@@ -60,11 +60,43 @@ show:song17 :note a :Curve;
:attr :strength; :point , , , .
- :time -1.3314e+01;
+ :time -1.3625e+01;
:value 0e+00 .
- :time -4.017e+00;
+ :time -5.961e+00;
:value 1e+00 .
:time 3.8973e+01;
:value 1e+00 .
:time 4.1162e+01;
:value 0e+00 .
+
+ a :Note; :curve ;
+ :effectClass effect:cyc; :originTime 2.62479e+02; :setting .
+
+ a :Curve;
+ :attr :strength; :point , , , .
+ :time -4.718e+00;
+ :value 0e+00 .
+ :time -2.605e+00;
+ :value 0.5 .
+ :time 4.29e+00;
+ :value 0.5 .
+ :time 5.494e+00;
+ :value 0e+00 .
+ :effectAttr :colorScale;
+ :value "#ffffff" .
+
+ a :Note; :curve ;
+ :effectClass effect:hexfill; :originTime 2.62787e+02; :setting .
+
+ a :Curve;
+ :attr :strength; :point , , , .
+ :time -4.963e+00;
+ :value 0e+00 .
+ :time -2.913e+00;
+ :value 1e+00 .
+ :time 4.202e+00;
+ :value 1e+00 .
+ :time 5.378e+00;
+ :value 0e+00 .
+ :effectAttr :colorScale;
+ :value "#ffff87" .
diff --git a/show/dance2018/song3.n3 b/show/dance2018/song3.n3
--- a/show/dance2018/song3.n3
+++ b/show/dance2018/song3.n3
@@ -7,7 +7,7 @@
@prefix xml: .
@prefix xsd: .
-show:song3 :note , , , .
+show:song3 :note , , , , .
a :Note; :curve ;
:effectClass effect:warm; :originTime 6.12e+00; :setting .
@@ -23,10 +23,10 @@ show:song3 :note :time 1.70341e+02;
:value 0e+00 .
:effectAttr :colorScale;
- :value "#fffefb" .
+ :value "#fffcfb" .
a :Note; :curve ;
- :effectClass effect:chase1; :originTime 2.30794e+02; :setting .
+ :effectClass effect:chase2; :originTime 2.30794e+02; :setting .
a :Curve;
:attr :strength; :point , , , .
@@ -39,7 +39,7 @@ show:song3 :note :time 2.4855e+01;
:value 0e+00 .
:effectAttr :colorScale;
- :value "#8368a6" .
+ :value "#c9a0ff" .
a :Note; :curve ;
:effectClass effect:warm; :originTime 2.24084e+02 .
@@ -70,3 +70,17 @@ show:song3 :note :effectAttr :colorScale;
:value "#301e19" .
+
+ a :Note; :curve ;
+ :effectClass effect:warm; :originTime 6.684e+01 .
+
+ a :Curve;
+ :attr :strength; :point , , , .
+ :time -1.2045e+01;
+ :value 0e+00 .
+ :time -1.0534e+01;
+ :value 1e+00 .
+ :time 4.3647e+01;
+ :value 1e+00 .
+ :time 6.547e+01;
+ :value 0e+00 .