Improved tabs and theme system