diff --git a/Examples/SDUI.Test/FluentForm.Designer.cs b/Examples/SDUI.Test/FluentForm.Designer.cs
deleted file mode 100644
index 196f931..0000000
--- a/Examples/SDUI.Test/FluentForm.Designer.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-namespace SDUI.Test
-{
-    partial class FluentForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            button1 = new Controls.Button();
-            button2 = new Controls.Button();
-            button3 = new Controls.Button();
-            generalPage1 = new GeneralPage();
-            SuspendLayout();
-            // 
-            // button1
-            // 
-            button1.Color = System.Drawing.Color.Transparent;
-            button1.Location = new System.Drawing.Point(31, 74);
-            button1.Name = "button1";
-            button1.Radius = 6;
-            button1.ShadowDepth = 4F;
-            button1.Size = new System.Drawing.Size(94, 29);
-            button1.TabIndex = 0;
-            button1.Text = "Dark";
-            button1.UseVisualStyleBackColor = true;
-            button1.Click += button1_Click;
-            // 
-            // button2
-            // 
-            button2.Color = System.Drawing.Color.Transparent;
-            button2.Location = new System.Drawing.Point(131, 74);
-            button2.Name = "button2";
-            button2.Radius = 6;
-            button2.ShadowDepth = 4F;
-            button2.Size = new System.Drawing.Size(94, 29);
-            button2.TabIndex = 1;
-            button2.Text = "Light";
-            button2.UseVisualStyleBackColor = true;
-            button2.Click += button2_Click;
-            // 
-            // button3
-            // 
-            button3.Color = System.Drawing.Color.Transparent;
-            button3.Location = new System.Drawing.Point(231, 74);
-            button3.Name = "button3";
-            button3.Radius = 6;
-            button3.ShadowDepth = 4F;
-            button3.Size = new System.Drawing.Size(94, 29);
-            button3.TabIndex = 2;
-            button3.Text = "Transparent";
-            button3.UseVisualStyleBackColor = true;
-            button3.Click += button3_Click;
-            // 
-            // generalPage1
-            // 
-            generalPage1.Location = new System.Drawing.Point(3, 144);
-            generalPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            generalPage1.Name = "generalPage1";
-            generalPage1.Size = new System.Drawing.Size(1802, 979);
-            generalPage1.TabIndex = 5;
-            // 
-            // FluentForm
-            // 
-            AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
-            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            BackColor = System.Drawing.Color.FromArgb(0, 0, 0, 0);
-            ClientSize = new System.Drawing.Size(1380, 965);
-            Controls.Add(generalPage1);
-            Controls.Add(button3);
-            Controls.Add(button2);
-            Controls.Add(button1);
-            DwmMargin = -1;
-            Location = new System.Drawing.Point(0, 0);
-            Name = "FluentForm";
-            Text = "FluentForm";
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Controls.Button button1;
-        private Controls.Button button2;
-        private Controls.Button button3;
-        private GeneralPage generalPage1;
-    }
-}
\ No newline at end of file
diff --git a/Examples/SDUI.Test/FluentForm.cs b/Examples/SDUI.Test/FluentForm.cs
deleted file mode 100644
index f073dc2..0000000
--- a/Examples/SDUI.Test/FluentForm.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using SDUI.Controls;
-using System;
-using System.Drawing;
-
-namespace SDUI.Test
-{
-    public partial class FluentForm : UIWindow
-    {
-        public FluentForm()
-        {
-            InitializeComponent();
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            ColorScheme.BackColor = Color.Black;
-            BackColor = ColorScheme.BackColor;
-        }
-
-        private void button2_Click(object sender, EventArgs e)
-        {
-            ColorScheme.BackColor = Color.White;
-            BackColor = ColorScheme.BackColor;
-        }
-
-        private void button3_Click(object sender, EventArgs e)
-        {
-            ColorScheme.BackColor = Color.Transparent;
-            BackColor = ColorScheme.BackColor;
-        }
-    }
-}
diff --git a/Examples/SDUI.Test/FluentForm.resx b/Examples/SDUI.Test/FluentForm.resx
deleted file mode 100644
index 8b2ff64..0000000
--- a/Examples/SDUI.Test/FluentForm.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/Examples/SDUI.Test/Program.cs b/Examples/SDUI.Test/Program.cs
index fff9374..548a4e2 100644
--- a/Examples/SDUI.Test/Program.cs
+++ b/Examples/SDUI.Test/Program.cs
@@ -15,7 +15,7 @@ static void Main()
         Application.SetHighDpiMode(HighDpiMode.PerMonitor | HighDpiMode.PerMonitorV2);
         Application.SetCompatibleTextRenderingDefault(false);
 
