diff --git a/cypress/platform/per.html b/cypress/platform/per.html
index 4ac3bb35b..8b401e8d1 100644
--- a/cypress/platform/per.html
+++ b/cypress/platform/per.html
@@ -89,7 +89,7 @@ stateDiagram-v2
       </pre
     >
 
-    <pre id="diagram" class="mermaid2">
+    <pre id="diagram" class="mermaid">
       stateDiagram
         [*] --> Still
         Still --> [*]
@@ -102,7 +102,7 @@ stateDiagram-v2
 
     </pre>
 
-    <pre id="diagram" class="mermaid">
+    <pre id="diagram" class="mermaid2">
       stateDiagram
         direction LR
         [*] --> A
diff --git a/packages/mermaid/src/diagrams/state/styles.js b/packages/mermaid/src/diagrams/state/styles.js
index f43e48a94..bec741741 100644
--- a/packages/mermaid/src/diagrams/state/styles.js
+++ b/packages/mermaid/src/diagrams/state/styles.js
@@ -101,7 +101,7 @@ g.stateGroup line {
 }
 
 .node circle.state-end {
-  fill: ${options.innerEndBackground};
+  fill:  ${options.stateBkg || options.mainBkg};
   stroke: ${options.background};
   stroke-width: 1.5
 }
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts
index a904fb954..7d0bb4c7d 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts
@@ -44,26 +44,16 @@ export const drawRect = async (parent: SVGAElement, node: Node, options: RectOpt
 
     rect = shapeSvg.insert(() => roughNode, ':first-child');
     rect.attr('class', 'basic label-container').attr('style', cssStyles);
-  } else if (node.look === 'neo') {
-    // TODO: Take theme and look into account
-    rect = shapeSvg.insert('rect', ':first-child');
-
-    rect
-      .attr('class', 'basic label-container state-shadow-neo')
-      .attr('style', cssStyles)
-      .attr('rx', rx)
-      .attr('data-id', 'abc')
-      .attr('data-et', 'node')
-      .attr('ry', ry)
-      .attr('x', x)
-      .attr('y', y)
-      .attr('width', totalWidth)
-      .attr('height', totalHeight);
   } else {
     rect = shapeSvg.insert('rect', ':first-child');
 
+    let rectClass = 'basic label-container';
+    if (node.look === 'neo') {
+      rectClass += ' state-shadow-neo';
+    }
+
     rect
-      .attr('class', 'basic label-container')
+      .attr('class', rectClass)
       .attr('style', cssStyles)
       .attr('rx', rx)
       .attr('data-id', 'abc')
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts
index 5229b606c..61a214426 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts
@@ -6,8 +6,8 @@ export const roundedRect = async (parent: SVGAElement, node: Node) => {
   const { look } = getConfig();
   node.look = look;
   const options = {
-    rx: node.look === 'neo' ? 1 : 5,
-    ry: node.look === 'neo' ? 1 : 5,
+    rx: node.look === 'neo' ? 3 : 5,
+    ry: node.look === 'neo' ? 3 : 5,
 
     labelPaddingX: node.padding * 2,
     labelPaddingY: node.padding * 1,
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/state.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/state.ts
index f1bc733d6..dbb080894 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/state.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/state.ts
@@ -7,8 +7,8 @@ export const state = async (parent: SVGAElement, node: Node) => {
   node.look = look;
 
   const options = {
-    rx: node.look === 'neo' ? 2 : 5,
-    ry: node.look === 'neo' ? 2 : 5,
+    rx: node.look === 'neo' ? 3 : 5,
+    ry: node.look === 'neo' ? 3 : 5,
     classes: 'flowchart-node',
   };
   return drawRect(parent, node, options);