Readd supertab and adjust scheme