diff --git a/pom.xml b/pom.xml
index 172a824..18494cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.extio</groupId>
     <artifactId>game-engine</artifactId>
-    <version>1.0.17</version>
+    <version>1.0.18</version>
 
     <properties>
         <java.version>25</java.version>
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomMultiLineTextArea.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomMultiLineTextArea.java
index 5cc4016..cb6b415 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomMultiLineTextArea.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomMultiLineTextArea.java
@@ -974,6 +974,11 @@ public class CustomMultiLineTextArea extends Component {
 		g2d.setColor(bgColor);
 		g2d.fillRect(0, 0, this.getWidth(), this.getHeight());
 		
+		g2d.setColor(theme.getBorderOuter().toColor());
+		g2d.drawRect(0, 0, this.getWidth() - 1, this.getHeight() - 1);
+		g2d.setColor(theme.getBorderInner().toColor());
+		g2d.drawRect(1, 1, this.getWidth() - 2, this.getHeight() - 2);
+		
 		final int textAreaWidth = toScreenCoord(getTextAreaWidth() + TEXT_AREA_PADDING);
 		final int visibleHeight = getVisibleHeight();
 		
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomSingleLineTextField.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomSingleLineTextField.java
index 39f7093..e65edfe 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomSingleLineTextField.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomSingleLineTextField.java
@@ -550,6 +550,11 @@ public class CustomSingleLineTextField extends Component {
 		g2d.setColor(bgColor);
 		g2d.fillRect(0, 0, this.getWidth(), this.getHeight());
 
+		g2d.setColor(theme.getBorderOuter().toColor());
+		g2d.drawRect(0, 0, this.getWidth() - 1, this.getHeight() - 1);
+		g2d.setColor(theme.getBorderInner().toColor());
+		g2d.drawRect(1, 1, this.getWidth() - 2, this.getHeight() - 2);
+
 		if (this.cachedRawFontHeight == 0) {
 			this.cachedRawFontHeight = G2DDrawFont.getTextDimensions("ÄÖÜABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzgjpqy", g2d, this.fontSize, 1.0).getY();
 		}