Cleaning some code again

(bzr r8379)

1 files changed, 84 insertions, 84 deletions

diff --git a/share/filters/filters.svg b/share/filters/filters.svg
index a0c2381b0..0c9c9a059 100644
--- a/share/filters/filters.svg
+++ b/share/filters/filters.svg
@@ -387,7 +387,7 @@
 <feDistantLight id="feDistantLight2924" elevation="50" azimuth="235" />
 </feSpecularLighting>
 <feBlend id="feBlend2926" in="result2" in2="result1" result="result5" mode="screen" blend="normal" />
-<feComposite id="feComposite2928" in2="SourceGraphic" result="result4" operator="in" k2="1.5" k3="0.6" in="result5" />
+<feComposite id="feComposite2928" in2="SourceGraphic" result="result4" operator="in" in="result5" />
 </filter>
 <filter id="CrackGlas0" inkscape:label="Cracked glass" inkscape:menu="Textures" inkscape:menu-tooltip="Under a cracked glass" x="-0.1" y="-0.1" width="1.2" height="1.2">
 <feTurbulence id="feTurbulence3501" baseFrequency="0.1" seed="50" numOctaves="5" result="result1" type="fractalNoise" />
@@ -398,9 +398,9 @@
 <feSpecularLighting id="feSpecularLighting3511" surfaceScale="-3" result="result4" specularConstant="3.5" specularExponent="35" in="result6">
 <feDistantLight id="feDistantLight3513" elevation="45" azimuth="225" />
 </feSpecularLighting>
-<feComposite id="feComposite3515" k1="1.7" k4="0" k3="0.7" in2="result2" in="result4" operator="arithmetic" />
+<feComposite id="feComposite3515" k1="1.7" k3="0.7" in2="result2" in="result4" operator="arithmetic" />
 <feBlend id="feBlend3517" result="fbSourceGraphic" mode="multiply" blend="normal" />
-<feComposite id="feComposite3519" in2="fbSourceGraphic" in="fbSourceGraphic" result="result2" operator="arithmetic" k2="0" k1="0" />
+<feComposite id="feComposite3519" in2="fbSourceGraphic" in="fbSourceGraphic" result="result2" operator="arithmetic" />
 <feComposite id="feComposite3521" in="result2" result="result4" operator="arithmetic" k2="2" k3="2" in2="fbSourceGraphic" />
 <feBlend id="feBlend3523" mode="screen" blend="normal" in="result4" in2="result4" />
 </filter>
@@ -410,7 +410,7 @@
 <feGaussianBlur stdDeviation="4" id="feGaussianBlur3023" result="result8" />
 <feDisplacementMap id="feDisplacementMap2993" result="result7" in2="result8" scale="5" in="SourceGraphic" xChannelSelector="R" />
 <feComposite id="feComposite2975" result="result2" operator="in" in2="result1" in="result7" />
-<feComposite id="feComposite2977" k1="0" k4="0" k3="3" k2="0" in2="result2" in="result0" operator="arithmetic" />
+<feComposite id="feComposite2977" k3="3" in2="result2" in="result0" operator="arithmetic" />
 <feBlend id="feBlend2979" result="fbSourceGraphic" mode="multiply" blend="normal" in2="result2" />
 <feColorMatrix id="feColorMatrix2981" type="matrix" values="1 0 0 -1 0 1 0 1 -1 0 1 0 0 -1 0 -1.8 -0.5 0 5.7 -3.5 " in="fbSourceGraphic" result="fbSourceGraphicAlpha" />
 <feGaussianBlur id="feGaussianBlur2983" stdDeviation="0.5" in="fbSourceGraphicAlpha" result="result0" />
@@ -424,7 +424,7 @@
 <feGaussianBlur id="feGaussianBlur3789" stdDeviation="1" result="result1" />
 <feGaussianBlur id="feGaussianBlur3793" stdDeviation="10" result="result6" in="result1" />
 <feComposite id="feComposite3795" operator="atop" in="result6" in2="result1" result="result8" />
-<feComposite id="feComposite3797" operator="xor" result="fbSourceGraphic" in="result6" k1="0" k2="0" k3="0" k4="0" />
+<feComposite id="feComposite3797" operator="xor" result="fbSourceGraphic" in="result6" />
 <feColorMatrix id="feColorMatrix3799" result="fbSourceGraphicAlpha" in="fbSourceGraphic" values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 2 0 " />
 <feGaussianBlur id="feGaussianBlur3801" result="result0" in="fbSourceGraphicAlpha" stdDeviation="1" />
 <feSpecularLighting id="feSpecularLighting3803" specularExponent="35" specularConstant="1.5" surfaceScale="-2" lighting-color="rgb(255,255,255)" result="result1" in="result0">
@@ -513,13 +513,13 @@
 <feBlend id="feBlend3821" blend="normal" in="SourceGraphic" mode="normal" result="result5" in2="result1" />
 <feGaussianBlur id="feGaussianBlur3823" stdDeviation="3" result="result6" in="result5" />
 <feComposite id="feComposite3825" operator="xor" in="result6" in2="result6" result="result8" />
-<feComposite id="feComposite3827" operator="in" result="fbSourceGraphic" in="result6" k2="1" k3="1" k1="-1" k4="0" />
+<feComposite id="feComposite3827" operator="in" result="fbSourceGraphic" in="result6" />
 <feColorMatrix id="feColorMatrix3829" result="fbSourceGraphicAlpha" in="fbSourceGraphic" values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0 " type="matrix" />
 <feGaussianBlur id="feGaussianBlur3831" result="result0" in="fbSourceGraphic" stdDeviation="0.5" />
 <feSpecularLighting id="feSpecularLighting3833" specularExponent="55" specularConstant="2" surfaceScale="2" lighting-color="rgb(255,255,255)" result="result1" in="result0">
 <fePointLight id="fePointLight3835" z="20000" y="-10000" x="-5000" />
 </feSpecularLighting>
-<feComposite id="feComposite3837" operator="arithmetic" result="result2" in="result1" in2="fbSourceGraphicAlpha" k2="0" k1="1" k3="0" k4="0" />
+<feComposite id="feComposite3837" operator="arithmetic" result="result2" in="result1" in2="fbSourceGraphicAlpha" k1="1" />
 <feComposite id="feComposite3839" k3="1" k2="0.5" operator="arithmetic" result="result4" in="fbSourceGraphic" />
 <feComposite id="feComposite3841" operator="over" in="result9" in2="result4" />
 <feBlend id="feBlend3843" blend="normal" mode="screen" />
@@ -569,11 +569,11 @@
 <filter id="IridBees0" inkscape:label="Iridescent beeswax" inkscape:menu="Materials" inkscape:menu-tooltip="Waxy texture which keeps its iridescence through color fill change">
 <feGaussianBlur id="feGaussianBlur4667" result="result0" in="SourceGraphic" stdDeviation="3" />
 <feTurbulence id="feTurbulence4669" type="turbulence" baseFrequency="0.05" seed="200" numOctaves="5" result="result1" />
-<feComposite id="feComposite4671" k4="-1" k1="1.5" k2="1" k3="0" result="result2" operator="in" in2="result1" in="result0" />
+<feComposite id="feComposite4671" result="result2" operator="in" in2="result1" in="result0" />
 <feSpecularLighting id="feSpecularLighting4673" lighting-color="rgb(255,255,255)" surfaceScale="4" result="result4" specularConstant="8" specularExponent="3" in="result2">
 <feDistantLight id="feDistantLight4675" elevation="62" azimuth="225" />
 </feSpecularLighting>
-<feComposite id="feComposite4677" k1="1.8" k4="0" k3="0.8" k2="-0.4" in2="result2" in="result4" operator="arithmetic" />
+<feComposite id="feComposite4677" k1="1.8" k3="0.8" k2="-0.4" in2="result2" in="result4" operator="arithmetic" />
 <feBlend id="feBlend4679" result="fbSourceGraphic" mode="screen" blend="normal" />
 <feComposite id="feComposite4681" in2="fbSourceGraphic" in="result1" result="result2" operator="in" />
 <feComposite id="feComposite4683" in="fbSourceGraphic" result="fbSourceGraphic" operator="arithmetic" k2="2" k3="5" />
@@ -589,13 +589,13 @@
 <feGaussianBlur id="feGaussianBlur3763" result="result0" in="SourceGraphic" stdDeviation="1" />
 <feTurbulence id="feTurbulence3765" type="turbulence" baseFrequency="0.057" seed="4" numOctaves="4" result="result1" />
 <feComposite id="feComposite3767" result="result2" operator="out" in="result0" />
-<feComposite id="feComposite3769" k1="0.1" k3="1.2" k2="0" in2="result2" in="SourceAlpha" operator="arithmetic" result="result5" />
+<feComposite id="feComposite3769" k1="0.1" k3="1.2" in2="result2" in="SourceAlpha" operator="arithmetic" result="result5" />
 <feBlend id="feBlend3771" result="fbSourceGraphic" mode="multiply" blend="normal" />
 <feGaussianBlur id="feGaussianBlur3775" stdDeviation="3" in="fbSourceGraphic" result="result0" />
 <feSpecularLighting id="feSpecularLighting3777" in="result0" result="result1" lighting-color="rgb(254,230,93)" surfaceScale="3" specularConstant="0.4" specularExponent="15">
 <fePointLight id="fePointLight3779" x="-5000" y="-10000" z="20000" />
 </feSpecularLighting>
