11 files changed, 288 insertions, 19 deletions
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-1.dot b/docs/reference/libtracker-sparql/images/triple-graph-1.dot
index 319417d5c..7625533fc 100644
--- a/docs/reference/libtracker-sparql/images/triple-graph-1.dot
+++ b/docs/reference/libtracker-sparql/images/triple-graph-1.dot
@@ -1,9 +1,9 @@
 digraph G {
   rankdir=LR;
-  graph [bgcolor="#00000000"];
-  node [fontname="Cantarell", style="filled", shape="ellipse", color="#000000", fillcolor="#d8e5e5"]; Subject;
-  node [shape="rectangle", color="#000000", fillcolor="#add8e6"]; Object;
-  edge [fontname="Cantarell"];
+  bgcolor=transparent;
+  node [shape="box", border=0, fontname="sans-serif"]; Object;
+  node [shape="box", style="rounded", border=0, fontname="sans-serif"]; Subject;
+  edge [fontname="sans-serif", fontsize=10];
 
   Subject -> Object [label=Predicate];
 }
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-1.png b/docs/reference/libtracker-sparql/images/triple-graph-1.png
deleted file mode 100644
index 2cf93dbe8..000000000
--- a/docs/reference/libtracker-sparql/images/triple-graph-1.png
+++ /dev/null
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-1.svg b/docs/reference/libtracker-sparql/images/triple-graph-1.svg
new file mode 100644
index 000000000..3dd8b9991
--- /dev/null
+++ b/docs/reference/libtracker-sparql/images/triple-graph-1.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 7.1.0 (0)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="213pt" height="44pt"
+ viewBox="0.00 0.00 213.00 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
+<title>G</title>
+<!-- Object -->
+<g id="node1" class="node">
+<title>Object</title>
+<polygon fill="none" stroke="black" points="205,-36 145,-36 145,0 205,0 205,-36"/>
+<text text-anchor="middle" x="175" y="-14.3" font-family="sans-serif" font-size="14.00">Object</text>
+</g>
+<!-- Subject -->
+<g id="node2" class="node">
+<title>Subject</title>
+<path fill="none" stroke="black" d="M53,-36C53,-36 12,-36 12,-36 6,-36 0,-30 0,-24 0,-24 0,-12 0,-12 0,-6 6,0 12,0 12,0 53,0 53,0 59,0 65,-6 65,-12 65,-12 65,-24 65,-24 65,-30 59,-36 53,-36"/>
+<text text-anchor="middle" x="32.5" y="-14.3" font-family="sans-serif" font-size="14.00">Subject</text>
+</g>
+<!-- Subject&#45;&gt;Object -->
+<g id="edge1" class="edge">
+<title>Subject&#45;&gt;Object</title>
+<path fill="none" stroke="black" d="M65.38,-18C85.47,-18 111.59,-18 133.18,-18"/>
+<polygon fill="black" stroke="black" points="133.13,-21.5 143.13,-18 133.13,-14.5 133.13,-21.5"/>
+<text text-anchor="middle" x="105" y="-21" font-family="sans-serif" font-size="10.00">Predicate</text>
+</g>
+</g>
+</svg>
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-2.dot b/docs/reference/libtracker-sparql/images/triple-graph-2.dot
index 1187da0ec..70c981866 100644
--- a/docs/reference/libtracker-sparql/images/triple-graph-2.dot
+++ b/docs/reference/libtracker-sparql/images/triple-graph-2.dot
@@ -1,9 +1,9 @@
 digraph G {
   rankdir=LR;
-  graph [bgcolor="#00000000"];
-  node [fontname="Cantarell", style="filled", shape="ellipse", color="#000000", fillcolor="#d8e5e5"]; "http://example.com/Song", "nfo:FileDataObject", "nmm:MusicPiece", "http://example.com/Album", "http://example.com/Jason", "http://example.com/Marty", "http://example.com/Band";
-  node [shape="rectangle", color="#000000", fillcolor="#add8e6"]; Images, "Go Off!", "Marty Friedman", "Jason Becker", "Cacophony";
-  edge [fontname="Cantarell"];
+  bgcolor=transparent;
+  node [shape="box", border=0, fontname="sans-serif"]; Images, "Go Off!", "Marty Friedman", "Jason Becker", "Cacophony";
+  node [shape="box", style="rounded", border=0, fontname="sans-serif"];  "http://example.com/Song", "nfo:FileDataObject", "nmm:MusicPiece", "http://example.com/Album", "http://example.com/Jason", "http://example.com/Marty", "http://example.com/Band";
+  edge [fontname="sans-serif", fontsize=10];
 
   "http://example.com/Song" -> "nfo:FileDataObject" [label="rdf:type"];
   "http://example.com/Song" -> "nmm:MusicPiece" [label="rdf:type"];
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-2.png b/docs/reference/libtracker-sparql/images/triple-graph-2.png
deleted file mode 100644
index d80ce6d90..000000000
--- a/docs/reference/libtracker-sparql/images/triple-graph-2.png
+++ /dev/null
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-2.svg b/docs/reference/libtracker-sparql/images/triple-graph-2.svg
new file mode 100644
index 000000000..94bfb3aff
--- /dev/null
+++ b/docs/reference/libtracker-sparql/images/triple-graph-2.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 7.1.0 (0)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="743pt" height="368pt"
+ viewBox="0.00 0.00 743.00 368.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 364)">
+<title>G</title>
+<!-- Images -->
+<g id="node1" class="node">
+<title>Images</title>
+<polygon fill="none" stroke="black" points="433.5,-360 368.5,-360 368.5,-324 433.5,-324 433.5,-360"/>
+<text text-anchor="middle" x="401" y="-338.3" font-family="sans-serif" font-size="14.00">Images</text>
+</g>
+<!-- Go Off! -->
+<g id="node2" class="node">
+<title>Go Off!</title>
+<polygon fill="none" stroke="black" points="706,-198 642,-198 642,-162 706,-162 706,-198"/>
+<text text-anchor="middle" x="674" y="-176.3" font-family="sans-serif" font-size="14.00">Go Off!</text>
+</g>
+<!-- Marty Friedman -->
+<g id="node3" class="node">
+<title>Marty Friedman</title>
+<polygon fill="none" stroke="black" points="735,-90 613,-90 613,-54 735,-54 735,-90"/>
+<text text-anchor="middle" x="674" y="-68.3" font-family="sans-serif" font-size="14.00">Marty Friedman</text>
+</g>
+<!-- Jason Becker -->
+<g id="node4" class="node">
+<title>Jason Becker</title>
+<polygon fill="none" stroke="black" points="724.5,-144 623.5,-144 623.5,-108 724.5,-108 724.5,-144"/>
+<text text-anchor="middle" x="674" y="-122.3" font-family="sans-serif" font-size="14.00">Jason Becker</text>
+</g>
+<!-- Cacophony -->
+<g id="node5" class="node">
+<title>Cacophony</title>
+<polygon fill="none" stroke="black" points="719,-36 629,-36 629,0 719,0 719,-36"/>
+<text text-anchor="middle" x="674" y="-14.3" font-family="sans-serif" font-size="14.00">Cacophony</text>
+</g>
+<!-- http://example.com/Song -->
+<g id="node6" class="node">
+<title>http://example.com/Song</title>
+<path fill="none" stroke="black" d="M172,-198C172,-198 12,-198 12,-198 6,-198 0,-192 0,-186 0,-186 0,-174 0,-174 0,-168 6,-162 12,-162 12,-162 172,-162 172,-162 178,-162 184,-168 184,-174 184,-174 184,-186 184,-186 184,-192 178,-198 172,-198"/>
+<text text-anchor="middle" x="92" y="-176.3" font-family="sans-serif" font-size="14.00">http://example.com/Song</text>
+</g>
+<!-- http://example.com/Song&#45;&gt;Images -->
+<g id="edge3" class="edge">
+<title>http://example.com/Song&#45;&gt;Images</title>
+<path fill="none" stroke="black" d="M111.84,-198.33C132.65,-217.87 167.75,-248.87 202,-270 244.17,-296.02 257.37,-298.25 304,-315 321.08,-321.13 340.26,-326.77 356.97,-331.29"/>
+<polygon fill="black" stroke="black" points="356.06,-334.67 366.62,-333.84 357.85,-327.9 356.06,-334.67"/>
+<text text-anchor="middle" x="244" y="-310" font-family="sans-serif" font-size="10.00">nie:title</text>
+</g>
+<!-- nfo:FileDataObject -->
+<g id="node7" class="node">
+<title>nfo:FileDataObject</title>
+<path fill="none" stroke="black" d="M459,-306C459,-306 343,-306 343,-306 337,-306 331,-300 331,-294 331,-294 331,-282 331,-282 331,-276 337,-270 343,-270 343,-270 459,-270 459,-270 465,-270 471,-276 471,-282 471,-282 471,-294 471,-294 471,-300 465,-306 459,-306"/>
+<text text-anchor="middle" x="401" y="-284.3" font-family="sans-serif" font-size="14.00">nfo:FileDataObject</text>
+</g>
+<!-- http://example.com/Song&#45;&gt;nfo:FileDataObject -->
+<g id="edge1" class="edge">
+<title>http://example.com/Song&#45;&gt;nfo:FileDataObject</title>
+<path fill="none" stroke="black" d="M132.21,-198.42C152.78,-207.79 178.52,-219.06 202,-228 246.53,-244.96 258.39,-247.21 304,-261 309.85,-262.77 315.92,-264.56 322.02,-266.34"/>
+<polygon fill="black" stroke="black" points="320.99,-269.69 331.57,-269.1 322.93,-262.96 320.99,-269.69"/>
+<text text-anchor="middle" x="244" y="-258" font-family="sans-serif" font-size="10.00">rdf:type</text>
+</g>
+<!-- nmm:MusicPiece -->
+<g id="node8" class="node">
+<title>nmm:MusicPiece</title>
+<path fill="none" stroke="black" d="M453.5,-252C453.5,-252 348.5,-252 348.5,-252 342.5,-252 336.5,-246 336.5,-240 336.5,-240 336.5,-228 336.5,-228 336.5,-222 342.5,-216 348.5,-216 348.5,-216 453.5,-216 453.5,-216 459.5,-216 465.5,-222 465.5,-228 465.5,-228 465.5,-240 465.5,-240 465.5,-246 459.5,-252 453.5,-252"/>
+<text text-anchor="middle" x="401" y="-230.3" font-family="sans-serif" font-size="14.00">nmm:MusicPiece</text>
+</g>
+<!-- http://example.com/Song&#45;&gt;nmm:MusicPiece -->
+<g id="edge2" class="edge">
+<title>http://example.com/Song&#45;&gt;nmm:MusicPiece</title>
+<path fill="none" stroke="black" d="M184.28,-196.06C229.22,-203.96 282.73,-213.37 325.21,-220.85"/>
+<polygon fill="black" stroke="black" points="324.38,-224.25 334.83,-222.54 325.59,-217.36 324.38,-224.25"/>
+<text text-anchor="middle" x="244" y="-216" font-family="sans-serif" font-size="10.00">rdf:type</text>
+</g>
+<!-- http://example.com/Album -->
+<g id="node9" class="node">
+<title>http://example.com/Album</title>
+<path fill="none" stroke="black" d="M486,-198C486,-198 316,-198 316,-198 310,-198 304,-192 304,-186 304,-186 304,-174 304,-174 304,-168 310,-162 316,-162 316,-162 486,-162 486,-162 492,-162 498,-168 498,-174 498,-174 498,-186 498,-186 498,-192 492,-198 486,-198"/>
+<text text-anchor="middle" x="401" y="-176.3" font-family="sans-serif" font-size="14.00">http://example.com/Album</text>
+</g>
+<!-- http://example.com/Song&#45;&gt;http://example.com/Album -->
+<g id="edge4" class="edge">
+<title>http://example.com/Song&#45;&gt;http://example.com/Album</title>
+<path fill="none" stroke="black" d="M184.28,-180C218.25,-180 257.11,-180 292.41,-180"/>
+<polygon fill="black" stroke="black" points="292.22,-183.5 302.22,-180 292.22,-176.5 292.22,-183.5"/>
+<text text-anchor="middle" x="244" y="-183" font-family="sans-serif" font-size="10.00">nmm:musicAlbum</text>
+</g>
+<!-- http://example.com/Jason -->
+<g id="node10" class="node">
+<title>http://example.com/Jason</title>
+<path fill="none" stroke="black" d="M482,-144C482,-144 320,-144 320,-144 314,-144 308,-138 308,-132 308,-132 308,-120 308,-120 308,-114 314,-108 320,-108 320,-108 482,-108 482,-108 488,-108 494,-114 494,-120 494,-120 494,-132 494,-132 494,-138 488,-144 482,-144"/>
+<text text-anchor="middle" x="401" y="-122.3" font-family="sans-serif" font-size="14.00">http://example.com/Jason</text>
+</g>
+<!-- http://example.com/Song&#45;&gt;http://example.com/Jason -->
+<g id="edge5" class="edge">
+<title>http://example.com/Song&#45;&gt;http://example.com/Jason</title>
+<path fill="none" stroke="black" d="M184.28,-163.94C219.6,-157.73 260.21,-150.59 296.6,-144.19"/>
+<polygon fill="black" stroke="black" points="297.01,-147.67 306.26,-142.49 295.8,-140.77 297.01,-147.67"/>
+<text text-anchor="middle" x="244" y="-162" font-family="sans-serif" font-size="10.00">nmm:albumArtist</text>
+</g>
+<!-- http://example.com/Marty -->
+<g id="node11" class="node">
+<title>http://example.com/Marty</title>
+<path fill="none" stroke="black" d="M484,-90C484,-90 318,-90 318,-90 312,-90 306,-84 306,-78 306,-78 306,-66 306,-66 306,-60 312,-54 318,-54 318,-54 484,-54 484,-54 490,-54 496,-60 496,-66 496,-66 496,-78 496,-78 496,-84 490,-90 484,-90"/>
+<text text-anchor="middle" x="401" y="-68.3" font-family="sans-serif" font-size="14.00">http://example.com/Marty</text>
+</g>
+<!-- http://example.com/Song&#45;&gt;http://example.com/Marty -->
+<g id="edge6" class="edge">
+<title>http://example.com/Song&#45;&gt;http://example.com/Marty</title>
+<path fill="none" stroke="black" d="M131.12,-161.53C151.84,-151.83 178.05,-140.1 202,-131 246.41,-114.12 258.46,-112.54 304,-99 310.06,-97.2 316.34,-95.36 322.67,-93.53"/>
+<polygon fill="black" stroke="black" points="323.2,-97.02 331.85,-90.9 321.27,-90.29 323.2,-97.02"/>
+<text text-anchor="middle" x="244" y="-134" font-family="sans-serif" font-size="10.00">nmm:albumArtist</text>
+</g>
+<!-- http://example.com/Band -->
+<g id="node12" class="node">
+<title>http://example.com/Band</title>
+<path fill="none" stroke="black" d="M481.5,-36C481.5,-36 320.5,-36 320.5,-36 314.5,-36 308.5,-30 308.5,-24 308.5,-24 308.5,-12 308.5,-12 308.5,-6 314.5,0 320.5,0 320.5,0 481.5,0 481.5,0 487.5,0 493.5,-6 493.5,-12 493.5,-12 493.5,-24 493.5,-24 493.5,-30 487.5,-36 481.5,-36"/>
+<text text-anchor="middle" x="401" y="-14.3" font-family="sans-serif" font-size="14.00">http://example.com/Band</text>
+</g>
+<!-- http://example.com/Song&#45;&gt;http://example.com/Band -->
+<g id="edge7" class="edge">
+<title>http://example.com/Song&#45;&gt;http://example.com/Band</title>
+<path fill="none" stroke="black" d="M111.39,-161.76C132.09,-141.95 167.35,-110.31 202,-89 244.05,-63.13 257.47,-61.5 304,-45 308.99,-43.23 314.16,-41.5 319.39,-39.82"/>
+<polygon fill="black" stroke="black" points="320.23,-43.23 328.74,-36.91 318.15,-36.54 320.23,-43.23"/>
+<text text-anchor="middle" x="244" y="-92" font-family="sans-serif" font-size="10.00">nmm:performer</text>
+</g>
+<!-- http://example.com/Album&#45;&gt;Go Off! -->
+<g id="edge8" class="edge">
+<title>http://example.com/Album&#45;&gt;Go Off!</title>
+<path fill="none" stroke="black" d="M498.31,-180C543.41,-180 594.86,-180 630.18,-180"/>
+<polygon fill="black" stroke="black" points="629.99,-183.5 639.99,-180 629.99,-176.5 629.99,-183.5"/>
+<text text-anchor="middle" x="555.5" y="-183" font-family="sans-serif" font-size="10.00">nie:title</text>
+</g>
+<!-- http://example.com/Jason&#45;&gt;Jason Becker -->
+<g id="edge9" class="edge">
+<title>http://example.com/Jason&#45;&gt;Jason Becker</title>
+<path fill="none" stroke="black" d="M494.13,-126C533,-126 577.2,-126 611.94,-126"/>
+<polygon fill="black" stroke="black" points="611.82,-129.5 621.82,-126 611.82,-122.5 611.82,-129.5"/>
+<text text-anchor="middle" x="555.5" y="-129" font-family="sans-serif" font-size="10.00">nmm:artistName</text>
+</g>
+<!-- http://example.com/Marty&#45;&gt;Marty Friedman -->
+<g id="edge10" class="edge">
+<title>http://example.com/Marty&#45;&gt;Marty Friedman</title>
+<path fill="none" stroke="black" d="M496.4,-72C530.97,-72 569.49,-72 601.7,-72"/>
+<polygon fill="black" stroke="black" points="601.3,-75.5 611.3,-72 601.3,-68.5 601.3,-75.5"/>
+<text text-anchor="middle" x="555.5" y="-75" font-family="sans-serif" font-size="10.00">nmm:artistName</text>
+</g>
+<!-- http://example.com/Band&#45;&gt;Cacophony -->
+<g id="edge11" class="edge">
+<title>http://example.com/Band&#45;&gt;Cacophony</title>
+<path fill="none" stroke="black" d="M493.75,-18C534.9,-18 582.08,-18 617.71,-18"/>
+<polygon fill="black" stroke="black" points="617.33,-21.5 627.33,-18 617.33,-14.5 617.33,-21.5"/>
+<text text-anchor="middle" x="555.5" y="-21" font-family="sans-serif" font-size="10.00">nmm:artistName</text>
+</g>
+</g>
+</svg>
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-3.dot b/docs/reference/libtracker-sparql/images/triple-graph-3.dot
index 55ce34e70..9ad595bce 100644
--- a/docs/reference/libtracker-sparql/images/triple-graph-3.dot
+++ b/docs/reference/libtracker-sparql/images/triple-graph-3.dot
@@ -1,9 +1,10 @@
 digraph G {
   rankdir=LR;
-  graph [bgcolor="#00000000"];
-  node [fontname="Cantarell", style="filled", shape="ellipse", color="#000000", fillcolor="#d8e5e5"]; "nmm:MusicPiece";
-  node [style="filled,dotted", color="#000000", fillcolor="#ffffff"]; song, songTitle, album, albumTitle;
-  edge [fontname="Cantarell"];
+  bgcolor=transparent;
+
+  node [shape="box", style="rounded", border=0, fontname="sans-serif"]; "nmm:MusicPiece";
+  node [shape="ellipse", style="dashed", border=1, fillcolor="#000000"]; song, songTitle, album, albumTitle;
+  edge [fontname="sans-serif", fontsize=10];
 
   song -> "nmm:MusicPiece" [label="rdf:type"];
   song -> songTitle [label="nie:title"];
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-3.png b/docs/reference/libtracker-sparql/images/triple-graph-3.png
deleted file mode 100644
index 965694481..000000000
--- a/docs/reference/libtracker-sparql/images/triple-graph-3.png
+++ /dev/null
diff --git a/docs/reference/libtracker-sparql/images/triple-graph-3.svg b/docs/reference/libtracker-sparql/images/triple-graph-3.svg
new file mode 100644
index 000000000..6fb0dc667
--- /dev/null
+++ b/docs/reference/libtracker-sparql/images/triple-graph-3.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 7.1.0 (0)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="504pt" height="152pt"
+ viewBox="0.00 0.00 504.48 152.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 148)">
+<title>G</title>
+<!-- nmm:MusicPiece -->
+<g id="node1" class="node">
+<title>nmm:MusicPiece</title>
+<path fill="none" stroke="black" d="M300.69,-144C300.69,-144 195.69,-144 195.69,-144 189.69,-144 183.69,-138 183.69,-132 183.69,-132 183.69,-120 183.69,-120 183.69,-114 189.69,-108 195.69,-108 195.69,-108 300.69,-108 300.69,-108 306.69,-108 312.69,-114 312.69,-120 312.69,-120 312.69,-132 312.69,-132 312.69,-138 306.69,-144 300.69,-144"/>
+<text text-anchor="middle" x="248.19" y="-122.3" font-family="sans-serif" font-size="14.00">nmm:MusicPiece</text>
+</g>
+<!-- song -->
+<g id="node2" class="node">
+<title>song</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="31.85" cy="-72" rx="31.7" ry="18"/>
+<text text-anchor="middle" x="31.85" y="-68.3" font-family="sans-serif" font-size="14.00">song</text>
+</g>
+<!-- song&#45;&gt;nmm:MusicPiece -->
+<g id="edge1" class="edge">
+<title>song&#45;&gt;nmm:MusicPiece</title>
+<path fill="none" stroke="black" d="M60.14,-80.73C67.14,-82.87 74.67,-85.1 81.69,-87 111.12,-94.98 143.75,-102.87 172.2,-109.44"/>
+<polygon fill="black" stroke="black" points="171.28,-112.82 181.81,-111.65 172.85,-106 171.28,-112.82"/>
+<text text-anchor="middle" x="123.69" y="-110" font-family="sans-serif" font-size="10.00">rdf:type</text>
+</g>
+<!-- songTitle -->
+<g id="node3" class="node">
+<title>songTitle</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="248.19" cy="-72" rx="50.09" ry="18"/>
+<text text-anchor="middle" x="248.19" y="-68.3" font-family="sans-serif" font-size="14.00">songTitle</text>
+</g>
+<!-- song&#45;&gt;songTitle -->
+<g id="edge2" class="edge">
+<title>song&#45;&gt;songTitle</title>
+<path fill="none" stroke="black" d="M64.02,-72C95.93,-72 146.37,-72 186.25,-72"/>
+<polygon fill="black" stroke="black" points="186.21,-75.5 196.21,-72 186.21,-68.5 186.21,-75.5"/>
+<text text-anchor="middle" x="123.69" y="-75" font-family="sans-serif" font-size="10.00">nie:title</text>
+</g>
+<!-- album -->
+<g id="node4" class="node">
+<title>album</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="248.19" cy="-18" rx="37.89" ry="18"/>
+<text text-anchor="middle" x="248.19" y="-14.3" font-family="sans-serif" font-size="14.00">album</text>
+</g>
+<!-- song&#45;&gt;album -->
+<g id="edge3" class="edge">
+<title>song&#45;&gt;album</title>
+<path fill="none" stroke="black" d="M60.14,-63.27C67.14,-61.13 74.67,-58.9 81.69,-57 122.09,-46.05 168.51,-35.27 201.88,-27.82"/>
+<polygon fill="black" stroke="black" points="202.63,-31.24 211.64,-25.66 201.11,-24.41 202.63,-31.24"/>
+<text text-anchor="middle" x="123.69" y="-60" font-family="sans-serif" font-size="10.00">nmm:MusicAlbum</text>
+</g>
+<!-- albumTitle -->
+<g id="node5" class="node">
+<title>albumTitle</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="440.59" cy="-18" rx="55.79" ry="18"/>
+<text text-anchor="middle" x="440.59" y="-14.3" font-family="sans-serif" font-size="14.00">albumTitle</text>
+</g>
+<!-- album&#45;&gt;albumTitle -->
+<g id="edge4" class="edge">
+<title>album&#45;&gt;albumTitle</title>
+<path fill="none" stroke="black" d="M286.36,-18C311.01,-18 344.05,-18 373.14,-18"/>
+<polygon fill="black" stroke="black" points="372.97,-21.5 382.97,-18 372.97,-14.5 372.97,-21.5"/>
+<text text-anchor="middle" x="348.69" y="-21" font-family="sans-serif" font-size="10.00">nie:title</text>
+</g>
+</g>
+</svg>
diff --git a/docs/reference/libtracker-sparql/tracker-sparql.toml.in b/docs/reference/libtracker-sparql/tracker-sparql.toml.in
index 78d01838a..fef19fe55 100644
--- a/docs/reference/libtracker-sparql/tracker-sparql.toml.in
+++ b/docs/reference/libtracker-sparql/tracker-sparql.toml.in
@@ -41,9 +41,6 @@ content_images = [
     "images/icon-multivalue.svg",
     "images/icon-notify.svg",
     "images/icon-superproperty.svg",
-    "images/triple-graph-1.png",
-    "images/triple-graph-2.png",
-    "images/triple-graph-3.png",
 ]
 
 urlmap_file = "urlmap.js"
diff --git a/docs/reference/libtracker-sparql/tutorial.md.in b/docs/reference/libtracker-sparql/tutorial.md.in
index 570046648..6a19663bf 100644
--- a/docs/reference/libtracker-sparql/tutorial.md.in
+++ b/docs/reference/libtracker-sparql/tutorial.md.in
@@ -36,7 +36,9 @@ triple of the form:
 
 Or expressed visually:
 
-![Triple Graph](triple-graph-1.png)
+<div class="docblock">
+{{ images/triple-graph-1.svg }}
+</div>
 
 Subject and object are 2 graph vertices and the predicate is the edge,
 the accumulation of those triples form the full graph. For example,
@@ -66,7 +68,9 @@ the following triples:
 
 Would visually generate the following graph:
 
-![Triple Graph](triple-graph-2.png)
+<div class="docblock">
+{{ images/triple-graph-2.svg }}
+</div>
 
 The dot after each triple is not (just) there for legibility, but is
 part of the syntax. The RDF triples in full length are quite
@@ -283,7 +287,10 @@ SELECT ?song ?songTitle ?albumTitle {
 ```
 
 Stop a bit to think on the graph pattern expressed in the last query:
-![Graph Pattern](triple-graph-3.png)
+
+<div class="docblock">
+{{ images/triple-graph-3.svg }}
+</div>
 
 This pattern on one hand consists of specified data (eg. `?song` must be
 a `nmm:MusicPiece`, it must have a `nmm:musicAlbum` and a `nie:title`,
@@ -548,7 +555,9 @@ sets of `subject predicate object`. A single predicate like that
 is the simplest property path there is, it relates subject and object
 directly via a labeled arrow.
 
-![](triple-graph-1.png)
+<div class="docblock">
+{{ images/triple-graph-1.svg }}
+</div>
 
 Property paths make it possible to define more complex connections
 between subject and object (literally, paths of properties). The `/`