-        Application.SetDefaultFont(SDUI.Helpers.FontManager.Segoe);
+        //Application.SetDefaultFont(SDUI.Helpers.FontManager.Segoe);
         Application.Run(new MainWindow());
     }
 }
diff --git a/SDUI/Controls/InputDailog.Designer.cs b/SDUI/Controls/InputDailog.Designer.cs
index 4e748ba..c2273e9 100644
--- a/SDUI/Controls/InputDailog.Designer.cs
+++ b/SDUI/Controls/InputDailog.Designer.cs
@@ -53,7 +53,7 @@ private void InitializeComponent()
             lblTitle.GradientAnimation = false;
             lblTitle.Location = new System.Drawing.Point(0, 0);
             lblTitle.Name = "lblTitle";
-            lblTitle.Size = new System.Drawing.Size(319, 20);
+            lblTitle.Size = new System.Drawing.Size(324, 20);
             lblTitle.TabIndex = 1;
             lblTitle.Text = "Input";
             // 
@@ -71,13 +71,13 @@ private void InitializeComponent()
             lblMessage.GradientAnimation = false;
             lblMessage.Location = new System.Drawing.Point(0, 20);
             lblMessage.Name = "lblMessage";
-            lblMessage.Size = new System.Drawing.Size(319, 46);
+            lblMessage.Size = new System.Drawing.Size(324, 46);
             lblMessage.TabIndex = 2;
             lblMessage.Text = "Please enter a value";
             // 
             // txtValue
             // 
-            txtValue.Location = new System.Drawing.Point(11, 69);
+            txtValue.Location = new System.Drawing.Point(11, 83);
             txtValue.MaxLength = 32767;
             txtValue.MultiLine = false;
             txtValue.Name = "txtValue";
@@ -94,11 +94,11 @@ private void InitializeComponent()
             btnOK.Color = System.Drawing.Color.DodgerBlue;
             btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
             btnOK.ForeColor = System.Drawing.Color.White;
-            btnOK.Location = new System.Drawing.Point(11, 8);
+            btnOK.Location = new System.Drawing.Point(11, 6);
             btnOK.Name = "btnOK";
-            btnOK.Radius = 2;
+            btnOK.Radius = 6;
             btnOK.ShadowDepth = 4F;
-            btnOK.Size = new System.Drawing.Size(75, 23);
+            btnOK.Size = new System.Drawing.Size(106, 29);
             btnOK.TabIndex = 0;
             btnOK.Text = "OK";
             btnOK.UseVisualStyleBackColor = true;
@@ -109,11 +109,11 @@ private void InitializeComponent()
             btnCancel.Color = System.Drawing.Color.Firebrick;
             btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             btnCancel.ForeColor = System.Drawing.Color.White;
-            btnCancel.Location = new System.Drawing.Point(239, 8);
+            btnCancel.Location = new System.Drawing.Point(223, 6);
             btnCancel.Name = "btnCancel";
-            btnCancel.Radius = 2;
+            btnCancel.Radius = 6;
             btnCancel.ShadowDepth = 4F;
-            btnCancel.Size = new System.Drawing.Size(75, 23);
+            btnCancel.Size = new System.Drawing.Size(91, 29);
             btnCancel.TabIndex = 1;
             btnCancel.Text = "Cancel";
             btnCancel.UseVisualStyleBackColor = true;
