Tweak structure + border character + add secretToken to stream