diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo
index 8b5a8e34e6..c28c4596e4 100644
--- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo
+++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo
@@ -30,6 +30,16 @@ The current controller is parameterized according to the absolute optimum.
 Further reading:
 <a href=\"modelica://Modelica/Resources/Documentation/Electrical/Machines/DriveControl.pdf\">Tutorial at the Modelica Conference 2017</a>
 </p>
-</html>"),
+</html>",
+figures = {
+  Figure(
+        title = "CurrentControlled DCPM",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentController.u),
+          Curve(x = time, y = currentController.u_m),
+          Curve(x = time, y = currentController.y)})})}),
     Diagram(coordinateSystem(extent={{-200,-100},{100,100}})));
 end CurrentControlledDCPM;
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo
index c535d79fb4..bd06fb49ff 100644
--- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo
+++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo
@@ -70,6 +70,17 @@ At time=2.3 s a load torque step is applied, causing the drive to slightly leave
 Further reading:
 <a href=\"modelica://Modelica/Resources/Documentation/Electrical/Machines/DriveControl.pdf\">Tutorial at the Modelica Conference 2017</a>
 </p>
-</html>"),
+</html>",
+figures = {
+  Figure(
+        title = "PositionControlled DCPM",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = positionController.u),
+          Curve(x = time, y = positionController.u_m),
+          Curve(x = time, y = speedController.u_m),
+          Curve(x = time, y = currentController.u_m)})})}),
     Diagram(coordinateSystem(extent={{-200,-100},{100,100}})));
 end PositionControlledDCPM;
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo
index 2f0667a723..f942aa52bc 100644
--- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo
+++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo
@@ -61,6 +61,16 @@ You may try a slewRateLimiter instead of the prefilter to limit the speed rise i
 Further reading:
 <a href=\"modelica://Modelica/Resources/Documentation/Electrical/Machines/DriveControl.pdf\">Tutorial at the Modelica Conference 2017</a>
 </p>
-</html>"),
+</html>",
+figures = {
+  Figure(
+        title = "SpeedControlled DCPM",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = speedController.u),
+          Curve(x = time, y = speedController.u_m),
+          Curve(x = time, y = currentController.u_m)})})}),
     Diagram(coordinateSystem(extent={{-200,-100},{100,100}})));
 end SpeedControlledDCPM;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCEE_Start.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCEE_Start.mo
index a75a1490a6..017c61cb3e 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCEE_Start.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCEE_Start.mo
@@ -104,5 +104,15 @@ Simulate for 2 seconds and plot (versus time):
 <li>dcee.ie: excitation current</li>
 </ul>
 Default machine parameters of model <em>DC_ElectricalExcited</em> are used.
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCEE Start",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcee.ia),
+          Curve(x = time, y = dcee.tauElectrical),
+          Curve(x = time, y = dcee.wMechanical)})})}));
 end DCEE_Start;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Cooling.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Cooling.mo
index ac0c0e9cc2..7584b5df29 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Cooling.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Cooling.mo
@@ -196,5 +196,15 @@ Default machine parameters are used, but:
 <li>Armature reference temperature is set to 80 degC.</li>
 <li>Nominal armature temperature is set to 80 degC.</li>
 </ul>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCPM Cooling",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = armature.T),
+          Curve(x = time, y = core.T),
+          Curve(x = time, y = cooling.T)})})}));
 end DCPM_Cooling;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_CurrentControlled.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_CurrentControlled.mo
index 3b06bee359..411d7b8d46 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_CurrentControlled.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_CurrentControlled.mo
@@ -121,5 +121,15 @@ Simulate for 2 seconds and plot (versus time):
 <li>dcpm.tauElectrical: motor's torque</li>
 </ul>
 Default machine parameters of model <em>DC_PermanentMagnet</em> are used.
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCPM CurrentControlled",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcpm.ia),
+          Curve(x = time, y = dcpm.tauElectrical),
+          Curve(x = time, y = dcpm.wMechanical)})})}));
 end DCPM_CurrentControlled;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo
