merge pics_theo into pics