-<feComposite id="feComposite3781" in2="fbSourceGraphic" in="result1" result="result2" operator="in" k1="0" k3="0" k2="-1" />
+<feComposite id="feComposite3781" in2="fbSourceGraphic" in="result1" result="result2" operator="in" />
 <feComposite id="feComposite3783" k1="-1" in="fbSourceGraphic" result="result4" operator="arithmetic" k2="2.5" k3="3.5" />
 <feBlend id="feBlend3785" mode="multiply" blend="normal" />
 </filter>
@@ -606,7 +606,7 @@
 <feSpecularLighting lighting-color="rgb(255,230,136)" surfaceScale="2" result="result4" specularConstant="2" specularExponent="65" in="result2" id="feSpecularLighting4270">
 <feDistantLight elevation="62" azimuth="225" id="feDistantLight4272" />
 </feSpecularLighting>
-<feComposite k1="2.5" k4="0" k3="1" k2="-0.5" in2="result2" in="result4" operator="arithmetic" id="feComposite4274" />
+<feComposite k1="2.5" k3="1" k2="-0.5" in2="result2" in="result4" operator="arithmetic" id="feComposite4274" />
 <feBlend result="fbSourceGraphic" mode="multiply" id="feBlend4276" blend="normal" />
 <feColorMatrix type="matrix" id="feColorMatrix4278" values="1 0 0 -1 0 1 0 1 -1 0 1 0 0 -1 0 -2 -0.5 0 5 -2" in="fbSourceGraphic" result="fbSourceGraphicAlpha" />
 <feGaussianBlur stdDeviation="8" in="fbSourceGraphicAlpha" result="result0" id="feGaussianBlur4280" />
@@ -636,7 +636,7 @@
 <feGaussianBlur id="feGaussianBlur3654" stdDeviation="0.5" in="SourceGraphic" result="result0" />
 <feTurbulence id="feTurbulence3656" result="result1" numOctaves="1" seed="488" baseFrequency="0.095" type="turbulence" />
 <feComposite id="feComposite3658" in="result0" in2="result1" operator="in" result="result2" />
-<feComposite id="feComposite3660" operator="arithmetic" in="result4" in2="result2" k2="0" k3="1" k4="0" k1="3" />
+<feComposite id="feComposite3660" operator="arithmetic" in="result4" in2="result2" k3="1" k1="3" />
 <feBlend blend="normal" id="feBlend3662" mode="multiply" result="fbSourceGraphic" />
 <feColorMatrix result="fbSourceGraphicAlpha" in="fbSourceGraphic" values="0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 5 0" id="feColorMatrix3664" type="matrix" />
 <feGaussianBlur id="feGaussianBlur3666" result="result0" in="fbSourceGraphicAlpha" stdDeviation="3" />
@@ -644,7 +644,7 @@
 <feSpecularLighting id="feSpecularLighting3670" specularExponent="30" specularConstant="1.1" surfaceScale="2" lighting-color="rgb(111,236,253)" result="result1" in="result0">
 <fePointLight id="fePointLight3672" z="20000" y="-10000" x="-5000" />
 </feSpecularLighting>
-<feComposite k2="-1" k3="0" k1="0" id="feComposite3674" operator="in" result="result2" in="result1" in2="fbSourceGraphicAlpha" />
+<feComposite k2="-1" id="feComposite3674" operator="in" result="result2" in="result1" in2="fbSourceGraphicAlpha" />
 <feComposite id="feComposite3676" k3="1" k2="3" operator="arithmetic" result="result4" in="fbSourceGraphic" />
 <feBlend blend="normal" id="feBlend3678" mode="multiply" />
 </filter>
@@ -669,7 +669,7 @@
 <feTurbulence id="feTurbulence2850" numOctaves="3" baseFrequency="0.08 0.05" type="fractalNoise" seed="7" result="result6" />
 <feGaussianBlur id="feGaussianBlur2852" stdDeviation="0.5" result="result7" />
 <feDisplacementMap id="feDisplacementMap2854" in="result3" xChannelSelector="R" yChannelSelector="G" scale="3" result="result4" in2="result7" />
-<feComposite id="feComposite2856" in="result4" k3="0" k1="1" result="result2" operator="arithmetic" in2="result4" k2="1" />
+<feComposite id="feComposite2856" in="result4" k1="1" result="result2" operator="arithmetic" in2="result4" k2="1" />
 <feBlend id="feBlend2858" in2="result4" mode="normal" blend="normal" in="result2" />
 </filter>
 <filter id="filter3570" inkscape:label="Refractive gel A" inkscape:menu="Ridges" inkscape:menu-tooltip="Gel effect with light refraction" height="1.4" width="1.4" y="-0.2" x="-0.2">
@@ -750,7 +750,7 @@
 <feGaussianBlur id="feGaussianBlur3877" stdDeviation="1" result="result1" />
 <feGaussianBlur id="feGaussianBlur3881" stdDeviation="8" result="result6" in="result1" />
 <feComposite id="feComposite3883" operator="atop" in="result6" in2="result1" result="result8" />
-<feComposite id="feComposite3885" operator="xor" result="fbSourceGraphic" in="result6" k1="0" k2="0" k3="0" k4="0" />
+<feComposite id="feComposite3885" operator="xor" result="fbSourceGraphic" in="result6" />
 <feColorMatrix id="feColorMatrix3887" result="fbSourceGraphicAlpha" in="fbSourceGraphic" values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 2 0 " type="matrix" />
 <feGaussianBlur id="feGaussianBlur3889" result="result0" in="fbSourceGraphicAlpha" stdDeviation="2.5" />
 <feSpecularLighting id="feSpecularLighting3891" specularExponent="35" specularConstant="1" surfaceScale="4" lighting-color="rgb(255,255,255)" result="result1" in="result0">
@@ -766,7 +766,7 @@
 <feGaussianBlur stdDeviation="1" id="feGaussianBlur3755" />
 <feDisplacementMap id="feDisplacementMap3737" numOctaves="2" scale="15" yChannelSelector="G" xChannelSelector="R" in="SourceGraphic" />
 <feGaussianBlur id="feGaussianBlur3739" stdDeviation="1.5" />
-<feComposite id="feComposite3741" result="fbSourceGraphic" k4="-0.3" k1="0" k3="1" k2="1" operator="arithmetic" />
+<feComposite id="feComposite3741" result="fbSourceGraphic" k4="-0.3" k3="1" k2="1" operator="arithmetic" />
 <feGaussianBlur id="feGaussianBlur3743" stdDeviation="3.5" in="fbSourceGraphic" result="result0" />
 <feSpecularLighting id="feSpecularLighting3745" in="result0" result="result1" lighting-color="rgb(255,255,255)" surfaceScale="3" specularConstant="1" specularExponent="55">
 <feDistantLight id="feDistantLight3747" azimuth="235" elevation="65" />
@@ -785,7 +785,7 @@
 </filter>
 <filter id="Paralhol0" inkscape:label="Parallel hollow" inkscape:menu="Morphology" inkscape:menu-tooltip="A blurry hollow going parallel to the edge on the inside">
 <feGaussianBlur id="feGaussianBlur3582" stdDeviation="7.5" in="SourceAlpha" result="result1" />
-<feComposite id="feComposite3584" operator="arithmetic" k2="3.2" k3="0" k1="-1" k4="-2" />
+<feComposite id="feComposite3584" operator="arithmetic" k2="3.2" k1="-1" k4="-2" />
 <feColorMatrix id="feColorMatrix3586" values="0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 3 0 " />
 <feComposite id="feComposite3588" result="fbSourceGraphic" in="SourceGraphic" operator="out" />
 <feGaussianBlur id="feGaussianBlur3590" in="fbSourceGraphic" stdDeviation="2" />
@@ -795,7 +795,7 @@
 </filter>
 <filter id="Hole0" inkscape:label="Hole" inkscape:menu="Morphology" inkscape:menu-tooltip="Opens a smooth hole inside the shape">
 <feGaussianBlur id="feGaussianBlur2864" stdDeviation="12" in="SourceAlpha" result="result1" />
-<feComposite id="feComposite2866" operator="arithmetic" k2="3.5" k3="0" k1="0" k4="-2" result="result2" />
+<feComposite id="feComposite2866" operator="arithmetic" k2="3.5" k4="-2" result="result2" />
 <feComposite id="feComposite2868" in="SourceGraphic" operator="out" in2="result2" />
 <feBlend id="feBlend2870" blend="normal" mode="darken" />
 </filter>
@@ -811,7 +811,7 @@
 <feGaussianBlur id="feGaussianBlur3142" stdDeviation="4" />
 <feColorMatrix id="feColorMatrix3144" result="fbSourceGraphic" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 7 -4 " type="matrix" />
 <feGaussianBlur stdDeviation="0.7" id="feGaussianBlur3150" />
-<feComposite id="feComposite3146" operator="xor" k2="0" k1="0" k3="0" />
+<feComposite id="feComposite3146" operator="xor" />
 <feBlend id="feBlend3148" blend="normal" mode="darken" />
 </filter>
 <filter id="Cub0" inkscape:label="Cubes" inkscape:menu="Scatter" inkscape:menu-tooltip="Scattered cubes; adjust the Morphology primitive to vary size">