index 6a4b61fd05..c0243a9bc8 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo
@@ -158,5 +158,16 @@ which is the case after accelerating the whole drive when angular velocity settl
 An additional energy storage between the battery and the inverters (like a large capacitor or a super capacitor) would help to avoid such situations
 and to smooth possible current spikes.
 </p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+        title = "DCPM Drive",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcpm1.ia),
+          Curve(x = time, y = dcpm2.ia),
+          Curve(x = time, y = dcpm1.va),
+          Curve(x = time, y = dcpm2.va)})})}));
 end DCPM_Drive;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_QuasiStatic.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_QuasiStatic.mo
index 002529e1f0..a418def703 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_QuasiStatic.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_QuasiStatic.mo
@@ -112,5 +112,16 @@ Simulate for 2 seconds and plot (versus time):
 <li>dcpm2.wMechanical: motor's speed of quasi-static model</li>
 <li>dcpm2.tauElectrical: motor's torque of quasi-static model</li>
 </ul>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCPM QuasiStatic",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcpm1.ia),
+          Curve(x = time, y = dcpm2.ia),
+          Curve(x = time, y = dcpm1.wMechanical),
+          Curve(x = time, y = dcpm2.wMechanical)})})}));
 end DCPM_QuasiStatic;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Start.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Start.mo
index 467eb92fcb..956e00db9a 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Start.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Start.mo
@@ -78,5 +78,15 @@ Simulate for 2 seconds and plot (versus time):
 <li>dcpm.tauElectrical: motor's torque</li>
 </ul>
 Default machine parameters of model <em>DC_PermanentMagnet</em> are used.
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCPM Start",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcpm.ia),
+          Curve(x = time, y = dcpm.tauElectrical),
+          Curve(x = time, y = dcpm.wMechanical)})})}));
 end DCPM_Start;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Temperature.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Temperature.mo
index 214abf885c..16c10c34db 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Temperature.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Temperature.mo
@@ -106,5 +106,15 @@ Default machine parameters are used, but:
 </ul>
 So the machine is at the beginning in cold condition, ending in warm condition
 (with the same armature resistance as the unmodified machine).
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCPM Temperature",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcpm.ia),
+          Curve(x = time, y = dcpm.tauElectrical),
+          Curve(x = time, y = dcpm.wMechanical)})})}));
 end DCPM_Temperature;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo
index 635627b70c..d9096e8849 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo
@@ -160,5 +160,16 @@ Anton Haumer, Christian Kral, Hansj&ouml;rg Kapeller, Thomas B&auml;uml, Johanne
 <a href=\"https://2009.international.conference.modelica.org/proceedings/pages/papers/0103/0103_FI.pdf\">
 The AdvancedMachines Library: Loss Models for Electric Machines</a><br>
 Modelica 2009, 7<sup>th</sup> International Modelica Conference
-</html>"));
+</html>",
+figures = {
+  Figure(
+        title = "DCPM with Losses",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcpm1.ia),
+          Curve(x = time, y = dcpm2.ia),
+          Curve(x = time, y = dcpm1.wMechanical),
+          Curve(x = time, y = dcpm2.wMechanical)})})}));
 end DCPM_withLosses;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo
index df70a44c85..7ce3355b13 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo
@@ -99,5 +99,15 @@ Default machine parameters of model <em>DC_SeriesExcited</em> are used.<br>
 <strong>Note:</strong><br>
 Since both the field and the armature current are sinusoidal, the waveform of the torque is the square of sine.
 Due to the additional inductive voltage drops, output of the motor is lower, compared to the same motor (DCSE_Start) at DC voltage.
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCSE SinglePhase",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcse.ia),
+          Curve(x = time, y = dcse.tauElectrical),
+          Curve(x = time, y = dcse.wMechanical)})})}));
 end DCSE_SinglePhase;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo
