From 93e5964e5f35914f3f7b89de620c596795550083 Mon Sep 17 00:00:00 2001
From: Arnaud Roques <plantuml@gmail.com>
Date: Wed, 4 May 2022 19:52:00 +0200
Subject: [PATCH] Import version 1.2022.5

---
 build.xml                                     |   2 +-
 skin/plantuml.skin                            |   2 +-
 skin/rose.skin                                |   9 +
 src/net/sourceforge/plantuml/SkinParam.java   |   2 +-
 .../plantuml/elk/CucaDiagramFileMakerElk.java |   2 +-
 .../sourceforge/plantuml/security/SURL.java   |   2 +-
 .../style/CommandStyleMultilinesCSS.java      |   1 -
 .../sourceforge/plantuml/style/Context.java   |   2 +-
 .../plantuml/style/FromSkinparamToStyle.java  |  24 ++-
 .../plantuml/style/StyleLoader.java           |   2 +-
 .../sourceforge/plantuml/svek/Boundary.java   |   3 +-
 .../plantuml/svek/CircleInterface2.java       |   3 +-
 .../sourceforge/plantuml/svek/Cluster.java    | 162 +++++++-----------
 .../plantuml/svek/ClusterPosition.java        |   2 +-
 .../plantuml/svek/ConcurrentStateImage.java   |   2 +-
 .../sourceforge/plantuml/svek/Control.java    |   3 +-
 ...ucaDiagramFileMakerSvek2InternalImage.java |   2 +-
 .../plantuml/svek/DecorateEntityImage.java    |   2 +-
 .../plantuml/svek/DecorateEntityImage3.java   |   1 -
 .../plantuml/svek/DirectionalTextBlock.java   |   3 +-
 .../plantuml/svek/EntityDomain.java           |   3 +-
 .../plantuml/svek/EntityImageDegenerated.java |   2 +-
 .../plantuml/svek/EntityImageProtected.java   |   2 +-
 .../plantuml/svek/GeneralImageBuilder.java    |  36 ++--
 .../plantuml/svek/GraphvizCrash.java          |   2 +-
 .../plantuml/svek/GroupPngMakerState.java     |  60 ++-----
 .../plantuml/svek/HeaderLayout.java           |   3 +-
 .../plantuml/svek/InnerActivity.java          |   1 -
 .../plantuml/svek/InnerStateAutonom.java      |   3 +-
 .../plantuml/svek/PackageStyle.java           |   2 +-
 .../plantuml/svek/RoundedContainer.java       |  40 +++--
 .../plantuml/svek/RoundedNorth.java           |  88 ++++++++++
 .../plantuml/svek/RoundedSouth.java           |  88 ++++++++++
 .../sourceforge/plantuml/svek/SvekLine.java   |   2 +-
 .../sourceforge/plantuml/svek/SvekNode.java   |   2 +-
 .../sourceforge/plantuml/svek/SvekResult.java |   2 +-
 .../svek/image/AbstractEntityImageBorder.java |   3 +-
 .../svek/image/EntityImageActivity.java       |   2 +-
 .../svek/image/EntityImageArcCircle.java      |   3 +-
 .../svek/image/EntityImageAssociation.java    |   3 +-
 .../image/EntityImageAssociationPoint.java    |   3 +-
 .../svek/image/EntityImageBranch.java         |   2 +-
 .../svek/image/EntityImageCircleEnd.java      |   3 +-
 .../svek/image/EntityImageCircleStart.java    |   3 +-
 .../plantuml/svek/image/EntityImageClass.java |   2 +-
 .../svek/image/EntityImageClassHeader.java    |   3 +-
 .../svek/image/EntityImageEmptyPackage.java   |   2 +-
 .../plantuml/svek/image/EntityImageGroup.java |   3 +-
 .../plantuml/svek/image/EntityImageJson.java  |   4 -
 .../image/EntityImageLollipopInterface.java   |   2 +-
 .../EntityImageLollipopInterfaceEye1.java     |   2 +-
 .../EntityImageLollipopInterfaceEye2.java     |   2 +-
 .../plantuml/svek/image/EntityImageNote.java  |   2 +-
 .../svek/image/EntityImageNoteLink.java       |   3 +-
 .../plantuml/svek/image/EntityImagePort.java  |   2 +-
 .../svek/image/EntityImagePseudoState.java    |   3 +-
 .../plantuml/svek/image/EntityImageState.java |   2 +-
 .../svek/image/EntityImageState2.java         |   3 +-
 .../svek/image/EntityImageStateBorder.java    |   2 +-
 .../svek/image/EntityImageStateCommon.java    |   3 +-
 .../EntityImageStateEmptyDescription.java     |   3 +-
 .../svek/image/EntityImageSynchroBar.java     |   3 +-
 .../plantuml/svek/image/EntityImageTips.java  |   2 +-
 .../svek/image/EntityImageUseCase.java        |   2 +-
 .../plantuml/svek/image/Footprint.java        |   2 +-
 .../plantuml/svek/image/Opale.java            |   2 +-
 .../sourceforge/plantuml/svg/SvgGraphics.java |  14 +-
 .../plantuml/timingdiagram/ChangeState.java   |  24 ++-
 .../plantuml/timingdiagram/Player.java        |  25 +--
 .../plantuml/timingdiagram/PlayerAnalog.java  |  12 +-
 .../plantuml/timingdiagram/PlayerBinary.java  |  35 +---
 .../plantuml/timingdiagram/PlayerClock.java   |  16 +-
 .../timingdiagram/PlayerRobustConcise.java    |  22 +--
 .../timingdiagram/TimeConstraint.java         |   2 +-
 .../plantuml/timingdiagram/TimingDiagram.java |  13 +-
 .../plantuml/timingdiagram/TimingRuler.java   |   3 +-
 .../timingdiagram/command/CommandBinary.java  |  18 +-
 .../command/CommandRobustConcise.java         |  18 +-
 .../timingdiagram/graphic/PlayerFrame.java    |   3 +-
 .../timingdiagram/graphic/Ribbon.java         |   2 +-
 .../timingdiagram/graphic/TimeArrow.java      |   2 +-
 .../plantuml/ugraphic/UImageSvg.java          |   4 +
 .../plantuml/ugraphic/color/HColorUtils.java  |  32 ++--
 .../plantuml/ugraphic/hand/UPathHand.java     |  12 +-
 .../sourceforge/plantuml/version/Version.java |   6 +-
 stdlib/classy-abx.repx                        | Bin 0 -> 10558 bytes
 stdlib/classy-c4-abx.repx                     | Bin 0 -> 3474 bytes
 stdlib/classy-c4-dex.repx                     |   1 +
 stdlib/classy-dex.repx                        |   1 +
 stdlib/domainstory-abx.repx                   | Bin 0 -> 2048 bytes
 stdlib/domainstory-dex.repx                   |   1 +
 stdlib/home.repx                              |  17 +-
 92 files changed, 513 insertions(+), 413 deletions(-)
 create mode 100644 src/net/sourceforge/plantuml/svek/RoundedNorth.java
 create mode 100644 src/net/sourceforge/plantuml/svek/RoundedSouth.java
 create mode 100644 stdlib/classy-abx.repx
 create mode 100644 stdlib/classy-c4-abx.repx
 create mode 100644 stdlib/classy-c4-dex.repx
 create mode 100644 stdlib/classy-dex.repx
 create mode 100644 stdlib/domainstory-abx.repx
 create mode 100644 stdlib/domainstory-dex.repx

diff --git a/build.xml b/build.xml
index 764b8da62a9..20d0e1d3e0b 100644
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,7 @@
 	<target name="compile">
 		<delete dir="build" />
 		<mkdir dir="build" />
-		<javac target="1.7" source="1.7" srcdir="src" destdir="build" debug="on" />
+		<javac target="1.8" source="1.8" srcdir="src" destdir="build" debug="on" />
 		<copy file="src/net/sourceforge/plantuml/version/logo.png"
 			todir="build/net/sourceforge/plantuml/version" />
 		<copy file="src/net/sourceforge/plantuml/version/favicon.png"
