diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelPatternRenderer.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelPatternRenderer.java
index ca98c64..f6ace41 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelPatternRenderer.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelPatternRenderer.java
@@ -33,7 +33,7 @@ public class BevelPatternRenderer implements PatternRenderer {
 		}
 			
 		// Outer bevel (raised)
-		drawBevel(g2d, x, y, width, height, strength, true, light, dark);
+		drawBevel(g2d, x, y, width, height, strength + 1, true, light, dark);
 	}
 	
 	@Override
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamPatternRenderer.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamPatternRenderer.java
index c01778f..cb0e80e 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamPatternRenderer.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamPatternRenderer.java
@@ -34,7 +34,7 @@ public class DreamPatternRenderer implements PatternRenderer {
 		final var arc = Math.max(6, s * 6);
 		
 		g2d.setColor(backgroundColor);
-		g2d.fillRoundRect(x + s, y + s, Math.max(0, width - s * 2), Math.max(0, height - s * 2), arc, arc);
+		g2d.fillRoundRect(x - s, y - s, Math.max(0, width + s * 2), Math.max(0, height + s * 2), arc, arc);
 		
 		this.drawDecorativeBorder(g2d, x, y, width, height, s, borderColor);
 	}
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyPatternRenderer.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyPatternRenderer.java
index 01489e7..a5a47dc 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyPatternRenderer.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyPatternRenderer.java
@@ -88,13 +88,13 @@ public class FantasyPatternRenderer implements PatternRenderer {
 		
 		final Color fg;
 		if (pressed) {
-			fg = theme.getTextNormal().toColor();
+			fg = theme.getSelectionSecondary().toColor();
 		}
 		else if (highlight) {
-			fg = Color.BLACK;
+			fg = theme.getTextNormal().toColor();
 		}
 		else {
-			fg = theme.getTextDisabled().toColor();
+			fg = theme.getTextNormal().toColor();
 		}
 		g2d.setColor(fg);
 		
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanPatternRenderer.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanPatternRenderer.java
index 7fe498c..0d1ea4e 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanPatternRenderer.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanPatternRenderer.java
@@ -43,7 +43,7 @@ public class UrbanPatternRenderer implements PatternRenderer {
 	public void drawDecorativeBorderFilled(final Graphics2D g2d, final int x, final int y, final int width, final int height, final int strength, final Color borderColor, final Color backgroundColor) {
 		final var s = Math.max(1, strength);
 		g2d.setColor(backgroundColor);
-		g2d.fillRect(x + s, y + s, Math.max(0, width - s * 2), Math.max(0, height - s * 2));
+		g2d.fillRect(x - s, y - s, Math.max(0, width + s * 2), Math.max(0, height + s * 2));
 		this.drawDecorativeBorder(g2d, x, y, width, height, s, borderColor);
 	}
 	
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java
index ef23efb..2385ed3 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java
@@ -13,11 +13,11 @@ public class UrbanThemeFactoryBean implements FactoryBean<Theme> {
 				.borderInner(new HSBColor(0.58f, 0.06f, 0.72f))
 				.borderInnerDisabled(new HSBColor(0.58f, 0.04f, 0.22f))
 				.backgroundNormal(new HSBColor(0.58f, 0.22f, 0.16f))
-				.backgroundSelected(new HSBColor(0.03f, 0.80f, 0.78f))
+				.backgroundSelected(new HSBColor(0.03f, 0.08f, 0.78f))
 				.textNormal(new HSBColor(0.00f, 0.00f, 0.94f))
 				.textDisabled(new HSBColor(0.00f, 0.00f, 0.62f))
-				.selectionPrimary(new HSBColor(0.03f, 0.80f, 0.78f))
-				.selectionSecondary(new HSBColor(0.48f, 0.65f, 0.88f))
+				.selectionPrimary(new HSBColor(0.03f, 0.08f, 0.78f))
+				.selectionSecondary(new HSBColor(0.48f, 0.08f, 0.88f))
 				.windowBackground(new HSBColor(0.58f, 0.28f, 0.09f))
 				.hoverBrightnessAdjustment(0.18f)
 				.pressedBrightnessAdjustment(0.32f)