@@ -125,12 +125,12 @@ private void InitializeComponent()
             comboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             comboBox.FormattingEnabled = true;
             comboBox.IntegralHeight = false;
-            comboBox.ItemHeight = 17;
-            comboBox.Location = new System.Drawing.Point(12, 69);
+            comboBox.ItemHeight = 23;
+            comboBox.Location = new System.Drawing.Point(12, 80);
             comboBox.Name = "comboBox";
             comboBox.Radius = 5;
             comboBox.ShadowDepth = 4F;
-            comboBox.Size = new System.Drawing.Size(298, 23);
+            comboBox.Size = new System.Drawing.Size(277, 29);
             comboBox.TabIndex = 4;
             comboBox.Visible = false;
             // 
@@ -139,12 +139,12 @@ private void InitializeComponent()
             numValue.BackColor = System.Drawing.Color.Transparent;
             numValue.Font = new System.Drawing.Font("Segoe UI", 9.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             numValue.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0);
-            numValue.Location = new System.Drawing.Point(12, 69);
+            numValue.Location = new System.Drawing.Point(12, 77);
             numValue.Maximum = new decimal(new int[] { 32765, 0, 0, 0 });
             numValue.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
             numValue.MinimumSize = new System.Drawing.Size(80, 25);
             numValue.Name = "numValue";
-            numValue.Size = new System.Drawing.Size(156, 25);
+            numValue.Size = new System.Drawing.Size(156, 34);
             numValue.TabIndex = 5;
             numValue.Value = new decimal(new int[] { 1, 0, 0, 0 });
             numValue.KeyUp += numValue_KeyUp;
@@ -157,19 +157,18 @@ private void InitializeComponent()
             panel1.Controls.Add(btnOK);
             panel1.Controls.Add(btnCancel);
             panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            panel1.Location = new System.Drawing.Point(0, 101);
+            panel1.Location = new System.Drawing.Point(0, 125);
             panel1.Name = "panel1";
             panel1.Radius = 0;
             panel1.ShadowDepth = 4F;
-            panel1.Size = new System.Drawing.Size(319, 39);
+            panel1.Size = new System.Drawing.Size(324, 39);
             panel1.TabIndex = 6;
             // 
             // InputDialog
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
             AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            BackColor = System.Drawing.Color.White;
-            ClientSize = new System.Drawing.Size(319, 140);
+            ClientSize = new System.Drawing.Size(324, 164);
             ControlBox = false;
             Controls.Add(panel1);
             Controls.Add(numValue);
@@ -177,7 +176,6 @@ private void InitializeComponent()
             Controls.Add(txtValue);
             Controls.Add(lblMessage);
             Controls.Add(lblTitle);
-            Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             ForeColor = System.Drawing.Color.Black;
             FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             MaximizeBox = false;
