made the bookmarks a bit more flexible and uniform...

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