index b668c2a561..968bb398bf 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo
@@ -95,5 +95,15 @@ Simulate for 2 seconds and plot (versus time):
 <li>dcse.tauElectrical: motor's torque</li>
 </ul>
 Default machine parameters of model <em>DC_SeriesExcited</em> are used.
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "DCSE Start",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = dcse.ia),
+          Curve(x = time, y = dcse.tauElectrical),
+          Curve(x = time, y = dcse.wMechanical)})})}));
 end DCSE_Start;
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DC_CompareCharacteristics.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DC_CompareCharacteristics.mo
index a41bbbbdc6..5ecd6ac440 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DC_CompareCharacteristics.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DC_CompareCharacteristics.mo
@@ -193,5 +193,15 @@ but speed of the series excited dc machine rises when load torque is lowered.
 Dynamic increase of speed is determined by the sum of inertias.
 Load torque of the series excited is not lowered to zero, otherwise speed would rise infinitely.
 </p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+        title = "DCPM CompareCharacteristics",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = ramp.y, y = dcpm.wMechanical),
+          Curve(x = ramp.y, y = dcee.wMechanical),
+          Curve(x = ramp.y, y = dcse.wMechanical)})})}));
 end DC_CompareCharacteristics;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
index a99836093e..b813b9f38b 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
@@ -122,5 +122,15 @@ The mechanical load is a constant torque like a conveyor (with regularization ar
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC Conveyor",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_Conveyor;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DCBraking.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DCBraking.mo
index 47fe6a8dc9..5ecf259468 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DCBraking.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DCBraking.mo
@@ -128,5 +128,15 @@ Choose a layout and plot tauElectrical and tauShaft versus wMechanical.
         ISBN 978-3-446-45218-3, 2017.</td>
     </tr>
 </table>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC DC Braking",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = imc.wMechanical, y = imc.tauShaft),
+          Curve(x = imc.wMechanical, y = imc.tauElectrical)},
+        x = Axis(min = -100, max = 1500, unit = "rpm"))})}));
 end IMC_DCBraking;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo
index 64197dc5a8..22ee0d1fef 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo
@@ -116,5 +116,15 @@ finally reaching nominal speed.</p>
 <li>aimc.tauElectrical: motor's torque</li>
 </ul>
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC DOL",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_DOL;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo
index b8feb7cce3..b8fdcc4f1e 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo
@@ -110,5 +110,15 @@ at time tStart a load torque step is applied.</p>
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC Initialize",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_Initialize;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Inverter.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Inverter.mo
index d0d3f489db..232f3a753a 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Inverter.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Inverter.mo
@@ -118,5 +118,15 @@ and accelerating inertias.<br>At time tStep a load step is applied.</p>
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC Inverter",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_Inverter;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
index f207aa65c3..1d0843829a 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
@@ -210,5 +210,15 @@ This is a model of a complete inverter drive comprising:
 <p>Please note: Be patient, two switching devices cause many event iterations which cost performance.</p>
 <p>Note that due to the voltage drop the voltage at the machine can't reach the full voltage which means torque reduction.</p>
 <p>Default machine parameters are adapted to nominal phase voltage 400 V and nominal phase current 25 A.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC InverterDrive",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = machineCurrent.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_InverterDrive;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo
index 97c8637bb0..604d74c4ae 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo
@@ -178,5 +178,15 @@ equation
 the machine starts from standstill, accelerating inertias against load torque quadratic dependent on speed, finally reaching nominal speed.</p>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC Steinmetz",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_Steinmetz;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo
index 3e16bd3e82..e38a6f6ab4 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo
@@ -190,5 +190,15 @@ at start time tStart2 the machine is fed directly from the voltage source, final
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC Transformer",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_Transformer;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo
index 6e7d13a277..1e12cf22f0 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo
@@ -123,5 +123,15 @@ load torque quadratic dependent on speed, finally reaching nominal speed.</p>
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC YD",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_YD;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo
index 2e03fdbe88..7b82eb77fe 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo
@@ -135,5 +135,15 @@ Note that a switchYDwithArc is used to avoid unphysical voltage peaks when openi
 </p>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC YDarc",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_YDarc;
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo
index 51516b0d45..c1bdf08c38 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo
@@ -245,7 +245,31 @@ Anton Haumer, Christian Kral, Hansj&ouml;rg Kapeller, Thomas B&auml;uml, Johanne
 <a href=\"https://2009.international.conference.modelica.org/proceedings/pages/papers/0103/0103_FI.pdf\">
 The AdvancedMachines Library: Loss Models for Electric Machines</a><br>
 Modelica 2009, 7<sup>th</sup> International Modelica Conference</p>
