diff --git a/src/main/java/de/extio/game_engine/renderer/container/Window.java b/src/main/java/de/extio/game_engine/renderer/container/Window.java
index 41c2821..c25d40c 100644
--- a/src/main/java/de/extio/game_engine/renderer/container/Window.java
+++ b/src/main/java/de/extio/game_engine/renderer/container/Window.java
@@ -53,7 +53,7 @@ public class Window extends Container {
 				.setThickBorder(true)
 				.withDimensionAbsolute(this.area.getDimension())
 				.withPositionAbsoluteAnchorTopLeft(this.area.getPosition())
-				.setLayer(RenderingBoLayer.UI0_BGR);
+				.setLayer(RenderingBoLayer.UI_BGR);
 		this.rendererWorkingSet.put(this.id, windowFrame);
 		
 		if (this.closeButton) {
@@ -65,7 +65,7 @@ public class Window extends Container {
 					.setVisible(true)
 					.withDimensionAbsolute(this.area.getDimension())
 					.withPositionAbsoluteAnchorTopLeft(this.area.getPosition())
-					.setLayer(RenderingBoLayer.UI0_1);
+					.setLayer(RenderingBoLayer.UI1);
 			this.rendererWorkingSet.put(this.id, closeButtonBo);
 		}
 		
diff --git a/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java b/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java
index 09e8863..d525a7d 100644
--- a/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java
+++ b/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java
@@ -30,7 +30,7 @@ public class ScrollBar {
 	
 	private int lastNumElements;
 	
-	private RenderingBoLayer layer = RenderingBoLayer.UI0_1;
+	private RenderingBoLayer layer = RenderingBoLayer.UI1;
 	
 	public ScrollBar(final String nameSuffix) {
 		this.name = "Scrollbar_" + nameSuffix;
diff --git a/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java b/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java
index 2a74cb9..4bbae7a 100644
--- a/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java
+++ b/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java
@@ -196,7 +196,7 @@ public class Window implements HasPositionAndDimension2, AutoCloseable {
 				bo.setLayer(RenderingBoLayer.values()[Math.min(this.renderingBoLayer.ordinal() + 2, RenderingBoLayer.values().length - 1)]);
 			}
 			else {
-				bo.setLayer(RenderingBoLayer.UI0_1);
+				bo.setLayer(RenderingBoLayer.UI1);
 			}
 			consumer.accept(renderingBo, bo);
 		}
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java
index 4b138d9..777a1b3 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java
@@ -37,7 +37,7 @@ public class G2DDrawEffect extends G2DAbstractRenderingBo implements DrawEffectR
 	private String customString0;
 	
 	public G2DDrawEffect() {
-		super(RenderingBoLayer.UI0_2);
+		super(RenderingBoLayer.UI2);
 	}
 	
 	@Override
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java
index 7ceaffc..0c63f2d 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java
@@ -58,7 +58,7 @@ public class G2DDrawFont extends G2DAbstractRenderingBo implements DrawFontRende
 	private HorizontalAlignment alignment = HorizontalAlignment.LEFT;
 	
 	public G2DDrawFont() {
-		super(RenderingBoLayer.UI0_0);
+		super(RenderingBoLayer.UI0);
 	}
 	
 	@Override
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawImage.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawImage.java
index bf4c1c1..7c52c0f 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawImage.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawImage.java
@@ -40,7 +40,7 @@ public class G2DDrawImage extends G2DAbstractRenderingBo implements DrawImageRen
 	private int scaledY;
 	
 	public G2DDrawImage() {
-		super(RenderingBoLayer.BACKGROUND1);
+		super(RenderingBoLayer.UI0);
 		
 		this.transparency = 1.0f;
 	}
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawTest.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawTest.java
index 53b3a52..3ef1064 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawTest.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawTest.java
@@ -51,7 +51,7 @@ public class G2DDrawTest extends G2DAbstractRenderingBo implements DrawTestRende
 	}
 	
 	public G2DDrawTest() {
-		super(RenderingBoLayer.UI0_1);
+		super(RenderingBoLayer.UI1);
 	}
 	
 	@Override
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java
index 2ae5c5c..2a15980 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java
@@ -22,7 +22,7 @@ public class G2DDrawWindow extends G2DAbstractRenderingBo implements DrawWindowR
 	private boolean thickBorder;
 	
 	public G2DDrawWindow() {
-		super(RenderingBoLayer.UI0_BGR);
+		super(RenderingBoLayer.UI_BGR);
 		
 		this.color = COLOR_WINDOW;
 	}
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java
index 0ef5823..5ffed07 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java
@@ -37,7 +37,7 @@ public class G2DDrawWindow2 extends G2DAbstractRenderingBo implements DrawWindow
 	private Color awtColor;
 	
 	public G2DDrawWindow2() {
-		super(RenderingBoLayer.UI0_BGR);
+		super(RenderingBoLayer.UI_BGR);
 		
 		this.color = COLOR_WINDOW_BGR;
 	}
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java
index 2b8d927..b4a55e8 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java
@@ -64,7 +64,7 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen
 	private String tooltip;
 	
 	public G2DDrawControl() {
-		super(RenderingBoLayer.UI0_0);
+		super(RenderingBoLayer.UI0);
 	}
 	
 	@Override
diff --git a/src/main/java/de/extio/game_engine/renderer/model/RenderingBoLayer.java b/src/main/java/de/extio/game_engine/renderer/model/RenderingBoLayer.java
index 68f1283..181b9d2 100644
--- a/src/main/java/de/extio/game_engine/renderer/model/RenderingBoLayer.java
+++ b/src/main/java/de/extio/game_engine/renderer/model/RenderingBoLayer.java
@@ -4,16 +4,14 @@ public enum RenderingBoLayer {
 	
 	BACKGROUND0,
 	BACKGROUND1,
-	UI0_BGR,
-	UI0_0,
-	UI0_1,
-	UI0_2,
-	UI1_BGR,
-	UI1_0,
-	UI1_1,
-	UI2_BGR,
-	UI2_0,
-	UI2_1,
+	BACKGROUND2,
+	FOREGROUND0,
+	FOREGROUND1,
+	FOREGROUND2,
+	UI_BGR,
+	UI0,
+	UI1,
+	UI2,
 	TOP;
 
 }
diff --git a/src/test/java/de/extio/game_engine/demo/DemoModule.java b/src/test/java/de/extio/game_engine/demo/DemoModule.java
index f4fd5ed..3597778 100644
--- a/src/test/java/de/extio/game_engine/demo/DemoModule.java
+++ b/src/test/java/de/extio/game_engine/demo/DemoModule.java
@@ -126,7 +126,7 @@ public class DemoModule extends AbstractClientModule {
 		bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Logo", DrawImageRenderingBo.class)
 				.setResource(new StaticResource(List.of("renderer"), "logo.png"))
 				.withDimensionAbsolute(256, 256)
-				.setLayer(RenderingBoLayer.UI0_0)
+				.setLayer(RenderingBoLayer.UI0)
 				.withPositionRelative((this.mainWindow.getNormalizedDimension().getX() - 256) / 2, 200);
 		this.mainWindow.putRenderingBo(bo);
 		
diff --git a/src/test/java/de/extio/game_engine/renderer/work/RendererWorkingSetImplTest.java b/src/test/java/de/extio/game_engine/renderer/work/RendererWorkingSetImplTest.java
index 9006468..b0aa53e 100644
--- a/src/test/java/de/extio/game_engine/renderer/work/RendererWorkingSetImplTest.java
+++ b/src/test/java/de/extio/game_engine/renderer/work/RendererWorkingSetImplTest.java
@@ -424,7 +424,7 @@ public class RendererWorkingSetImplTest {
 		
 		@Override
 		public RenderingBoLayer getLayer() {
-			return RenderingBoLayer.UI0_0;
+			return RenderingBoLayer.UI0;
 		}
 		
 		@Override