@@ -890,7 +890,7 @@
 <feSpecularLighting id="feSpecularLighting3503" surfaceScale="1.5" result="result4" specularConstant="1" specularExponent="30" in="result2">
 <feDistantLight id="feDistantLight3505" elevation="70" azimuth="235" />
 </feSpecularLighting>
-<feComposite id="feComposite3507" in2="result2" in="result4" operator="atop" k2="0" k1="1" k3="1" k4="1" result="result5" />
+<feComposite id="feComposite3507" in2="result2" in="result4" operator="atop" result="result5" />
 <feBlend id="feBlend3509" mode="multiply" blend="normal" result="result6" />
 <feBlend id="feBlend3511" blend="normal" mode="screen" in="result6" />
 </filter>
@@ -901,7 +901,7 @@
 <feSpecularLighting id="feSpecularLighting3737" surfaceScale="3" result="result4" specularConstant="3.94" specularExponent="40" lighting-color="rgb(226,252,180)" in="result2">
 <feDistantLight id="feDistantLight3739" elevation="80" azimuth="265" />
 </feSpecularLighting>
-<feComposite id="feComposite3741" k1="5" k4="0" k3="0.5" k2="0" in2="result2" in="result4" operator="arithmetic" />
+<feComposite id="feComposite3741" k1="5" k3="0.5" in2="result2" in="result4" operator="arithmetic" />
 <feBlend id="feBlend3743" result="fbSourceGraphic" mode="darken" blend="normal" />
 <feGaussianBlur id="feGaussianBlur3747" stdDeviation="5" in="fbSourceGraphic" result="result0" />
 <feSpecularLighting id="feSpecularLighting3751" in="result0" result="result1" lighting-color="rgb(250,224,108)" surfaceScale="4" specularConstant="0.8" specularExponent="20">
@@ -918,7 +918,7 @@
 <feDistantLight id="feDistantLight3146" azimuth="235" elevation="40" />
 </feDiffuseLighting>
 <feComposite id="feComposite3148" operator="in" in="result3" in2="result1" result="result2" />
-<feComposite id="feComposite3150" in2="result1" result="result5" operator="arithmetic" k2="0" k3="0" k1="1.7" />
+<feComposite id="feComposite3150" in2="result1" result="result5" operator="arithmetic" k1="1.7" />
 <feBlend id="feBlend3152" in="result5" in2="result3" blend="normal" mode="normal" />
 </filter>
 <filter id="RoughGloss0" inkscape:label="Rough and glossy" inkscape:menu="Textures" inkscape:menu-tooltip="Crumpled glossy paper effect which can be used for pictures as for objects">
@@ -929,8 +929,8 @@
 <feSpecularLighting id="feSpecularLighting3016" in="result0" surfaceScale="3" specularConstant="1" specularExponent="25" kernelUnitLength="1" result="result3">
 <feDistantLight id="feDistantLight3018" azimuth="235" elevation="55" />
 </feSpecularLighting>
-<feComposite id="feComposite3020" in="result1" in2="SourceGraphic" operator="arithmetic" k1="1" k2="0" k3="0" result="result2" />
-<feComposite id="feComposite3022" in="result2" in2="result3" operator="arithmetic" k1="0" k2="1" k3="1" k4="0" result="result4" />
+<feComposite id="feComposite3020" in="result1" in2="SourceGraphic" operator="arithmetic" k1="1" result="result2" />
+<feComposite id="feComposite3022" in="result2" in2="result3" operator="arithmetic" k2="1" k3="1" result="result4" />
 <feComposite id="feComposite3024" in2="SourceAlpha" operator="in" in="result4" result="fbSourceGraphic" />
 <feDisplacementMap id="feDisplacementMap3026" numOctaves="2" scale="7" yChannelSelector="G" xChannelSelector="R" in2="result0" />
 </filter>
@@ -951,11 +951,11 @@
 <feColorMatrix id="feColorMatrix2962" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 " result="fbSourceGraphic" type="matrix" />
 <feGaussianBlur id="feGaussianBlur2964" stdDeviation="3" result="result1" />
 <feOffset id="feOffset2966" dx="2" dy="2" result="result6" />
-<feComposite id="feComposite2968" k4="0" k2="2" operator="in" result="result2" in="result6" in2="result1" />
+<feComposite id="feComposite2968" k2="2" operator="in" result="result2" in="result6" in2="result1" />
 <feColorMatrix id="feColorMatrix2970" values="110" result="result3" type="hueRotate" />
 <feBlend id="feBlend2972" mode="screen" blend="normal" in="result2" in2="result3" result="result4" />
 <feConvolveMatrix id="feConvolveMatrix2974" order="3 3" kernelMatrix="-2 0 2 0 4 0 2 0 2" divisor="2" bias="0" targetX="0" in="result4" result="result5" />
-<feComposite id="feComposite2976" operator="atop" in="result2" k2="3" k3="3" k1="0" k4="0" />
+<feComposite id="feComposite2976" operator="atop" in="result2" />
 </filter>
 <filter id="Coolouts0" inkscape:label="Cool outside" inkscape:menu="Morphology" inkscape:menu-tooltip="Blurred colorized contour, empty inside">
 <feGaussianBlur id="feGaussianBlur2998" stdDeviation="2" result="result1" />
@@ -999,7 +999,7 @@
 </filter>
 <filter id="InnerOutlin0" inkscape:label="Inner outline" inkscape:menu="Morphology" inkscape:menu-tooltip="Draws an outline around">
 <feGaussianBlur id="feGaussianBlur2915" result="result1" in="SourceAlpha" stdDeviation="3" />
-<feComposite id="feComposite2917" result="result3" k4="-2" k1="-1" k3="0" k2="3.2" operator="arithmetic" />
+<feComposite id="feComposite2917" result="result3" k4="-2" k1="-1" k2="3.2" operator="arithmetic" />
 <feColorMatrix id="feColorMatrix2919" result="result2" values="0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 10 0 " type="matrix" />
 <feComposite id="feComposite2921" operator="out" in="SourceGraphic" result="fbSourceGraphic" />
 <feBlend id="feBlend2929" blend="normal" mode="darken" in2="fbSourceGraphic" in="fbSourceGraphic" />
@@ -1010,13 +1010,13 @@
 <feColorMatrix id="feColorMatrix3230" type="matrix" values="0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 10 0 " result="result2" />
 <feComposite id="feComposite3232" result="fbSourceGraphic" in="SourceGraphic" operator="out" />
 <feGaussianBlur id="feGaussianBlur3234" in="fbSourceGraphic" stdDeviation="0.5" result="result4" />
-<feComposite id="feComposite3236" k3="0" k1="0" k2="0" operator="xor" in="result4" result="result5" />
+<feComposite id="feComposite3236" operator="xor" in="result4" result="result5" />
 <feBlend id="feBlend3238" result="result6" blend="normal" mode="darken" in="result5" />
 <feBlend id="feBlend3240" in="result6" in2="result6" mode="darken" blend="normal" />
 </filter>
 <filter id="Fancyblur0" inkscape:label="Fancy blur" inkscape:menu="Blurs" inkscape:menu-tooltip="Smooth colorized contour which allows desaturation and hue rotation">
 <feGaussianBlur id="feGaussianBlur3040" stdDeviation="5" result="result1" />
-<feComposite id="feComposite3042" operator="arithmetic" k2="2" k1="0" k3="0" in="result1" />
+<feComposite id="feComposite3042" operator="arithmetic" k2="2" in="result1" />
 </filter>
 <filter id="filter3956" inkscape:label="Glow" inkscape:menu="Shadows and Glows" inkscape:menu-tooltip="Glow of object's own color at the edges">
 <feGaussianBlur stdDeviation="5" id="feGaussianBlur3958" />
@@ -1025,7 +1025,7 @@
 <filter id="OutLine0" inkscape:label="Outline" inkscape:menu="Morphology" inkscape:menu-tooltip="Adds a glowing blur and removes the shape">
 <feGaussianBlur id="feGaussianBlur2848" stdDeviation="5" result="result2" />
 <feColorMatrix id="feColorMatrix2852" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 10 -2 " result="result1" />
-<feComposite id="feComposite2850" operator="arithmetic" in="SourceGraphic" k2="-1" k1="0" k3="1" k4="0" in2="result1" />
+<feComposite id="feComposite2850" operator="arithmetic" in="SourceGraphic" k2="-1" k3="1" in2="result1" />
 </filter>
 <filter inkscape:label="Color emboss" x="0" y="0" width="1" height="1" inkscape:menu="Bumps" inkscape:menu-tooltip="Classic or colorized emboss effect: grayscale, color and 3D relief" id="ColEmboss0">
 <feColorMatrix type="luminanceToAlpha" result="result2" id="feColorMatrix3067" />
@@ -1033,7 +1033,7 @@
 <feDistantLight azimuth="225" elevation="25" id="feDistantLight3071" />
 </feDiffuseLighting>
 <feFlood flood-opacity="0.5" result="result3" flood-color="rgb(86,172,140)" in="SourceGraphic" id="feFlood3073" />
