Chris' configs with necessary improvements and additions