diff --git a/deploy/img/theme-window.png b/deploy/img/theme-window.png
index 1f1febd..b663ba4 100644
Binary files a/deploy/img/theme-window.png and b/deploy/img/theme-window.png differ
diff --git a/deploy/img/theme-window.svg b/deploy/img/theme-window.svg
index 435082e..c109a7e 100644
--- a/deploy/img/theme-window.svg
+++ b/deploy/img/theme-window.svg
@@ -7,9 +7,9 @@
    viewBox="0 0 158.74975 185.20813"
    version="1.1"
    id="svg8"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   sodipodi:docname="theme-variables.svg"
-   inkscape:export-filename="theme-variables.png"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   sodipodi:docname="theme-window.svg"
+   inkscape:export-filename="theme-window.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -29,8 +29,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="541.5"
-     inkscape:cy="340"
+     inkscape:cx="304"
+     inkscape:cy="387"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -39,8 +39,8 @@
      inkscape:bbox-nodes="false"
      inkscape:object-nodes="false"
      inkscape:snap-nodes="false"
-     inkscape:window-width="1918"
-     inkscape:window-height="1027"
+     inkscape:window-width="1366"
+     inkscape:window-height="755"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
@@ -69,13 +69,6 @@
        d="M 1.4826771,116.02512 H 151.58749"
        id="path4551"
        inkscape:connector-curvature="0" />
-    <path
-       style="fill:#808080;stroke:#808080;stroke-width:0.264576;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264576, 0.529153;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 82.779577,66.639201 -7.497642,30.66021"
-       id="path4551-5"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-1.8866291"
-       inkscape:transform-center-y="-27.950207" />
     <path
        style="fill:#808080;stroke:#808080;stroke-width:0.26454;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26454, 0.529088;stroke-dashoffset:0;stroke-opacity:1"
        d="M 35.346891,10.47989 11.741383,105.69795"
@@ -134,21 +127,6 @@
            style="fill:#808080" /></flowRegion><flowPara
          id="flowPara4655"
          style="font-size:18.6666px;fill:#808080">border.width</flowPara></flowRoot>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot4649-36"
-       style="font-style:normal;font-weight:normal;font-size:18.6659px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none"
-       transform="matrix(0.26458333,0,0,0.26460587,7.9715371,-27.74585)"><flowRegion
-         id="flowRegion4651-7"
-         style="fill:#808080"><rect
-           id="rect4653-5"
-           width="180.237"
-           height="29.647175"
-           x="288"
-           y="348.51968"
-           style="fill:#808080" /></flowRegion><flowPara
-         id="flowPara4655-3"
-         style="font-size:18.6659px;fill:#808080">padding.height</flowPara></flowRoot>
     <rect
        style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4657"
