diff --git a/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/chrome.css b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/chrome.css
new file mode 100644
index 00000000..ccf67aca
--- /dev/null
+++ b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/chrome.css
@@ -0,0 +1,81 @@
+
+.titlebar-buttonbox {
+    padding-inline-end: calc(var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)) !important;
+    align-items: center;
+}
+
+.titlebar-button {
+    padding: 0 var(--toolbarbutton-outer-padding) !important;
+    height: calc(2 * var(--toolbarbutton-inner-padding) + 16px);
+}
+
+.titlebar-button > image {
+    padding: var(--toolbarbutton-inner-padding) !important;
+    border-radius: var(--toolbarbutton-border-radius) !important;
+    outline: var(--toolbarbutton-outline) !important;
+    outline-offset: var(--toolbarbutton-outline-offset) !important;
+
+width: calc(2 * var(--toolbarbutton-inner-padding) + 12px) !important;
+    height: calc(2 * var(--toolbarbutton-inner-padding) + 12px) !important;
+}
+
+.titlebar-button:hover > image {
+    background-color: var(--toolbarbutton-hover-background) !important;
+
+outline-color: var(--toolbarbutton-hover-outline-color) !important;
+}
+
+.titlebar-min:hover {
+    background: none !important;
+}
+
+.titlebar-max:hover {
+    background: none !important;
+}
+
+.titlebar-restore:hover {
+    background: none !important;
+}
+
+.titlebar-close:hover {
+    stroke: currentColor !important;
+    background: none !important;
+}
+
+@media (-moz-bool-pref: "theme.betterWindowsButtons.use_custom_icon_color_for_close") {
+    .titlebar-close:hover {
+        stroke: var(--theme-betterWindowsButtons-icon_color_for_close) !important;
+    }
+}
+
+@media (-moz-bool-pref: "theme.betterWindowsButtons.use_custom_button_color_for_close") {
+    .titlebar-close:hover > image {
+        background-color: var(--theme-betterWindowsButtons-button_color_for_close) !important;
+    }
+}
+
+@media (-moz-bool-pref: "theme.betterWindowsButtons.use_custom_icon_color_for_restore") {
+    .titlebar-restore:hover,
+    .titlebar-max:hover {
+        stroke: var(--theme-betterWindowsButtons-icon_color_for_restore) !important;
+    }
+}
+
+@media (-moz-bool-pref: "theme.betterWindowsButtons.use_custom_button_color_for_restore") {
+    .titlebar-restore:hover > image,
+    .titlebar-max:hover > image {
+        background-color: var(--theme-betterWindowsButtons-button_color_for_restore) !important;
+    }
+}
+
+@media (-moz-bool-pref: "theme.betterWindowsButtons.use_custom_icon_color_for_min") {
+    .titlebar-min:hover {
+        stroke: var(--theme-betterWindowsButtons-icon_color_for_min) !important;
+    }
+}
+
+@media (-moz-bool-pref: "theme.betterWindowsButtons.use_custom_button_color_for_min") {
+    .titlebar-min:hover > image {
+        background-color: var(--theme-betterWindowsButtons-button_color_for_min) !important;
+    }
+}
diff --git a/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/image.png b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/image.png
new file mode 100644
index 00000000..fe8891e2
Binary files /dev/null and b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/image.png differ
diff --git a/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/preferences.json b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/preferences.json
new file mode 100644
index 00000000..fa0f1b57
--- /dev/null
+++ b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/preferences.json
@@ -0,0 +1,74 @@
+[
+    {
+        "property": "theme.betterWindowsButtons.use_custom_icon_color_for_min",
+        "label": "Use custom icon color for \u2501 button",
+        "type": "checkbox",
+        "defaultValue": false
+    },
+    {
+        "property": "theme.betterWindowsButtons.icon_color_for_min",
+        "label": "Icon color for \u2501 button (tick checkbox above)",
+        "type": "string",
+        "placeholder": "white, #fff, rgb(255, 255, 255), etc..."
+    },
+    {
+        "property": "theme.betterWindowsButtons.use_custom_button_color_for_min",
+        "label": "Use custom button color for \u2501 button",
+        "type": "checkbox",
+        "defaultValue": false
+    },
+    {
+        "property": "theme.betterWindowsButtons.button_color_for_min",
+        "label": "Button color for \u2501 button (tick checkbox above)",
+        "type": "string",
+        "placeholder": "limegreen, #f53, rgb(255, 85, 51), etc..."
+    },
+    {
+        "property": "theme.betterWindowsButtons.use_custom_icon_color_for_restore",
+        "label": "Use custom icon color for \u29c9 button",
+        "type": "checkbox",
+        "defaultValue": false
+    },
+    {
+        "property": "theme.betterWindowsButtons.icon_color_for_restore",
+        "label": "Icon color for \u29c9 button (tick checkbox above)",
+        "type": "string",
+        "placeholder": "white, #fff, rgb(255, 255, 255), etc..."
+    },
+    {
+        "property": "theme.betterWindowsButtons.use_custom_button_color_for_restore",
+        "label": "Use custom button color for \u29c9 button",
+        "type": "checkbox",
+        "defaultValue": false
+    },
+    {
+        "property": "theme.betterWindowsButtons.button_color_for_restore",
+        "label": "Button color for \u29c9 button (tick checkbox above)",
+        "type": "string",
+        "placeholder": "orange, #ffa500, rgb(255, 87, 51), etc..."
+    },
+    {
+        "property": "theme.betterWindowsButtons.use_custom_icon_color_for_close",
+        "label": "Use custom icon color for \u2716 button",
+        "type": "checkbox",
+        "defaultValue": false
+    },
+    {
+        "property": "theme.betterWindowsButtons.icon_color_for_close",
+        "label": "Icon color for \u2716 button (tick checkbox above)",
+        "type": "string",
+        "placeholder": "white, #fff, rgb(255, 255, 255), etc..."
+    },
+    {
+        "property": "theme.betterWindowsButtons.use_custom_button_color_for_close",
+        "label": "Use custom button color for \u2716 button",
+        "type": "checkbox",
+        "defaultValue": false
+    },
+    {
+        "property": "theme.betterWindowsButtons.button_color_for_close",
+        "label": "Button color for \u2716 button (tick checkbox above)",
+        "type": "string",
+        "placeholder": "red, #f00, rgb(255, 0, 0), etc..."
+    }
+]
\ No newline at end of file
diff --git a/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/readme.md b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/readme.md
new file mode 100644
index 00000000..bdccb672
--- /dev/null
+++ b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/readme.md
@@ -0,0 +1,10 @@
+
+# Better – ⧉ ✖ Windows Buttons
+
+Do you rage when looking at the standard Windows buttons? This theme is the Solution.
+
+## Features
+
+- Looks stunning
+- Moreover, it’s perfectly consistent
+- Plus, you can customize the colors in the settings
diff --git a/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/theme.json b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/theme.json
new file mode 100644
index 00000000..215df70f
--- /dev/null
+++ b/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/theme.json
@@ -0,0 +1,15 @@
+{
+    "id": "c164e8f4-7986-4309-a0fe-5f916b46fef8",
+    "name": "Better Windows Buttons",
+    "description": "Do you rage when looking at the standard Windows buttons? This theme is the Solution.",
+    "homepage": "https://github.com/tsukanov-alexey/zen-related-stuff",
+    "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/chrome.css",
+    "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/readme.md",
+    "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/image.png",
+    "author": "tsukanov-alexey",
+    "version": "1.0.0",
+    "tags": [],
+    "createdAt": "2024-10-19",
+    "updatedAt": "2024-10-19",
+    "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c164e8f4-7986-4309-a0fe-5f916b46fef8/preferences.json"
+}
\ No newline at end of file