diff --git a/milsko.xml b/milsko.xml
index 76ad045..01467d3 100644
--- a/milsko.xml
+++ b/milsko.xml
@@ -462,6 +462,8 @@
 		<widget name="Image">
 			<properties>
 				<property name="pixmap" />
+				<property name="hasBorder" />
+				<property name="inverted" />
 			</properties>
 		</widget>
 		<widget name="Label">
@@ -585,6 +587,8 @@
 				<property name="main" />
 				<property name="iconPixmap" />
 				<property name="sizeHints" />
+				<property name="hasBorder" />
+				<property name="inverted" />
 			</properties>
 			<functions>
 				<function name="MakeBorderless" />
diff --git a/src/widget/image.c b/src/widget/image.c
index 93fe446..6728f73 100644
--- a/src/widget/image.c
+++ b/src/widget/image.c
@@ -4,6 +4,9 @@
 static int create(MwWidget handle) {
 	MwSetDefault(handle);
 
+	MwSetInteger(handle, MwNhasBorder, 0);
+	MwSetInteger(handle, MwNinverted, 1);
+
 	return 0;
 }
 
@@ -16,6 +19,9 @@ static void draw(MwWidget handle) {
 	r.y	 = 0;
 	r.width	 = MwGetInteger(handle, MwNwidth);
 	r.height = MwGetInteger(handle, MwNheight);
+
+	if(MwGetInteger(handle, MwNhasBorder)) MwDrawFrame(handle, &r, base, MwGetInteger(handle, MwNinverted));
+
 	MwDrawRect(handle, &r, base);
 	if(px != NULL) {
 		MwLLDrawPixmap(handle->lowlevel, &r, px);
@@ -25,7 +31,7 @@ static void draw(MwWidget handle) {
 }
 
 static void prop_change(MwWidget handle, const char* key) {
-	if(strcmp(key, MwNpixmap) == 0) MwForceRender(handle);
+	if(strcmp(key, MwNpixmap) == 0 || strcmp(key, MwNhasBorder) == 0 || strcmp(key, MwNinverted) == 0) MwForceRender(handle);
 }
 
 MwClassRec MwImageClassRec = {
diff --git a/src/widget/window.c b/src/widget/window.c
index b5b594a..5368a44 100644
--- a/src/widget/window.c
+++ b/src/widget/window.c
@@ -4,6 +4,9 @@
 static int create(MwWidget handle) {
 	MwSetDefault(handle);
 
+	MwSetInteger(handle, MwNhasBorder, 0);
+	MwSetInteger(handle, MwNinverted, 1);
+
 	return 0;
 }
 
@@ -16,10 +19,17 @@ static void draw(MwWidget handle) {
 	r.width	 = MwGetInteger(handle, MwNwidth);
 	r.height = MwGetInteger(handle, MwNheight);
 
+	if(MwGetInteger(handle, MwNhasBorder)) MwDrawFrame(handle, &r, base, MwGetInteger(handle, MwNinverted));
+
 	MwDrawRect(handle, &r, c);
 
 	MwLLFreeColor(c);
 }
+
+static void prop_change(MwWidget handle, const char* key) {
+	if(strcmp(key, MwNhasBorder) == 0 || strcmp(key, MwNinverted) == 0) MwForceRender(handle);
+}
+
 static void mwWindowMakeBorderlessImpl(MwWidget handle, int toggle) {
 	MwLLBeginStateChange(handle->lowlevel);
 	MwLLMakeBorderless(handle->lowlevel, toggle);
@@ -40,7 +50,7 @@ MwClassRec MwWindowClassRec = {
     draw,	  /* draw */
     NULL,	  /* click */
     NULL,	  /* parent_resize */
-    NULL,	  /* prop_change */
+    prop_change,  /* prop_change */
     NULL,	  /* mouse_move */
     NULL,	  /* mouse_up */
     NULL,	  /* mouse_down */