Moved tab highlighting to core
Fix button colours