diff --git a/skin/plantuml.skin b/skin/plantuml.skin
index 18ce558ee86..5d604d9f85a 100644
--- a/skin/plantuml.skin
+++ b/skin/plantuml.skin
@@ -423,7 +423,7 @@ timingDiagram {
 	  FontSize 12
 	  LineColor darkgreen
 	  BackgroundColor: var(--grey-blue);
-      LineThickness 2
+      LineThickness 1.5
 	}
 	robust {
 	  FontStyle plain
diff --git a/skin/rose.skin b/skin/rose.skin
index 13133d2a633..e3fb8e6a06f 100644
--- a/skin/rose.skin
+++ b/skin/rose.skin
@@ -136,6 +136,14 @@ group {
     BackGroundColor transparent
 }
 
+componentDiagram {
+  node, rectangle {
+    LineColor black
+    LineThickness 1.5
+  }
+}
+
+
 sequenceDiagram {
   group {
     LineColor black
@@ -494,6 +502,7 @@ timingDiagram {
 	  FontSize 12
 	  LineColor darkgreen
 	  BackgroundColor #c
+      LineThickness 1.5
 	}
 	robust {
 	  FontStyle plain
diff --git a/src/net/sourceforge/plantuml/SkinParam.java b/src/net/sourceforge/plantuml/SkinParam.java
index fdcc0c72ba6..db7cd9b9438 100644
--- a/src/net/sourceforge/plantuml/SkinParam.java
+++ b/src/net/sourceforge/plantuml/SkinParam.java
@@ -217,7 +217,7 @@ List<String> cleanForKey(String key) {
 
 	List<String> cleanForKeySlow(String key) {
 		key = StringUtils.trin(StringUtils.goLowerCase(key));
-		key = key.replaceAll("_|\\.|\\s", "");
+		key = key.replaceAll("_|\\.", "");
 		// key = replaceSmart(key, "partition", "package");
 		key = replaceSmart(key, "sequenceparticipant", "participant");
 		key = replaceSmart(key, "sequenceactor", "actor");
diff --git a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java
index 8940842f5c8..0b973a06788 100644
--- a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java
+++ b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java
@@ -258,7 +258,7 @@ private void drawSingleCluster(UGraphic ug, IGroup group, ElkNode elkNode) {
 			final Style style = Cluster.getDefaultStyleDefinition(umlDiagramType.getStyleName(), group.getUSymbol())
 					.getMergedStyle(skinParam.getCurrentStyleBuilder());
 			final double shadowing = style.value(PName.Shadowing).asDouble();
-			final UStroke stroke = Cluster.getStrokeInternal(group, skinParam, style);
+			final UStroke stroke = Cluster.getStrokeInternal(group, style);
 
 			HColor backColor = getBackColor(umlDiagramType);
 			backColor = Cluster.getBackColor(backColor, skinParam, group.getStereotype(), umlDiagramType.getStyleName(),
diff --git a/src/net/sourceforge/plantuml/security/SURL.java b/src/net/sourceforge/plantuml/security/SURL.java
index 68a0cdb9e0d..fb9a487776c 100644
--- a/src/net/sourceforge/plantuml/security/SURL.java
+++ b/src/net/sourceforge/plantuml/security/SURL.java
@@ -110,7 +110,7 @@ public class SURL {
 	/**
 	 * Regex to remove the UserInfo part from a URL.
 	 */
-	private static final Pattern PATTERN_USERINFO = Pattern.compile("(^https?://)([-_:0-9a-zA-Z]+@)([^@]*)");
+	private static final Pattern PATTERN_USERINFO = Pattern.compile("(^https?://)([-_0-9a-zA-Z]+@)([^@]*)");
 
 	private static final ExecutorService EXE = Executors.newCachedThreadPool(new ThreadFactory() {
 		public Thread newThread(Runnable r) {
diff --git a/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java b/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java
index 9461e2b1a6a..fa3bfebbe11 100644
--- a/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java
+++ b/src/net/sourceforge/plantuml/style/CommandStyleMultilinesCSS.java
@@ -37,7 +37,6 @@
 
 import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.TitledDiagram;
-import net.sourceforge.plantuml.UseStyle;
 import net.sourceforge.plantuml.command.BlocLines;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.CommandMultilines2;
diff --git a/src/net/sourceforge/plantuml/style/Context.java b/src/net/sourceforge/plantuml/style/Context.java
index 14b8d419ce5..20d29bc9cef 100644
--- a/src/net/sourceforge/plantuml/style/Context.java
+++ b/src/net/sourceforge/plantuml/style/Context.java
@@ -83,7 +83,7 @@ public Collection<StyleSignatureBasic> toSignatures() {
 			final List<StyleSignatureBasic> tmp = new ArrayList<>();
 			for (StyleSignatureBasic ss : results)
 				for (String name : names)
-					tmp.add(ss.add(name));
+					tmp.add(ss.add(name.trim()));
 			results = tmp;
 		}
 
diff --git a/src/net/sourceforge/plantuml/style/FromSkinparamToStyle.java b/src/net/sourceforge/plantuml/style/FromSkinparamToStyle.java
index 9e68dd39604..7d9a33c6c59 100644
--- a/src/net/sourceforge/plantuml/style/FromSkinparamToStyle.java
+++ b/src/net/sourceforge/plantuml/style/FromSkinparamToStyle.java
@@ -210,6 +210,14 @@ public String toString() {
 		addMagic(SName.usecase);
 		addMagic(SName.map);
 		addMagic(SName.archimate);
+		
+		
+//		addConvert("nodeStereotypeFontSize", PName.FontSize, SName.node, SName.stereotype);
+//		addConvert("sequenceStereotypeFontSize", PName.FontSize, SName.stereotype);
+//		addConvert("sequenceStereotypeFontStyle", PName.FontStyle, SName.stereotype);
+//		addConvert("sequenceStereotypeFontColor", PName.FontColor, SName.stereotype);
+//		addConvert("sequenceStereotypeFontName", PName.FontName, SName.stereotype);
+
 
 	}
 
@@ -221,8 +229,14 @@ private static void addMagic(SName sname) {
 		addConvert(cleanName + "RoundCorner", PName.RoundCorner, sname);
 		addConvert(cleanName + "DiagonalCorner", PName.DiagonalCorner, sname);
 		addConvert(cleanName + "BorderStyle", PName.LineStyle, sname);
-		addConvert(cleanName + "StereotypeFontColor", PName.FontColor, SName.stereotype, sname);
 		addConFont(cleanName, sname);
+		addConvert(cleanName + "Shadowing", PName.Shadowing, sname);
+		
+		addConvert(cleanName + "StereotypeFontSize", PName.FontSize, SName.stereotype, sname);
+		addConvert(cleanName + "StereotypeFontStyle", PName.FontStyle, SName.stereotype, sname);
+		addConvert(cleanName + "StereotypeFontColor", PName.FontColor, SName.stereotype, sname);
+		addConvert(cleanName + "StereotypeFontName", PName.FontName, SName.stereotype, sname);
+
 	}
 
 	private final List<Style> styles = new ArrayList<>();
@@ -234,7 +248,7 @@ public FromSkinparamToStyle(String key) {
 		if (key.contains("<<")) {
 			final StringTokenizer st = new StringTokenizer(key, "<>");
 			this.key = st.nextToken();
-			this.stereo = st.hasMoreTokens() ? st.nextToken() : null;
+			this.stereo = st.hasMoreTokens() ? st.nextToken().trim() : null;
 		} else {
 			this.key = key;
 			this.stereo = null;
@@ -243,6 +257,12 @@ public FromSkinparamToStyle(String key) {
 	}
 
 	public void convertNow(String value, final AutomaticCounter counter) {
+		if (key.endsWith("shadowing")) {
+			if (value.equalsIgnoreCase("false"))
+				value = "0";
+			else if (value.equalsIgnoreCase("true"))
+				value = "3";
+		}
 		if (value.equalsIgnoreCase("right:right"))
 			value = "right";
 		if (value.equalsIgnoreCase("dotted"))
diff --git a/src/net/sourceforge/plantuml/style/StyleLoader.java b/src/net/sourceforge/plantuml/style/StyleLoader.java
index ded52bdddf0..7339930b773 100644
--- a/src/net/sourceforge/plantuml/style/StyleLoader.java
+++ b/src/net/sourceforge/plantuml/style/StyleLoader.java
@@ -164,7 +164,7 @@ public static Collection<Style> getDeclaredStyles(BlocLines lines, AutomaticCoun
 
 			final Matcher2 mKeyNames = keyName.matcher(trimmed);
 			if (mKeyNames.find()) {
-				String names = mKeyNames.group(1).replace(" ", "");
+				String names = mKeyNames.group(1);
 				final boolean isRecurse = mKeyNames.group(2) != null;
 				if (isRecurse)
 					names += "*";
diff --git a/src/net/sourceforge/plantuml/svek/Boundary.java b/src/net/sourceforge/plantuml/svek/Boundary.java
index 71db2436dfa..f5fa27ae527 100644
--- a/src/net/sourceforge/plantuml/svek/Boundary.java
+++ b/src/net/sourceforge/plantuml/svek/Boundary.java
@@ -35,9 +35,8 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.SymbolContext;
diff --git a/src/net/sourceforge/plantuml/svek/CircleInterface2.java b/src/net/sourceforge/plantuml/svek/CircleInterface2.java
index f5f1cd24c37..a723bf1c0db 100644
--- a/src/net/sourceforge/plantuml/svek/CircleInterface2.java
+++ b/src/net/sourceforge/plantuml/svek/CircleInterface2.java
@@ -35,9 +35,8 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
diff --git a/src/net/sourceforge/plantuml/svek/Cluster.java b/src/net/sourceforge/plantuml/svek/Cluster.java
index e62db44f216..02c5b0760eb 100644
--- a/src/net/sourceforge/plantuml/svek/Cluster.java
+++ b/src/net/sourceforge/plantuml/svek/Cluster.java
@@ -74,11 +74,10 @@
 import net.sourceforge.plantuml.graphic.color.ColorType;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.posimo.Moveable;
-import net.sourceforge.plantuml.skin.rose.Rose;
-import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.svek.image.EntityImageState;
 import net.sourceforge.plantuml.ugraphic.UComment;
@@ -308,7 +307,7 @@ static public StyleSignature getDefaultStyleDefinitionStateGroup(Stereotype ster
 				.withTOBECHANGED(stereotype);
 	}
 
-	public void drawU(UGraphic ug, UmlDiagramType umlDiagramType, ISkinParam skinParam2) {
+	public void drawU(UGraphic ug, UmlDiagramType umlDiagramType, ISkinParam skinParam2unused) {
 		if (group.isHidden())
 			return;
 
@@ -316,40 +315,17 @@ public void drawU(UGraphic ug, UmlDiagramType umlDiagramType, ISkinParam skinPar
 		if (fullName.startsWith("##") == false)
 			ug.draw(new UComment("cluster " + fullName));
 
+		final USymbol uSymbol = group.getUSymbol() == null ? USymbols.PACKAGE : group.getUSymbol();
+		Style style = getDefaultStyleDefinition(umlDiagramType.getStyleName(), uSymbol)
+				.withTOBECHANGED(group.getStereotype()).getMergedStyle(skinParam.getCurrentStyleBuilder());
+		final double shadowing = style.value(PName.Shadowing).asDouble();
 		HColor borderColor;
-		Style style = null;
-		final double rounded;
-		final double diagonalCorner;
-		final double shadowing;
-		if (UseStyle.useBetaStyle()) {
-			final USymbol uSymbol = group.getUSymbol() == null ? USymbols.PACKAGE : group.getUSymbol();
-			final StyleSignatureBasic tmp = getDefaultStyleDefinition(umlDiagramType.getStyleName(), uSymbol);
-			style = tmp.withTOBECHANGED(group.getStereotype()).getMergedStyle(skinParam.getCurrentStyleBuilder());
-			shadowing = style.value(PName.Shadowing).asDouble();
-			if (group.getColors().getColor(ColorType.LINE) != null)
-				borderColor = group.getColors().getColor(ColorType.LINE);
-			else
-				borderColor = style.value(PName.LineColor).asColor(skinParam2.getThemeStyle(),
-						skinParam2.getIHtmlColorSet());
-			rounded = style.value(PName.RoundCorner).asDouble();
-			diagonalCorner = style.value(PName.DiagonalCorner).asDouble();
-
-		} else {
-			if (group.getUSymbol() == null)
-				shadowing = skinParam2.shadowing2(group.getStereotype(), USymbols.PACKAGE.getSkinParameter()) ? 3 : 0;
-			else
-				shadowing = skinParam2.shadowing2(group.getStereotype(), group.getUSymbol().getSkinParameter()) ? 3 : 0;
-
-			rounded = IEntityImage.CORNER;
-			if (umlDiagramType == UmlDiagramType.STATE)
-				borderColor = getColor(ColorParam.stateBorder, skinParam, group.getStereotype());
-			else if (umlDiagramType == UmlDiagramType.ACTIVITY)
-				borderColor = getColor(ColorParam.packageBorder, skinParam, group.getStereotype());
-			else
-				borderColor = getColor(ColorParam.packageBorder, skinParam, group.getStereotype());
-			diagonalCorner = 0;
-
-		}
+		if (group.getColors().getColor(ColorType.LINE) != null)
+			borderColor = group.getColors().getColor(ColorType.LINE);
+		else
+			borderColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet());
+		final double rounded = style.value(PName.RoundCorner).asDouble();
+		final double diagonalCorner = style.value(PName.DiagonalCorner).asDouble();
 
 		ug.startGroup(Collections.singletonMap(UGroupType.ID, "cluster_" + fullName));
 
@@ -368,49 +344,30 @@ else if (umlDiagramType == UmlDiagramType.ACTIVITY)
 			final boolean isState = umlDiagramType == UmlDiagramType.STATE;
 
 			if (isState && group.getUSymbol() == null) {
-				UStroke strokeForState = getDefaultStyleDefinition(SName.stateDiagram, null)
-						.getMergedStyle(skinParam.getCurrentStyleBuilder()).getStroke();
-				if (group.getColors().getSpecificLineStroke() != null)
-					strokeForState = group.getColors().getSpecificLineStroke();
-
-				if (group.getColors().getColor(ColorType.LINE) != null)
-					borderColor = group.getColors().getColor(ColorType.LINE);
-
-				drawUState(ug, borderColor, skinParam2, strokeForState, umlDiagramType, rounded, shadowing);
+				drawUState(ug, umlDiagramType, rounded, shadowing);
 				return;
 			}
 			PackageStyle packageStyle = group.getPackageStyle();
 			if (packageStyle == null)
-				packageStyle = skinParam2.packageStyle();
+				packageStyle = skinParam.packageStyle();
 
 			if (border != null) {
-				final HColor tmp = skinParam2.getHtmlColor(border, group.getStereotype(), false);
+				final HColor tmp = skinParam.getHtmlColor(border, group.getStereotype(), false);
 				if (tmp != null)
 					borderColor = tmp;
 			}
 
-			final UStroke stroke;
-			if (UseStyle.useBetaStyle())
-				stroke = getStrokeInternal(group, skinParam2, style);
-			else
-				stroke = getStrokeInternal(group, skinParam2, null);
+			final UStroke stroke = getStrokeInternal(group, style);
 
 			HColor backColor = getBackColor(umlDiagramType, style);
-			backColor = getBackColor(backColor, skinParam2, group.getStereotype(), umlDiagramType.getStyleName(),
+			backColor = getBackColor(backColor, skinParam, group.getStereotype(), umlDiagramType.getStyleName(),
 					group.getUSymbol());
 			if (ztitle != null || zstereo != null) {
-				final double roundCorner;
-				if (UseStyle.useBetaStyle())
-					roundCorner = rounded;
-				else
-					roundCorner = group.getUSymbol() == null ? 0
-							: group.getUSymbol().getSkinParameter().getRoundCorner(skinParam, group.getStereotype());
-
 				final ClusterDecoration decoration = new ClusterDecoration(packageStyle, group.getUSymbol(), ztitle,
 						zstereo, minX, minY, maxX, maxY, stroke);
-				decoration.drawU(ug, backColor, borderColor, shadowing, roundCorner,
-						skinParam2.getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null, false, null),
-						skinParam2.getStereotypeAlignment(), diagonalCorner);
+				decoration.drawU(ug, backColor, borderColor, shadowing, rounded,
+						skinParam.getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null, false, null),
+						skinParam.getStereotypeAlignment(), diagonalCorner);
 				return;
 			}
 			final URectangle rect = new URectangle(maxX - minX, maxY - minY);
@@ -425,18 +382,12 @@ else if (umlDiagramType == UmlDiagramType.ACTIVITY)
 		}
 	}
 
-	static public UStroke getStrokeInternal(IGroup group, ISkinParam skinParam, Style style) {
+	static public UStroke getStrokeInternal(IGroup group, Style style) {
 		final Colors colors = group.getColors();
 		if (colors.getSpecificLineStroke() != null)
 			return colors.getSpecificLineStroke();
 
-		if (style != null)
-			return style.getStroke();
-
-		if (group.getUSymbol() != null && group.getUSymbol() != USymbols.PACKAGE)
-			return group.getUSymbol().getSkinParameter().getStroke(skinParam, group.getStereotype());
-
-		return GeneralImageBuilder.getForcedStroke(group.getStereotype(), skinParam);
+		return style.getStroke();
 	}
 
 	public void manageEntryExitPoint(StringBounder stringBounder) {
@@ -477,12 +428,19 @@ private void drawSwinLinesState(UGraphic ug, HColor borderColor) {
 
 	}
 
-	private HColor getColorLegacy(ISkinParam skinParam, ColorParam colorParam, Stereotype stereo) {
-		return new Rose().getHtmlColor(skinParam, stereo, colorParam);
+	// GroupPngMakerState
+	private Style getStyleStateHeader() {
+		return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.state, SName.header)
+				.withTOBECHANGED(group.getStereotype()).getMergedStyle(skinParam.getCurrentStyleBuilder());
 	}
 
-	private void drawUState(UGraphic ug, HColor borderColor, ISkinParam skinParam2, UStroke stroke,
-			UmlDiagramType umlDiagramType, double rounded, double shadowing) {
+	private Style getStyleState() {
+		return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.state)
+				.withTOBECHANGED(group.getStereotype()).getMergedStyle(skinParam.getCurrentStyleBuilder());
+	}
+	// GroupPngMakerState
+
+	private void drawUState(UGraphic ug, UmlDiagramType umlDiagramType, double rounded, double shadowing) {
 		final Dimension2D total = new Dimension2DDouble(maxX - minX, maxY - minY);
 		final double suppY;
 		if (ztitle == null)
@@ -494,26 +452,33 @@ private void drawUState(UGraphic ug, HColor borderColor, ISkinParam skinParam2,
 		final Style styleGroup = getDefaultStyleDefinitionStateGroup(group.getStereotype())
 				.getMergedStyle(skinParam.getCurrentStyleBuilder());
 
-		HColor stateBack = getBackColor(umlDiagramType, styleGroup);
-		if (UseStyle.useBetaStyle() == false && stateBack == null)
-			stateBack = getColorLegacy(skinParam2, ColorParam.stateBackground, group.getStereotype());
+		HColor borderColor = group.getColors().getColor(ColorType.LINE);
+		if (borderColor == null)
+			borderColor = getStyleState().value(PName.LineColor).asColor(skinParam.getThemeStyle(),
+					skinParam.getIHtmlColorSet());
 
-		final HColor background;
-		if (UseStyle.useBetaStyle() == false)
-			background = getColorLegacy(skinParam2, ColorParam.background, null);
-		else
-			background = stateBack;
+		HColor backColor = group.getColors().getColor(ColorType.BACK);
+		if (backColor == null)
+			backColor = getStyleState().value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(),
+					skinParam.getIHtmlColorSet());
+
+		final HColor imgBackcolor = getBackColor(umlDiagramType, styleGroup);
 
 		// final Style style = getStyle(FontParam.STATE_ATTRIBUTE, skinParam2);
 
-		final TextBlock attribute = GeneralImageBuilder.stateHeader(group, styleGroup, skinParam2);
+		final TextBlock attribute = GeneralImageBuilder.stateHeader(group, styleGroup, skinParam);
 		final double attributeHeight = attribute.calculateDimension(ug.getStringBounder()).getHeight();
 		if (total.getWidth() == 0) {
 			System.err.println("Cluster::drawUState issue");
 			return;
 		}
+
+		UStroke stroke = group.getColors().getSpecificLineStroke();
+		if (stroke == null)
+			stroke = getStyleState().getStroke();
+
 		final RoundedContainer r = new RoundedContainer(total, suppY,
-				attributeHeight + (attributeHeight > 0 ? IEntityImage.MARGIN : 0), borderColor, stateBack, background,
+				attributeHeight + (attributeHeight > 0 ? IEntityImage.MARGIN : 0), borderColor, backColor, imgBackcolor,
 				stroke, rounded, shadowing);
 		r.drawU(ug.apply(new UTranslate(minX, minY)));
 
@@ -919,20 +884,19 @@ private final HColor getBackColor(UmlDiagramType umlDiagramType, Style style) {
 
 		final Stereotype stereo = group.getStereotype();
 
-		if (UseStyle.useBetaStyle())
-			return style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet());
-
-		final USymbol sym = group.getUSymbol() == null ? USymbols.PACKAGE : group.getUSymbol();
-		final ColorParam backparam = umlDiagramType == UmlDiagramType.ACTIVITY ? ColorParam.partitionBackground
-				: sym.getColorParamBack();
-		final HColor c1 = skinParam.getHtmlColor(backparam, stereo, false);
-		if (c1 != null)
-			return c1;
-
-		if (parentCluster == null)
-			return null;
-
-		return parentCluster.getBackColor(umlDiagramType, style);
+		return style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet());
+
+//		final USymbol sym = group.getUSymbol() == null ? USymbols.PACKAGE : group.getUSymbol();
+//		final ColorParam backparam = umlDiagramType == UmlDiagramType.ACTIVITY ? ColorParam.partitionBackground
+//				: sym.getColorParamBack();
+//		final HColor c1 = skinParam.getHtmlColor(backparam, stereo, false);
+//		if (c1 != null)
+//			return c1;
+//
+//		if (parentCluster == null)
+//			return null;
+//
+//		return parentCluster.getBackColor(umlDiagramType, style);
 	}
 
 	public boolean isClusterOf(IEntity ent) {
diff --git a/src/net/sourceforge/plantuml/svek/ClusterPosition.java b/src/net/sourceforge/plantuml/svek/ClusterPosition.java
index 769ee564794..bf6057060ee 100644
--- a/src/net/sourceforge/plantuml/svek/ClusterPosition.java
+++ b/src/net/sourceforge/plantuml/svek/ClusterPosition.java
@@ -36,10 +36,10 @@
 package net.sourceforge.plantuml.svek;
 
 import java.awt.geom.CubicCurve2D;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.posimo.BezierUtils;
 
 public class ClusterPosition {
diff --git a/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java b/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java
index ec8628d2af0..ae0cf6c7290 100644
--- a/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java
+++ b/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -43,6 +42,7 @@
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.skin.rose.Rose;
diff --git a/src/net/sourceforge/plantuml/svek/Control.java b/src/net/sourceforge/plantuml/svek/Control.java
index ec33f0ded7d..22acf03d674 100644
--- a/src/net/sourceforge/plantuml/svek/Control.java
+++ b/src/net/sourceforge/plantuml/svek/Control.java
@@ -35,9 +35,8 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.SymbolContext;
diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java
index 21c505c7fa4..9b05d0a9ff0 100644
--- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java
+++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java
@@ -35,13 +35,13 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.List;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java
index 238bd1479ba..22fd6153446 100644
--- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java
+++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java
@@ -35,10 +35,10 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.Objects;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.StringBounder;
diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java
index 82dc10794ef..e7dfee65a59 100644
--- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java
+++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java
@@ -36,7 +36,6 @@
 package net.sourceforge.plantuml.svek;
 
 import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
diff --git a/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java b/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java
index bc4aecf04e4..ef09f7563ce 100644
--- a/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java
+++ b/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java
@@ -35,9 +35,8 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Direction;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
diff --git a/src/net/sourceforge/plantuml/svek/EntityDomain.java b/src/net/sourceforge/plantuml/svek/EntityDomain.java
index bef207a5818..5558512b48f 100644
--- a/src/net/sourceforge/plantuml/svek/EntityDomain.java
+++ b/src/net/sourceforge/plantuml/svek/EntityDomain.java
@@ -35,9 +35,8 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.SymbolContext;
diff --git a/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java b/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java
index 6f3c415b6d0..803ed40316d 100644
--- a/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java
+++ b/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java
@@ -35,11 +35,11 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.InnerStrategy;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.ugraphic.MinMax;
diff --git a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java
index e9c4c3c0a48..9758e08e536 100644
--- a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java
+++ b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java
@@ -35,10 +35,10 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.dot.Neighborhood;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.InnerStrategy;
diff --git a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java
index fb22a5c05b5..a2c7abb2c94 100644
--- a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java
+++ b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java
@@ -102,10 +102,10 @@
 import net.sourceforge.plantuml.graphic.USymbolHexagon;
 import net.sourceforge.plantuml.graphic.USymbolInterface;
 import net.sourceforge.plantuml.graphic.USymbols;
-import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.svek.image.EntityImageActivity;
 import net.sourceforge.plantuml.svek.image.EntityImageArcCircle;
@@ -703,24 +703,26 @@ private TextBlock getTitleBlock(IGroup g) {
 			return TextBlockUtils.empty(0, 0);
 
 		final ISkinParam skinParam = dotData.getSkinParam();
-		final FontConfiguration fontConfiguration;
-		if (UseStyle.useBetaStyle()) {
-			final SName sname = dotData.getUmlDiagramType().getStyleName();
-			final StyleSignatureBasic signature;
-			final USymbol uSymbol = g.getUSymbol();
-			if (uSymbol == USymbols.RECTANGLE)
-				signature = StyleSignatureBasic.of(SName.root, SName.element, sname, uSymbol.getSName(), SName.title);
-			else
-				signature = StyleSignatureBasic.of(SName.root, SName.element, sname, SName.title);
 
-			final Style style = signature //
-					.withTOBECHANGED(g.getStereotype()) //
-					.with(g.getStereostyles()) //
-					.getMergedStyle(skinParam.getCurrentStyleBuilder());
+		final SName sname = dotData.getUmlDiagramType().getStyleName();
+		final StyleSignatureBasic signature;
+		final USymbol uSymbol = g.getUSymbol();
+		if (g.getGroupType() == GroupType.STATE)
+			signature = StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.state,
+					SName.header);
+		else if (uSymbol == USymbols.RECTANGLE)
+			signature = StyleSignatureBasic.of(SName.root, SName.element, sname, uSymbol.getSName(), SName.title);
+		else
+			signature = StyleSignatureBasic.of(SName.root, SName.element, sname, SName.title);
+
+		final Style style = signature //
+				.withTOBECHANGED(g.getStereotype()) //
+				.with(g.getStereostyles()) //
+				.getMergedStyle(skinParam.getCurrentStyleBuilder());
+
+		final FontConfiguration fontConfiguration = style.getFontConfiguration(skinParam.getThemeStyle(),
+				skinParam.getIHtmlColorSet());
 
-			fontConfiguration = style.getFontConfiguration(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet());
-		} else
-			fontConfiguration = g.getFontConfigurationForTitle(skinParam);
 		final HorizontalAlignment alignment = HorizontalAlignment.CENTER;
 		return label.create(fontConfiguration, alignment, dotData.getSkinParam());
 	}
diff --git a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java
index b023ccdb575..05fc913ecf8 100644
--- a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java
+++ b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java
@@ -36,7 +36,6 @@
 package net.sourceforge.plantuml.svek;
 
 import java.awt.Color;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,6 +43,7 @@
 import net.sourceforge.plantuml.BackSlash;
 import net.sourceforge.plantuml.OptionPrint;
 import net.sourceforge.plantuml.StringUtils;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils;
 import net.sourceforge.plantuml.flashcode.FlashCodeFactory;
diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java
index 08435e54b9d..8bf77e7ee2a 100644
--- a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java
+++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java
@@ -40,10 +40,7 @@
 import java.util.List;
 import java.util.Set;
 
-import net.sourceforge.plantuml.ColorParam;
-import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
-import net.sourceforge.plantuml.UseStyle;
 import net.sourceforge.plantuml.cucadiagram.CucaDiagram;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.EntityUtils;
@@ -62,7 +59,6 @@
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.color.ColorType;
-import net.sourceforge.plantuml.skin.rose.Rose;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
@@ -128,30 +124,18 @@ private Style getStyleStateHeader() {
 	}
 
 	private Style getStyleState() {
-		return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.state).withTOBECHANGED(group.getStereotype())
-				.getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder());
+		return StyleSignatureBasic.of(SName.root, SName.element, SName.stateDiagram, SName.state)
+				.withTOBECHANGED(group.getStereotype()).getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder());
 	}
 
 	public IEntityImage getImage() {
 		final Display display = group.getDisplay();
 		final ISkinParam skinParam = diagram.getSkinParam();
 
-		final FontConfiguration fontConfiguration;
-		final double rounded;
-		double shadowing = 0;
-
-		if (UseStyle.useBetaStyle()) {
-			rounded = getStyleState().value(PName.RoundCorner).asDouble();
-			shadowing = getStyleState().value(PName.Shadowing).asDouble();
-			fontConfiguration = getStyleStateHeader().getFontConfiguration(skinParam.getThemeStyle(),
-					skinParam.getIHtmlColorSet());
-		} else {
-			rounded = IEntityImage.CORNER;
-			fontConfiguration = FontConfiguration.create(skinParam, FontParam.STATE, group.getStereotype());
-			if (skinParam.shadowing(group.getStereotype()))
-				shadowing = 3.0;
-		}
-
+		final double rounded = getStyleState().value(PName.RoundCorner).asDouble();
+		final double shadowing = getStyleState().value(PName.Shadowing).asDouble();
+		final FontConfiguration fontConfiguration = getStyleStateHeader()
+				.getFontConfiguration(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet());
 		final TextBlock title = display.create(fontConfiguration, HorizontalAlignment.CENTER, diagram.getSkinParam());
 
 		if (group.size() == 0 && group.getChildren().size() == 0)
@@ -175,30 +159,18 @@ skinParam, new InnerGroupHierarchy(), diagram.getColorMapper(), diagram.getEntit
 
 		HColor borderColor = group.getColors().getColor(ColorType.LINE);
 		if (borderColor == null)
-			if (UseStyle.useBetaStyle())
-				borderColor = getStyleState().value(PName.LineColor).asColor(skinParam.getThemeStyle(),
-						skinParam.getIHtmlColorSet());
-			else
-				borderColor = getColor(ColorParam.stateBorder, group.getStereotype());
+			borderColor = getStyleState().value(PName.LineColor).asColor(skinParam.getThemeStyle(),
+					skinParam.getIHtmlColorSet());
 
 		final Stereotype stereo = group.getStereotype();
-		final HColor tmp = group.getColors().getColor(ColorType.BACK);
-		final HColor backColor;
-		if (tmp == null)
-			if (UseStyle.useBetaStyle())
-				backColor = getStyleState().value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(),
-						skinParam.getIHtmlColorSet());
-			else
-				backColor = getColor(ColorParam.stateBackground, stereo);
-		else
-			backColor = tmp;
+		HColor backColor = group.getColors().getColor(ColorType.BACK);
+		if (backColor == null)
+			backColor = getStyleState().value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(),
+					skinParam.getIHtmlColorSet());
 
 		UStroke stroke = group.getColors().getSpecificLineStroke();
 		if (stroke == null)
-			if (UseStyle.useBetaStyle())
-				stroke = getStyleState().getStroke();
-			else
-				stroke = new UStroke(1.5);
+			stroke = getStyleState().getStroke();
 
 		final TextBlock attribute = GeneralImageBuilder.stateHeader((IEntity) group, null, skinParam);
 
@@ -236,10 +208,4 @@ private boolean containsOnlyConcurrentStates(DotData dotData) {
 		return true;
 	}
 
-	private final Rose rose = new Rose();
-
-	private HColor getColor(ColorParam colorParam, Stereotype stereo) {
-		final ISkinParam skinParam = diagram.getSkinParam();
-		return rose.getHtmlColor(skinParam, stereo, colorParam);
-	}
 }
diff --git a/src/net/sourceforge/plantuml/svek/HeaderLayout.java b/src/net/sourceforge/plantuml/svek/HeaderLayout.java
index 0240ccac232..60ba6b2ffc0 100644
--- a/src/net/sourceforge/plantuml/svek/HeaderLayout.java
+++ b/src/net/sourceforge/plantuml/svek/HeaderLayout.java
@@ -35,9 +35,8 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockEmpty;
diff --git a/src/net/sourceforge/plantuml/svek/InnerActivity.java b/src/net/sourceforge/plantuml/svek/InnerActivity.java
index ec91538c71c..bf1f1bc9cee 100644
--- a/src/net/sourceforge/plantuml/svek/InnerActivity.java
+++ b/src/net/sourceforge/plantuml/svek/InnerActivity.java
@@ -36,7 +36,6 @@
 package net.sourceforge.plantuml.svek;
 
 import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java
index 3514ac9ec1f..815a75bfda3 100644
--- a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java
+++ b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java
@@ -35,10 +35,9 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
diff --git a/src/net/sourceforge/plantuml/svek/PackageStyle.java b/src/net/sourceforge/plantuml/svek/PackageStyle.java
index bc672b4203c..720f03b6fef 100644
--- a/src/net/sourceforge/plantuml/svek/PackageStyle.java
+++ b/src/net/sourceforge/plantuml/svek/PackageStyle.java
@@ -36,10 +36,10 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.EnumSet;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.USymbol;
 import net.sourceforge.plantuml.graphic.USymbols;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/svek/RoundedContainer.java b/src/net/sourceforge/plantuml/svek/RoundedContainer.java
index 8f50d31b61d..0739481abfe 100644
--- a/src/net/sourceforge/plantuml/svek/RoundedContainer.java
+++ b/src/net/sourceforge/plantuml/svek/RoundedContainer.java
@@ -36,13 +36,15 @@
 package net.sourceforge.plantuml.svek;
 
 import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.ULine;
+import net.sourceforge.plantuml.ugraphic.UPath;
 import net.sourceforge.plantuml.ugraphic.URectangle;
+import net.sourceforge.plantuml.ugraphic.UShape;
 import net.sourceforge.plantuml.ugraphic.UStroke;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
 
 public final class RoundedContainer {
 
@@ -58,9 +60,9 @@ public final class RoundedContainer {
 
 	public RoundedContainer(Dimension2D dim, double titleHeight, double attributeHeight, HColor borderColor,
 			HColor backColor, HColor imgBackcolor, UStroke stroke, double rounded, double shadowing) {
-		if (dim.getWidth() == 0) {
+		if (dim.getWidth() == 0)
 			throw new IllegalArgumentException();
-		}
+
 		this.rounded = rounded;
 		this.dim = dim;
 		this.imgBackcolor = imgBackcolor;
@@ -73,28 +75,28 @@ public RoundedContainer(Dimension2D dim, double titleHeight, double attributeHei
 	}
 
 	public void drawU(UGraphic ug) {
-		ug = ug.apply(backColor.bg()).apply(borderColor);
+		ug = ug.apply(backColor.bg()).apply(borderColor).apply(stroke);
 		final URectangle rect = new URectangle(dim.getWidth(), dim.getHeight()).rounded(rounded);
-		rect.setDeltaShadow(shadowing);
-		ug.apply(stroke).draw(rect);
-
-		final double yLine = titleHeight + attributeHeight;
 
-		ug = ug.apply(imgBackcolor.bg());
+		if (shadowing > 0) {
+			rect.setDeltaShadow(shadowing);
+			ug.apply(HColorUtils.transparent().bg()).draw(rect);
+			rect.setDeltaShadow(0);
+			
+		}
+		final double headerHeight = titleHeight + attributeHeight;
 
-		final double thickness = stroke.getThickness();
+		new RoundedNorth(dim.getWidth(), headerHeight, backColor, rounded).drawU(ug);
+		new RoundedSouth(dim.getWidth(), dim.getHeight() - headerHeight, imgBackcolor, rounded)
+				.drawU(ug.apply(UTranslate.dy(headerHeight)));
 
-		final URectangle inner = new URectangle(dim.getWidth() - 4 * thickness,
-				dim.getHeight() - titleHeight - 4 * thickness - attributeHeight).rounded(rounded);
-		ug.apply(imgBackcolor).apply(new UTranslate(2 * thickness, yLine + 2 * thickness)).draw(inner);
+		ug.apply(HColorUtils.transparent().bg()).draw(rect);
 
-		if (titleHeight > 0) {
-			ug.apply(stroke).apply(UTranslate.dy(yLine)).draw(ULine.hline(dim.getWidth()));
-		}
+		if (headerHeight > 0)
+			ug.apply(UTranslate.dy(headerHeight)).draw(ULine.hline(dim.getWidth()));
 
-		if (attributeHeight > 0) {
-			ug.apply(stroke).apply(UTranslate.dy(yLine - attributeHeight)).draw(ULine.hline(dim.getWidth()));
-		}
+		if (attributeHeight > 0)
+			ug.apply(UTranslate.dy(titleHeight)).draw(ULine.hline(dim.getWidth()));
 
 	}
 }
diff --git a/src/net/sourceforge/plantuml/svek/RoundedNorth.java b/src/net/sourceforge/plantuml/svek/RoundedNorth.java
new file mode 100644
index 00000000000..6c6834bc8b7
--- /dev/null
+++ b/src/net/sourceforge/plantuml/svek/RoundedNorth.java
@@ -0,0 +1,88 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2023, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ *
+ */
+package net.sourceforge.plantuml.svek;
+
+import net.sourceforge.plantuml.graphic.UDrawable;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UPath;
+import net.sourceforge.plantuml.ugraphic.URectangle;
+import net.sourceforge.plantuml.ugraphic.UShape;
+import net.sourceforge.plantuml.ugraphic.UStroke;
+import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
+
+public final class RoundedNorth implements UDrawable {
+
+	private final double width;
+	private final double height;
+	private final HColor backColor;
+	private final double rounded;
+
+	public RoundedNorth(double width, double height, HColor backColor, double rounded) {
+		if (width == 0)
+			throw new IllegalArgumentException();
+		if (height == 0)
+			throw new IllegalArgumentException();
+
+		this.width = width;
+		this.height = height;
+		this.rounded = rounded;
+		this.backColor = backColor;
+	}
+
+	public void drawU(UGraphic ug) {
+		if (HColorUtils.isTransparent(backColor))
+			return;
+
+		final UShape header;
+		if (rounded == 0) {
+			header = new URectangle(width, height);
+		} else {
+			final UPath path = new UPath();
+			path.moveTo(rounded / 2, 0);
+			path.lineTo(width - rounded / 2, 0);
+			path.arcTo(rounded / 2, rounded / 2, 0, 0, 1, width, rounded / 2);
+			path.lineTo(width, height);
+			path.lineTo(0, height);
+			path.lineTo(0, rounded / 2);
+			path.arcTo(rounded / 2, rounded / 2, 0, 0, 1, rounded / 2, 0);
+			path.closePath();
+			header = path;
+		}
+		ug.apply(new UStroke()).apply(backColor).apply(backColor.bg()).draw(header);
+
+	}
+}
diff --git a/src/net/sourceforge/plantuml/svek/RoundedSouth.java b/src/net/sourceforge/plantuml/svek/RoundedSouth.java
new file mode 100644
index 00000000000..c1767748557
--- /dev/null
+++ b/src/net/sourceforge/plantuml/svek/RoundedSouth.java
@@ -0,0 +1,88 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2023, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ *
+ */
+package net.sourceforge.plantuml.svek;
+
+import net.sourceforge.plantuml.graphic.UDrawable;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UPath;
+import net.sourceforge.plantuml.ugraphic.URectangle;
+import net.sourceforge.plantuml.ugraphic.UShape;
+import net.sourceforge.plantuml.ugraphic.UStroke;
+import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
+
+public final class RoundedSouth implements UDrawable {
+
+	private final double width;
+	private final double height;
+	private final HColor backColor;
+	private final double rounded;
+
+	public RoundedSouth(double width, double height, HColor backColor, double rounded) {
+		if (width == 0)
+			throw new IllegalArgumentException();
+		if (height == 0)
+			throw new IllegalArgumentException();
+
+		this.width = width;
+		this.height = height;
+		this.rounded = rounded;
+		this.backColor = backColor;
+	}
+
+	public void drawU(UGraphic ug) {
+		if (HColorUtils.isTransparent(backColor))
+			return;
+
+		final UShape header;
+		if (rounded == 0) {
+			header = new URectangle(width, height);
+		} else {
+			final UPath path = new UPath();
+			path.moveTo(0, 0);
+			path.lineTo(width, 0);
+			path.lineTo(width, height - rounded / 2);
+			path.arcTo(rounded / 2, rounded / 2, 0, 0, 1, width - rounded / 2, height);
+			path.lineTo(rounded / 2, height);
+			path.arcTo(rounded / 2, rounded / 2, 0, 0, 1, 0, height - rounded / 2);
+			path.lineTo(0, 0);
+			path.closePath();
+			header = path;
+		}
+		ug.apply(new UStroke()).apply(backColor).apply(backColor.bg()).draw(header);
+
+	}
+}
diff --git a/src/net/sourceforge/plantuml/svek/SvekLine.java b/src/net/sourceforge/plantuml/svek/SvekLine.java
index e2246731df3..c7003d3ec7c 100644
--- a/src/net/sourceforge/plantuml/svek/SvekLine.java
+++ b/src/net/sourceforge/plantuml/svek/SvekLine.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -57,6 +56,7 @@
 import net.sourceforge.plantuml.StringUtils;
 import net.sourceforge.plantuml.UmlDiagramType;
 import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.EntityPort;
diff --git a/src/net/sourceforge/plantuml/svek/SvekNode.java b/src/net/sourceforge/plantuml/svek/SvekNode.java
index bf8d1ac21ac..226ea4fa855 100644
--- a/src/net/sourceforge/plantuml/svek/SvekNode.java
+++ b/src/net/sourceforge/plantuml/svek/SvekNode.java
@@ -35,13 +35,13 @@
  */
 package net.sourceforge.plantuml.svek;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.List;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.Hideable;
 import net.sourceforge.plantuml.StringUtils;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.EntityPosition;
 import net.sourceforge.plantuml.cucadiagram.IGroup;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
diff --git a/src/net/sourceforge/plantuml/svek/SvekResult.java b/src/net/sourceforge/plantuml/svek/SvekResult.java
index 0e7177c2983..fa7de194f00 100644
--- a/src/net/sourceforge/plantuml/svek/SvekResult.java
+++ b/src/net/sourceforge/plantuml/svek/SvekResult.java
@@ -49,11 +49,11 @@
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.skin.rose.Rose;
-import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.style.StyleBuilder;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.ugraphic.MinMax;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java b/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java
index bedb3db3377..5d4dced41fb 100644
--- a/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java
+++ b/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java
@@ -36,10 +36,9 @@
 
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.EntityPosition;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.cucadiagram.Rankdir;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java
index 28939ad9096..872dcbaaef9 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java
@@ -50,10 +50,10 @@
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.color.ColorType;
-import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.svek.AbstractEntityImage;
 import net.sourceforge.plantuml.svek.Bibliotekon;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java
index 8b68df81f07..ac855c2a378 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java
@@ -35,12 +35,11 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.Guillemet;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java
index 33373d309ee..64ef7fa3ec1 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java
@@ -35,13 +35,12 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.style.PName;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java
index 707d34c6ab0..98dd958d6c7 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java
@@ -35,10 +35,9 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.svek.AbstractEntityImage;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java
index 40ee77af7e1..efd88f3edb9 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.EnumMap;
 import java.util.Map;
 
@@ -44,6 +43,7 @@
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.style.PName;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java
index d0410dfe855..8f6996a1ba7 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java
@@ -35,13 +35,12 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.style.PName;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java
index 411a7149a0b..f88c88aeca2 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java
@@ -35,13 +35,12 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.style.PName;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java
index 88f94b5018d..2b4d9121335 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
 import java.util.EnumMap;
 import java.util.Map;
@@ -50,6 +49,7 @@
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.creole.Stencil;
 import net.sourceforge.plantuml.cucadiagram.EntityPortion;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
index 7ff4b2d003b..50e0839868a 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
@@ -35,14 +35,13 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.Guillemet;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.EntityPortion;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java
index e0e0b256d0a..2ee3e408569 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java
@@ -61,10 +61,10 @@
 import net.sourceforge.plantuml.graphic.USymbols;
 import net.sourceforge.plantuml.graphic.color.ColorType;
 import net.sourceforge.plantuml.graphic.color.Colors;
-import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.svek.AbstractEntityImage;
 import net.sourceforge.plantuml.svek.Cluster;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java
index 93b27e76f9d..b483a6a72c9 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java
@@ -35,10 +35,9 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.svek.AbstractEntityImage;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java b/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java
index 67272b5016f..eb3e279e7c4 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageJson.java
@@ -35,9 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import java.util.EnumMap;
-import java.util.Map;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.CornerParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
@@ -76,7 +73,6 @@
 import net.sourceforge.plantuml.ugraphic.Shadowable;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UGraphicStencil;
-import net.sourceforge.plantuml.ugraphic.UGroupType;
 import net.sourceforge.plantuml.ugraphic.ULayoutGroup;
 import net.sourceforge.plantuml.ugraphic.URectangle;
 import net.sourceforge.plantuml.ugraphic.UStroke;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java
index d6c2e543550..01dad2f576a 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.EnumMap;
 import java.util.Map;
 
@@ -46,6 +45,7 @@
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.cucadiagram.LeafType;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java
index 08a57e3cd31..815d1bc346e 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.List;
 
@@ -45,6 +44,7 @@
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java
index 9fba7efe646..155404d19da 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.Objects;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
@@ -44,6 +43,7 @@
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.BodyFactory;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.EntityPortion;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java
index d09d00060f3..80d63878cb3 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 import java.util.EnumMap;
@@ -55,6 +54,7 @@
 import net.sourceforge.plantuml.UmlDiagramType;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.creole.Stencil;
 import net.sourceforge.plantuml.cucadiagram.BodyFactory;
 import net.sourceforge.plantuml.cucadiagram.Display;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java
index ea6816d1bdf..80fe0982055 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java
@@ -35,10 +35,9 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java
index c66907c4abf..fdc9da721ec 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java
@@ -36,7 +36,6 @@
 
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 
 import net.sourceforge.plantuml.ColorParam;
@@ -45,6 +44,7 @@
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.EntityPosition;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.StringBounder;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java
index 05baae928ad..b1110d2a63c 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java
@@ -35,14 +35,13 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java
index 3b4bb61b149..0aae24d20b5 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java
@@ -35,13 +35,13 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.Collections;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.creole.CreoleMode;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.IEntity;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java
index 8a11ee17538..6887444c3fd 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java
@@ -35,12 +35,11 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.BodyFactory;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java
index 21ca33f4d0c..e8d91ffcbbb 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 
 import net.sourceforge.plantuml.ColorParam;
@@ -43,6 +42,7 @@
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.EntityPosition;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.graphic.color.ColorType;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java
index 06b5407641b..146a37bf0c8 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java
@@ -35,8 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
@@ -44,6 +42,7 @@
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.creole.CreoleMode;
 import net.sourceforge.plantuml.cucadiagram.IEntity;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java
index 1529969a057..9acd9295be6 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java
@@ -35,11 +35,10 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.IEntity;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java
index d717ef42274..2db7710c08f 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java
@@ -35,13 +35,12 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.ILeaf;
 import net.sourceforge.plantuml.cucadiagram.Rankdir;
 import net.sourceforge.plantuml.graphic.StringBounder;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java
index 8dadb5e7bc0..194efb4f241 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.Map;
@@ -48,6 +47,7 @@
 import net.sourceforge.plantuml.LineBreakStrategy;
 import net.sourceforge.plantuml.UmlDiagramType;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.BodyFactory;
 import net.sourceforge.plantuml.cucadiagram.Display;
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java
index af584a470a8..0e42b3cb8a1 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java
@@ -64,10 +64,10 @@
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.graphic.color.ColorType;
 import net.sourceforge.plantuml.graphic.color.Colors;
-import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.svek.AbstractEntityImage;
 import net.sourceforge.plantuml.svek.ShapeType;
diff --git a/src/net/sourceforge/plantuml/svek/image/Footprint.java b/src/net/sourceforge/plantuml/svek/image/Footprint.java
index 1600ccb1dbd..0e8b2afa434 100644
--- a/src/net/sourceforge/plantuml/svek/image/Footprint.java
+++ b/src/net/sourceforge/plantuml/svek/image/Footprint.java
@@ -37,11 +37,11 @@
 
 import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.UDrawable;
 import net.sourceforge.plantuml.ugraphic.UBackground;
diff --git a/src/net/sourceforge/plantuml/svek/image/Opale.java b/src/net/sourceforge/plantuml/svek/image/Opale.java
index f896e0fd219..a30858b0310 100644
--- a/src/net/sourceforge/plantuml/svek/image/Opale.java
+++ b/src/net/sourceforge/plantuml/svek/image/Opale.java
@@ -35,11 +35,11 @@
  */
 package net.sourceforge.plantuml.svek.image;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.Direction;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
diff --git a/src/net/sourceforge/plantuml/svg/SvgGraphics.java b/src/net/sourceforge/plantuml/svg/SvgGraphics.java
index 5e887e23fe8..7c01ae1bcb8 100644
--- a/src/net/sourceforge/plantuml/svg/SvgGraphics.java
+++ b/src/net/sourceforge/plantuml/svg/SvgGraphics.java
@@ -35,7 +35,6 @@
  */
 package net.sourceforge.plantuml.svg;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.PathIterator;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -45,9 +44,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -71,6 +68,7 @@
 import net.sourceforge.plantuml.FileUtils;
 import net.sourceforge.plantuml.Log;
 import net.sourceforge.plantuml.SignatureUtils;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.code.Base64Coder;
 import net.sourceforge.plantuml.security.SImageIO;
 import net.sourceforge.plantuml.security.SecurityUtils;
@@ -895,8 +893,14 @@ public void svgImage(UImageSvg image, double x, double y) {
 
 			String svg = manageScale(image);
 
-			final String svgHeader = "<svg height=\"" + (int) (image.getHeight() * scale) + "\" width=\""
-					+ (int) (image.getWidth() * scale) + "\" xmlns=\"http://www.w3.org/2000/svg\" >";
+			final String svgHeader;
+			if (image.containsXlink())
+				svgHeader = "<svg height=\"" + (int) (image.getHeight() * scale) + "\" width=\""
+						+ (int) (image.getWidth() * scale)
+						+ "\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns=\"http://www.w3.org/2000/svg\" >";
+			else
+				svgHeader = "<svg height=\"" + (int) (image.getHeight() * scale) + "\" width=\""
+						+ (int) (image.getWidth() * scale) + "\" xmlns=\"http://www.w3.org/2000/svg\" >";
 
 			svg = svgHeader + svg.substring(5);
 
diff --git a/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java b/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java
index 1893f156c68..7e171c81100 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/ChangeState.java
@@ -54,9 +54,9 @@ public class ChangeState implements Comparable<ChangeState> {
 	private final Colors colors;
 
 	public ChangeState(TimeTick when, String comment, Colors colors, String... states) {
-		if (states.length == 0) {
+		if (states.length == 0)
 			throw new IllegalArgumentException();
-		}
+
 		this.when = when;
 		this.states = states;
 		this.comment = comment;
@@ -84,28 +84,26 @@ public String getComment() {
 	}
 
 	public final HColor getBackColor(ISkinParam skinParam, Style style) {
-		if (colors == null || colors.getColor(ColorType.BACK) == null) {
-			if (UseStyle.useBetaStyle() == false)
-				return HColorUtils.COL_D7E0F2;
-
+		if (colors == null || colors.getColor(ColorType.BACK) == null)
 			return style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet());
-		}
+
 		return colors.getColor(ColorType.BACK);
 	}
 
 	private final HColor getLineColor(ISkinParam skinParam, Style style) {
-		if (colors == null || colors.getColor(ColorType.LINE) == null) {
-			if (UseStyle.useBetaStyle() == false)
-				return HColorUtils.COL_038048;
-
+		if (colors == null || colors.getColor(ColorType.LINE) == null)
 			return style.value(PName.LineColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet());
-		}
+
 		return colors.getColor(ColorType.LINE);
 	}
 
+	private UStroke getStroke(Style style) {
+		return style.getStroke();
+	}
+
 	public SymbolContext getContext(ISkinParam skinParam, Style style) {
 		return new SymbolContext(getBackColor(skinParam, style), getLineColor(skinParam, style))
-				.withStroke(new UStroke(1.5));
+				.withStroke(getStroke(style));
 	}
 
 	public final boolean isBlank() {
diff --git a/src/net/sourceforge/plantuml/timingdiagram/Player.java b/src/net/sourceforge/plantuml/timingdiagram/Player.java
index 3461942d8fe..58220ea9df3 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/Player.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/Player.java
@@ -34,11 +34,10 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
-import net.sourceforge.plantuml.UseStyle;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.StringBounder;
@@ -49,10 +48,10 @@
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.ugraphic.UStroke;
 import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
 
 public abstract class Player implements TimeProjected {
 
@@ -61,8 +60,10 @@ public abstract class Player implements TimeProjected {
 	private final boolean compact;
 	private final Display title;
 	protected int suggestedHeight;
+	protected final Stereotype stereotype;
 
-	public Player(String title, ISkinParam skinParam, TimingRuler ruler, boolean compact) {
+	public Player(String title, ISkinParam skinParam, TimingRuler ruler, boolean compact, Stereotype stereotype) {
+		this.stereotype = stereotype;
 		this.skinParam = skinParam;
 		this.compact = compact;
 		this.ruler = ruler;
@@ -73,23 +74,15 @@ public boolean isCompact() {
 		return compact;
 	}
 
-	protected abstract StyleSignatureBasic getStyleSignature();
-
-	protected abstract SymbolContext getContextLegacy();
-//	private StyleSignature getStyleSignature() {
-//		return StyleSignature.of(SName.root, SName.element, SName.timingDiagram);
-//	}
+	protected abstract StyleSignature getStyleSignature();
 
 	final protected Style getStyle() {
 		return getStyleSignature().getMergedStyle(skinParam.getCurrentStyleBuilder());
-
 	}
 
 	final protected FontConfiguration getFontConfiguration() {
-		if (UseStyle.useBetaStyle() == false)
-			return FontConfiguration.create(skinParam, FontParam.TIMING, null);
-		return FontConfiguration.create(skinParam, StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram)
-				.getMergedStyle(skinParam.getCurrentStyleBuilder()));
+		return FontConfiguration.create(skinParam, StyleSignatureBasic
+				.of(SName.root, SName.element, SName.timingDiagram).getMergedStyle(skinParam.getCurrentStyleBuilder()));
 	}
 
 	final protected UStroke getStroke() {
@@ -98,8 +91,6 @@ final protected UStroke getStroke() {
 	}
 
 	final protected SymbolContext getContext() {
-		if (UseStyle.useBetaStyle() == false)
-			return getContextLegacy();
 
 		final Style style = getStyleSignature().getMergedStyle(skinParam.getCurrentStyleBuilder());
 		final HColor lineColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(),
diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java
index 7058ebd0b2f..341831ad7a3 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java
@@ -34,7 +34,6 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -43,12 +42,12 @@
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.graphic.SymbolContext;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.UDrawable;
 import net.sourceforge.plantuml.graphic.color.Colors;
@@ -57,9 +56,7 @@
 import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.ULine;
-import net.sourceforge.plantuml.ugraphic.UStroke;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
 
 public class PlayerAnalog extends Player {
 
@@ -71,7 +68,7 @@ public class PlayerAnalog extends Player {
 	private Integer ticksEvery;
 
 	public PlayerAnalog(String code, ISkinParam skinParam, TimingRuler ruler, boolean compact) {
-		super(code, skinParam, ruler, compact);
+		super(code, skinParam, ruler, compact, null);
 		this.suggestedHeight = 100;
 	}
 
@@ -100,11 +97,6 @@ public double getFullHeight(StringBounder stringBounder) {
 		return suggestedHeight;
 	}
 
-	@Override
-	protected SymbolContext getContextLegacy() {
-		return new SymbolContext(HColorUtils.COL_D7E0F2, HColorUtils.COL_038048).withStroke(new UStroke(1.5));
-	}
-
 	public IntricatedPoint getTimeProjection(StringBounder stringBounder, TimeTick tick) {
 		final double x = ruler.getPosInPixel(tick);
 		final double value = getValueAt(tick);
diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java
index 5fd2c492838..c61858a0a77 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java
@@ -34,7 +34,6 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.List;
@@ -46,27 +45,24 @@
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.graphic.SymbolContext;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.UDrawable;
 import net.sourceforge.plantuml.graphic.color.Colors;
-import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
-import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.ULine;
-import net.sourceforge.plantuml.ugraphic.UStroke;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
 
 public class PlayerBinary extends Player {
 
@@ -76,11 +72,9 @@ public class PlayerBinary extends Player {
 	private final List<TimeConstraint> constraints = new ArrayList<>();
 	private final SortedMap<TimeTick, ChangeState> values = new TreeMap<>();
 	private ChangeState initialState;
-	private final Style style;
 
-	public PlayerBinary(String code, ISkinParam skinParam, TimingRuler ruler, boolean compact) {
-		super(code, skinParam, ruler, compact);
-		this.style = getStyleSignature().getMergedStyle(skinParam.getCurrentStyleBuilder());
+	public PlayerBinary(String code, ISkinParam skinParam, TimingRuler ruler, boolean compact, Stereotype stereotype) {
+		super(code, skinParam, ruler, compact, stereotype);
 		this.suggestedHeight = 30;
 	}
 
@@ -93,23 +87,8 @@ public double getFullHeight(StringBounder stringBounder) {
 	}
 
 	@Override
-	protected StyleSignatureBasic getStyleSignature() {
-		return StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.binary);
-	}
-
-	@Override
-	protected SymbolContext getContextLegacy() {
-
-		if (UseStyle.useBetaStyle() == false)
-			return new SymbolContext(HColorUtils.COL_D7E0F2, HColorUtils.COL_038048).withStroke(new UStroke(2));
-
-		final HColor lineColor = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(),
-				skinParam.getIHtmlColorSet());
-		final HColor backgroundColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(),
-				skinParam.getIHtmlColorSet());
-
-		return new SymbolContext(backgroundColor, lineColor).withStroke(getStroke());
-
+	protected StyleSignature getStyleSignature() {
+		return StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.binary).withTOBECHANGED(stereotype);
 	}
 
 	public IntricatedPoint getTimeProjection(StringBounder stringBounder, TimeTick tick) {
diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java
index 302039e1ed0..70cfc11e791 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java
@@ -34,32 +34,25 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.math.BigDecimal;
 
-import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
-import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
-import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.graphic.SymbolContext;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.graphic.UDrawable;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.style.SName;
-import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint;
 import net.sourceforge.plantuml.timingdiagram.graphic.PlayerFrame;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.ULine;
-import net.sourceforge.plantuml.ugraphic.UStroke;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
 
 public class PlayerClock extends Player {
 
@@ -71,7 +64,7 @@ public class PlayerClock extends Player {
 
 	public PlayerClock(String title, ISkinParam skinParam, TimingRuler ruler, int period, int pulse, int offset,
 			boolean compact) {
-		super(title, skinParam, ruler, compact);
+		super(title, skinParam, ruler, compact, null);
 		this.displayTitle = title.length() > 0;
 		this.period = period;
 		this.pulse = pulse;
@@ -93,11 +86,6 @@ private double getTitleHeight(StringBounder stringBounder) {
 		return 0;
 	}
 
-	@Override
-	protected SymbolContext getContextLegacy() {
-		return new SymbolContext(HColorUtils.COL_D7E0F2, HColorUtils.COL_038048).withStroke(new UStroke(1.5));
-	}
-
 	protected StyleSignatureBasic getStyleSignature() {
 		return StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.clock);
 	}
diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java
index 1dc6901670b..a7266cfac55 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java
@@ -34,7 +34,6 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -44,16 +43,18 @@
 
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.graphic.SymbolContext;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.UDrawable;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.timingdiagram.graphic.Histogram;
 import net.sourceforge.plantuml.timingdiagram.graphic.IntricatedPoint;
@@ -75,27 +76,22 @@ public final class PlayerRobustConcise extends Player {
 	private PDrawing cached;
 	private Colors initialColors;
 
-	public PlayerRobustConcise(TimingStyle type, String full, ISkinParam skinParam, TimingRuler ruler,
-			boolean compact) {
-		super(full, skinParam, ruler, compact);
+	public PlayerRobustConcise(TimingStyle type, String full, ISkinParam skinParam, TimingRuler ruler, boolean compact,
+			Stereotype stereotype) {
+		super(full, skinParam, ruler, compact, stereotype);
 		this.type = type;
 		this.suggestedHeight = 0;
 	}
 
 	@Override
-	protected StyleSignatureBasic getStyleSignature() {
+	protected StyleSignature getStyleSignature() {
 		if (type == TimingStyle.CONCISE)
-			return StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.concise);
+			return StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.concise).withTOBECHANGED(stereotype);
 		if (type == TimingStyle.ROBUST)
-			return StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.robust);
+			return StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.robust).withTOBECHANGED(stereotype);
 		throw new IllegalStateException();
 	}
 
-	@Override
-	protected SymbolContext getContextLegacy() {
-		throw new UnsupportedOperationException();
-	}
-
 	private PDrawing buildPDrawing() {
 		final Style style = getStyleSignature().getMergedStyle(skinParam.getCurrentStyleBuilder());
 		if (type == TimingStyle.CONCISE)
diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java b/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java
index bb68132c222..7a5015d5bae 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java
@@ -34,13 +34,13 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.List;
 import java.util.Objects;
 
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java
index ae5ac0c8ca4..4af1f9b28d1 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java
@@ -34,7 +34,6 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -51,11 +50,13 @@
 import net.sourceforge.plantuml.UmlDiagramType;
 import net.sourceforge.plantuml.UseStyle;
 import net.sourceforge.plantuml.api.ThemeStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.core.DiagramDescription;
 import net.sourceforge.plantuml.core.ImageData;
 import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.InnerStrategy;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
@@ -296,8 +297,10 @@ private UTranslate getUTranslateForPlayer(Player candidat, StringBounder stringB
 		throw new IllegalArgumentException();
 	}
 
-	public CommandExecutionResult createRobustConcise(String code, String full, TimingStyle type, boolean compact) {
-		final Player player = new PlayerRobustConcise(type, full, getSkinParam(), ruler, compactByDefault || compact);
+	public CommandExecutionResult createRobustConcise(String code, String full, TimingStyle type, boolean compact,
+			Stereotype stereotype) {
+		final Player player = new PlayerRobustConcise(type, full, getSkinParam(), ruler, compactByDefault || compact,
+				stereotype);
 		players.put(code, player);
 		lastPlayer = player;
 		return CommandExecutionResult.ok();
@@ -320,8 +323,8 @@ public PlayerAnalog createAnalog(String code, String full, boolean compact) {
 		return player;
 	}
 
-	public CommandExecutionResult createBinary(String code, String full, boolean compact) {
-		final Player player = new PlayerBinary(full, getSkinParam(), ruler, compactByDefault);
+	public CommandExecutionResult createBinary(String code, String full, boolean compact, Stereotype stereotype) {
+		final Player player = new PlayerBinary(full, getSkinParam(), ruler, compactByDefault, stereotype);
 		players.put(code, player);
 		return CommandExecutionResult.ok();
 	}
diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java b/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java
index 900a1621266..f6816e9e593 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java
@@ -34,7 +34,6 @@
  */
 package net.sourceforge.plantuml.timingdiagram;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Comparator;
@@ -46,6 +45,7 @@
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
 import net.sourceforge.plantuml.api.ThemeStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
@@ -61,7 +61,6 @@
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 import net.sourceforge.plantuml.ugraphic.color.HColor;
 import net.sourceforge.plantuml.ugraphic.color.HColorSet;
-import net.sourceforge.plantuml.ugraphic.color.HColorSimple;
 import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
 
 public class TimingRuler {
diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java
index 8b894f05f84..449de6e36f9 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java
@@ -43,6 +43,7 @@
 import net.sourceforge.plantuml.command.regex.RegexLeaf;
 import net.sourceforge.plantuml.command.regex.RegexOptional;
 import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.timingdiagram.TimingDiagram;
 
 public class CommandBinary extends SingleLineCommand2<TimingDiagram> {
@@ -60,10 +61,16 @@ private static IRegex getRegexConcat() {
 				new RegexLeaf("binary"), //
 				RegexLeaf.spaceOneOrMore(), //
 				new RegexLeaf("FULL", "[%g]([^%g]+)[%g]"), //
+				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), //
 				RegexLeaf.spaceOneOrMore(), //
 				new RegexLeaf("as"), //
 				RegexLeaf.spaceOneOrMore(), //
-				new RegexLeaf("CODE", "([%pLN_.@]+)"), RegexLeaf.end());
+				new RegexLeaf("CODE", "([%pLN_.@]+)"), //
+				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("STEREOTYPE2", "(\\<\\<.*\\>\\>)?"), //
+				RegexLeaf.spaceZeroOrMore(), //
+				RegexLeaf.end());
 	}
 
 	@Override
@@ -71,7 +78,14 @@ final protected CommandExecutionResult executeArg(TimingDiagram diagram, LineLoc
 		final String compact = arg.get("COMPACT", 0);
 		final String code = arg.get("CODE", 0);
 		final String full = arg.get("FULL", 0);
-		return diagram.createBinary(code, full, compact != null);
+
+		Stereotype stereotype = null;
+		if (arg.get("STEREOTYPE", 0) != null)
+			stereotype = Stereotype.build(arg.get("STEREOTYPE", 0));
+		else if (arg.get("STEREOTYPE2", 0) != null)
+			stereotype = Stereotype.build(arg.get("STEREOTYPE2", 0));
+
+		return diagram.createBinary(code, full, compact != null, stereotype);
 	}
 
 }
diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java
index d472d1e8b76..1e81992409e 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java
@@ -43,6 +43,7 @@
 import net.sourceforge.plantuml.command.regex.RegexLeaf;
 import net.sourceforge.plantuml.command.regex.RegexOptional;
 import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.timingdiagram.TimingDiagram;
 import net.sourceforge.plantuml.timingdiagram.TimingStyle;
 
@@ -64,9 +65,14 @@ private static IRegex getRegexConcat() {
 						new RegexConcat( //
 								new RegexLeaf("FULL", "[%g]([^%g]+)[%g]"), //
 								RegexLeaf.spaceOneOrMore(), //
+								new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), //
+								RegexLeaf.spaceZeroOrMore(), //
 								new RegexLeaf("as"), //
 								RegexLeaf.spaceOneOrMore())), //
 				new RegexLeaf("CODE", "([%pLN_.@]+)"), //
+				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("STEREOTYPE2", "(\\<\\<.*\\>\\>)?"), //
+				RegexLeaf.spaceZeroOrMore(), //
 				RegexLeaf.end());
 	}
 
@@ -75,11 +81,17 @@ final protected CommandExecutionResult executeArg(TimingDiagram diagram, LineLoc
 		final String compact = arg.get("COMPACT", 0);
 		final String code = arg.get("CODE", 0);
 		String full = arg.get("FULL", 0);
-		if (full == null) {
+		if (full == null)
 			full = code;
-		}
+
+		Stereotype stereotype = null;
+		if (arg.get("STEREOTYPE", 0) != null)
+			stereotype = Stereotype.build(arg.get("STEREOTYPE", 0));
+		else if (arg.get("STEREOTYPE2", 0) != null)
+			stereotype = Stereotype.build(arg.get("STEREOTYPE2", 0));
+
 		final TimingStyle type = TimingStyle.valueOf(arg.get("TYPE", 0).toUpperCase());
-		return diagram.createRobustConcise(code, full, type, compact != null);
+		return diagram.createRobustConcise(code, full, type, compact != null, stereotype);
 	}
 
 }
diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java
index 5bee3ebec94..40154bcae70 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java
@@ -34,10 +34,9 @@
  */
 package net.sourceforge.plantuml.timingdiagram.graphic;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java
index c43e80050fd..3367b818721 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java
@@ -34,7 +34,6 @@
  */
 package net.sourceforge.plantuml.timingdiagram.graphic;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +42,7 @@
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.UseStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.command.Position;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java
index f3e5d958b39..12f6fe4dd44 100644
--- a/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java
+++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java
@@ -34,10 +34,10 @@
  */
 package net.sourceforge.plantuml.timingdiagram.graphic;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 
 import net.sourceforge.plantuml.ISkinSimple;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.WithLinkType;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
diff --git a/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java b/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java
index f122518b5c7..6152a05ffad 100644
--- a/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java
+++ b/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java
@@ -55,6 +55,10 @@ public String getMD5Hex() {
 		return SignatureUtils.getMD5Hex(svg);
 	}
 
+	public boolean containsXlink() {
+		return svg.contains("xmlns:xlink=\"http://www.w3.org/1999/xlink\"");
+	}
+
 	public String getSvg(boolean raw) {
 		String result = svg;
 		if (raw)
diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorUtils.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorUtils.java
index cafbf53a23b..6e3e8151845 100644
--- a/src/net/sourceforge/plantuml/ugraphic/color/HColorUtils.java
+++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorUtils.java
@@ -119,17 +119,17 @@ public class HColorUtils {
 	}
 
 	public static HColor noGradient(HColor color) {
-		if (color instanceof HColorGradient) {
+		if (color instanceof HColorGradient)
 			return ((HColorGradient) color).getColor1();
-		}
+
 		return color;
 	}
 
 	public static UChange changeBack(UGraphic ug) {
 		final HColor color = ug.getParam().getColor();
-		if (color == null) {
+		if (color == null)
 			return new HColorNone().bg();
-		}
+
 		return color.bg();
 	}
 
@@ -140,28 +140,28 @@ public static HColor transparent() {
 	}
 
 	public static boolean isTransparent(HColor back) {
-		if (back == TRANSPARENT) {
+		if (back == TRANSPARENT)
 			return true;
-		}
-		if (back instanceof HColorBackground && ((HColorBackground) back).getBack() == TRANSPARENT) {
+
+		if (back instanceof HColorBackground && ((HColorBackground) back).getBack() == TRANSPARENT)
 			return true;
-		}
-		if (back instanceof HColorSimple && ((HColorSimple) back).isTransparent()) {
+
+		if (back instanceof HColorSimple && ((HColorSimple) back).isTransparent())
 			return true;
-		}
+
 		return false;
 	}
 
 	public static HColor unlinear(HColor color1, HColor color2, int completion) {
-		if (completion == 0) {
+		if (completion == 0)
 			return color1;
-		}
-		if (completion == 100) {
+
+		if (completion == 100)
 			return color2;
-		}
-		if (color1 instanceof HColorSimple && color2 instanceof HColorSimple) {
+
+		if (color1 instanceof HColorSimple && color2 instanceof HColorSimple)
 			return HColorSimple.unlinear((HColorSimple) color1, (HColorSimple) color2, completion);
-		}
+
 		return color1;
 	}
 
diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java
index f48f85c21b5..a276629b735 100644
--- a/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java
+++ b/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java
@@ -75,11 +75,15 @@ public UPathHand(UPath source, Random rnd) {
 				final double y = segment.getCoord()[1];
 				final HandJiggle jiggle = new HandJiggle(last.getX(), last.getY(), defaultVariation, rnd);
 				jiggle.lineTo(x, y);
-				for (USegment seg2 : jiggle.toUPath()) {
-					if (seg2.getSegmentType() == USegmentType.SEG_LINETO) {
+				for (USegment seg2 : jiggle.toUPath())
+					if (seg2.getSegmentType() == USegmentType.SEG_LINETO)
 						result.lineTo(seg2.getCoord()[0], seg2.getCoord()[1]);
-					}
-				}
+
+				last = new Point2D.Double(x, y);
+			} else if (type == USegmentType.SEG_ARCTO) {
+				final double x = segment.getCoord()[5];
+				final double y = segment.getCoord()[6];
+				result.lineTo(x, y);
 				last = new Point2D.Double(x, y);
 			} else {
 				this.path = source;
diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java
index a587da53cfc..2baab756afc 100644
--- a/src/net/sourceforge/plantuml/version/Version.java
+++ b/src/net/sourceforge/plantuml/version/Version.java
@@ -44,7 +44,7 @@ public class Version {
 	private static final int MAJOR_SEPARATOR = 1000000;
 
 	public static int version() {
-		return 1202204;
+		return 1202205;
 	}
 
 	public static int versionPatched() {
@@ -80,7 +80,7 @@ public static String versionString(int size) {
 	}
 
 	public static int beta() {
-		final int beta = 1;
+		final int beta = 0;
 		return beta;
 	}
 
@@ -93,7 +93,7 @@ public static String turningId() {
 	}
 
 	public static long compileTime() {
-		return 1649510957985L;
+		return 1651316152000L;
 	}
 
 	public static String compileTimeString() {
diff --git a/stdlib/classy-abx.repx b/stdlib/classy-abx.repx
new file mode 100644
index 0000000000000000000000000000000000000000..8a3745247f88e0a2996221d6eea00a1ef81b7c7f
GIT binary patch
literal 10558
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
M9MEX*$1e{4AF-%~u>b%7

literal 0
HcmV?d00001

diff --git a/stdlib/classy-c4-abx.repx b/stdlib/classy-c4-abx.repx
new file mode 100644
index 0000000000000000000000000000000000000000..ba2438fc289208c9ab6db9b32ea7da77c8ec8485
GIT binary patch
literal 3474
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
Ak^lez

literal 0
HcmV?d00001

diff --git a/stdlib/classy-c4-dex.repx b/stdlib/classy-c4-dex.repx
new file mode 100644
index 00000000000..1c8a0e79762
--- /dev/null
+++ b/stdlib/classy-c4-dex.repx
@@ -0,0 +1 @@
+;
\ No newline at end of file
diff --git a/stdlib/classy-dex.repx b/stdlib/classy-dex.repx
new file mode 100644
index 00000000000..1c8a0e79762
--- /dev/null
+++ b/stdlib/classy-dex.repx
@@ -0,0 +1 @@
+;
\ No newline at end of file
diff --git a/stdlib/domainstory-abx.repx b/stdlib/domainstory-abx.repx
new file mode 100644
index 0000000000000000000000000000000000000000..31fedd15c3f629fcf0a1e285930faa50595c68f7
GIT binary patch
literal 2048
zcmV+b2><sRbtV9;2Y5qSyj!$UCnUrJ1M_r3cTLBymc?e!+-@5pI<d#pE0ju0P&zR}
znBEZ<UJAaHXbnOVauUL|E#-4V<dNU_CMz~WGk+0Y#3F7}Q*)LHlLo03l=QK*HJskY
zet#1ON@)!<gEIzYaGuaCp@U^q%eghp^}lp!Djx)J`V_T`D&2vUbY<%JzrXuuES=AE
zJ_Cih%j{pRr2ue=*m2R;u#BxP()a`xuo2?)vxDL93wVEQIQNSyR^ONDQC%;?_d)!|
zZyt`*oHum=rcBAY+0~m~cf<VhngJ*24#QRzi#}Qh@^Yp(Wta>I3tXaK<GW`b^IL<h
zx52+0+)K4^mK3g52gW#WYieo-gp01%cDqw+<q!)g>)Q7C+wnHf1eN_-jyU^gKd<jF
zRxa!Is`o$mupA)8b^VVzIJoL|n<JXYh>f~?D1Nt9B<dq@PU10AQmZV2Y0#HVLwvmU
zJL;sPio_gQX@?=G>}aa+E~vKlvrg%H7nIS8oD9rhCWuYPOl5W%xPuylvZM9^D06e3
zN}DH&BD?p30OtxgF&L1Oe<i>p`sx8+C$DfADlCS<bL4otK1Wh-Kw`P&9>NRNnI`vi
z!NC#W{<7gTfyke7tc7OXB)ZhETY;n6l=Y}=7kpt%4*OX{Wf&W9@q9UTHg_7`F7sOF
ze94Q?{K=c~(OH4<)j3Ez!-sRS(R9@P>JW~s%!cBqf&7Tn`IJj7e}fN;O;UoEVgGoI
zwjLw945?d;wY6E;niNjhsOWVs9hP(pqe|tzW>a7@=jom)ayV{zR{!jWo|77wu?!pC
z8vbxCDfbdTp>4<$ZCq~l&<?0rdQkcGKuk2G)#bVMEj(R^`F-GPA53NhOw++QYx)*k
zsNuLgDonTqc{UQ^(03HZ-O53qs%I`%I@*2JCMMj$mpsWYn$%<4_P?w_IzPvGn@)f9
zrj*N+9mdr!blMU%&F}ROVNB9ZT2=-`C|dwXM&pFVm&I69BMt3`X~Wg*$umO-br<2|
z?bd}2zMV`1+uR&*^?qx!>TiXn%p58Mm}MD76movr!juB&v}R05ss%1kBKgozn$($E
zPA%QX_XJKl&Hwp$1u1cL!8s!ZVP7C$+WRtzMQ<?&iZ^xw?Xlc0>szv=k0a*hZ4l2M
z1Vy&E<EQit^~#%eko+T$XlfUAsh<HK25?&FaIR1?eTavWa6(<?MY3AePZ=Q{DV>>i
zLGgLaM%38|%B2R1eDOlef9o2>a^!Ovqgck0F;-4!N&d6v*lD}m>fDzL9J8!3Zk(2p
z2Lk5INmG@x2G!@dvO{Y_<k%;$B8t4&K9HjBm95Pp1K>n17G8@imcpAFN!zcHpP*wW
zfYLcNEh(aMWcTdh!bE}(3#AC<*Um_8!HPPbu@o?4#Kim*I-M(+F6i~SCptulHX<wP
z)-Wb~wypu)zp=f9PPhD2G%ow>E{JFh)6v6OdT|q10EP!f3Dj`TuepQX&sv=^7aR~`
zboeXkHFjQgXyzxwxJlD_>69_eo0_&3fFQ_ofyTf-WK<*=B=5+F+6J^Ju{T^5UPxcD
zU8oYoj#EE(e!`ENb-Sz`1!!Isx*`h&oGJW^KnOoXlqDE+iagL-h@ynvFeQ8tHdriD
z$d_5jcOI0-GC)+$VmixrObc$$S2NOKx<hGS6L~C?ZWq^H&W@$Cb#zW^D?|~v_Z}<n
z4|<M}FYCIR?+JX<$NtdvK-hOQ-_S{0zqW5ei%V_xnB^iPn|I)9gWY){2Z3X5I#n&E
zH|k}?Y}cA@TA9vpaqm*pf61k>T~|W#Vic^J{9mzXLU?s>uLZ>EvQ4kCXBlRjs^D{*
zR2@jEjE*y1X|1HXLzU_hV}nnl*Hb<FBquHjzYRw_k%fW_GL7++kw5??RL)Ne(Q}2T
z#=BVDLksDtZe7=bBnEO^W@D{aIe?TgC_NCLOv;-s*M%VRCtwJ74ptwwD%-l6IHqvJ
zWIZf*z9c!cjjD@!ySS%qw)}<PdMZ9W-R6m%07#r;Y*$(!PG^P&g+x(;i=&yB)fA_~
zABUGum{F$K0V|-XSk60x3{ZMnh@8)iEY}OJ?3vdXY!pYFq?mUCQia2%#XQQf?M_K@
z<EbmgJbdoB?sK-F7aY$T*-HT47CyAf5hV0(+pL_<a)KL=Gr6SqA}_n<C0eCZ;8cEV
zUVMbY=~Bk#Wvq8v$n4d>3yxy~hH%yMt5&yHSrdd7?}63K9hFdt1j`pGO|F2n|JR;l
zqD;cMsJ1jt;)F_M@<JWNILf2HBK`&&Gx?y2@qAaCq5>^Y+Hyp6+P+}+(!Q(Jd7$*l
zLg9Z91E%5)OeOGhw$+wJ2lj9jw}T%%j^T8=ffcf}Z*9e+zdF{6koZ4m>luY-7%YLT
zPM{RA4pQXNo~S2O__Vg9STB=os=&__5;oT^%L?gV2&+|vLKS4<0y3&S?}taIp!o{n
z`1+$&ANB5XgLW^()sfq7g&T%5LYe4m94aR$+}R@h>QG$>L`+jD|1AKvf#~LmO6syd
zSAkibNi+g_TtLYyS)AJ&I6TFdhy7K*RUSAz@9ur7yig<{+d215sgXMa((4Y3kmOD`
zW;bb7L{&##ME&kZB?dMDqB%il6SlJ2U$4H_)tM|sG1?KT(F^2B837qe8W6rQA_@~C
ebB>;pJ(<2RT=qcWeZ!e<nKOV-(p#DT=l21M$Li?-

literal 0
HcmV?d00001

diff --git a/stdlib/domainstory-dex.repx b/stdlib/domainstory-dex.repx
new file mode 100644
index 00000000000..1c8a0e79762
--- /dev/null
+++ b/stdlib/domainstory-dex.repx
@@ -0,0 +1 @@
+;
\ No newline at end of file
diff --git a/stdlib/home.repx b/stdlib/home.repx
index 034b9e7a790..94f621da59b 100644
--- a/stdlib/home.repx
+++ b/stdlib/home.repx
@@ -1,14 +1,17 @@
-azure
+archimate
 aws
 awslib
+azure
+c4
+classy
+classy-c4
 cloudinsight
 cloudogu
-tupadr3
+domainstory
+elastic
+kubernetes
+logos
 material
 office
-c4
 osa
-kubernetes
-logos
-elastic
-archimate
\ No newline at end of file
+tupadr3