diff --git a/packages/mermaid/src/diagrams/state/styles.js b/packages/mermaid/src/diagrams/state/styles.js
index a6b4a6980..16f769506 100644
--- a/packages/mermaid/src/diagrams/state/styles.js
+++ b/packages/mermaid/src/diagrams/state/styles.js
@@ -156,7 +156,8 @@ g.stateGroup line {
   ry: ${options.radius}px;
 }
 
-.state-shadow {
+
+.state-shadow-neo {
   filter: drop-shadow( 1px 2px 2px rgba(185,185,185,1.0) );
 }
 
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/clusters.js b/packages/mermaid/src/rendering-util/rendering-elements/clusters.js
index 344de8919..0c96868a7 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/clusters.js
+++ b/packages/mermaid/src/rendering-util/rendering-elements/clusters.js
@@ -250,7 +250,7 @@ const roundedWithTitle = (parent, node) => {
     rect = outerRectG.insert('rect', ':first-child');
     let outerRectClass = 'outer';
     if (look === 'neo') {
-      outerRectClass = 'outer state-shadow';
+      outerRectClass = 'outer state-shadow-neo';
     } else {
       outerRectClass = 'outer';
     }
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 e54d46bcf..a904fb954 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts
@@ -49,7 +49,7 @@ export const drawRect = async (parent: SVGAElement, node: Node, options: RectOpt
     rect = shapeSvg.insert('rect', ':first-child');
 
     rect
-      .attr('class', 'basic label-container neo-node state-shadow')
+      .attr('class', 'basic label-container state-shadow-neo')
       .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 32d4d7a4f..5229b606c 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts
@@ -8,6 +8,7 @@ export const roundedRect = async (parent: SVGAElement, node: Node) => {
   const options = {
     rx: node.look === 'neo' ? 1 : 5,
     ry: node.look === 'neo' ? 1 : 5,
+
     labelPaddingX: node.padding * 2,
     labelPaddingY: node.padding * 1,
     classes: '',
diff --git a/packages/mermaid/src/themes/theme-neo.js b/packages/mermaid/src/themes/theme-neo.js
index 68dbcdbab..1b8df789b 100644
--- a/packages/mermaid/src/themes/theme-neo.js
+++ b/packages/mermaid/src/themes/theme-neo.js
@@ -15,7 +15,8 @@ class Theme {
     this.background = '#ffffff';
 
     this.primaryColor = '#cccccc';
-    this.mainBkg = '#ffffff';
+    //this.mainBkg = '#ffffff';
+    this.mainBkg = '#ecedfe';
 
     this.noteBkgColor = '#fff5ad';
     this.noteTextColor = '#333';
@@ -57,6 +58,7 @@ class Theme {
     this.nodeBkg = this.nodeBkg || this.primaryColor;
     this.mainBkg = this.mainBkg || this.primaryColor;
     this.nodeBorder = this.nodeBorder || this.primaryBorderColor;
+    this.nodeBorder = 'none';
     this.clusterBkg = this.clusterBkg || this.tertiaryColor;
     this.clusterBorder = this.clusterBorder || this.tertiaryBorderColor;
     this.defaultLinkColor = this.defaultLinkColor || this.lineColor;