Add waystack, fix bridge coloring