Adding colour updates
Fixing menu item positioning so data-bb-pin now works.
Fixes #858
Fixes #815
Merge pull request #890 from glasspear/858+815

Fixing 858 and 815