Rename, reformat, remerge
Trashes
Conky refix