Rearrange frontend context and move mainloop
Add colon token name to collection