-<feComposite result="result4" in2="result3" operator="arithmetic" in="result1" k1="0.5" k2="0.5" k3="1" k4="0" id="feComposite3075" />
+<feComposite result="result4" in2="result3" operator="arithmetic" in="result1" k1="0.5" k2="0.5" k3="1" id="feComposite3075" />
 <feBlend mode="lighten" in2="SourceGraphic" blend="normal" in="result4" id="feBlend3077" />
 <feComposite in2="SourceGraphic" operator="in" id="feComposite3079" />
 <feComposite in2="SourceGraphic" operator="in" id="feComposite3081" />
@@ -1057,7 +1057,7 @@
 </filter>
 <filter id="Softfoc0" inkscape:label="Soft focus lens" inkscape:menu="Image effects" inkscape:menu-tooltip="Glowing image content without blurring it" height="1" y="0" width="1" x="0">
 <feGaussianBlur id="feGaussianBlur2936" stdDeviation="5" result="result3" />
-<feComposite id="feComposite2938" in2="result3" operator="arithmetic" in="result3" k2="0" k1="0.5" k3="0.5" k4="0" result="result1" />
+<feComposite id="feComposite2938" in2="result3" operator="arithmetic" in="result3" k1="0.5" k3="0.5" result="result1" />
 <feBlend id="feBlend2940" in2="result1" result="result5" blend="normal" mode="screen" in="SourceGraphic" />
 <feBlend id="feBlend2942" blend="normal" mode="darken" in="result5" result="result6" />
 </filter>
@@ -1095,7 +1095,7 @@
 <feSpecularLighting id="feSpecularLighting3111" in="result0" result="result1" lighting-color="rgb(255,255,255)" surfaceScale="-2" specularConstant="1.5" specularExponent="10">
 <feDistantLight id="feDistantLight3113" elevation="50" azimuth="235" />
 </feSpecularLighting>
-<feComposite id="feComposite3115" result="result4" operator="in" k2="1.5" k3="0.6" in="SourceGraphic" in2="result1" />
+<feComposite id="feComposite3115" result="result4" operator="in" in="SourceGraphic" in2="result1" />
 <feComposite id="feComposite3117" operator="arithmetic" k2="1" k3="1" />
 </filter>
 <filter id="BubBumAl0" inkscape:label="Bubbly Bumps alpha" inkscape:menu="Image effects, transparent" inkscape:menu-tooltip="Same than Bubbly Bumps but with transparent highlights">
@@ -1104,7 +1104,7 @@
 <feGaussianBlur id="feGaussianBlur2907" stdDeviation="4" result="result8" />
 <feDisplacementMap id="feDisplacementMap2909" result="result7" in2="result8" scale="5" in="SourceGraphic" xChannelSelector="R" />
 <feComposite id="feComposite2912" result="result2" operator="in" in2="result1" in="result7" />
-<feComposite id="feComposite2914" k1="0" k4="0" k3="3" k2="0" in2="result2" in="result0" operator="arithmetic" />
+<feComposite id="feComposite2914" k3="3" in2="result2" in="result0" operator="arithmetic" />
 <feBlend id="feBlend2916" result="fbSourceGraphic" mode="multiply" blend="normal" in2="result2" />
 <feColorMatrix id="feColorMatrix2918" type="matrix" values="1 0 0 -1 0 1 0 1 -1 0 1 0 0 -1 0 -1.8 -0.5 0 5.7 -3.5 " in="fbSourceGraphic" result="fbSourceGraphicAlpha" />
 <feGaussianBlur id="feGaussianBlur2920" stdDeviation="0.5" in="fbSourceGraphicAlpha" result="result0" />
@@ -1268,7 +1268,7 @@
 <feDiffuseLighting diffuseConstant="0.5" result="result1" surfaceScale="10" id="feDiffuseLighting3049">
 <fePointLight z="20000" y="-10000" x="-5000" id="fePointLight3051" />
 </feDiffuseLighting>
-<feComposite result="result3" k3="0.5" k2="0" k1="1.5" in="result1" operator="arithmetic" in2="SourceGraphic" id="feComposite3053" />
+<feComposite result="result3" k3="0.5" k1="1.5" in="result1" operator="arithmetic" in2="SourceGraphic" id="feComposite3053" />
 <feComposite result="result5" operator="in" in="result3" id="feComposite3055" />
 <feBlend result="result6" in2="result1" mode="lighten" in="result5" blend="normal" id="feBlend3057" />
 <feComposite in2="SourceGraphic" in="result6" operator="in" id="feComposite3059" />
@@ -1332,7 +1332,7 @@
 <feComposite id="feComposite2880" in2="result8" result="result6" operator="over" in="result7" />
 <feColorMatrix id="feColorMatrix2882" result="result9" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 6 -4 " />
 <feDisplacementMap id="feDisplacementMap2884" in="result7" in2="result9" xChannelSelector="A" yChannelSelector="A" scale="50" result="result4" />
-<feComposite id="feComposite2886" in2="result4" result="result2" operator="in" in="result8" k2="0" />
+<feComposite id="feComposite2886" in2="result4" result="result2" operator="in" in="result8" />
 <feComposite id="feComposite2888" result="fbSourceGraphic" in="result2" operator="in" in2="result9" />
 <feComposite id="feComposite2892" operator="arithmetic" k2="1" k1="0.5" in="fbSourceGraphic" />
 <feBlend id="feBlend2890" in="fbSourceGraphic" mode="multiply" blend="normal" />
@@ -1344,7 +1344,7 @@
 <feGaussianBlur id="feGaussianBlur2850" result="result4" in="result2" stdDeviation="5" />
 <feComposite id="feComposite2852" result="result6" k1="1" k3="1" k2="0.5" in="result0" in2="result4" operator="arithmetic" />
 <feComposite id="feComposite2854" in="result6" in2="result0" operator="in" />
-<feComposite id="feComposite2856" operator="arithmetic" k1="1.5" in="result2" k3="0" k2="0" />
+<feComposite id="feComposite2856" operator="arithmetic" k1="1.5" in="result2" />
 </filter>
 <filter id="Inkp0" inkscape:label="Ink paint" inkscape:menu="Textures" inkscape:menu-tooltip="Ink paint on paper with some turbulent color shift" height="1.3" y="-0.15" width="1.3" x="-0.15">
 <feTurbulence id="feTurbulence2929" type="fractalNoise" baseFrequency="0.07" numOctaves="4" result="result0" />
@@ -1352,13 +1352,13 @@
 <feBlend id="feBlend2933" result="result5" in="result2" mode="multiply" blend="normal" />
 <feGaussianBlur id="feGaussianBlur2935" stdDeviation="10" in="result2" result="result4" />
 <feComposite id="feComposite2937" operator="arithmetic" in2="result4" in="result0" k3="0.5" k1="2" result="result6" />
-<feComposite id="feComposite2939" operator="in" in2="result5" in="result6" k1="1" k3="1" k2="1" result="result7" />
+<feComposite id="feComposite2939" operator="in" in2="result5" in="result6" result="result7" />
 </filter>
 <filter id="Tintrain0" x="-0.25" width="1.5" y="-0.25" height="1.5" inkscape:menu-tooltip="Smooth rainbow colors melted along the edges and colorizable" inkscape:menu="Textures" inkscape:label="Tinted rainbow">
 <feGaussianBlur id="feGaussianBlur2920" result="result8" stdDeviation="5" />
 <feTurbulence id="feTurbulence2922" baseFrequency="0.015" numOctaves="2" type="fractalNoise" result="result7" seed="20" />
 <feComposite id="feComposite2924" in="SourceGraphic" operator="in" result="result6" in2="result8" />
-<feComposite id="feComposite2928" in="result6" operator="arithmetic" result="result2" in2="result7" k2="0" k1="0" k3="1.7" />
+<feComposite id="feComposite2928" in="result6" operator="arithmetic" result="result2" in2="result7" k3="1.7" />
 <feComposite id="feComposite2930" in2="result6" operator="in" in="result2" result="fbSourceGraphic" />
 <feComposite id="feComposite2934" in2="SourceGraphic" in="fbSourceGraphic" k3="0.3" k2="1.5" operator="arithmetic" result="result9" />
 </filter>
@@ -1366,14 +1366,14 @@
 <feGaussianBlur id="feGaussianBlur2900" result="result8" stdDeviation="5" />
 <feTurbulence id="feTurbulence2902" baseFrequency="0.015" numOctaves="2" type="fractalNoise" result="result7" seed="20" />
 <feComposite id="feComposite2904" in="SourceGraphic" operator="in" result="result6" in2="result8" />
-<feComposite id="feComposite2908" in="result6" operator="arithmetic" result="result2" in2="result7" k2="0" k1="0" k3="1" />
+<feComposite id="feComposite2908" in="result6" operator="arithmetic" result="result2" in2="result7" k3="1" />
 <feComposite id="feComposite2910" in2="result6" operator="in" in="result2" result="fbSourceGraphic" />
-<feComposite id="feComposite2914" in2="fbSourceGraphic" in="fbSourceGraphic" k3="0" k1="0" k2="2.5" operator="arithmetic" />
+<feComposite id="feComposite2914" in2="fbSourceGraphic" in="fbSourceGraphic" k2="2.5" operator="arithmetic" />
 </filter>
 <filter id="Flexmet0" inkscape:label="Flex metal" inkscape:menu="Materials" inkscape:menu-tooltip="Bright, polished uneven metal casting, colorizable" height="1.5" y="-0.25" width="1.5" x="-0.25">
 <feGaussianBlur id="feGaussianBlur3245" stdDeviation="5" result="result8" />
 <feTurbulence id="feTurbulence3247" seed="25" result="result7" type="turbulence" numOctaves="2" baseFrequency="0.03" />
