merge spigot and glowkit