-</html>"),
+</html>",
+figures = {
+  Figure( title = "IMC with Losses",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = Pmech, y = I_sim),
+          Curve(x = Pmech, y = I_meas)})}),
+  Figure( title = "IMC with Losses",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = Pmech, y = w_sim),
+          Curve(x = Pmech, y = w_meas)})}),
+  Figure( title = "IMC with Losses",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = Pmech, y = pf_sim),
+          Curve(x = Pmech, y = pf_meas),
+          Curve(x = Pmech, y = eff_sim),
+          Curve(x = Pmech, y = eff_meas)})})}),
     Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
             {100,100}}), graphics={Text(
                 extent={{-72,100},{68,80}},
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo
index 39daed2395..f668b4b360 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo
@@ -135,5 +135,15 @@ using a starting resistance. At time tStart2 external rotor resistance is shorte
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMS Start",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aims.tauElectrical),
+          Curve(x = time, y = aims.wMechanical)})})}));
 end IMS_Start;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_DOL.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_DOL.mo
index c9b2383125..f1f9ca9d37 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_DOL.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_DOL.mo
@@ -210,5 +210,15 @@ To drive at higher torque, i.e., produce more electric power, excitation has to
 This noise is caused by the interaction of the high resistance of the switch and the machine, see
 <a href=\"https://github.com/modelica/ModelicaStandardLibrary/issues/2388\">#2388</a>.
 </p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMEE DOL",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smee.tauElectrical),
+          Curve(x = time, y = smee.wMechanical)})})}));
 end SMEE_DOL;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo
index 3fba52c584..ba85d4f4c8 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo
@@ -173,5 +173,15 @@ rotor angle is very slowly increased. This allows to see several characteristics
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMEE Generator",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = rotorDisplacementAngle.rotorDisplacementAngle, y = electricalPowerSensor.P),
+          Curve(x = rotorDisplacementAngle.rotorDisplacementAngle, y = electricalPowerSensor.Q)},
+        x = Axis(min = -180, max = 180, unit = "deg"))})}));
 end SMEE_Generator;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_LoadDump.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_LoadDump.mo
index ae7a3f2b27..3d62a054dc 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_LoadDump.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_LoadDump.mo
@@ -237,5 +237,15 @@ Voltage is controlled, the set point depends on speed. After start-up the genera
 <p>Default machine parameters are used.</p>
 
 <p>One could try to optimize the controller parameters.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMEE LoadDump",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = voltageQuasiRMSSensor.V),
+          Curve(x = time, y = smee.tauElectrical),
+          Curve(x = time, y = smee.ie)})})}));
 end SMEE_LoadDump;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Rectifier.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Rectifier.mo
index fdd1ee3eca..bff89ed0e6 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Rectifier.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Rectifier.mo
@@ -254,5 +254,16 @@ equation
 the set point depends on speed. The generator is loaded with a rectifier.</p>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMEE Rectifier",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = voltageController.u_s),
+          Curve(x = time, y = voltageController.u_m),
+          Curve(x = time, y = smee.ve),
+          Curve(x = time, y = smee.ie)})})}));
 end SMEE_Rectifier;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo
index b85bdf27a3..a8ef2fea88 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo
@@ -158,5 +158,15 @@ Since induced voltage is reduced proportional to falling speed, the braking resi
 achieve constant current and torque.</p>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMPM Braking",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smpm.tauElectrical),
+          Curve(x = time, y = smpm.wMechanical)})})}));
 end SMPM_Braking;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_CurrentSource.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_CurrentSource.mo
index 52dc958d86..dc1b59faf3 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_CurrentSource.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_CurrentSource.mo
@@ -168,5 +168,15 @@ and fed to the machine. The result shows that the torque is influenced by the q-
 whereas the stator voltage is influenced by the d-current.</p>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMPM CurrentSource",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smpm.tauElectrical),
+          Curve(x = time, y = smpm.wMechanical)})})}));
 end SMPM_CurrentSource;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Inverter.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Inverter.mo
index d9664b5f27..88205c1589 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Inverter.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Inverter.mo
@@ -138,5 +138,15 @@ and accelerating inertias. At time tStep a load step is applied.</p>
 
 <p>
 In practice it is nearly impossible to drive a PMSMD without current controller.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMPM Inverter",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smpm.tauElectrical),
