diff --git a/build.gradle b/build.gradle
index f5f6b874576bf8eb952b47316b48a63954b2be32..2b9d1da8ab9a31945774bd2950f7ad03185e259d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,14 +6,13 @@ plugins {
 }
 
 group 'de.tudresden.inf.st'
-version '0.3'
 
 ext {
     mainClassName = 'de.tudresden.inf.st.mg.Main'
 }
 
 // set the main class name for `gradle run`
-application.mainClassName = "${mainClassName}"
+application.mainClass = "${mainClassName}"
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(11)
 
@@ -35,7 +34,7 @@ idea.module.generatedSourceDirs += genSrc
 sourceSets.main.java.srcDir genSrc
 
 dependencies {
-    implementation group: 'de.tudresden.inf.st', name: 'dumpAstWithPlantuml', version: "${relast2uml_version}"
+    implementation group: 'de.tudresden.inf.st', name: 'dumpAst', version: "${relast2uml_version}"
     grammar2uml group: 'de.tudresden.inf.st', name: 'grammar2uml', version: "${grammar2uml_version}"
     testImplementation group: 'org.assertj', name: 'assertj-core', version: "${assertj_version}"
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: "${jupyter_version}"
@@ -74,11 +73,11 @@ test {
 
 jar {
     manifest {
-        attributes "Main-Class": "${mainClassName}"
+        attributes 'Main-Class': "${mainClassName}"
     }
 
     from {
-        configurations.runtimeClasspath.collect { return (it.isDirectory() ? it : zipTree(it))}
+        configurations.runtimeClasspath.collect { return (it.isDirectory() ? it : zipTree(it)) }
     }
 }
 
@@ -153,6 +152,7 @@ jastadd {
 }
 
 // Workflow configuration for phases
+clean.dependsOn cleanGen
 generateAst.dependsOn relastToJastAdd
 generateAst.dependsOn generateGrammarDiagrams
 
diff --git a/gradle.properties b/gradle.properties
index 44581f8cca5fa5957fb1926b86f574084465d5d8..d765f554b8a080de14e8b0bc00135ef711324d14 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-relast2uml_version = 0.3.6-54
+relast2uml_version = 0.3.7-59
 jupyter_version = 5.8.2
 assertj_version = 3.22.0
 grammar2uml_version = 0.2.1
diff --git a/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java b/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java
index 1666e34c3e653142358427a81f07dcad77a74e08..239c46230633783decdaf653f8f080e2ba336f15 100644
--- a/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java
+++ b/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java
@@ -1,6 +1,7 @@
 package de.tudresden.inf.st.mg.common;
 
 import de.tudresden.inf.st.jastadd.dumpAst.ast.Dumper;
+import de.tudresden.inf.st.jastadd.dumpAst.ast.SkinParamBooleanSetting;
 import de.tudresden.inf.st.mg.jastadd.model.ASTNode;
 import de.tudresden.inf.st.mg.jastadd.model.T;
 import de.tudresden.inf.st.mg.jastadd.model.Token;
@@ -50,9 +51,11 @@ public abstract class MotionGrammarParser {
       }
       // TODO remove this once the issue in relast2uml has been resolved
       if (rootContainer_.getChild(0) != null) {
-        Dumper.read(rootContainer_.getChild(0)).setBackgroundColorMethod(n -> n == null ? "white" : (n == highlightNode ? (n instanceof Token ? H_T : H_N) : (n instanceof Token ? N_T : N_N)))
-                .setNameMethod(o -> o == null ? "null" : o.getClass().getSimpleName())
-                .customPreamble("\nskinparam object {\nBackgroundColor<<null>> white\nBorderColor<<null>> white\nStereotypeFontColor<<null>> white\n}\n")
+        Dumper.read(rootContainer_.getChild(0))
+                .setBackgroundColorMethod(n ->  (n == highlightNode ? (n instanceof Token ? H_T : H_N) : (n instanceof Token ? N_T : N_N)))
+                .setNameMethod(o -> o.getClass().getSimpleName())
+                .skinParam(SkinParamBooleanSetting.Shadowing, false)
+//                .dumpAsSource(astDiagramDir_.resolve("AST-" + String.format("%03d", timeStep_) + "-" + step + ".puml"))
                 .dumpAsPNG(astDiagramDir_.resolve("AST-" + String.format("%03d", timeStep_) + "-" + step + ".png"));
       }
       timeStep_++;