diff --git a/packages/mermaid/src/rendering-util/rendering-elements/nodes.js b/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
index 781029d29..c6b66a07f 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
+++ b/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
@@ -56,16 +56,20 @@ import { curlyBraces } from './shapes/curlyBraces.js';
 const shapes = {
   // States
   state,
+  stateStart,
   'small-circle': stateStart,
   'sm-circ': stateStart,
   start: stateStart,
+  stateEnd,
   'framed-circle': stateEnd,
   stop: stateEnd,
 
   // Rectangles
-  'rect-with-title': rectWithTitle,
+  rectWithTitle,
+  roundedRect,
   rounded: roundedRect,
   event: roundedRect,
+  squareRect,
   rectangle: squareRect,
   rect: squareRect,
   process: squareRect,
@@ -73,15 +77,19 @@ const shapes = {
   stadium,
   pill: stadium,
   term: stadium,
+  windowPane,
   'window-pane': windowPane,
   'win-pane': windowPane,
   'internal-storage': windowPane,
+  dividedRectangle,
   'divided-rectangle': dividedRectangle,
   'div-rect': dividedRectangle,
   'div-proc': dividedRectangle,
+  taggedRect,
   'tagged-rect': taggedRect,
   'tag-rect': taggedRect,
   'tag-proc': taggedRect,
+  multiRect,
   'multi-rect': multiRect,
   'mul-rect': multiRect,
   'mul-proc': multiRect,
@@ -96,34 +104,43 @@ const shapes = {
   cylinder,
   cyl: cylinder,
   db: cylinder,
+  tiltedCylinder,
   'tilted-cylinder': tiltedCylinder,
   't-cyl': tiltedCylinder,
   das: tiltedCylinder,
+  linedCylinder,
   'lined-cylinder': linedCylinder,
   'l-cyl': linedCylinder,
   disk: linedCylinder,
 
   // Circles
   circle,
+  doublecircle,
   'double-circle': doublecircle,
   dc: doublecircle,
+  crossedCircle,
   'crossed-circle': crossedCircle,
   'cross-circle': crossedCircle,
   summary: crossedCircle,
+  filledCircle,
   'filled-circle': filledCircle,
   fc: filledCircle,
   junction: filledCircle,
-  'shaded-process': shadedProcess,
+  shadedProcess,
   'lined-proc': shadedProcess,
   'lined-rect': shadedProcess,
 
   // Trapezoids
+  trapezoid,
+  trapezoidBaseBottom: trapezoid,
   'trapezoid-bottom': trapezoid,
   'trap-b': trapezoid,
   priority: trapezoid,
+  inv_trapezoid,
   'trapezoid-top': inv_trapezoid,
   'trap-t': inv_trapezoid,
   manual: inv_trapezoid,
+  curvedTrapezoid,
   'curved-trapezoid': curvedTrapezoid,
   'cur-trap': curvedTrapezoid,
   disp: curvedTrapezoid,
@@ -136,52 +153,65 @@ const shapes = {
   'small-triangle': triangle,
   'sm-tri': triangle,
   extract: triangle,
+  flippedTriangle,
   'flipped-triangle': flippedTriangle,
   'flip-tria': flippedTriangle,
   'manual-file': flippedTriangle,
+  trapezoidalPentagon,
   'notched-pentagon': trapezoidalPentagon,
   'not-pent': trapezoidalPentagon,
   'loop-limit': trapezoidalPentagon,
 
   //wave Edged Rectangles
+  waveRectangle,
   'wave-rectangle': waveRectangle,
   'w-rect': waveRectangle,
   flag: waveRectangle,
   'paper-tape': waveRectangle,
+  waveEdgedRectangle,
   'wave-edge-rect': waveEdgedRectangle,
   'wave-rect': waveEdgedRectangle,
   'we-rect': waveEdgedRectangle,
   doc: waveEdgedRectangle,
+  multiWaveEdgedRectangle,
   'multi-wave-edged-rectangle': multiWaveEdgedRectangle,
   'mul-we-rect': multiWaveEdgedRectangle,
   'mul-doc': multiWaveEdgedRectangle,
+  linedWaveEdgedRect,
   'lined-wave-edged-rect': linedWaveEdgedRect,
   'lin-we-rect': linedWaveEdgedRect,
   'lin-doc': linedWaveEdgedRect,
+  taggedWaveEdgedRectangle,
   'tagged-wave-edged-rectangle': taggedWaveEdgedRectangle,
   'tag-we-rect': taggedWaveEdgedRectangle,
   'tag-doc': taggedWaveEdgedRectangle,
 
   // Custom Rectangles
+  bowTieRect,
   'bow-tie-rect': bowTieRect,
   'bt-rect': bowTieRect,
   'stored-data': bowTieRect,
+  slopedRect,
   'sloped-rectangle': slopedRect,
   'sloped-rect': slopedRect,
   'manual-input': slopedRect,
+  halfRoundedRectangle,
   'half-rounded-rect': halfRoundedRectangle,
   delay: halfRoundedRectangle,
   card,
   'notched-rect': card,
   'notch-rect': card,
   'lean-right': lean_right,
+  lean_right: lean_right,
   'l-r': lean_right,
   'in-out': lean_right,
   'lean-left': lean_left,
+  lean_left: lean_left,
   'l-l': lean_left,
   'out-in': lean_left,
 
   // Miscellaneous
+  forkJoin,
   'long-rect': forkJoin,
   fork: forkJoin,
   join: forkJoin,
@@ -190,18 +220,17 @@ const shapes = {
   text,
   anchor,
   diamond: question,
-  diam: question,
-  decision: question,
+  lightningBolt,
   'lightning-bolt': lightningBolt,
   bolt: lightningBolt,
   'com-link': lightningBolt,
-  'curly-brace-left': curlyBraceLeft,
+  curlyBraceLeft,
   'brace-l': curlyBraceLeft,
   comment: curlyBraceLeft,
   hourglass,
   odd: rect_left_inv_arrow,
-  'label-rect': labelRect,
-  'curly-brace-right': curlyBraceRight,
+  labelRect,
+  curlyBraceRight,
   'brace-r': curlyBraceRight,
   braces: curlyBraces,
 };