diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py
index 352f93b..c0a177b 100644
--- a/src/wireviz/Harness.py
+++ b/src/wireviz/Harness.py
@@ -18,6 +18,7 @@ from wireviz.wv_bom import manufacturer_info_field, component_table_entry, \
 from wireviz.wv_html import generate_html_output
 from wireviz.wv_helper import awg_equiv, mm2_equiv, tuplelist2tsv, flatten2d, \
     open_file_read, open_file_write
+from wireviz.svgembed import embed_svg_images
 
 
 class Harness:
@@ -345,7 +346,7 @@ class Harness:
         from io import BytesIO
         graph = self.create_graph()
         data = BytesIO()
-        data.write(graph.pipe(format='svg'))
+        data.write(graph.pipe(format='svg'))  # TODO: use embed_svg_images()
         data.seek(0)
         return data.read()
 
@@ -356,6 +357,8 @@ class Harness:
             graph.format = f
             graph.render(filename=filename, view=view, cleanup=cleanup)
         graph.save(filename=f'{filename}.gv')
+        if 'svg' in fmt:
+            embed_svg_images(f'{filename}.svg')
         # bom output
         bomlist = bom_list(self.bom())
         with open_file_write(f'{filename}.bom.tsv') as file: