Updated NightTools