unified marks and bookmarks, now almost complete. image update still not done...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>