fixing up the order of content, added maps and colors