Fixes for classic theme to look and work like before