Improve themes for Graphic and Terminal vim