diff --git a/deploy/img/theme-window2.png b/deploy/img/theme-window2.png
new file mode 100644
index 0000000..d584b0b
Binary files /dev/null and b/deploy/img/theme-window2.png differ
diff --git a/deploy/img/theme-window2.svg b/deploy/img/theme-window2.svg
new file mode 100644
index 0000000..293f172
--- /dev/null
+++ b/deploy/img/theme-window2.svg
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="600"
+   height="700"
+   viewBox="0 0 158.74975 185.20813"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   sodipodi:docname="theme-window2.svg"
+   inkscape:export-filename="theme-window2.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="542"
+     inkscape:cy="340"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="755"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0"
+     units="in"
+     width="793.70081px"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.4826771,116.02512 H 151.58749"
+       id="path4551"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#808080;stroke:#808080;stroke-width:0.264576;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264576, 0.529153;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 72.196257,66.639201 -7.497642,30.66021"
+       id="path4551-5"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.8866291"
+       inkscape:transform-center-y="-27.950207" />
+    <path
+       style="fill:#808080;stroke:#808080;stroke-width:0.264587;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264587, 0.529173;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 148.0192,105.14109 -10.59088,43.32877"
+       id="path4551-5-2-0"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.4202296"
+       inkscape:transform-center-y="-33.420116" />
+    <path
+       style="fill:#808080;stroke:#808080;stroke-width:0.207616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.207616, 0.415231;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 131.94053,104.59694 -8.31045,33.99921"
+       id="path4551-5-2-0-1"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.1144247"
+       inkscape:transform-center-y="-26.224089" />
+    <path
+       style="fill:#808080;stroke:#808080;stroke-width:0.264535;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264535, 0.529075;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 127.37582,83.49166 -4.08428,16.90223"
+       id="path4551-5-2-0-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-0.54770173"
+       inkscape:transform-center-y="-13.036898" />
+    <path
+       style="fill:#808080;stroke:#808080;stroke-width:0.264535;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.264535, 0.529075;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 118.62932,105.85806 -4.08428,16.90223"
+       id="path4551-5-2-0-8-3"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-0.54770173"
+       inkscape:transform-center-y="-13.036898" />
+    <path
+       style="fill:none;stroke:#808080;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 9.5875133,93.951371 c -4.4319983,0 -8.0000245,3.568029 -8.0000245,8.000039 v 81.80737 H 151.58749 v -81.80737 c 0,-4.43201 -3.56803,-8.000039 -8.00003,-8.000039 z"
+       id="rect3736"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 56.88545,110.46881 H 75.670858"
+       id="path4617"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 59.798721,99.895059 H 75.938287"
+       id="path4617-7"
+       inkscape:connector-curvature="0" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4649-36"
+       style="font-style:normal;font-weight:normal;font-size:18.6659px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none"
+       transform="matrix(0.26458333,0,0,0.26460587,-69.155436,-32.411192)"><flowRegion
+         id="flowRegion4651-7"
+         style="fill:#808080"><rect
+           id="rect4653-5"
+           width="305.23685"
+           height="27.64736"
+           x="288"
+           y="348.51968"
+           style="fill:#808080" /></flowRegion><flowPara
+         id="flowPara4655-3"
+         style="font-size:18.6659px;fill:#808080">window.titlebar.padding.height</flowPara></flowRoot>
+    <path
+       style="fill:#808080;stroke:#808080;stroke-width:0.394583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.394583, 0.789168;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 150.84968,52.014795 139.66785,97.740794"
+       id="path4551-5-2"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.8136786"
+       inkscape:transform-center-y="-41.684357" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4649-36-6"
+       style="font-style:normal;font-weight:normal;font-size:18.6659px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none"
+       transform="matrix(0.26458333,0,0,0.26460587,1.0282778,-45.992706)"><flowRegion
+         id="flowRegion4651-7-1"
+         style="fill:#808080"><rect
+           id="rect4653-5-8"
+           width="337.23679"
+           height="41.646149"
+           x="288"
+           y="348.51968"
+           style="fill:#808080" /></flowRegion><flowPara
+         id="flowPara4655-3-7"
+         style="font-size:18.6659px;fill:#808080">window.titlebar.padding.height</flowPara></flowRoot>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4649-36-3"
+       style="font-style:normal;font-weight:normal;font-size:18.6659px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none"
+       transform="matrix(0.26458333,0,0,0.26460587,7.3265922,-14.945548)"><flowRegion
+         id="flowRegion4651-7-6"
+         style="fill:#808080"><rect
+           id="rect4653-5-7"
+           width="203.944"
+           height="28.241053"
+           x="288"
+           y="348.51968"
+           style="fill:#808080" /></flowRegion><flowPara
+         id="flowPara4655-3-5"
+         style="font-size:18.6659px;fill:#808080">window.button.width</flowPara></flowRoot>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4649-36-3-5"
+       style="font-style:normal;font-weight:normal;font-size:18.6659px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none"
+       transform="matrix(0.26458333,0,0,0.26460587,-11.20525,31.98796)"><flowRegion
+         id="flowRegion4651-7-6-6"
+         style="fill:#808080"><rect
+           id="rect4653-5-7-2"
+           width="216.22523"
+           height="28.241058"
+           x="288"
+           y="348.51968"
+           style="fill:#808080" /></flowRegion><flowPara
+         id="flowPara4655-3-5-9"
+         style="font-size:18.6659px;fill:#808080">window.button.height</flowPara></flowRoot>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4649-36-3-5-2"
+       style="font-style:normal;font-weight:normal;font-size:18.6659px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none"
+       transform="matrix(0.26458333,0,0,0.26460587,-3.2140191,47.432994)"><flowRegion
+         id="flowRegion4651-7-6-6-7"
+         style="fill:#808080"><rect
+           id="rect4653-5-7-2-0"
+           width="216.22523"
+           height="28.241058"
+           x="288"
+           y="348.51968"
+           style="fill:#808080" /></flowRegion><flowPara
+         id="flowPara4655-3-5-9-9"
+         style="font-size:18.6659px;fill:#808080">window.button.spacing</flowPara></flowRoot>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4649-36-3-5-2-3"
+       style="font-style:normal;font-weight:normal;font-size:18.6659px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none"
+       transform="matrix(0.26458333,0,0,0.26460587,-4.0046634,57.638037)"><flowRegion
+         id="flowRegion4651-7-6-6-7-6"
+         style="fill:#808080"><rect
+           id="rect4653-5-7-2-0-0"
+           width="304.2251"
+           height="25.241318"
+           x="288"
+           y="348.51968"
+           style="fill:#808080" /></flowRegion><flowPara
+         id="flowPara4655-3-5-9-9-6"
+         style="font-size:18.6659px;fill:#808080">window.titlebar.padding.width</flowPara></flowRoot>
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4657"
+       width="10.159241"
+       height="10.159135"
+       x="134.38882"
+       y="100.06448" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4657-3"
+       width="10.159241"
+       height="10.159135"
+       x="118.69707"
+       y="100.06409" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4649-3"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       transform="matrix(0.26458333,0,0,0.26458333,-31.731567,-65.992313)"><flowRegion
+         id="flowRegion4651-6"><rect
+           id="rect4653-7"
+           width="133"
+           height="74.000008"
+           x="288"
+           y="348.51968" /></flowRegion><flowPara
+         id="flowPara4655-5"
+         style="font-size:13.3333px">windowborder.width.</flowPara></flowRoot>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:12.5023px;line-height:1.25;font-family:sans-serif;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.312557"
+       x="63.809036"
+       y="109.79826"
+       id="text3608"><tspan
+         sodipodi:role="line"
+         id="tspan3606"
+         style="fill:#808080;fill-opacity:1;stroke-width:0.312557"
+         x="63.809036"
+         y="109.79826">title</tspan></text>
+  </g>
+</svg>
diff --git a/src/diagrams-theme.md b/src/diagrams-theme.md
index efe4312..8471946 100644
--- a/src/diagrams-theme.md
+++ b/src/diagrams-theme.md
@@ -3,7 +3,9 @@
 <!-- source: img/theme-window.svg --> 
 <!-- also at "https://i.imgur.com/534SSaOl.png" -->
 ## Window
-<img src="img/theme-window.png" />
+<img src="img/theme-window.png"/>
+<br/>
+<img src="img/theme-window2.png"/>
 
 ## Menu
-<img src="img/theme-menu.png" />
+<img src="img/theme-menu.png"/>