replaced some non-functioning objects from conkyrc
merge