add tabline settings and update to latest master commits