Tab highlighting and updated menus
Merge branch 'master' of https://github.com/sbtkd85/config