Merge spigot and glowkit