diff --git a/PlayWall/src/main/resources/style/modern-global.css b/PlayWall/src/main/resources/style/modern-global.css
index c96d4e03b2d60d70903de66d8296f74af856b22c..46e6d8940370b0ff3c2376ca8f69d378feb1c104 100644
--- a/PlayWall/src/main/resources/style/modern-global.css
+++ b/PlayWall/src/main/resources/style/modern-global.css
@@ -11,7 +11,7 @@
 }
 
 .pad-playbar${#class} .bar {
-	-fx-background-insets: 1 1 1 1;
+	-fx-background-insets: 0 0 0 0;
 	-fx-padding: 0.25em;
 
 	-fx-background-color: ${#playbarBarColor};
diff --git a/PlayWall/src/main/resources/style/modern-pad.css b/PlayWall/src/main/resources/style/modern-pad.css
index 4ec044a48286558e787557e0a1c8446963a5868d..32f6e10fa0efe158978874ac93eb51bdbd6c92ce 100644
--- a/PlayWall/src/main/resources/style/modern-pad.css
+++ b/PlayWall/src/main/resources/style/modern-pad.css
@@ -11,7 +11,7 @@
 }
 
 .pad${#prefix}-playbar${#class} .bar {
-	-fx-background-insets: 1 1 1 1;
+	-fx-background-insets: 0 0 0 0;
 	-fx-padding: 0.25em;
 
 	-fx-background-color: ${#playbarBarColor};
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
index 35f3a55f46218942721cbd67f205c7f342a056ee..4343558bceca45c9c37f81d1d332f43aeb3d1c6c 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
@@ -8,62 +8,62 @@ import javafx.scene.paint.*;
 public enum ModernColor implements DisplayableColor {
 
 	// - Color Hi -- Color Low -- Font ---- Button -- Bar BG -- Bar Track
-	RED1("#ef9a9a", "#ef5350", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	RED2("#ef5350", "#e53935", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	RED3("#e53935", "#c62828", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
+	RED1("#ef9a9a", "#ef5350", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	RED2("#ef5350", "#e53935", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	RED3("#e53935", "#c62828", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
 
 	// --------- BG ------ PLAY ----- Font ---- Button -- Bar BG -- Bar Track
-	DARK_RED1("#D92349", "#AD2039", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	DARK_RED2("#C92349", "#8D2039", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	DARK_RED3("#A90329", "#6D0019", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
+	DARK_RED1("#D92349", "#AD2039", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	DARK_RED2("#C92349", "#8D2039", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	DARK_RED3("#A90329", "#6D0019", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
 
 	// ---- BG ------ PLAY ----- Font ---- Button -- Bar BG -- Bar Track
-	PINK1("#f48fb1", "#ec407a", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	PINK2("#ec407a", "#d81b60", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	PINK3("#d81b60", "#ad1457", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
+	PINK1("#f48fb1", "#ec407a", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	PINK2("#ec407a", "#d81b60", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	PINK3("#d81b60", "#ad1457", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
 
 	// -------- BG ------ PLAY ----- Font ---- Button -- Bar BG -- Bar Track
-	PURPLE1("#ce93d8", "#ab47bc", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	PURPLE2("#ab47bc", "#8e24aa", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
-	PURPLE3("#8e24aa", "#6a1b9a", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#000000"),
+	PURPLE1("#ce93d8", "#ab47bc", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	PURPLE2("#ab47bc", "#8e24aa", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
+	PURPLE3("#8e24aa", "#6a1b9a", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#333333"),
 
 	// ---- BG ------ PLAY ----- Font ---- Button -- Bar BG -- Bar Track
-	LIGHT_BLUE1("#80deea", "#26c6da", "#000000", "#000000", "#FFFFFF", "#000000"),
-	LIGHT_BLUE2("#26c6da", "#00acc1", "#000000", "#000000", "#FFFFFF", "#000000"),
-	LIGHT_BLUE3("#00acc1", "#00838f", "#000000", "#000000", "#FFFFFF", "#000000"),
+	LIGHT_BLUE1("#80deea", "#26c6da", "#000000", "#000000", "#FFFFFF", "#333333"),
+	LIGHT_BLUE2("#26c6da", "#00acc1", "#000000", "#000000", "#FFFFFF", "#333333"),
+	LIGHT_BLUE3("#00acc1", "#00838f", "#000000", "#000000", "#FFFFFF", "#333333"),
 
 	// ---- BG ------ PLAY ----- Font ---- Button -- Bar BG -- Bar Track
-	BLUE1("#90caf9", "#42a5f5", "#000000", "#000000", "#FFFFFF", "#000000"),
-	BLUE2("#42a5f5", "#1e88e5", "#000000", "#000000", "#FFFFFF", "#000000"),
-	BLUE3("#1e88e5", "#1565c0", "#000000", "#000000", "#FFFFFF", "#000000"),
+	BLUE1("#90caf9", "#42a5f5", "#000000", "#000000", "#FFFFFF", "#333333"),
+	BLUE2("#42a5f5", "#1e88e5", "#000000", "#000000", "#FFFFFF", "#333333"),
+	BLUE3("#1e88e5", "#1565c0", "#000000", "#000000", "#FFFFFF", "#333333"),
 
 	// ------------ BG ------ PLAY ----- Font ---- Button --- Bar BG -- Bar Track
-	LIGHT_GREEN1("#c5e1a5", "#9ccc65", "#000000", "#000000", "#FFFFFF", "#000000"),
-	LIGHT_GREEN2("#9ccc65", "#7cb342", "#000000", "#000000", "#FFFFFF", "#000000"),
-	LIGHT_GREEN3("#7cb342", "#558b2f", "#000000", "#000000", "#FFFFFF", "#000000"),
+	LIGHT_GREEN1("#c5e1a5", "#9ccc65", "#000000", "#000000", "#FFFFFF", "#333333"),
+	LIGHT_GREEN2("#9ccc65", "#7cb342", "#000000", "#000000", "#FFFFFF", "#333333"),
+	LIGHT_GREEN3("#7cb342", "#558b2f", "#000000", "#000000", "#FFFFFF", "#333333"),
 
 	// ---- BG ------ PLAY ----- Font ---- Button -- Bar BG -- Bar Track
-	LIME1("#e6ee9c", "#d4e157", "#000000", "#000000", "#FFFFFF", "#000000"),
-	LIME2("#d4e157", "#c0ca33", "#000000", "#000000", "#FFFFFF", "#000000"),
-	LIME3("#c0ca33", "#9e9d24", "#000000", "#000000", "#FFFFFF", "#000000"),
+	LIME1("#e6ee9c", "#d4e157", "#000000", "#000000", "#FFFFFF", "#333333"),
+	LIME2("#d4e157", "#c0ca33", "#000000", "#000000", "#FFFFFF", "#333333"),
+	LIME3("#c0ca33", "#9e9d24", "#000000", "#000000", "#FFFFFF", "#333333"),
 
 	// ------- BG ------ PLAY ------ Font ---- Button -- Bar BG -- Bar Track
-	YELLOW1("#fff59d", "#ffee58", "#000000", "#000000", "#FFFFFF", "#000000"),
-	YELLOW2("#ffee58", "#fdd835", "#000000", "#000000", "#FFFFFF", "#000000"),
-	YELLOW3("#fdd835", "#f9a825", "#000000", "#000000", "#FFFFFF", "#000000"),
+	YELLOW1("#fff59d", "#ffee58", "#000000", "#000000", "#FFFFFF", "#333333"),
+	YELLOW2("#ffee58", "#fdd835", "#000000", "#000000", "#FFFFFF", "#333333"),
+	YELLOW3("#fdd835", "#f9a825", "#000000", "#000000", "#FFFFFF", "#333333"),
 
 	// ------- BG ------ PLAY ----- Font ---- Button -- Bar BG -- Bar Track
-	ORANGE1("#ffcc80", "#ffa726", "#000000", "#000000", "#FFFFFF", "#000000"),
-	ORANGE2("#ffa726", "#fb8c00", "#000000", "#000000", "#FFFFFF", "#000000"),
-	ORANGE3("#fb8c00", "#ef6c00", "#000000", "#000000", "#FFFFFF", "#000000"),
+	ORANGE1("#ffcc80", "#ffa726", "#000000", "#000000", "#FFFFFF", "#333333"),
+	ORANGE2("#ffa726", "#fb8c00", "#000000", "#000000", "#FFFFFF", "#333333"),
+	ORANGE3("#fb8c00", "#ef6c00", "#000000", "#000000", "#FFFFFF", "#333333"),
 
 	// ---- BG ------ PLAY ----- Font ---- Button --- Bar BG --- Bar Track
-	GRAY1("#eeeeee", "#cccccc", "#000000", "#000000", "#000000", "#FFFFFF"),
+	GRAY1("#eeeeee", "#cccccc", "#000000", "#000000", "#FFFFFF", "#333333"),
 	GRAY2("#cccccc", "#aaaaaa", "#000000", "#000000", "#000000", "#FFFFFF"),
 	GRAY3("#aaaaaa", "#888888", "#FFFFFF", "#FFFFFF", "#000000", "#FFFFFF"),
 	GRAY4("#888888", "#666666", "#FFFFFF", "#FFFFFF", "#000000", "#FFFFFF"),
-	GRAY5("#666666", "#444444", "#FFFFFF", "#FFFFFF", "#000000", "#FFFFFF"),
-	GRAY6("#444444", "#222222", "#FFFFFF", "#FFFFFF", "#000000", "#FFFFFF");
+	GRAY5("#666666", "#444444", "#FFFFFF", "#FFFFFF", "#888888", "#FFFFFF"),
+	GRAY6("#444444", "#222222", "#FFFFFF", "#FFFFFF", "#888888", "#FFFFFF");
 
 	private final String colorHi;
 	private final String colorLow;