Color scheme overhaul & bug fixes