-<feComposite id="feComposite3251" in2="result8" result="result6" operator="in" in="result8" k2="0" k1="0" k3="0" />
+<feComposite id="feComposite3251" in2="result8" result="result6" operator="in" in="result8" />
 <feDisplacementMap id="feDisplacementMap3253" in="result7" in2="result6" xChannelSelector="A" yChannelSelector="A" scale="120" result="result4" />
 <feComposite id="feComposite3255" in2="result4" result="result2" operator="arithmetic" in="SourceGraphic" k1="2" k3="2.5" k2="0.25" />
 <feComposite id="feComposite3257" result="fbSourceGraphic" in="result2" operator="in" in2="SourceGraphic" />
@@ -1384,21 +1384,21 @@
 <feGaussianBlur stdDeviation="7" result="result8" id="feGaussianBlur2856" />
 <feComposite in2="result8" result="result6" operator="xor" in="result8" id="feComposite2858" />
 <feDisplacementMap in="SourceGraphic" in2="result6" xChannelSelector="A" yChannelSelector="A" scale="100" result="result4" id="feDisplacementMap2860" />
-<feComposite in2="result4" result="result2" operator="arithmetic" in="SourceGraphic" k1="1" k3="0" k2="0" id="feComposite2862" />
+<feComposite in2="result4" result="result2" operator="arithmetic" in="SourceGraphic" k1="1" id="feComposite2862" />
 <feComposite result="fbSourceGraphic" in="result6" operator="in" in2="result2" id="feComposite2864" />
 </filter>
 <filter inkscape:label="Comics fading" inkscape:menu-tooltip="Cartoon paint style with some fading at the edges" inkscape:menu="Non realistic 3D shaders" height="1.5" y="-0.25" width="1.5" x="-0.25" id="Comfdgnr0">
 <feGaussianBlur stdDeviation="7" result="result8" id="feGaussianBlur2856-5" />
-<feComposite in2="result8" result="result6" operator="xor" in="result8" k2="0" k1="0" k3="0" id="feComposite2858-6" />
+<feComposite in2="result8" result="result6" operator="xor" in="result8" id="feComposite2858-6" />
 <feDisplacementMap in="SourceGraphic" in2="result6" xChannelSelector="A" yChannelSelector="A" scale="100" result="result4" id="feDisplacementMap2860-1" />
-<feComposite in2="result4" result="result2" operator="arithmetic" in="SourceGraphic" k1="1" k3="0" k2="0" id="feComposite2862-1" />
+<feComposite in2="result4" result="result2" operator="arithmetic" in="SourceGraphic" k1="1" id="feComposite2862-1" />
 <feComposite result="fbSourceGraphic" in="result8" operator="in" in2="result2" id="feComposite2864-5" />
 </filter>
 <filter inkscape:label="Smooth shader NR" inkscape:menu-tooltip="Smooth shading with a graphite pencil grey" inkscape:menu="Non realistic 3D shaders" height="1.5" y="-0.25" width="1.5" x="-0.25" id="Smoothshdnr0">
 <feGaussianBlur stdDeviation="7" result="result8" id="feGaussianBlur2856-8-6" />
-<feComposite in2="result8" result="result6" operator="xor" in="result8" k2="0" k1="0" k3="0" id="feComposite2858-5-3" />
+<feComposite in2="result8" result="result6" operator="xor" in="result8" id="feComposite2858-5-3" />
 <feDisplacementMap in="result8" in2="result6" xChannelSelector="A" yChannelSelector="A" scale="75" result="result4" id="feDisplacementMap2860-0-1" />
-<feComposite in2="result4" result="result2" operator="arithmetic" in="SourceGraphic" k1="1" k3="0" k2="0" id="feComposite2862-9-7" />
+<feComposite in2="result4" result="result2" operator="arithmetic" in="SourceGraphic" k1="1" id="feComposite2862-9-7" />
 <feComposite result="fbSourceGraphic" in="result8" operator="in" in2="result2" id="feComposite2864-6-5" />
 </filter>
 <filter id="Embossshdnr0" x="-0.25" width="1.5" y="-0.25" height="1.5" inkscape:menu="Non realistic 3D shaders" inkscape:menu-tooltip="Combination of smooth shading and embossing" inkscape:label="Emboss shader NR">
@@ -1430,7 +1430,7 @@
 </filter>
 <filter x="-0.25" width="1.5" y="-0.25" height="1.5" inkscape:menu="Non realistic 3D shaders" inkscape:menu-tooltip="Non realistic frosted glass imitation" inkscape:label="Frosted glass NR" id="Frglassnr">
 <feGaussianBlur result="result8" stdDeviation="7" id="feGaussianBlur3072" />
-<feComposite k3="0" k1="0" k2="0" in="result8" operator="xor" result="result6" in2="result8" id="feComposite3074" />
+<feComposite in="result8" operator="xor" result="result6" in2="result8" id="feComposite3074" />
 <feDisplacementMap result="result4" scale="75" yChannelSelector="A" xChannelSelector="A" in2="result6" in="result6" id="feDisplacementMap3076" />
 <feComposite k1="2" in="SourceGraphic" operator="arithmetic" result="result2" in2="result4" id="feComposite3078" />
 <feComposite in2="result2" operator="in" in="result6" result="fbSourceGraphic" id="feComposite3080" />
@@ -1457,16 +1457,16 @@
 </filter>
 <filter id="Chromnr0" x="-0.25" width="1.5" y="-0.25" height="1.5" inkscape:menu="Non realistic 3D shaders" inkscape:menu-tooltip="Non realistic chrome shader with strong speculars" inkscape:label="Chrome NR">
 <feGaussianBlur id="feGaussianBlur2984-8" result="result8" stdDeviation="4" />
-<feComposite id="feComposite2986-5" k3="0" k1="0" k2="0" in="result8" operator="xor" result="result6" in2="result8" />
+<feComposite id="feComposite2986-5" in="result8" operator="xor" result="result6" in2="result8" />
 <feDisplacementMap id="feDisplacementMap2988-0" result="result4" scale="80" yChannelSelector="A" xChannelSelector="A" in2="result6" in="result6" />
 <feComposite id="feComposite2990-9" k1="3" in="result8" operator="arithmetic" result="result2" in2="result4" />
 <feComposite id="feComposite2992-6" in2="result2" operator="in" in="result2" result="fbSourceGraphic" />
 </filter>
 <filter inkscape:label="Chrome dark NR" inkscape:menu-tooltip="Dark version of chrome shading with a ground reflection simulation" inkscape:menu="Non realistic 3D shaders" height="1.5" y="-0.25" width="1.5" x="-0.25" id="Chromdrknr0">
 <feGaussianBlur stdDeviation="3.5" result="result8" id="feGaussianBlur3100" />
-<feComposite in2="result8" result="result6" operator="xor" in="result8" k2="0" k1="0" k3="0" id="feComposite3102" />
+<feComposite in2="result8" result="result6" operator="xor" in="result8" id="feComposite3102" />
 <feDisplacementMap in="result8" in2="result6" xChannelSelector="A" yChannelSelector="A" scale="75" result="result4" id="feDisplacementMap3104" />
-<feComposite in2="result4" result="result2" operator="arithmetic" in="result8" k1="3" k3="0" k2="0" id="feComposite3106" />
+<feComposite in2="result4" result="result2" operator="arithmetic" in="result8" k1="3" id="feComposite3106" />
 <feComposite result="fbSourceGraphic" in="result2" operator="in" in2="result2" id="feComposite3108" />
 </filter>
 <filter id="Wavytart0" inkscape:label="Wavy tartan" inkscape:menu="Overlays" inkscape:menu-tooltip="Tartan pattern with a wavy displacement and bevel around the edges" x="-0.25" width="1.5" y="-0.25" height="1.5">
@@ -1475,9 +1475,9 @@
 <feComposite id="feComposite2872" result="result1" operator="arithmetic" in2="result3" in="result0" k2="1" k3="1" k1="3" />
 <feComposite id="feComposite2880" result="fbSourceGraphic" in="SourceGraphic" operator="in" />
 <feGaussianBlur id="feGaussianBlur2882" result="result8" stdDeviation="10" in="fbSourceGraphic" />
-<feComposite id="feComposite2884" k3="0" k1="0" k2="0" in="result8" operator="xor" result="result6" in2="result8" />
+<feComposite id="feComposite2884" in="result8" operator="xor" result="result6" in2="result8" />
 <feDisplacementMap id="feDisplacementMap2886" result="result4" scale="75" yChannelSelector="A" xChannelSelector="A" in2="result6" in="result1" />
-<feComposite id="feComposite2888" k2="0" k3="0" k1="1" in="SourceGraphic" operator="in" result="result2" in2="result4" />
+<feComposite id="feComposite2888" k1="1" in="SourceGraphic" operator="in" result="result2" in2="result4" />
 </filter>
 <filter id="3Dmarble0" inkscape:label="3D marble" inkscape:menu="Materials" inkscape:menu-tooltip="3D warped marble texture" height="1.5" y="-0.25" width="1.5" x="-0.25">
 <feGaussianBlur id="feGaussianBlur2974" stdDeviation="4" result="result8" />
