Merge with conky1-extra, Changelog contains the changes