diff --git a/README.md b/README.md
index 87d1267..c275a04 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 wlroots-based Wayland compositor with virtual outputs and physical cursor continuity.
 Originally forked from dwl.
 
-`LOC: 7444 total, 2880 vwl.c`
+`LOC: 7448 total, 2880 vwl.c`
 
 ## Features
 
diff --git a/config.def.h b/config.def.h
index ff36590..c5e43cc 100644
--- a/config.def.h
+++ b/config.def.h
@@ -11,6 +11,7 @@ static const int fullscreen_idle_inhibit   = 1;  /* 1 inhibits idle whenever a v
 static const int passthrough_on_pointer_lock = 0; /* 1 passes keybindings to client when pointer is locked (eg QEMU grab) */
 static const unsigned int borderpx         = 1;  /* border pixel of windows */
 static const unsigned int floatborderpx    = 1;  /* border pixel of floating windows */
+static const unsigned int xborderpx        = 1;  /* border pixel of Xwayland windows */
 static const float rootcolor[]             = COLOR(0x222222ff);
 static const float bordercolor[]           = COLOR(0x444444ff);
 static const float focuscolor[]            = COLOR(0x005577ff);
@@ -18,6 +19,9 @@ static const float urgentcolor[]           = COLOR(0xff0000ff);
 static const float floatbordercolor[]      = COLOR(0x444444ff);
 static const float floatfocuscolor[]       = COLOR(0x005577ff);
 static const float floaturgentcolor[]      = COLOR(0xff0000ff);
+static const float xbordercolor[]          = COLOR(0x444444ff);
+static const float xfocuscolor[]           = COLOR(0x005577ff);
+static const float xurgentcolor[]          = COLOR(0xff0000ff);
 static const int center_floating_windows   = 0;     /* center windows when toggled floating */
 static const float floating_window_width_factor = 1.0f;  /* 0 < factor <= 1 */
 static const float floating_window_height_factor = 1.0f; /* 0 < factor <= 1 */
diff --git a/vwl.c b/vwl.c
index 74399c9..b4cf6d8 100644
--- a/vwl.c
+++ b/vwl.c
@@ -895,17 +895,17 @@ borderwidth(Client *c)
 {
 	if (!c || client_is_unmanaged(c) || c->isfullscreen)
 		return 0;
-	return c->isfloating ? floatborderpx : borderpx;
+	return client_is_x11(c) ? xborderpx : c->isfloating ? floatborderpx : borderpx;
 }
 
 static const float *
 bordercolorfor(Client *c, int focused)
 {
 	if (c->isurgent)
-		return c->isfloating ? floaturgentcolor : urgentcolor;
+		return client_is_x11(c) ? xurgentcolor : c->isfloating ? floaturgentcolor : urgentcolor;
 	if (focused)
-		return c->isfloating ? floatfocuscolor : focuscolor;
-	return c->isfloating ? floatbordercolor : bordercolor;
+		return client_is_x11(c) ? xfocuscolor : c->isfloating ? floatfocuscolor : focuscolor;
+	return client_is_x11(c) ? xbordercolor : c->isfloating ? floatbordercolor : bordercolor;
 }
 
 static void