@@ -1509,7 +1509,7 @@
 <feDistantLight id="feDistantLight4921" azimuth="235" elevation="50" />
 </feSpecularLighting>
 <feComposite id="feComposite4923" operator="in" result="result2" in="result1" in2="result9" />
-<feComposite id="feComposite4925" k3="0.5" k2="0.5" operator="arithmetic" result="result4" in="result9" k1="0" />
+<feComposite id="feComposite4925" k3="0.5" k2="0.5" operator="arithmetic" result="result4" in="result9" />
 <feConvolveMatrix id="feConvolveMatrix4927" order="3 3" kernelMatrix="2 0 0 0 2 0 0 0 -2 " targetX="2" targetY="2" result="result10" />
 <feBlend id="feBlend4929" blend="normal" mode="multiply" in="result10" />
 </filter>
@@ -1534,9 +1534,9 @@
 <feComposite id="feComposite2912" result="result1" operator="over" in2="result0" in="result0" />
 <feComposite id="feComposite2914" result="fbSourceGraphic" in="SourceGraphic" operator="arithmetic" in2="result1" k1="1" />
 <feGaussianBlur id="feGaussianBlur2916" stdDeviation="10" result="result8" in="fbSourceGraphic" />
-<feComposite id="feComposite2918" in2="result8" result="result6" operator="xor" in="result8" k2="0" k1="0" k3="0" />
+<feComposite id="feComposite2918" in2="result8" result="result6" operator="xor" in="result8" />
 <feDisplacementMap id="feDisplacementMap2920" xChannelSelector="A" yChannelSelector="A" scale="100" result="result4" in="result1" in2="result6" />
-<feComposite id="feComposite2922" in2="result4" result="result2" operator="arithmetic" k1="1" k3="0" k2="0" in="SourceGraphic" />
+<feComposite id="feComposite2922" in2="result4" result="result2" operator="arithmetic" k1="1" in="SourceGraphic" />
 <feComposite operator="out" id="feComposite2924" in="SourceGraphic" />
 </filter>
 <filter id="ShakenLiq0" x="-0.25" width="1.5" y="-0.5" height="2" inkscape:menu-tooltip="Colorizable filling with flow inside like transparency" inkscape:menu="Textures" inkscape:label="Shaken liquid">
@@ -1553,7 +1553,7 @@
 <feTurbulence baseFrequency="0.02 0.02" numOctaves="1" type="turbulence" result="result7" seed="77" id="feTurbulence3358" />
 <feComposite in="result8" operator="xor" result="result6" in2="result7" id="feComposite3362" />
 <feDisplacementMap result="result4" scale="170" yChannelSelector="A" xChannelSelector="A" in2="result6" in="SourceGraphic" id="feDisplacementMap3364" />
-<feComposite in="result4" operator="arithmetic" result="result2" in2="SourceGraphic" id="feComposite3366" k1="1" k3="0" />
+<feComposite in="result4" operator="arithmetic" result="result2" in2="SourceGraphic" id="feComposite3366" k1="1" />
 <feComposite in2="result2" operator="out" in="SourceGraphic" result="fbSourceGraphic" id="feComposite3368" />
 </filter>
 <filter id="BlacLi0" inkscape:label="Black Light" inkscape:menu="Color" inkscape:menu-tooltip="Light areas turn to black" x="0" width="1" y="0" height="1">
@@ -1580,18 +1580,18 @@
 <feColorMatrix result="result4" values="0" type="saturate" id="feColorMatrix3786" />
 <feComposite id="feComposite3784" in="SourceGraphic" in2="result4" operator="arithmetic" k1="1.25" k2="0.5" k3="0.5" result="result2" />
 <feBlend result="result5" mode="normal" in="result2" in2="SourceGraphic" id="feBlend3788" blend="normal" />
-<feComposite id="feComposite3790" in="result5" in2="SourceGraphic" operator="in" k1="1" k2="1.2" result="result3" />
+<feComposite id="feComposite3790" in="result5" in2="SourceGraphic" operator="in" result="result3" />
 </filter>
 <filter id="Hslbumptr0" inkscape:menu-tooltip="Highly flexible specular bump with transparency" inkscape:menu="Bumps" inkscape:label="HSL Bumps, transparent">
 <feGaussianBlur id="feGaussianBlur2966" result="result0" in="SourceGraphic" stdDeviation="0.5" />
-<feComposite id="feComposite2968" k3="0.5" k2="0" k1="0.5" in2="result0" in="result0" result="result2" operator="arithmetic" />
+<feComposite id="feComposite2968" k3="0.5" k1="0.5" in2="result0" in="result0" result="result2" operator="arithmetic" />
 <feColorMatrix id="feColorMatrix2970" type="matrix" values="1 0 0 -1 0 1 0 1 -1 0 1 0 0 -1 0 -0.8 -1 0 4.4 -2.9 " in="result2" result="fbSourceGraphicAlpha" />
 <feGaussianBlur id="feGaussianBlur2972" stdDeviation="0.7" in="fbSourceGraphicAlpha" result="result0" />
 <feSpecularLighting id="feSpecularLighting2974" in="result0" result="result1" lighting-color="rgb(255,255,255)" surfaceScale="8" specularConstant="1.4" specularExponent="25">
 <feDistantLight id="feDistantLight2976" elevation="50" azimuth="235" />
 </feSpecularLighting>
 <feBlend id="feBlend2978" in="result1" in2="SourceGraphic" result="result5" mode="screen" blend="normal" />
-<feComposite id="feComposite2980" in2="fbSourceGraphicAlpha" result="result4" operator="atop" k2="1.5" k3="0.6" in="result5" />
+<feComposite id="feComposite2980" in2="fbSourceGraphicAlpha" result="result4" operator="atop" in="result5" />
 </filter>
 <filter id="Drawing0" x="0" y="0" width="1" height="1" inkscape:menu-tooltip="Give lead pencil or chromolithography or engraving or other effects to images and material filled objects" inkscape:menu="Image effects" inkscape:label="Drawing">
 <feGaussianBlur id="feGaussianBlur3222" stdDeviation="0.5" result="result8" />
@@ -1612,7 +1612,7 @@
 <feGaussianBlur id="feGaussianBlur2905" result="result8" stdDeviation="0.6" />
 <feConvolveMatrix id="feConvolveMatrix2907" order="3 3" kernelMatrix="1 1 1 1 -8 1 1 1 1 " in="result8" divisor="1" targetX="1" targetY="1" preserveAlpha="true" result="result0" bias="0" />
 <feColorMatrix id="feColorMatrix2909" values="1" in="result0" result="result1" type="luminanceToAlpha" />
-<feComposite id="feComposite2911" k2="10" in="result1" result="result2" operator="arithmetic" in2="result1" k1="0" />
+<feComposite id="feComposite2911" k2="10" in="result1" result="result2" operator="arithmetic" in2="result1" />
 <feGaussianBlur id="feGaussianBlur2913" result="result7" in="result2" stdDeviation="0.01" />
 <feColorMatrix id="feColorMatrix2915" result="result9" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 8 -1.7 " />
 <feFlood id="feFlood2917" flood-opacity="1" result="result10" flood-color="rgb(0,0,0)" />
@@ -1624,7 +1624,7 @@
 <feConvolveMatrix id="feConvolveMatrix3726" order="3 3" kernelMatrix="1 1 1 1 -8 1 1 1 1 " in="result8" divisor="1" targetX="1" targetY="1" preserveAlpha="true" result="result0" bias="0" />
 <feColorMatrix id="feColorMatrix3728" in="result0" type="matrix" result="result3" values="0 -20 0 0 1 0 -20 0 0 1 0 -20 0 0 1 0 0 0 1 0 " />
 <feColorMatrix id="feColorMatrix3730" values="1" in="result3" result="result1" type="luminanceToAlpha" />
-<feComposite id="feComposite3732" in2="result1" k2="2" in="SourceGraphic" result="result2" operator="out" />
+<feComposite id="feComposite3732" in2="result1" in="SourceGraphic" result="result2" operator="out" />
 <feGaussianBlur id="feGaussianBlur3734" result="result7" in="result2" stdDeviation="0.01" />
 <feColorMatrix id="feColorMatrix3736" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 8 -1.7 " type="matrix" result="result9" />
 <feComposite id="feComposite3738" operator="arithmetic" k2="1.25" />
@@ -1639,15 +1639,15 @@
 </filter>
 <filter inkscape:menu-tooltip="Draws a black outline around" inkscape:menu="ABCs" inkscape:label="Black outline" id="BlackOutl0">
 <feGaussianBlur stdDeviation="2" in="SourceAlpha" result="result0" id="feGaussianBlur3908" />
