updated conf files to use new elements
readded old conf files just in case