diff --git a/SDUI/Controls/InputDailog.resx b/SDUI/Controls/InputDailog.resx
index af32865..8b2ff64 100644
--- a/SDUI/Controls/InputDailog.resx
+++ b/SDUI/Controls/InputDailog.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/SDUI/Controls/MultiPageControl.cs b/SDUI/Controls/MultiPageControl.cs
index 811bd80..c6a9c81 100644
--- a/SDUI/Controls/MultiPageControl.cs
+++ b/SDUI/Controls/MultiPageControl.cs
@@ -15,9 +15,9 @@ namespace SDUI.Controls;
 
 public class MultiPageControlItem : Panel
 {
-    public Rectangle Rectangle { get; set; }
-    public Rectangle RectangleClose { get; set; }
-    public Rectangle RectangleIcon { get; set; }
+    public RectangleF Rectangle { get; set; }
+    public RectangleF RectangleClose { get; set; }
+    public RectangleF RectangleIcon { get; set; }
 
     [Localizable(true), Browsable(true), EditorBrowsable(EditorBrowsableState.Always)]
     public override string Text
@@ -52,6 +52,8 @@ public MultiPageControlItem(string text)
 [Designer(typeof(MultiPageControlDesigner))]
 public class MultiPageControl : UserControl
 {
+    public float DPI => DeviceDpi / 96.0f;
+
     private EventHandler<int> _onSelectedIndexChanged;
     private EventHandler _onNewPageButtonClicked;
     private EventHandler _onClosePageButtonClicked;
@@ -143,7 +145,7 @@ public Size HeaderControlSize
     private Point _mouseLocation;
     private GraphicsPath _newButtonPath;
     private int _mouseState;
-    private int _lastTabX;
+    private float _lastTabX;
 
     public bool _renderNewPageButton = true;
     public bool RenderNewPageButton
@@ -180,22 +182,24 @@ public bool RenderPageClose
 
     private void ReorganizePages()
     {
-        _lastTabX = 6;// this.Radius / 2;
+        _lastTabX = 6 * DPI;// this.Radius / 2;
 
         for(int i = 0; i < Controls.Count; i++)
         {
             var control = Controls[i];
 
             var stringSize = TextRenderer.MeasureText(control.Text, Font);
-            var width = stringSize.Width + 80;
-            var rectangle = new Rectangle(_lastTabX, 6, width, _headerControlSize.Height - 6);
+            var width = stringSize.Width + 80 * DPI;
+            RectangleF rectangle = new(_lastTabX, 6 * DPI, width, _headerControlSize.Height * DPI - 6);
+            
             control.Rectangle = rectangle;
-            control.RectangleClose = new Rectangle(rectangle.X + rectangle.Width - 20, rectangle.Y + 6, 12, 12);
-            control.RectangleIcon = new Rectangle(rectangle.X + 6, rectangle.Y + 5, 16, 16);
+            control.RectangleClose = new(rectangle.X + rectangle.Width - 20 * DPI, rectangle.Y + 6 * DPI, 12 * DPI, 12 * DPI);
+            control.RectangleIcon = new(rectangle.X + 6 * DPI, rectangle.Y + 5 * DPI, 16 * DPI, 16 * DPI);
+
             _lastTabX += width;
         }
 
-        _newButtonPath = new RectangleF(_lastTabX + 4, 9, 24, 16).Radius(6, 12, 12, 6);
+        _newButtonPath = new RectangleF(_lastTabX + 4, 9 * DPI, 24 * DPI, 16 * DPI).Radius(6, 12, 12, 6);
     }
 
     public MultiPageControlItem Add()
@@ -271,7 +275,7 @@ protected override void OnPaint(PaintEventArgs e)
             var rectangle = control.Rectangle;
 
             if (i == SelectedIndex)
-                graphics.FillPath(borderPen.Brush, rectangle.ToRectangleF().Radius(6, 6));
+                graphics.FillPath(borderPen.Brush, rectangle.Radius(6 * DPI, 6 * DPI));
 
             // is mouse in close button
             if (_renderPageClose)
@@ -290,11 +294,11 @@ protected override void OnPaint(PaintEventArgs e)
                 inlineCloseRect.Offset(0, 0);
                 inlineCloseRect.Inflate(-2, -2);
 
-                graphics.FillPie(closeBrush, inlineCloseRect, 0, 360);
+                graphics.FillPie(closeBrush, inlineCloseRect.X, inlineCloseRect.Y, inlineCloseRect.Width, inlineCloseRect.Height, 0, 360);
             }
 
             if (_renderPageIcon)
-                graphics.DrawIcon(SystemIcons.Hand, control.RectangleIcon);
+                graphics.DrawIcon(SystemIcons.Hand, control.RectangleIcon.ToRectangle());
 
             i++;
             control.DrawString(graphics, ColorScheme.ForeColor, rectangle);
diff --git a/SDUI/Controls/NumUpDown.cs b/SDUI/Controls/NumUpDown.cs
index 2423fe4..77ebf71 100644
--- a/SDUI/Controls/NumUpDown.cs
+++ b/SDUI/Controls/NumUpDown.cs
@@ -219,24 +219,26 @@ protected override void OnMouseWheel(MouseEventArgs e)
 
         protected override void OnPaint(PaintEventArgs e)
         {
+            var dpi = DeviceDpi / 96f;
             //base.OnPaint(e);
             var graphics = e.Graphics;
             ButtonRenderer.DrawParentBackground(e.Graphics, Bounds, this);
 
             using var borderPen = new Pen(ColorScheme.BorderColor);
             using var backColorBrush = ColorScheme.BackColor.Alpha(90).Brush();
-            using var foreColorBrush = ColorScheme.ForeColor.Brush();
+            using var foreColorBrush = ColorScheme.ForeColor.Alpha(200).Brush();
 
             graphics.SmoothingMode = SmoothingMode.AntiAlias;
             using var round = ClientRectangle.Radius(8);
             graphics.FillPath(backColorBrush, round);
             graphics.DrawPath(borderPen, round);
 
-            using var plusMinusFont = new Font("Tahoma", 12.75f, FontStyle.Bold);
-            graphics.DrawString("+", plusMinusFont, foreColorBrush, Width - (22 * (DeviceDpi / 96)), 1);
-            graphics.DrawLine(borderPen, Width - (25 * (DeviceDpi / 96)), 1, (Width - 25 * (DeviceDpi / 96)), Height - 2 * (DeviceDpi / 96));
-            graphics.DrawString("-", plusMinusFont, foreColorBrush, (Width - 41 * (DeviceDpi / 96)), 1);
-            graphics.DrawLine(borderPen, Width - (45 * (DeviceDpi / 96)), 1, (Width - 45 * (DeviceDpi / 96)), Height - 2 * (DeviceDpi / 96));
+            using var plusMinusFont = new Font("Tahoma", 10.4f * dpi, FontStyle.Regular);
+
+            graphics.DrawString("▲", Font, foreColorBrush, Width - 18 * dpi, 1.25f * dpi);
+            graphics.DrawLine(borderPen, Width - (22 * dpi), 1, (Width - 22 * dpi), Height - 2);
+            graphics.DrawString("▼", Font, foreColorBrush, (Width - 40 * dpi), 1.25f * dpi);
+            graphics.DrawLine(borderPen, Width - (45 * dpi), 1, (Width - 45 * dpi), Height - 2);
 
             TextRenderer.DrawText(graphics, Value.ToString(), Font, new Rectangle(1, 0, Width - 1, Height - 1), ColorScheme.ForeColor, TextFormatFlags.PreserveGraphicsClipping | TextFormatFlags.VerticalCenter | TextFormatFlags.Left);
         }
diff --git a/SDUI/Controls/UIWindow.cs b/SDUI/Controls/UIWindow.cs
index f5031ba..d9e3fae 100644
--- a/SDUI/Controls/UIWindow.cs
+++ b/SDUI/Controls/UIWindow.cs
@@ -1,10 +1,12 @@
 using SDUI.Animation;
 using SDUI.Helpers;
+using Svg;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
+using System.Security.Policy;
 using System.Windows.Forms;
 
 namespace SDUI.Controls;
@@ -823,20 +825,17 @@ protected override void OnPaint(PaintEventArgs e)
             // if (_inCloseBox)
             graphics.FillRectangle(Color.FromArgb((int)(closeBoxHoverAnimationManager.GetProgress() * closeHoverColor.A), closeHoverColor.RemoveAlpha()), _controlBoxRect);
 
-            for (int i = 0; i < 3; i++)
-            {
-                graphics.DrawLine(_inCloseBox ? Color.White : foreColor,
+            graphics.DrawLine(_inCloseBox ? Color.White : foreColor,
                 _controlBoxRect.Left + _controlBoxRect.Width / 2 - (5 * DPI),
                 _controlBoxRect.Top + _controlBoxRect.Height / 2 - (5 * DPI),
                 _controlBoxRect.Left + _controlBoxRect.Width / 2 + (5 * DPI),
                 _controlBoxRect.Top + _controlBoxRect.Height / 2 + (5 * DPI));
 
-                graphics.DrawLine(_inCloseBox ? Color.White : foreColor,
-                    _controlBoxRect.Left + _controlBoxRect.Width / 2 - (5 * DPI),
-                    _controlBoxRect.Top + _controlBoxRect.Height / 2 + (5 * DPI),
-                    _controlBoxRect.Left + _controlBoxRect.Width / 2 + (5 * DPI),
-                    _controlBoxRect.Top + _controlBoxRect.Height / 2 - (5 * DPI));
-            }
+            graphics.DrawLine(_inCloseBox ? Color.White : foreColor,
+                _controlBoxRect.Left + _controlBoxRect.Width / 2 - (5 * DPI),
+                _controlBoxRect.Top + _controlBoxRect.Height / 2 + (5 * DPI),
+                _controlBoxRect.Left + _controlBoxRect.Width / 2 + (5 * DPI),
+                _controlBoxRect.Top + _controlBoxRect.Height / 2 - (5 * DPI));
         }
 
         if (MaximizeBox)
@@ -900,8 +899,7 @@ protected override void OnPaint(PaintEventArgs e)
         if (ExtendBox)
         {
             //if (_inExtendBox)
-            graphics.FillRectangle(Color.FromArgb((int)(extendBoxHoverAnimationManager.GetProgress() * hoverColor.A), hoverColor.RemoveAlpha()), _extendBoxRect);
-
+            /*
             graphics.DrawLine(foreColor,
                     _extendBoxRect.Left + _extendBoxRect.Width / 2 - (5 * DPI) - 1,
                     _extendBoxRect.Top + _extendBoxRect.Height / 2 - (2 * DPI),
@@ -913,9 +911,28 @@ protected override void OnPaint(PaintEventArgs e)
                 _extendBoxRect.Top + _extendBoxRect.Height / 2 - (2 * DPI),
                 _extendBoxRect.Left + _extendBoxRect.Width / 2 - (1 * DPI),
                 _extendBoxRect.Top + _extendBoxRect.Height / 2 + (3 * DPI));
+            */
+
+            graphics.SetHighQuality();
+
+            var color = foreColor;
+            if (_inExtendBox)
+            {
+                var hoverSize = 24 * DPI;
+                var brush = new SolidBrush(Color.FromArgb((int)(extendBoxHoverAnimationManager.GetProgress() * hoverColor.A), hoverColor.RemoveAlpha()));
+                graphics.FillPath(brush, new RectangleF(_extendBoxRect.X + 20 * DPI, (_titleHeightDPI / 2) - (hoverSize / 2), hoverSize, hoverSize).Radius(15));
+            }
+
+            var svg = Svg.SvgDocument.FromSvg<Svg.SvgDocument>("<svg fill=\"currentColor\" version=\"1.1\" id=\"Capa_1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 38.998 38.998\" xml:space=\"preserve\"><g id=\"SVGRepo_bgCarrier\" stroke-width=\"0\"></g><g id=\"SVGRepo_tracerCarrier\" stroke-linecap=\"round\" stroke-linejoin=\"round\"></g><g id=\"SVGRepo_iconCarrier\"> <g> <path d=\"M35.497,15.111h-1.656c-0.282-0.924-0.653-1.807-1.102-2.646l1.176-1.175c1.364-1.366,1.366-3.582,0-4.949l-1.258-1.258 c-0.656-0.656-1.548-1.025-2.476-1.025l0,0c-0.93,0-1.818,0.369-2.477,1.025l-1.176,1.175c-0.838-0.446-1.721-0.817-2.645-1.102 V3.501c0-1.934-1.566-3.5-3.5-3.5h-1.778c-1.934,0-3.5,1.566-3.5,3.5v1.655c-0.923,0.282-1.807,0.653-2.645,1.102l-1.174-1.175 c-1.367-1.367-3.584-1.367-4.951,0L5.081,6.34c-1.367,1.366-1.367,3.583,0,4.949l1.174,1.175c-0.446,0.84-0.818,1.723-1.102,2.646 H3.5c-1.934,0-3.5,1.566-3.5,3.5v1.778c0,1.932,1.566,3.5,3.5,3.5h1.654c0.283,0.922,0.654,1.807,1.102,2.645l-1.175,1.176 c-1.366,1.365-1.366,3.582-0.001,4.949l1.258,1.258c0.656,0.654,1.547,1.023,2.475,1.023h0.001c0.929,0,1.818-0.369,2.475-1.023 l1.176-1.176c0.837,0.447,1.722,0.818,2.644,1.102v1.656c0,1.932,1.566,3.5,3.5,3.5h1.778c1.934,0,3.5-1.568,3.5-3.5v-1.656 c0.924-0.283,1.807-0.654,2.645-1.102l1.177,1.176c0.655,0.656,1.547,1.023,2.476,1.023c0.93,0,1.817-0.369,2.477-1.023 l1.256-1.258c1.366-1.367,1.365-3.582,0-4.949l-1.176-1.174c0.447-0.84,0.818-1.725,1.102-2.646h1.656c1.934,0,3.5-1.568,3.5-3.5 v-1.777C38.997,16.679,37.43,15.111,35.497,15.111z M19.499,27.499c-4.41,0-8-3.588-8-8c0-4.411,3.59-8,8-8c4.412,0,8,3.589,8,8 C27.499,23.911,23.911,27.499,19.499,27.499z\"></path> </g> </g></svg>");
+            svg.Color = new SvgColourServer(color);
+
+            var size = 16 * DPI;
+            using var bitmap = svg.Draw();
+            graphics.DrawImage(bitmap, _extendBoxRect.X + 24 * DPI, (_titleHeightDPI / 2) - (size / 2), size, size);
+            graphics.SetDefaultQuality();
         }
 
-        var faviconSize = 16;
+        var faviconSize = 16 * DPI;
         if (Icon != null)
             graphics.DrawImage(Icon.ToBitmap(), 10, (_titleHeightDPI / 2) - (faviconSize / 2), faviconSize, faviconSize);
 
diff --git a/SDUI/Controls/UIWindowBase.cs b/SDUI/Controls/UIWindowBase.cs
index 83eaf47..8afefd4 100644
--- a/SDUI/Controls/UIWindowBase.cs
+++ b/SDUI/Controls/UIWindowBase.cs
@@ -315,7 +315,9 @@ protected override void OnHandleCreated(EventArgs e)
 
         if (DesignMode)
             return;
-        
+
+        WindowsHelper.ApplyRoundCorner(this.Handle);
+
         /*if (_aeroEnabled)
         {
             var v = 2;
@@ -323,10 +325,10 @@ protected override void OnHandleCreated(EventArgs e)
             DwmSetWindowAttribute(Handle, DWMWINDOWATTRIBUTE.DWMWA_NCRENDERING_POLICY, ref v, 4);
             var margins = new MARGINS()
             {
-                Bottom = 0,
-                Left = 0,
-                Right = 0,
-                Top = Height + 10000000
+                Bottom = 1,
+                Left = 1,
+                Right = 1,
+                Top = 1
             };
 
             DwmExtendFrameIntoClientArea(this.Handle, ref margins);
diff --git a/SDUI/Extensions/RectangleExtensions.cs b/SDUI/Extensions/RectangleExtensions.cs
index 5a5c247..1235424 100644
--- a/SDUI/Extensions/RectangleExtensions.cs
+++ b/SDUI/Extensions/RectangleExtensions.cs
@@ -30,7 +30,91 @@ internal static GraphicsPath Radius(this RectangleF r, int radius)
 
         return path;
     }
+    internal static GraphicsPath Radius(this RectangleF r, float radius)
+    {
+        var path = new GraphicsPath();
+        path.AddArc(r.X, r.Y, radius, radius, 180, 90);
+        path.AddArc(r.X + r.Width - radius - 1, r.Y, radius, radius, 270, 90);
+        path.AddArc(r.X + r.Width - radius - 1, r.Y + r.Height - radius - 1, radius, radius, 0, 90);
+        path.AddArc(r.X, r.Y + r.Height - radius - 1, radius, radius, 90, 90);
+        path.CloseAllFigures();
+
+        //var path = new GraphicsPath();
+        //path.AddLine(r.X + radius, r.Y, r.X + r.Width - (radius * 2), r.Y);
+        //path.AddArc(r.X + r.Width - (radius * 2), r.Y, radius * 2, radius * 2, 270, 90);
+        //path.AddLine(r.X + r.Width, r.Y + radius, r.X + r.Width, r.Y + r.Height - (radius * 2));
+        //path.AddArc(r.X + r.Width - (radius * 2), r.Y + r.Height - (radius * 2), radius * 2, radius * 2, 0, 90);
+        //path.AddLine(r.X + r.Width - (radius * 2), r.Y + r.Height, r.X + radius, r.Y + r.Height);
+        //path.AddArc(r.X, r.Y + r.Height - (radius * 2), radius * 2, radius * 2, 90, 90);
+        //path.AddLine(r.X, r.Y + r.Height - (radius * 2), r.X, r.Y + radius);
+        //path.AddArc(r.X, r.Y, radius * 2, radius * 2, 180, 90);
+        //path.CloseFigure();
+
+        return path;
+    }
+    public static GraphicsPath Radius(this RectangleF bounds, float topLeft = 0, float topRight = 0, float bottomLeft = 0, float bottomRight = 0)
+    {
+        var diameter1 = topLeft * 2;
+        var diameter2 = topRight * 2;
+        var diameter3 = bottomLeft * 2;
+        var diameter4 = bottomRight * 2;
+
+        var arc1 = new RectangleF(bounds.Location, new SizeF(diameter1, diameter1));
+        var arc2 = new RectangleF(bounds.Location, new SizeF(diameter2, diameter2));
+        var arc3 = new RectangleF(bounds.Location, new SizeF(diameter3, diameter3));
+        var arc4 = new RectangleF(bounds.Location, new SizeF(diameter4, diameter4));
+        var path = new GraphicsPath();
+
+        // top left arc  
+        if (topLeft == 0)
+        {
+            path.AddLine(arc1.Location, arc1.Location);
+        }
+        else
+        {
+            path.AddArc(arc1, 180, 90);
+        }
+
+        // top right arc  
+        arc2.X = bounds.Right - diameter2;
+        if (topRight == 0)
+        {
+            path.AddLine(arc2.Location, arc2.Location);
+        }
+        else
+        {
+            path.AddArc(arc2, 270, 90);
+        }
 
+        // bottom right arc  
+
+        arc3.X = bounds.Right - diameter3;
+        arc3.Y = bounds.Bottom - diameter3;
+        if (bottomLeft == 0)
+        {
+            path.AddLine(arc3.Location, arc3.Location);
+        }
+        else
+        {
+            path.AddArc(arc3, 0, 90);
+        }
+
+        // bottom left arc 
+        arc4.X = bounds.Right - diameter4;
+        arc4.Y = bounds.Bottom - diameter4;
+        arc4.X = bounds.Left;
+        if (bottomRight == 0)
+        {
+            path.AddLine(arc4.Location, arc4.Location);
+        }
+        else
+        {
+            path.AddArc(arc4, 90, 90);
+        }
+
+        path.CloseFigure();
+        return path;
+    }
     public static GraphicsPath Radius(this RectangleF bounds, int topLeft = 0, int topRight = 0, int bottomLeft = 0, int bottomRight = 0)
     {
         int diameter1 = topLeft * 2;
diff --git a/SDUI/SDUI.csproj b/SDUI/SDUI.csproj
index edb03d1..93e5401 100644
--- a/SDUI/SDUI.csproj
+++ b/SDUI/SDUI.csproj
@@ -8,6 +8,10 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Svg" Version="3.4.7" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Controls\NTextBox.cs">
       <SubType>UserControl</SubType>