diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeb15e3..5f12566 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -373,6 +373,9 @@ if(${DBus1_FOUND})
   )
 endif()
 
+list(APPEND LIBRARIES m)
+
+
 target_include_directories(
  Mw
  PRIVATE
diff --git a/include/Mw/LowLevel/Wayland.h b/include/Mw/LowLevel/Wayland.h
index 948cf72..e760609 100644
--- a/include/Mw/LowLevel/Wayland.h
+++ b/include/Mw/LowLevel/Wayland.h
@@ -466,6 +466,7 @@ struct _MwLLWayland {
 		wayland_protocol_t* value;
 	}* wl_protocol_map;
 
+	MwBool do_csd;
 	MwBool has_decorations;
 	char   title[256];
 
diff --git a/src/backend/wayland/buffer.c b/src/backend/wayland/buffer.c
index a37fd34..39a31dd 100644
--- a/src/backend/wayland/buffer.c
+++ b/src/backend/wayland/buffer.c
@@ -27,7 +27,7 @@ void MwLLWaylandBackbufferSetup(struct _MwLLWayland* wayland) {
 	}
 	MwU32 w = wayland->ww;
 	MwU32 h = wayland->wh;
-	if(!wayland->has_decorations) {
+	if(!wayland->has_decorations && wayland->do_csd) {
 		w += (CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT);
 		h += (CSD_BORDER_FRAME_TOP + CSD_BORDER_FRAME_BOTTOM);
 	}
diff --git a/src/backend/wayland/interfaces.c b/src/backend/wayland/interfaces.c
index f07e5af..2de4e67 100644
--- a/src/backend/wayland/interfaces.c
+++ b/src/backend/wayland/interfaces.c
@@ -618,7 +618,7 @@ static void pointer_button(void* data, struct wl_pointer* wl_pointer, MwU32 seri
 		}
 	}
 
-	if(!self->wayland.has_decorations) {
+	if(!self->wayland.has_decorations && self->wayland.do_csd) {
 		if(state != WL_POINTER_BUTTON_STATE_RELEASED)
 			xdg_borderless_step_mdown(self, p, serial);
 		else
diff --git a/src/backend/wayland/region.c b/src/backend/wayland/region.c
index c1bab73..83acdbe 100644
--- a/src/backend/wayland/region.c
+++ b/src/backend/wayland/region.c
@@ -11,7 +11,7 @@ void MwLLWaylandRegionSetup(MwLL handle) {
 	int  width  = (handle->wayland.clipping_rect.width == 0) ? handle->wayland.ww : handle->wayland.clipping_rect.width;
 	int  height = (handle->wayland.clipping_rect.height == 0) ? handle->wayland.wh : handle->wayland.clipping_rect.height;
 
-	if(!handle->wayland.has_decorations && handle->wayland.type == MwLL_WAYLAND_TOPLEVEL) {
+	if(!handle->wayland.has_decorations && handle->wayland.do_csd && handle->wayland.type == MwLL_WAYLAND_TOPLEVEL) {
 		width += CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT;
 		height += CSD_BORDER_FRAME_TOP + CSD_BORDER_FRAME_BOTTOM;
 	}
diff --git a/src/backend/wayland/wayland.c b/src/backend/wayland/wayland.c
index dc4a832..83332a0 100644
--- a/src/backend/wayland/wayland.c
+++ b/src/backend/wayland/wayland.c
@@ -270,6 +270,7 @@ static void setup_toplevel(MwLL r, int x, int y) {
 	/* check now if we have decorations so that everything else can act accordingly */
 	if(shget(r->wayland.wl_protocol_map, zxdg_decoration_manager_v1_interface.name) != NULL) {
 		r->wayland.has_decorations = MwTRUE;
+		r->wayland.do_csd	   = MwTRUE;
 	}
 
 	r->wayland.xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
@@ -314,7 +315,7 @@ static void setup_toplevel(MwLL r, int x, int y) {
 		zxdg_toplevel_decoration_v1_set_mode(
 		    dec->decoration, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
 	} else {
-		wl_subsurface_set_position(r->wayland.toplevel->ssurface, CSD_BORDER_FRAME_LEFT, CSD_BORDER_FRAME_TOP);
+		wl_subsurface_set_position(r->wayland.toplevel->ssurface, r->wayland.do_csd ? CSD_BORDER_FRAME_LEFT : 0, r->wayland.do_csd ? CSD_BORDER_FRAME_TOP : 0);
 	}
 }
 
@@ -456,7 +457,7 @@ static void setup_popup(MwLL r, int x, int y, MwLL parent) {
 	while(topmost_parent->wayland.type != MwLL_WAYLAND_TOPLEVEL) {
 		topmost_parent = topmost_parent->wayland.parent;
 	}
-	if(!topmost_parent->wayland.has_decorations) {
+	if(!topmost_parent->wayland.has_decorations && topmost_parent->wayland.do_csd) {
 		r->wayland.x += ceil((float)CSD_BORDER_FRAME_LEFT / 2.);
 		r->wayland.y += ceil((float)CSD_BORDER_FRAME_TOP / 2.);
 	}
@@ -478,6 +479,7 @@ static void setup_popup(MwLL r, int x, int y, MwLL parent) {
 	/* check now if we have decorations so that everything else can act accordingly */
 	if(shget(r->wayland.wl_protocol_map, zxdg_decoration_manager_v1_interface.name) != NULL) {
 		r->wayland.has_decorations = MwTRUE;
+		r->wayland.do_csd	   = MwTRUE;
 	}
 
 	r->wayland.popup->xdg_wm_base = WAYLAND_GET_INTERFACE(r->wayland, xdg_wm_base)->context;
@@ -681,7 +683,7 @@ static void widget_setup(MwLL r, MwLL parent, int x, int y, int width, int heigh
 	r->wayland.keyboard_delay = 600; /* starting at 600ms... */
 	r->wayland.keyboard_rate  = 25;	 /* and going every 25ms... */
 
-	if(!r->wayland.has_decorations) {
+	if(!r->wayland.has_decorations && r->wayland.do_csd) {
 		MwLLBeginDraw(r);
 		MwLLEndDraw(r);
 	}
@@ -921,7 +923,7 @@ static void MwLLBeginDrawImpl(MwLL handle) {
 		return;
 	}
 
-	if(!handle->wayland.has_decorations) {
+	if(!handle->wayland.has_decorations && handle->wayland.do_csd) {
 		int    y;
 		MwU32  w = handle->wayland.ww + CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT;
 		MwU32  h = handle->wayland.wh + CSD_BORDER_FRAME_TOP + CSD_BORDER_FRAME_BOTTOM;
@@ -1232,7 +1234,7 @@ static void MwLLSetTitleImpl(MwLL handle, const char* title) {
 	if(handle->wayland.type == MwLL_WAYLAND_TOPLEVEL) {
 		xdg_toplevel_set_title(handle->wayland.toplevel->xdg_top_level, title);
 	}
-	if(!handle->wayland.has_decorations) {
+	if(!handle->wayland.has_decorations && handle->wayland.do_csd) {
 		strncpy(handle->wayland.title, title, 255);
 		MwLLBeginDraw(handle);
 		MwLLEndDraw(handle);
@@ -1361,7 +1363,7 @@ static void MwLLSetIconImpl(MwLL handle, MwLLPixmap pixmap) {
 			xdg_toplevel_icon_manager_v1_set_icon(icon_manager, handle->wayland.toplevel->xdg_top_level, icon);
 		}
 	}
-	if(!handle->wayland.has_decorations) {
+	if(!handle->wayland.has_decorations && handle->wayland.do_csd) {
 		if(handle->wayland.icon_pixmap) {
 			MwLLDestroyPixmap(handle->wayland.icon_pixmap);
 		}
@@ -1483,8 +1485,8 @@ static void MwLLSetSizeHintsImpl(MwLL handle, int minx, int miny, int maxx, int
 }
 
 static void MwLLMakeBorderlessImpl(MwLL handle, int toggle) {
-	(void)toggle;
 	WIDGET_CHECK(handle);
+	printf("%d\n", toggle);
 	if(handle->wayland.type == MwLL_WAYLAND_TOPLEVEL) {
 		if(WAYLAND_GET_INTERFACE(handle->wayland, zxdg_decoration_manager_v1) != NULL) {
 			zxdg_decoration_manager_v1_context_t* dec = WAYLAND_GET_INTERFACE(handle->wayland, zxdg_decoration_manager_v1)->context;
@@ -1493,7 +1495,10 @@ static void MwLLMakeBorderlessImpl(MwLL handle, int toggle) {
 			    dec->manager, handle->wayland.toplevel->xdg_top_level);
 
 			zxdg_toplevel_decoration_v1_set_mode(
-			    dec->decoration, ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE);
+			    dec->decoration, toggle ? ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE : ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+		} else {
+			handle->wayland.do_csd = !toggle;
+			wl_subsurface_set_position(handle->wayland.toplevel->ssurface, handle->wayland.do_csd ? CSD_BORDER_FRAME_LEFT : 0, handle->wayland.do_csd ? CSD_BORDER_FRAME_TOP : 0);
 		}
 	}
 }