Major updates, including the inclusion of colorbox