Tabify
Fixed some theming issues