+          Curve(x = time, y = smpm.wMechanical)})})}));
 end SMPM_Inverter;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo
index 49518dd868..6e968d16a8 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo
@@ -105,5 +105,14 @@ Additionally, you may check the phase shift of the stator voltages with respect
 <p>Note that the angle of the voltage space phasor is pi/2 behind the angle of the hall sensor,
 i.e. after a rotation of the shaft by pi/2/p the flux linkage of phase 1 is zero and the induced voltage a maximum.
 </p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMPM NoLoad",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = smpm.wMechanical, y = toPolar.y[1]),
+          Curve(x = smpm.wMechanical, y = toDeg.y)})})}));
 end SMPM_NoLoad;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_ResistiveBraking.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_ResistiveBraking.mo
index 264e25d67e..3cb86ec6df 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_ResistiveBraking.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_ResistiveBraking.mo
@@ -176,5 +176,15 @@ The total braking resistance (sum of all stages) has to be adapted to the angula
 Plot tauElectrical and tauShaft versus wMechanical.
 </p>
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMPM ResistiveBraking",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smpm.tauElectrical),
+          Curve(x = time, y = smpm.wMechanical)})})}));
 end SMPM_ResistiveBraking;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_VoltageSource.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_VoltageSource.mo
index 9846ee96d1..ba7b422357 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_VoltageSource.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_VoltageSource.mo
@@ -200,5 +200,15 @@ and the output voltages fed to the machine. The result shows that the torque is
 whereas the stator voltage is influenced by the d-current.</p>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMPM VoltageSource",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smpm.tauElectrical),
+          Curve(x = time, y = smpm.wMechanical)})})}));
 end SMPM_VoltageSource;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_DOL.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_DOL.mo
index a11ecdbcc7..5ddcdd3fd7 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_DOL.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_DOL.mo
@@ -135,5 +135,15 @@ Simulate for 2.5 seconds and plot (versus time):
 <li>rotorDisplacementAngle.rotorDisplacementAngle: rotor displacement angle</li>
 </ul>
 Default machine parameters of model <em>SM_ReluctanceRotor</em> are used.
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMR DOL",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smr.tauElectrical),
+          Curve(x = time, y = smr.wMechanical)})})}));
 end SMR_DOL;
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_Inverter.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_Inverter.mo
index 4b97c74542..f7941313fe 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_Inverter.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMR_Inverter.mo
@@ -131,5 +131,15 @@ and accelerating inertias. At time tStep a load step is applied.</p>
 </ul>
 
 <p>Default machine parameters are used.</p>
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "SMR Inverter",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = smr.tauElectrical),
+          Curve(x = time, y = smr.wMechanical)})})}));
 end SMR_Inverter;
diff --git a/Modelica/Electrical/Machines/Examples/Transformers/AsymmetricalLoad.mo b/Modelica/Electrical/Machines/Examples/Transformers/AsymmetricalLoad.mo
index 8b97b39540..deb1cf51cc 100644
--- a/Modelica/Electrical/Machines/Examples/Transformers/AsymmetricalLoad.mo
+++ b/Modelica/Electrical/Machines/Examples/Transformers/AsymmetricalLoad.mo
@@ -101,6 +101,16 @@ In some cases it may be necessary to ground the transformer's starpoint even tho
 <li>Dy ... Load current in two   primary phases.</li>
 <li>Dz ... Load current in three primary phases.</li>
 </ul>
-</html>"),
+</html>",
+figures = {
+  Figure(
+        title = "Transformer AsymmetricalLoad",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = transformer.i1[1]),
+          Curve(x = time, y = transformer.i1[2]),
+          Curve(x = time, y = transformer.i1[3])})})}),
      experiment(StopTime=0.1, Interval=1E-4, Tolerance=1E-6));
 end AsymmetricalLoad;
