Further bootstrapification

As usual, branch name is now fairly unrelated
Also, these were the ui-state-highlight type things I mentioned :P