Incorporated changes from work machine. Included more conky configs