Added Massive includes (host name overwrite is a hack, but can't be helped)
Made the legacy dir_colors issues a bit more managable (only need one legacy file now)