-<feComposite result="result3" operator="arithmetic" in2="result0" in="SourceGraphic" id="feComposite3910" k2="1" k1="0" k3="10" />
-<feComposite k1="0" k3="0" k2="1" operator="in" id="feComposite3912" in="result3" result="result4" />
+<feComposite result="result3" operator="arithmetic" in2="result0" in="SourceGraphic" id="feComposite3910" k2="1" k3="10" />
+<feComposite k2="1" operator="in" id="feComposite3912" in="result3" result="result4" />
 </filter>
 <filter id="ColOutl0" inkscape:label="Color outline" inkscape:menu="Morphology" inkscape:menu-tooltip="Draws a coloured outline around" width="1.5" height="1.5" x="-0.25" y="-0.25">
 <feGaussianBlur id="feGaussianBlur2927" in="SourceAlpha" stdDeviation="3" result="blur" />
 <feColorMatrix id="feColorMatrix2956" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 10 -1 " type="matrix" result="result4" />
 <feFlood result="result1" flood-color="rgb(154,27,74)" id="feFlood2929" in="blur" />
 <feComposite result="result2" in2="result4" in="result1" operator="atop" id="feComposite2931" />
-<feComposite in="SourceGraphic" in2="result2" k1="0" result="result3" k3="1" k2="0" operator="atop" id="feComposite2933" />
+<feComposite in="SourceGraphic" in2="result2" result="result3" operator="atop" id="feComposite2933" />
 </filter>
 <filter id="InnerShad0" inkscape:label="Inner shadow" inkscape:menu="Shadows and Glows" inkscape:menu-tooltip="Adds a colorizable drop shadow inside">
 <feGaussianBlur id="feGaussianBlur2866" stdDeviation="4" result="result8" />
@@ -1673,12 +1673,12 @@
 <feGaussianBlur id="feGaussianBlur2911" result="result8" stdDeviation="5" />
 <feTurbulence id="feTurbulence2913" baseFrequency="0.015" numOctaves="2" type="fractalNoise" result="result7" seed="20" />
 <feDisplacementMap yChannelSelector="A" xChannelSelector="A" id="feDisplacementMap2915" scale="100" result="result10" in="result7" in2="result8" />
-<feComposite id="feComposite2917" in="result10" operator="atop" result="result2" in2="result8" k3="3" />
+<feComposite id="feComposite2917" in="result10" operator="atop" result="result2" in2="result8" />
 <feComposite id="feComposite2919" in2="result2" operator="arithmetic" in="result10" result="fbSourceGraphic" k1="2.5" k3="0.5" />
 </filter>
 <filter y="-0.2" height="1.4" id="RoughDil0" inkscape:label="Rough and dilate" inkscape:menu="Distort" inkscape:menu-tooltip="Create a turbulent contour around">
 <feMorphology id="feMorphology4135" radius="7" operator="dilate" result="result8" in="SourceGraphic" />
-<feComposite id="feComposite4137" in2="result8" result="result10" in="SourceGraphic" operator="arithmetic" k1="0.5" k2="0" k3="0.5" />
+<feComposite id="feComposite4137" in2="result8" result="result10" in="SourceGraphic" operator="arithmetic" k1="0.5" k3="0.5" />
 <feTurbulence result="result11" type="fractalNoise" numOctaves="3" baseFrequency="0.07" id="feTurbulence4139" />
 <feDisplacementMap result="result12" in2="result11" in="result10" xChannelSelector="R" scale="10" id="feDisplacementMap4141" />
 <feComposite operator="arithmetic" result="result13" in="SourceGraphic" id="feComposite4143" in2="result12" k1="0.25" k2="0.25" k3="0.75" />
@@ -1687,9 +1687,9 @@
 <feGaussianBlur result="result8" stdDeviation="7" id="feGaussianBlur4518" />
 <feTurbulence baseFrequency="0.05" numOctaves="3" type="fractalNoise" result="result7" seed="20" id="feTurbulence4520" />
 <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0.5 0.5 0 0.5 0 " result="result5" id="feColorMatrix4522" />
-<feComposite in="result5" operator="in" result="result6" in2="result8" id="feComposite4524" k1="1" k2="0" k3="0" />
+<feComposite in="result5" operator="in" result="result6" in2="result8" id="feComposite4524" />
 <feDisplacementMap result="result4" scale="300" yChannelSelector="A" xChannelSelector="A" in2="result6" in="result6" id="feDisplacementMap4526" />
-<feComposite in="result8" operator="arithmetic" result="result2" in2="result4" k1="3.5" k3="0" id="feComposite4528" k2="0" />
+<feComposite in="result8" operator="arithmetic" result="result2" in2="result4" k1="3.5" id="feComposite4528" />
 </filter>
 <filter id="OldPostcard" inkscape:label="Old postcard" x="0" y="0" width="1" height="1" inkscape:menu="Image effects" inkscape:menu-tooltip="Slightly posterize and draw edges like on old printed postcards">
 <feConvolveMatrix id="feConvolveMatrix2895" targetY="1" targetX="1" in="SourceGraphic" divisor="1" kernelMatrix="0 -0.4 0 -0.4 2.6 -0.4 0 -0.4 0 " order="3 3" result="result1" />
@@ -1700,7 +1700,7 @@
 <filter inkscape:label="Fuzzy glow" inkscape:menu="Shadows and Glows" inkscape:menu-tooltip="In and out glow with a possible offset and colorizable flood" height="1.2" y="-0.1" width="1.2" x="-0.1" id="FuzzyGlo0">
 <feOffset dx="4" dy="4" id="feOffset2969" result="result11" in="SourceGraphic" />
 <feGaussianBlur stdDeviation="4" result="result8" id="feGaussianBlur2971" />
-<feComposite result="result9" in="SourceGraphic" operator="in" in2="result8" id="feComposite2975" k1="0.5" k2="0.5" k3="0" />
+<feComposite result="result9" in="SourceGraphic" operator="in" in2="result8" id="feComposite2975" />
 <feBlend in="result9" in2="result8" blend="normal" mode="darken" id="feBlend2977" />
 </filter>
 <filter id="DotsTransp0" inkscape:label="Dots transparency" x="0" y="0" width="1" height="1" inkscape:menu="Image effects, transparent" inkscape:menu-tooltip="Gives a pointillist HSL sensitive transparency">
@@ -1723,7 +1723,7 @@
 </filter>
 <filter id="SmearTransp0" inkscape:label="Smear transparency" inkscape:menu="Image effects, transparent" inkscape:menu-tooltip="Paint objects with a transparent turbulence which turn around color edges" height="1.4" y="-0.2" width="1.4" x="-0.2">
 <feColorMatrix id="feColorMatrix3274" in="SourceGraphic" result="result1" type="luminanceToAlpha" />
-<feComposite in2="result1" id="feComposite3276" k2="0" k3="1" in="SourceGraphic" result="result2" operator="out" k1="0" />
+<feComposite in2="result1" id="feComposite3276" k3="1" in="SourceGraphic" result="result2" operator="out" />
 <feGaussianBlur stdDeviation="0.7" id="feGaussianBlur3296" result="result10" />
 <feBlend in2="result10" id="feBlend3278" blend="normal" mode="screen" in="result10" result="fbSourceGraphic" />
 <feGaussianBlur id="feGaussianBlur3280" stdDeviation="3" result="result8" in="fbSourceGraphic" />
@@ -1743,7 +1743,7 @@
 <feDiffuseLighting id="feDiffuseLighting3191" diffuseConstant="0.65" result="result1" surfaceScale="-4">
 <feDistantLight id="feDistantLight3193" azimuth="225" elevation="35" />
 </feDiffuseLighting>
-<feComposite id="feComposite3195" result="result3" k3="0.5" k2="0" k1="1.37" in="result1" operator="arithmetic" in2="fbSourceGraphic" />
+<feComposite id="feComposite3195" result="result3" k3="0.5" k1="1.37" in="result1" operator="arithmetic" in2="fbSourceGraphic" />
 <feComposite id="feComposite3197" result="result5" operator="in" in="result3" in2="result3" />
 </filter>
 <filter id="Burst0" inkscape:label="Burst" inkscape:menu="Textures" inkscape:menu-tooltip="Burst balloon texture crumpled and with holes" x="-0.2" y="-0.2" width="1.4" height="1.4">
@@ -1751,14 +1751,14 @@
 <feColorMatrix id="feColorMatrix3230" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 4 -0.7 " result="result5" type="matrix" />
 <feComposite id="feComposite3232" result="result11" in2="result5" operator="in" in="SourceGraphic" />
 <feDisplacementMap id="feDisplacementMap3234" result="result4" scale="50" yChannelSelector="G" xChannelSelector="R" in="result11" in2="result8" />
-<feComposite id="feComposite3236" result="result7" k1="0" in2="SourceAlpha" operator="arithmetic" in="result4" k2="1.3" />
+<feComposite id="feComposite3236" result="result7" in2="SourceAlpha" operator="arithmetic" in="result4" k2="1.3" />
 <feColorMatrix id="feColorMatrix3238" result="fbSourceGraphicAlpha" in="result7" values="1 0 0 -1 0 1 0 1 -1 0 1 0 0 -1 0 -0.8 -1 0 4 -2.5 " type="matrix" />
 <feGaussianBlur id="feGaussianBlur3240" stdDeviation="0.5" result="result10" />
 <feDiffuseLighting id="feDiffuseLighting3242" surfaceScale="15" diffuseConstant="0.4" result="result6" lighting-color="rgb(255,255,255)" in="result10">
 <feDistantLight id="feDistantLight3244" azimuth="235" elevation="25" />
 </feDiffuseLighting>
 <feComposite id="feComposite3246" operator="in" result="result2" in="result6" in2="result7" />
