diff --git a/src/Core.zig b/src/Core.zig
index 8fed0b48..b1ad641e 100644
--- a/src/Core.zig
+++ b/src/Core.zig
@@ -63,9 +63,6 @@ windows: mach.Objects(
         cursor_mode: CursorMode = .normal,
         cursor_shape: CursorShape = .arrow,
 
-        /// Outer border
-        border: bool = true,
-
         /// Width of the window in virtual pixels
         width: u32 = 1920 / 2,
 
@@ -75,16 +72,20 @@ windows: mach.Objects(
         /// Target frames per second
         refresh_rate: u32 = 0,
 
-        /// Titlebar/window decorations
+        /// Whether window decorations (titlebar, borders, etc.) should be shown.
+        ///
+        /// Has no effect on windows who DisplayMode is .fullscreen or .fullscreen_borderless
         decorated: bool = true,
 
-        /// Color of the window decorations, i.e. titlebar
-        /// if null, decoration is the system-determined color
+        /// Color of the window decorations, e.g. titlebar.
+        ///
+        /// if null, system chooses its defaults
         decoration_color: ?gpu.Color = null,
 
-        /// Whether the window should be completely transparent
-        /// or not. On macOS, to achieve a fully transparent window
-        /// decoration_color must also be set fully transparent.
+        /// Whether the window should be completely transparent or not.
+        ///
+        /// on macOS, you must also set decoration_color to a transparent color if you wish to have
+        /// a fully transparent window as it controls the 'background color' of the window.
         transparent: bool = false,
 
         // GPU
@@ -495,20 +496,6 @@ pub const InputState = struct {
     }
 };
 
-pub const WindowColor = union(enum) {
-    system: void, // Default window colors
-    transparent: struct {
-        color: gpu.Color,
-        // If true, and the OS supports it, the titlebar will also be set to color
-        titlebar: bool = false,
-    },
-    solid: struct {
-        color: gpu.Color,
-        // If titlebar is true, and the OS supports it, the titlebar will also be set to color
-        titlebar: bool = false,
-    },
-};
-
 pub const Event = union(enum) {
     key_press: KeyEvent,
     key_repeat: KeyEvent,
@@ -747,10 +734,12 @@ pub const DisplayMode = enum {
     /// Beware that true .fullscreen is also a hint to the OS that is used in various contexts, e.g.
     ///
     /// * macOS: Moving to a virtual space dedicated to fullscreen windows as the user expects
-    /// * macOS: .borderless windows cannot prevent the system menu bar from being displayed
+    /// * macOS: .fullscreen_borderless windows cannot prevent the system menu bar from being
+    ///          displayed, which makes it appear 'not fullscreen' to users who are familiar with
+    ///          macOS.
     ///
     /// Always allow users to choose their preferred display mode.
-    borderless,
+    fullscreen_borderless,
 };
 
 pub const VSyncMode = enum {
diff --git a/src/core/Windows.zig b/src/core/Windows.zig
index b600d57e..8559ea37 100644
--- a/src/core/Windows.zig
+++ b/src/core/Windows.zig
@@ -79,7 +79,7 @@ fn initWindow(
     var request_window_height: i32 = @bitCast(core_window.height);
 
     const window_ex_style: w.WINDOW_EX_STYLE = .{ .APPWINDOW = 1 };
-    const window_style: w.WINDOW_STYLE = if (core_window.border) w.WS_OVERLAPPEDWINDOW else w.WS_POPUPWINDOW; // w.WINDOW_STYLE{.POPUP = 1};
+    const window_style: w.WINDOW_STYLE = if (core_window.decorated) w.WS_OVERLAPPEDWINDOW else w.WS_POPUPWINDOW; // w.WINDOW_STYLE{.POPUP = 1};
 
     var rect: w.RECT = .{ .left = 0, .top = 0, .right = request_window_width, .bottom = request_window_height };
 
diff --git a/src/core/linux/X11.zig b/src/core/linux/X11.zig
index 57f1d6a5..6a8a7d72 100644
--- a/src/core/linux/X11.zig
+++ b/src/core/linux/X11.zig
@@ -304,7 +304,7 @@ pub fn setDisplayMode(x11: *const Native, display_mode: DisplayMode, border: boo
             x11.setFullscreen(true);
             _ = x11.libx11.XFlush(x11.display);
         },
-        .borderless => {
+        .fullscreen_borderless => {
             x11.setDecorated(false);
             x11.setFloating(true);
             x11.setFullscreen(false);