diff --git a/Modelica/Electrical/Machines/Examples/Transformers/IMC_Transformer.mo b/Modelica/Electrical/Machines/Examples/Transformers/IMC_Transformer.mo
index 7c5315903c..5136ff5244 100644
--- a/Modelica/Electrical/Machines/Examples/Transformers/IMC_Transformer.mo
+++ b/Modelica/Electrical/Machines/Examples/Transformers/IMC_Transformer.mo
@@ -15,5 +15,15 @@ Simulate for 2.5 seconds and plot (versus time):
 <li>aimc.tauElectrical: motor's torque</li>
 </ul>
 Default machine parameters of model <em>IM_SquirrelCage</em> are used.
-</html>"));
+</html>",
+figures = {
+  Figure(
+    title = "IMC Transformer",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentQuasiRMSSensor.I),
+          Curve(x = time, y = aimc.tauElectrical),
+          Curve(x = time, y = aimc.wMechanical)})})}));
 end IMC_Transformer;
diff --git a/Modelica/Electrical/Machines/Examples/Transformers/Rectifier12pulse.mo b/Modelica/Electrical/Machines/Examples/Transformers/Rectifier12pulse.mo
index 8b2eda810b..3217609ab5 100644
--- a/Modelica/Electrical/Machines/Examples/Transformers/Rectifier12pulse.mo
+++ b/Modelica/Electrical/Machines/Examples/Transformers/Rectifier12pulse.mo
@@ -73,6 +73,15 @@ Test example with polyphase components:<br>
 Star-connected voltage source feeds via two transformers (Dd0 and Dy1) two diode bridge rectifiers with a single DC burden.<br>
 Using f=50 Hz, simulate for 0.1 seconds (5 periods) and compare voltages and currents of source and DC burden,
 neglecting initial transient.
-</html>"),
+</html>",
+figures = {
+  Figure(
+        title = "Rectifier 12pulse",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentSensor.i[1]),
+          Curve(x = time, y = load.v)})})}),
      experiment(StopTime=0.1, Interval=1E-4, Tolerance=1E-6));
 end Rectifier12pulse;
diff --git a/Modelica/Electrical/Machines/Examples/Transformers/Rectifier6pulse.mo b/Modelica/Electrical/Machines/Examples/Transformers/Rectifier6pulse.mo
index 0241901a5f..8b989192b4 100644
--- a/Modelica/Electrical/Machines/Examples/Transformers/Rectifier6pulse.mo
+++ b/Modelica/Electrical/Machines/Examples/Transformers/Rectifier6pulse.mo
@@ -133,6 +133,15 @@ Test example with polyphase components:<br>
 Star-connected voltage source feeds via a transformer a diode bridge rectifier with a DC burden.<br>
 Using f=50 Hz, simulate for 0.1 seconds (5 periods) and compare voltages and currents of source and DC burden,
 neglecting initial transient.
-</html>"),
+</html>",
+figures = {
+  Figure(
+        title = "Rectifier 6pulse",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = currentSensor.i[1]),
+          Curve(x = time, y = load.v)})})}),
      experiment(StopTime=0.1, Interval=1E-4, Tolerance=1E-6));
 end Rectifier6pulse;
diff --git a/Modelica/Electrical/Machines/Examples/Transformers/TransformerTestbench.mo b/Modelica/Electrical/Machines/Examples/Transformers/TransformerTestbench.mo
index 0c6f9e35ec..43e8689aea 100644
--- a/Modelica/Electrical/Machines/Examples/Transformers/TransformerTestbench.mo
+++ b/Modelica/Electrical/Machines/Examples/Transformers/TransformerTestbench.mo
@@ -152,6 +152,17 @@ In some cases it may be necessary to ground the transformer's starpoint even tho
 <li>Dd ... No grounding necessary.</li>
 <li>Dz ... No grounding necessary.</li>
 </ul>
-</html>"),
+</html>",
+figures = {
+  Figure(
+        title = "Transformer TestBench",
+    preferred = true,
+    plots = {
+      Plot(
+        curves = {
+          Curve(x = time, y = transformer.v1[1]),
+          Curve(x = time, y = transformer.v2[1]),
+          Curve(x = time, y = transformer.i1[1]),
+          Curve(x = time, y = transformer.i2[1])})})}),
      experiment(StopTime=0.1, Interval=1E-4, Tolerance=1E-6));
 end TransformerTestbench;