-<feComposite id="feComposite3248" in2="result7" operator="arithmetic" k2="0.8" k1="0" k3="0.8" result="result12" />
+<feComposite id="feComposite3248" in2="result7" operator="arithmetic" k2="0.8" k3="0.8" result="result12" />
 <feBlend id="feBlend3250" blend="normal" in2="result12" mode="lighten" />
 </filter>
 <filter inkscape:menu-tooltip="Combine a HSL edges detection bump with a leathery or woody and colorizable texture" inkscape:menu="Bumps" inkscape:label="Embossed leather" height="1.4" width="1.4" x="-0.2" y="-0.2" id="LeathEmb0">
@@ -1774,7 +1774,7 @@
 <feDiffuseLighting surfaceScale="-20" result="result1" diffuseConstant="0.6" in="result13" id="feDiffuseLighting3269">
 <feDistantLight elevation="10" azimuth="225" id="feDistantLight3271" />
 </feDiffuseLighting>
-<feComposite k1="0" result="result4" in="SourceGraphic" operator="arithmetic" k2="1" k3="0.6" id="feComposite3273" />
+<feComposite result="result4" in="SourceGraphic" operator="arithmetic" k2="1" k3="0.6" id="feComposite3273" />
 <feComposite result="result11" in2="SourceGraphic" operator="in" id="feComposite3275" />
 <feBlend in2="result11" in="result11" result="result9" mode="normal" blend="normal" id="feBlend3277" />
 </filter>
@@ -1799,7 +1799,7 @@
 <feDistantLight id="feDistantLight3101" azimuth="225" elevation="80" />
 </feSpecularLighting>
 <feBlend id="feBlend3103" blend="normal" mode="screen" result="result9" in2="SourceGraphic" />
-<feComposite id="feComposite3105" operator="atop" in2="result14" result="result11" in="result9" k1="1" k2="1" k3="0" />
+<feComposite id="feComposite3105" operator="atop" in2="result14" result="result11" in="result9" />
 </filter>
 <filter id="Plaster0" y="-0.2" x="-0.2" width="1.4" height="1.4" inkscape:label="Plaster" inkscape:menu="Bumps" inkscape:menu-tooltip="Combine a HSL edges detection bump with a matte and crumpled surface effect">
 <feGaussianBlur id="feGaussianBlur3032" stdDeviation="2" result="result14" />
@@ -1810,7 +1810,7 @@
 <feDistantLight id="feDistantLight3050" azimuth="225" elevation="10" />
 </feDiffuseLighting>
 <feBlend id="feBlend3044" blend="normal" mode="screen" result="result9" in2="SourceGraphic" />
-<feComposite id="feComposite3046" operator="in" in2="SourceGraphic" result="result11" in="result9" k1="1" k2="1" k3="0" />
+<feComposite id="feComposite3046" operator="in" in2="SourceGraphic" result="result11" in="result9" />
 </filter>
 <filter id="RghTr0" inkscape:menu-tooltip="Adds a turbulent transparency which displace pixels at the same time" inkscape:menu="Image effects, transparent" inkscape:label="Rough transparency">
 <feTurbulence id="feTurbulence3302" result="result3" baseFrequency="0.3" in="SourceGraphic" type="fractalNoise" seed="0" numOctaves="3" />
@@ -1830,7 +1830,7 @@
 <feDisplacementMap id="feDisplacementMap2846" result="result3" in2="result1" in="SourceGraphic" xChannelSelector="R" yChannelSelector="G" scale="30" numOctaves="2" />
 <feComposite id="feComposite2848" result="result4" in="result3" in2="result1" operator="out" />
 <feComposite id="feComposite2852" result="result6" operator="arithmetic" k2="1" k1="0.3" k3="0.3" />
-<feComposite id="feComposite2850" in2="result5" in="result6" operator="over" k1="1" />
+<feComposite id="feComposite2850" in2="result5" in="result6" operator="over" />
 </filter>
 <filter id="AlphEngr0" inkscape:menu-tooltip="Gives a transparent engraving effect with rough line and filling" inkscape:menu="Image effects, transparent" inkscape:label="Alpha engraving" height="1" width="1" y="0" x="0">
 <feTurbulence id="feTurbulence3009" result="result1" baseFrequency="0.03" type="fractalNoise" seed="0" numOctaves="5" in="SourceGraphic" />
@@ -1854,7 +1854,7 @@
 <feGaussianBlur id="feGaussianBlur2987" in="result14" stdDeviation="0.5" result="result8" />
 <feConvolveMatrix id="feConvolveMatrix2989" bias="0" result="result0" preserveAlpha="true" targetY="1" targetX="1" divisor="1" in="result8" kernelMatrix="1 1 1 1 -8 1 1 1 1 " order="3 3" />
 <feColorMatrix id="feColorMatrix2991" type="luminanceToAlpha" result="result1" in="result0" values="1" />
-<feComposite id="feComposite2993" in="result1" in2="result1" k1="0" k3="0" k2="5" operator="arithmetic" result="result11" />
+<feComposite id="feComposite2993" in="result1" in2="result1" k2="5" operator="arithmetic" result="result11" />
 <feGaussianBlur id="feGaussianBlur2995" stdDeviation="0.2" in="result11" result="result7" />
 <feColorMatrix id="feColorMatrix2997" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 5 -0.5 " result="result9" />
 <feComposite id="feComposite2999" result="result13" operator="in" in2="result9" in="result12" />
@@ -1908,7 +1908,7 @@
 <feGaussianBlur id="feGaussianBlur3290" result="result8" stdDeviation="0.01" in="fbSourceGraphic" />
 <feConvolveMatrix id="feConvolveMatrix3292" order="3 3" kernelMatrix="1 1 1 1 -8 1 1 1 1 " in="result8" divisor="1" targetX="1" targetY="1" preserveAlpha="true" result="result0" bias="0" />
 <feColorMatrix id="feColorMatrix3294" values="1" in="result0" result="result1" type="luminanceToAlpha" />
-<feComposite id="feComposite3296" k2="2" in="result1" result="result2" operator="arithmetic" in2="result1" k1="0" />
+<feComposite id="feComposite3296" k2="2" in="result1" result="result2" operator="arithmetic" in2="result1" />
 <feGaussianBlur id="feGaussianBlur3298" result="result7" in="result2" stdDeviation="0.5" />
 <feColorMatrix id="feColorMatrix3300" result="result9" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 5 0 " />
 <feFlood id="feFlood3302" flood-opacity="1" result="result10" flood-color="rgb(65,94,115)" />
@@ -1953,19 +1953,19 @@
 <feGaussianBlur result="result8" id="feGaussianBlur3174" stdDeviation="1" />
 <feDisplacementMap in2="result0" in="result1" xChannelSelector="R" yChannelSelector="B" scale="20" result="result2" id="feDisplacementMap3176" />
 <feComposite result="result7" operator="in" in="result2" id="feComposite3178" in2="result8" />
-<feComposite in2="result7" result="fbSourceGraphic" k2="0.2" k3="0" in="result2" k1="1.8" operator="arithmetic" id="feComposite3180" />
+<feComposite in2="result7" result="fbSourceGraphic" k2="0.2" in="result2" k1="1.8" operator="arithmetic" id="feComposite3180" />
 <feColorMatrix type="matrix" values="1 0 0 -1 0 1 0 1 -1 0 1 0 0 -1 0 -0.8 -1 0 3.7 -2.6 " in="fbSourceGraphic" result="fbSourceGraphicAlpha" id="feColorMatrix3184" />
 <feGaussianBlur stdDeviation="0.5" id="feGaussianBlur3228" result="result9" />
 <feDiffuseLighting in="result9" lighting-color="rgb(255,255,255)" result="result6" diffuseConstant="0.4" surfaceScale="50" id="feDiffuseLighting3188">
 <feDistantLight elevation="50" azimuth="235" id="feDistantLight3190" />
 </feDiffuseLighting>
 <feComposite in2="fbSourceGraphic" in="result6" result="result2" operator="in" id="feComposite3192" />
-<feComposite k3="1.2" k1="0" k2="1.2" operator="arithmetic" in2="fbSourceGraphic" id="feComposite3194" />
+<feComposite k3="1.2" k2="1.2" operator="arithmetic" in2="fbSourceGraphic" id="feComposite3194" />
 </filter>
 <filter inkscape:label="Wrinkled varnish" inkscape:menu="Bumps" inkscape:menu-tooltip="Thick glossy and translucent paint texture with high depth" height="1.3" y="-0.15" width="1.3" x="-0.15" id="WrinkVarn0">
 <feGaussianBlur stdDeviation="1" in="SourceGraphic" result="result9" id="feGaussianBlur3308" />
 <feTurbulence seed="0" result="result7" type="fractalNoise" numOctaves="5" baseFrequency="0.015" in="result9" id="feTurbulence3310" />
-<feComposite k2="1" k1="0.5" in2="result7" result="result6" operator="out" in="result9" id="feComposite3314" />
+<feComposite in2="result7" result="result6" operator="out" in="result9" id="feComposite3314" />
 <feGaussianBlur result="result11" stdDeviation="2" id="feGaussianBlur3316" />
 <feDisplacementMap in="result7" in2="result11" xChannelSelector="A" yChannelSelector="G" scale="100" result="result4" id="feDisplacementMap3318" />
 <feComposite in2="result4" result="result2" operator="in" in="result9" id="feComposite3320" />