diff --git a/Ext/StyledComponents/source/Vcl.StyledButton.pas b/Ext/StyledComponents/source/Vcl.StyledButton.pas
index 5de365f..0da45a8 100644
--- a/Ext/StyledComponents/source/Vcl.StyledButton.pas
+++ b/Ext/StyledComponents/source/Vcl.StyledButton.pas
@@ -53,7 +53,7 @@ interface
   ;
 
 const
-  StyledButtonsVersion = '3.5.1';
+  StyledButtonsVersion = '3.5.2';
 
 resourcestring
   ERROR_SETTING_BUTTON_STYLE = 'Error setting Button Style: %s/%s/%s not available';
@@ -282,6 +282,7 @@   TStyledButtonRender = class(TObject)
     procedure SetGroupIndex(const AValue: Integer);
     procedure SetShowCaption(const AValue: Boolean);
     procedure UpAllButtons;
+    function GetCaptionToDraw: string;
   protected
     FCustomDrawType: Boolean;
     FUseButtonLayout: Boolean;
@@ -2575,7 +2576,7 @@ procedure TStyledButtonRender.DrawCaptionAndImage(const ACanvas: TCanvas;
   LCaption: TCaption;
 begin
   if FShowCaption then
-    LCaption := Caption
+    LCaption := GetCaptionToDraw
   else
     LCaption := '';
   case FCaptionAlignment of
@@ -3767,6 +3768,16 @@ function TStyledButtonRender.GetComponentWidth: Integer;
   Result := FOwnerControl.Width;
 end;
 
+function TStyledButtonRender.GetCaptionToDraw: string;
+begin
+  if FOwnerControl is TCustomStyledGraphicButton then
+    Result := TCustomStyledGraphicButton(FOwnerControl).GetCaptionToDraw
+  else if FOwnerControl is TCustomStyledButton then
+    Result := TCustomStyledButton(FOwnerControl).GetCaptionToDraw
+  else
+    Result := '';
+end;
+
 function TStyledButtonRender.GetComponentHeight: Integer;
 begin
   Result := FOwnerControl.Height;
@@ -3926,7 +3937,7 @@ constructor TCustomStyledGraphicButton.CreateStyled(AOwner: TComponent;
   inherited Create(AOwner);
   FImageIndex := -1;
   FRender := GetRenderClass.CreateStyled(Self,
-    ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
+    ControlClick, ControlFont, GetCaption, SetCaption,
       GetParentFont, SetParentFont,
       AFamily, AClass, AAppearance,
       _DefaultStyleDrawType, _DefaultCursor, _UseCustomDrawType);
@@ -3950,7 +3961,7 @@ constructor TCustomStyledGraphicButton.CreateStyled(AOwner: TComponent;
   inherited Create(AOwner);
   FImageIndex := -1;
   FRender := GetRenderClass.CreateStyled(Self,
-    ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
+    ControlClick, ControlFont, GetCaption, SetCaption,
       GetParentFont, SetParentFont,
       AFamily, AClass, AAppearance,
       ADrawType, ACursor, AUseCustomDrawType);
@@ -5074,7 +5085,7 @@ constructor TCustomStyledButton.CreateStyled(AOwner: TComponent;
   ParentColor := False;
   FImageIndex := -1;
   FRender := GetRenderClass.CreateStyled(Self,
-    ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
+    ControlClick, ControlFont, GetCaption, SetCaption,
       GetParentFont, SetParentFont,
       AFamily, AClass, AAppearance,
       _DefaultStyleDrawType, _DefaultCursor, _UseCustomDrawType);
@@ -5091,7 +5102,7 @@ constructor TCustomStyledButton.CreateStyled(AOwner: TComponent;
   ParentColor := False;
   FImageIndex := -1;
   FRender := GetRenderClass.CreateStyled(Self,
-    ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
+    ControlClick, ControlFont, GetCaption, SetCaption,
       GetParentFont, SetParentFont,
       AFamily, AClass, AAppearance,
       ADrawType, ACursor, AUseCustomDrawType);
diff --git a/Ext/StyledComponents/source/Vcl.StyledToolbar.pas b/Ext/StyledComponents/source/Vcl.StyledToolbar.pas
index aeeac16..6c68426 100644
--- a/Ext/StyledComponents/source/Vcl.StyledToolbar.pas
+++ b/Ext/StyledComponents/source/Vcl.StyledToolbar.pas
@@ -113,7 +113,6 @@   TStyledToolButton = class(TCustomStyledGraphicButton)
     function IsStoredStyleClass: Boolean; override;
     function IsEnabledStored: Boolean; override;
     function IsCaptionStored: Boolean; override;
-    function GetText: TCaption; override;
     function GetImage(out AImageList: TCustomImageList;
       out AImageIndex: Integer): Boolean; override;
     function GetButtonState: TStyledButtonState; override;
@@ -605,16 +604,6 @@ function TStyledToolButton.GetStyleDrawType: TStyledButtonDrawType;
   Result := inherited StyleDrawType;
 end;
 
-function TStyledToolButton.GetText: TCaption;
-begin
-  if Assigned(FToolBar) and not (FToolBar.ShowCaptions) then
-    Result := ''
-  else if IsSeparator then
-    Result := ''
-  else
-    Result := inherited GetText;
-end;
-
 function TStyledToolButton.GetWrap: Boolean;
 begin
   Result := inherited WordWrap;
diff --git a/Images/Context-Menu.png b/Images/Context-Menu.png
deleted file mode 100644
index b190502..0000000
Binary files a/Images/Context-Menu.png and /dev/null differ
diff --git a/Images/ExportToPNG.png b/Images/ExportToPNG.png
deleted file mode 100644
index 8c0e1f0..0000000
Binary files a/Images/ExportToPNG.png and /dev/null differ
diff --git a/Images/SkiaShellExtensions.png b/Images/SkiaShellExtensions.png
new file mode 100644
index 0000000..1cc29ad
Binary files /dev/null and b/Images/SkiaShellExtensions.png differ
diff --git a/Images/lottie_200.png b/Images/lottie_200.png
new file mode 100644
index 0000000..1af2b3f
Binary files /dev/null and b/Images/lottie_200.png differ
diff --git a/README.htm b/README.htm
index 9ac0b23..457c457 100644
--- a/README.htm
+++ b/README.htm
@@ -30,7 +30,7 @@
 }
 </style>
 <h1>SKIA Shell Extensions and Lottie Editor <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg" alt="License"/></a></h1>
-<p><strong>Latest Version 1.5.3 - 09 May 2024</strong></p>
+<p><strong>Latest Version 1.5.4 - 12 May 2024</strong></p>
 <p><strong>A collection of extensions tools for image and animations files, integrated into Microsoft Windows Explorer (7, 8, 10 and 11):</strong></p>
 <ul>
 <li><p>A <a href="https://docs.microsoft.com/en-us/windows/win32/shell/preview-handlers">Preview handler</a>  which allows you to see static images and animations files in the &ldquo;Preview Panel&rdquo;.</p>
@@ -97,13 +97,24 @@ <h3>Manual Build and Installation (for Delphi developers)</h3>
 </li>
 </ol>
 <h2>Release Notes</h2>
-<p>13 Jan 2024: ver. 1.5.2</p>
+<p>12 May 2024: ver. 1.5.4</p>
+<ul>
+<li>Added StyledComponents (Rounded Buttons options)</li>
+<li>Added init for GDI+Plus to Dll's</li>
+<li>Deleted unused images</li>
+</ul>
+<p>09 May 2024: ver. 1.5.3</p>
 <ul>
 <li>Added File Changed notification and reload</li>
 <li>Built with Delphi 12.1</li>
 <li>Built with Latest Image32 Library</li>
 <li>Built with Latest Skia4Delphi 6.1 Library</li>
 </ul>
+<p>13 Jan 2024: ver. 1.5.2</p>
+<ul>
+<li>Aligned to Image32 Library</li>
+<li>Updated Copyright</li>
+</ul>
 <p>26 Oct 2023: ver. 1.5.1</p>
 <ul>
 <li>Optimized rendering of Icon using the Skia Codec directly</li>
diff --git a/README.md b/README.md
index 6a0a5e7..a63977b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # SKIA Shell Extensions and Lottie Editor [![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](https://opensource.org/licenses/Apache-2.0)
 
-**Latest Version 1.5.3 - 09 May 2024**
+**Latest Version 1.5.4 - 12 May 2024**
 
 **A collection of extensions tools for image and animations files, integrated into Microsoft Windows Explorer (7, 8, 10 and 11):**
 
@@ -88,6 +88,11 @@ To manually install the SKIAShellExtensions.dll follow these steps:
 
 ## Release Notes ##
 
+12 May 2024: ver. 1.5.4
+- Added StyledComponents (Rounded Buttons options)
+- Added init for GDI+Plus to Dll's
+- Deleted unused images
+
 09 May 2024: ver. 1.5.3
 - Added File Changed notification and reload
 - Built with Delphi 12.1
diff --git a/Setup/Output/SKIAShellExtensionsSetup.exe b/Setup/Output/SKIAShellExtensionsSetup.exe
index a91803b..a338ed9 100644
Binary files a/Setup/Output/SKIAShellExtensionsSetup.exe and b/Setup/Output/SKIAShellExtensionsSetup.exe differ
diff --git a/Setup/SKIAShellExtensions.iss b/Setup/SKIAShellExtensions.iss
index 5ad3c48..fa056d7 100644
--- a/Setup/SKIAShellExtensions.iss
+++ b/Setup/SKIAShellExtensions.iss
@@ -1,7 +1,7 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 #define MyAppName 'SKIA Shell Extensions and Lottie Text Editor'
-#define MyAppVersion '1.5.3'
+#define MyAppVersion '1.5.4'
 
 [Setup]
 AppName={#MyAppName}
diff --git a/Source/EditorMainForm.dfm b/Source/EditorMainForm.dfm
index 697a7de..b5194af 100644
--- a/Source/EditorMainForm.dfm
+++ b/Source/EditorMainForm.dfm
@@ -28,28 +28,25 @@ object frmMain: TfrmMain
   TextHeight = 15
   object RightSplitter: TSplitter
     Left = 570
-    Top = 36
+    Top = 38
     Width = 6
-    Height = 533
+    Height = 531
     Align = alRight
     AutoSnap = False
     MinSize = 240
-    ExplicitLeft = 741
-    ExplicitTop = 61
-    ExplicitHeight = 500
   end
   object ClientPanel: TPanel
     Left = 44
-    Top = 36
+    Top = 38
     Width = 526
-    Height = 533
+    Height = 531
     Align = alClient
     TabOrder = 0
     object PageControl: TPageControl
       Left = 1
       Top = 1
       Width = 524
-      Height = 531
+      Height = 529
       Align = alClient
       Images = VirtualImageList
       TabOrder = 0
@@ -113,9 +110,9 @@ object frmMain: TfrmMain
   end
   object ImagePanel: TPanel
     Left = 576
-    Top = 36
+    Top = 38
     Width = 323
-    Height = 533
+    Height = 531
     Align = alRight
     BevelOuter = bvNone
     Color = clWhite
@@ -124,15 +121,12 @@ object frmMain: TfrmMain
     StyleElements = []
     object StatusSplitter: TSplitter
       Left = 0
-      Top = 495
+      Top = 493
       Width = 323
       Height = 4
       Cursor = crVSplit
       Align = alBottom
       AutoSnap = False
-      ExplicitLeft = 1
-      ExplicitTop = 487
-      ExplicitWidth = 248
     end
     object panelPreview: TPanel
       Left = 0
@@ -193,7 +187,7 @@ object frmMain: TfrmMain
     end
     object StatusPanel: TPanel
       Left = 0
-      Top = 499
+      Top = 497
       Width = 323
       Height = 34
       Align = alBottom
@@ -223,7 +217,7 @@ object frmMain: TfrmMain
     end
     object PlayerPanel: TPanel
       Left = 0
-      Top = 411
+      Top = 409
       Width = 323
       Height = 84
       Align = alBottom
@@ -246,47 +240,37 @@ object frmMain: TfrmMain
         AutoSize = False
         Caption = '0 %'
         WordWrap = True
-        ExplicitLeft = 49
-        ExplicitTop = 10
-        ExplicitWidth = 157
-        ExplicitHeight = 191
       end
-      object PlayerToolBar: TToolBar
+      object PlayerToolBar: TStyledToolbar
         AlignWithMargins = True
         Left = 4
         Top = 4
         Width = 144
         Height = 37
         Align = alLeft
-        AutoSize = True
         ButtonHeight = 36
         ButtonWidth = 36
-        Color = clYellow
-        DrawingStyle = dsGradient
-        GradientEndColor = clBtnFace
-        GradientStartColor = clBtnFace
         Images = VirtualImageList
-        ParentColor = False
+        Indent = 3
         TabOrder = 0
-        Transparent = True
-        object ToolButtonPlay: TToolButton
+        object ToolButtonPlay: TStyledToolButton
           Left = 0
           Top = 0
           Action = PlayAction
         end
-        object ToolButtonPlayInverse: TToolButton
+        object ToolButtonPlayInverse: TStyledToolButton
           Left = 36
           Top = 0
           Action = PlayInverseAction
         end
-        object ToolButtonPause: TToolButton
+        object ToolButtonPause: TStyledToolButton
           Left = 72
           Top = 0
           Action = PauseAction
         end
-        object ToolButtonStop: TToolButton
-          Left = 108
-          Top = 0
+        object ToolButtonStop: TStyledToolButton
+          Left = 0
+          Top = 36
           Action = StopAction
         end
       end
@@ -334,7 +318,7 @@ object frmMain: TfrmMain
     OnClosing = SVClosing
     OnOpened = SVOpened
     OnOpening = SVOpening
-    object catMenuItems: TCategoryButtons
+    object catMenuItems: TStyledCategoryButtons
       Left = 0
       Top = 0
       Width = 160
@@ -445,100 +429,84 @@ object frmMain: TfrmMain
     Left = 0
     Top = 0
     Width = 899
-    Height = 36
+    Height = 38
     Align = alTop
     BevelOuter = bvNone
     ParentBackground = False
     TabOrder = 4
     object lblTitle: TLabel
       AlignWithMargins = True
-      Left = 40
+      Left = 41
       Top = 3
       Width = 88
-      Height = 30
+      Height = 32
       Align = alLeft
       Caption = 'Lottie Text Editor'
       Layout = tlCenter
-      ExplicitHeight = 15
     end
-    object SettingsToolBar: TToolBar
+    object SettingsToolBar: TStyledToolbar
       AlignWithMargins = True
       Left = 696
       Top = 3
       Width = 200
-      Height = 30
+      Height = 32
       Align = alRight
-      AutoSize = True
       ButtonHeight = 32
       ButtonWidth = 32
-      Color = clYellow
-      DrawingStyle = dsGradient
-      GradientEndColor = clBtnFace
-      GradientStartColor = clBtnFace
       Images = VirtualImageList
-      ParentColor = False
+      Indent = 3
       TabOrder = 0
-      Transparent = True
-      object ColorSettingsToolButton: TToolButton
+      object ColorSettingsToolButton: TStyledToolButton
         Left = 0
         Top = 0
         Action = actnColorSettings
       end
-      object EditOptionsToolButton: TToolButton
+      object EditOptionsToolButton: TStyledToolButton
         Left = 32
         Top = 0
         Action = actnEditOptions
       end
-      object PageSetupToolButton: TToolButton
+      object PageSetupToolButton: TStyledToolButton
         Left = 64
         Top = 0
         Action = actnPageSetup
       end
-      object PrinterSetupToolButton: TToolButton
+      object PrinterSetupToolButton: TStyledToolButton
         Left = 96
         Top = 0
         Action = actnPrinterSetup
       end
-      object ToolButton9: TToolButton
+      object ToolButton9: TStyledToolButton
         Left = 128
         Top = 0
-        Width = 8
-        ImageIndex = 23
-        ImageName = 'about'
         Style = tbsSeparator
       end
-      object AboutToolButton: TToolButton
-        Left = 136
+      object AbouTStyledToolButton: TStyledToolButton
+        Left = 134
         Top = 0
         Action = acAbout
       end
-      object QuitToolButton: TToolButton
-        Left = 168
+      object QuiTStyledToolButton: TStyledToolButton
+        Left = 166
         Top = 0
         Action = acQuit
         ImageName = 'Exit'
       end
     end
-    object MenuButtonToolbar: TToolBar
+    object MenuButtonToolbar: TStyledToolbar
       AlignWithMargins = True
       Left = 3
       Top = 3
-      Width = 31
-      Height = 30
+      Width = 32
+      Height = 32
       Align = alLeft
       AutoSize = True
       ButtonHeight = 32
       ButtonWidth = 32
-      Color = clYellow
-      DrawingStyle = dsGradient
-      GradientEndColor = clBtnFace
-      GradientStartColor = clBtnFace
       Images = VirtualImageList
-      ParentColor = False
+      Indent = 3
       TabOrder = 1
-      Transparent = True
-      object ToolButton1: TToolButton
-        AlignWithMargins = True
+      object ToolButton1: TStyledToolButton
         Left = 0
         Top = 0
         Action = actMenu
diff --git a/Source/EditorMainForm.pas b/Source/EditorMainForm.pas
index 4128574..3fdef94 100644
--- a/Source/EditorMainForm.pas
+++ b/Source/EditorMainForm.pas
@@ -58,6 +58,9 @@ interface
   , Vcl.Skia.AnimatedImageEx
   , Vcl.StyledButton
   , Vcl.StyledToolbar
+  , Vcl.ButtonStylesAttributes
+  , Vcl.StyledButtonGroup
+  , Vcl.StyledCategoryButtons
   ;
 
 const
@@ -153,21 +156,21 @@   TfrmMain = class(TForm, IDragDrop)
     RightSplitter: TSplitter;
     panelPreview: TPanel;
     SV: TSplitView;
-    catMenuItems: TCategoryButtons;
+    catMenuItems: TStyledCategoryButtons;
     panlTop: TPanel;
     lblTitle: TLabel;
-    SettingsToolBar: TToolBar;
-    ColorSettingsToolButton: TToolButton;
-    EditOptionsToolButton: TToolButton;
+    SettingsToolBar: TStyledToolBar;
+    ColorSettingsToolButton: TStyledToolButton;
+    EditOptionsToolButton: TStyledToolButton;
     VirtualImageList: TVirtualImageList;
     actMenu: TAction;
-    MenuButtonToolbar: TToolBar;
-    ToolButton1: TToolButton;
-    PageSetupToolButton: TToolButton;
-    PrinterSetupToolButton: TToolButton;
-    AboutToolButton: TToolButton;
-    QuitToolButton: TToolButton;
-    ToolButton9: TToolButton;
+    MenuButtonToolbar: TStyledToolBar;
+    ToolButton1: TStyledToolButton;
+    PageSetupToolButton: TStyledToolButton;
+    PrinterSetupToolButton: TStyledToolButton;
+    AbouTStyledToolButton: TStyledToolButton;
+    QuiTStyledToolButton: TStyledToolButton;
+    ToolButton9: TStyledToolButton;
     FlowPanel: TFlowPanel;
     BackgroundTrackBar: TTrackBar;
     BackgroundGrayScaleLabel: TLabel;
@@ -193,15 +196,15 @@   TfrmMain = class(TForm, IDragDrop)
     PlayInverseAction: TAction;
     StopAction: TAction;
     PlayerPanel: TPanel;
-    PlayerToolBar: TToolBar;
-    ToolButtonPlay: TToolButton;
-    ToolButtonPause: TToolButton;
+    PlayerToolBar: TStyledToolBar;
+    ToolButtonPlay: TStyledToolButton;
+    ToolButtonPause: TStyledToolButton;
     LoopToggleSwitch: TToggleSwitch;
     TrackBar: TTrackBar;
     RunLabel: TLabel;
     PauseAction: TAction;
-    ToolButtonStop: TToolButton;
-    ToolButtonPlayInverse: TToolButton;
+    ToolButtonStop: TStyledToolButton;
+    ToolButtonPlayInverse: TStyledToolButton;
     CheckFileChangedTimer: TTimer;
     procedure PlayActionExecute(Sender: TObject);
     procedure StopActionExecute(Sender: TObject);
@@ -469,7 +472,18 @@ destructor TEditingFile.Destroy;
 
 procedure TEditingFile.LoadFromFile(const AFileName: string);
 begin
-  SynEditor.Lines.LoadFromFile(AFileName, TEncoding.UTF8);
+  try
+    //Try loading UTF-8 file
+    SynEditor.Lines.LoadFromFile(AFileName, TEncoding.UTF8);
+  except
+    on E: EEncodingError do
+    begin
+      //Try to load ANSI file
+      SynEditor.Lines.LoadFromFile(AFileName, TEncoding.ANSI);
+    end
+    else
+      raise;
+  end;
   SynEditor.Modified := False;
   FileAge(AFileName, FFileAge);
 end;
@@ -974,15 +988,24 @@ procedure TfrmMain.FormCreate(Sender: TObject);
 
 procedure TfrmMain.acNewFileExecute(Sender: TObject);
 var
-  NewExt : string;
+  NewExt, LNewFileName: string;
   EditingFile : TEditingFile;
+  LCount: Integer;
   NewFileType : TEditFileType;
 begin
   NewExt := 'lottie';
   NewFileType := dmResources.GetEditFileType(NewExt);
 
   //Create object to manage new file
-  EditingFile := TEditingFile.Create(CurrentDir+'New.'+NewExt);
+  LCount := 0;
+  LNewFileName := Format('%s%s.%s', [CurrentDir,'New',NewExt]);
+  while FileExists(LNewFileName) do
+  begin
+    Inc(LCount);
+    LNewFileName := Format('%s%s(%d).%s', [CurrentDir,'New',LCount,NewExt]);
+  end;
+
+  EditingFile := TEditingFile.Create(LNewFileName);
   Try
     AddEditingFile(EditingFile);
     if EditingFile.SynEditor.CanFocus then
@@ -1294,19 +1317,21 @@ procedure TfrmMain.CheckFileChangedTimerTimer(Sender: TObject);
     for var I := 0 to EditFileList.Count -1 do
     begin
       var LEditFile := TEditingFile(EditFileList.items[I]);
-      FileAge(LEditFile.FileName, LFileAge);
-      if LFileAge <> LEditFile.FFileAge then
+      if FileAge(LEditFile.FileName, LFileAge) then
       begin
-        var LConfirm := StyledMessageDlg(Format(FILE_CHANGED_RELOAD,[LEditFile.FileName]),
-          mtWarning, [mbYes, mbNo], 0);
-        if LConfirm = mrYes then
+        if LFileAge <> LEditFile.FFileAge then
         begin
-          LEditFile.ReadFromFile;
-          UpdateTabsheetImage(LEditFile.TabSheet, False);
-          SynEditChange(LEditFile.SynEditor);
-        end
-        else
-          LEditFile.FFileAge := LFileAge;
+          var LConfirm := StyledMessageDlg(Format(FILE_CHANGED_RELOAD,[LEditFile.FileName]),
+            mtWarning, [mbYes, mbNo], 0);
+          if LConfirm = mrYes then
+          begin
+            LEditFile.ReadFromFile;
+            UpdateTabsheetImage(LEditFile.TabSheet, False);
+            SynEditChange(LEditFile.SynEditor);
+          end
+          else
+            LEditFile.FFileAge := LFileAge;
+        end;
       end;
     end;
   Finally
@@ -1578,11 +1603,42 @@ procedure TfrmMain.UpdateEditorsOptions;
 end;
 
 procedure TfrmMain.UpdateFromSettings(AEditor: TSynEdit);
+var
+  LStyle: TStyledButtonDrawType;
 begin
   if AEditor <> nil then
-    FEditorSettings.ReadSettings(AEditor.Highlighter, self.FEditorOptions)
+  begin
+    FEditorSettings.ReadSettings(AEditor.Highlighter, self.FEditorOptions);
+    AEditor.ReadOnly := False;
+  end
   else
     FEditorSettings.ReadSettings(nil, self.FEditorOptions);
+
+  //Rounded Buttons for StyledButtons
+  if FEditorSettings.ButtonDrawRounded then
+    LStyle := btRounded
+  else
+    LStyle := btRoundRect;
+  TStyledButton.RegisterDefaultRenderingStyle(LStyle);
+
+  //Rounded Buttons for StyledToolbars
+  if FEditorSettings.ToolbarDrawRounded then
+    LStyle := btRounded
+  else
+    LStyle := btRoundRect;
+  TStyledToolbar.RegisterDefaultRenderingStyle(LStyle);
+  SettingsToolBar.StyleDrawType := LStyle;
+
+  //Rounded Buttons for menus: StyledCategories and StyledButtonGroup
+  if FEditorSettings.MenuDrawRounded then
+    LStyle := btRounded
+  else
+    LStyle := btRoundRect;
+  TStyledCategoryButtons.RegisterDefaultRenderingStyle(LStyle);
+  TStyledButtonGroup.RegisterDefaultRenderingStyle(LStyle);
+  catMenuItems.StyleDrawType := LStyle;
+  MenuButtonToolbar.StyleDrawType := LStyle;
+
   if FEditorSettings.FontSize >= MinfontSize then
     EditorFontSize := FEditorSettings.FontSize
   else
diff --git a/Source/LottieTextEditor.dproj b/Source/LottieTextEditor.dproj
index 473da09..1586f87 100644
--- a/Source/LottieTextEditor.dproj
+++ b/Source/LottieTextEditor.dproj
@@ -6,10 +6,10 @@
         <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
         <DCC_DependencyCheckOutputName>..\..\exe\InstantXMLEditor.exe</DCC_DependencyCheckOutputName>
         <ProjectVersion>20.1</ProjectVersion>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <FrameworkType>VCL</FrameworkType>
         <Base>True</Base>
-        <Platform Condition="'$(Platform)'==''">Win64</Platform>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <ProjectName Condition="'$(ProjectName)'==''">LottieTextEditor</ProjectName>
@@ -68,7 +68,7 @@
         <Icon_MainIcon>..\Icons\logo.ico</Icon_MainIcon>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA/Lottie Text Editor;FileVersion=1.5.3.0;InternalName=;LegalCopyright=Copyright © 2022-2024 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA/Lottie Text Editor;ProductVersion=1.5;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA/Lottie Text Editor;FileVersion=1.5.4.0;InternalName=;LegalCopyright=Copyright © 2022-2024 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA/Lottie Text Editor;ProductVersion=1.5;Comments=</VerInfo_Keys>
         <Custom_Styles>Glow|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glow.vsf;Sky|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Sky.vsf;Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Dark.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;;&quot;Windows11 Modern Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Dark.vsf&quot;;&quot;Windows11 Modern Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Light.vsf&quot;;&quot;Flat UI Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\FlatUILight.vsf&quot;;&quot;Windows10 BlackPearl|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlackPearl.vsf&quot;;&quot;Windows10 Blue Whale|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhale.vsf&quot;;&quot;Windows10 Blue Whale LE|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhaleLE.vsf&quot;;&quot;Windows10 Clear Day|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10ClearDay.vsf&quot;;&quot;Windows10 Malibu|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Malibu.vsf&quot;</Custom_Styles>
         <DCC_DebugInformation>0</DCC_DebugInformation>
         <DCC_ImportedDataReferences>false</DCC_ImportedDataReferences>
@@ -78,7 +78,7 @@
         <DCC_DependencyCheckOutputName>..\..\exe\InstantXMLEditor.exe</DCC_DependencyCheckOutputName>
         <DCC_Define>VCLSTYLEUTILS;SKIA;$(DCC_Define)</DCC_Define>
         <VerInfo_MinorVer>5</VerInfo_MinorVer>
-        <VerInfo_Release>3</VerInfo_Release>
+        <VerInfo_Release>4</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -166,6 +166,8 @@
                     <Source Name="MainSource">LottieTextEditor.dpr</Source>
                 </Source>
                 <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISRtl8_6290.bpl">Ethea InstantSolutions 8.6 Rtl Library</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISOpenOffice8_6290.bpl">Ethea InstantSolutions 8.6 LibreOffice/OpenOffice Components</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISVcl8_6290.bpl">Ethea InstantSolutions 8.6 Vcl Library</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISFLib8_6290.bpl">Ethea InstantSolutions 8.6 Framework Library</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
diff --git a/Source/LottieTextEditor.res b/Source/LottieTextEditor.res
index 8c886a5..27948a7 100644
Binary files a/Source/LottieTextEditor.res and b/Source/LottieTextEditor.res differ
diff --git a/Source/PreviewForm.dfm b/Source/PreviewForm.dfm
index b76229c..3109a74 100644
--- a/Source/PreviewForm.dfm
+++ b/Source/PreviewForm.dfm
@@ -28,153 +28,142 @@ inherited FrmPreview: TFrmPreview
     Align = alTop
     BevelOuter = bvNone
     TabOrder = 0
-    object ToolBar: TToolBar
+    object StyledToolBar: TStyledToolbar
       Left = 0
       Top = 0
       Width = 609
       Height = 35
       Align = alClient
-      AutoSize = True
       ButtonHeight = 30
-      ButtonWidth = 35
-      EdgeInner = esNone
-      EdgeOuter = esNone
+      ButtonWidth = 30
       Images = SVGIconImageList
       List = True
       TabOrder = 0
-      object ToolButtonPlay: TToolButton
+      object ToolButtonPlay: TStyledToolButton
         Left = 0
         Top = 0
-        Cursor = crHandPoint
         Hint = 'Play/Restart animation'
-        AutoSize = True
+        OnMouseEnter = ToolButtonMouseEnter
+        OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonPlayClick
         Caption = 'Play'
         ImageIndex = 13
         ImageName = 'play'
-        OnClick = ToolButtonPlayClick
-        OnMouseEnter = ToolButtonMouseEnter
-        OnMouseLeave = ToolButtonMouseLeave
+        AutoSize = True
       end
-      object ToolButtonInversePlay: TToolButton
-        Left = 35
+      object ToolButtonInversePlay: TStyledToolButton
+        Left = 30
         Top = 0
         Hint = 'Inverse Play/Restart animation'
-        Caption = 'Play inverse'
         Enabled = False
-        ImageIndex = 15
-        ImageName = 'PlayInverse'
-        OnClick = ToolButtonInversePlayClick
         OnMouseEnter = ToolButtonMouseEnter
         OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonInversePlayClick
+        Caption = 'Inverse'
+        ImageIndex = 15
+        ImageName = 'PlayInverse'
       end
-      object ToolButtonPause: TToolButton
-        Left = 70
+      object ToolButtonPause: TStyledToolButton
+        Left = 60
         Top = 0
-        Cursor = crHandPoint
         Hint = 'Pause animation'
-        AutoSize = True
-        Caption = 'Pause'
         Enabled = False
-        ImageIndex = 12
-        ImageName = 'pause'
-        OnClick = ToolButtonPauseClick
         OnMouseEnter = ToolButtonMouseEnter
         OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonPauseClick
+        Caption = 'Pause'
+        ImageIndex = 12
+        ImageName = 'pause'
+        AutoSize = True
       end
-      object ToolButtonStop: TToolButton
-        Left = 105
+      object ToolButtonStop: TStyledToolButton
+        Left = 90
         Top = 0
         Hint = 'Stop animation'
-        AutoSize = True
-        Caption = 'Stop'
         Enabled = False
-        ImageIndex = 14
-        ImageName = 'Stop'
-        OnClick = ToolButtonStopClick
         OnMouseEnter = ToolButtonMouseEnter
         OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonStopClick
+        Caption = 'Stop'
+        ImageIndex = 14
+        ImageName = 'Stop'
+        AutoSize = True
       end
-      object ToolButtonSettings: TToolButton
-        Left = 140
+      object ToolButtonSettings: TStyledToolButton
+        Left = 120
         Top = 0
-        Cursor = crHandPoint
         Hint = 'Preview settings...'
-        AutoSize = True
+        OnMouseEnter = ToolButtonMouseEnter
+        OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonSettingsClick
+        Visible = False
         Caption = 'Settings...'
         ImageIndex = 11
         ImageName = 'preferences-desktop'
-        Visible = False
-        OnClick = ToolButtonSettingsClick
-        OnMouseEnter = ToolButtonMouseEnter
-        OnMouseLeave = ToolButtonMouseLeave
+        AutoSize = True
       end
-      object ToolButtonAbout: TToolButton
-        Left = 175
+      object ToolButtonAbout: TStyledToolButton
+        Left = 150
         Top = 0
-        Cursor = crHandPoint
         Hint = 'Show about...'
-        AutoSize = True
+        OnMouseEnter = ToolButtonMouseEnter
+        OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonAboutClick
+        Visible = False
         Caption = 'About...'
         ImageIndex = 2
         ImageName = 'about'
-        Visible = False
-        OnClick = ToolButtonAboutClick
-        OnMouseEnter = ToolButtonMouseEnter
-        OnMouseLeave = ToolButtonMouseLeave
+        AutoSize = True
       end
-      object ToolButtonShowText: TToolButton
-        Left = 210
+      object ToolButtonShowText: TStyledToolButton
+        Left = 180
         Top = 0
-        Cursor = crHandPoint
-        AutoSize = True
+        OnMouseEnter = ToolButtonMouseEnter
+        OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonShowTextClick
+        Visible = False
         Caption = 'Hide text'
         ImageIndex = 1
         ImageName = 'Hide-Text'
-        Visible = False
-        OnClick = ToolButtonShowTextClick
-        OnMouseEnter = ToolButtonMouseEnter
-        OnMouseLeave = ToolButtonMouseLeave
+        AutoSize = True
       end
-      object ToolButtonReformat: TToolButton
-        Left = 245
+      object ToolButtonReformat: TStyledToolButton
+        Left = 210
         Top = 0
-        Cursor = crHandPoint
         Hint = 'Reformat JSON text'
-        AutoSize = True
+        OnMouseEnter = ToolButtonMouseEnter
+        OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonReformatClick
         Caption = 'Format'
         ImageIndex = 10
         ImageName = 'Reformat'
-        OnClick = ToolButtonReformatClick
-        OnMouseEnter = ToolButtonMouseEnter
-        OnMouseLeave = ToolButtonMouseLeave
+        AutoSize = True
       end
-      object ToolButtonZoomOut: TToolButton
-        Left = 280
+      object ToolButtonZoomOut: TStyledToolButton
+        Left = 240
         Top = 0
-        Cursor = crHandPoint
         Hint = 'Zoom out (decrease font size)'
-        AutoSize = True
+        OnMouseEnter = ToolButtonMouseEnter
+        OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonZoomOutClick
+        Visible = False
         Caption = 'Zoom Out'
         ImageIndex = 7
         ImageName = 'minus'
-        Visible = False
-        OnClick = ToolButtonZoomOutClick
-        OnMouseEnter = ToolButtonMouseEnter
-        OnMouseLeave = ToolButtonMouseLeave
+        AutoSize = True
       end
-      object ToolButtonZoomIn: TToolButton
-        Left = 315
+      object ToolButtonZoomIn: TStyledToolButton
+        Left = 270
         Top = 0
-        Cursor = crHandPoint
         Hint = 'Zoom in (increase font size)'
-        AutoSize = True
+        OnMouseEnter = ToolButtonMouseEnter
+        OnMouseLeave = ToolButtonMouseLeave
+        OnClick = ToolButtonZoomInClick
+        Visible = False
         Caption = 'Zoom In'
         ImageIndex = 6
         ImageName = 'plus'
-        Visible = False
-        OnClick = ToolButtonZoomInClick
-        OnMouseEnter = ToolButtonMouseEnter
-        OnMouseLeave = ToolButtonMouseLeave
+        AutoSize = True
       end
     end
   end
@@ -254,7 +243,6 @@ inherited FrmPreview: TFrmPreview
       Height = 40
       Align = alTop
       ParentBackground = False
-      ShowCaption = False
       TabOrder = 0
       object BackgroundGrayScaleLabel: TLabel
         Left = 10
diff --git a/Source/PreviewForm.pas b/Source/PreviewForm.pas
index f2bc06b..cff773a 100644
--- a/Source/PreviewForm.pas
+++ b/Source/PreviewForm.pas
@@ -46,7 +46,9 @@ interface
   Vcl.Skia.AnimatedImageEx,
   Vcl.WinXCtrls,
   SVGIconImageList, SVGIconImageListBase, SVGIconImage, Vcl.VirtualImageList,
-  UPreviewContainer;
+  UPreviewContainer,
+  Vcl.ButtonStylesAttributes, Vcl.StyledButton,
+  Vcl.StyledToolbar, Vcl.StyledButtonGroup;
 
 type
   TFrmPreview = class(TPreviewContainer)
@@ -55,25 +57,25 @@   TFrmPreview = class(TPreviewContainer)
     PanelEditor: TPanel;
     StatusBar: TStatusBar;
     SVGIconImageList: TVirtualImageList;
-    ToolButtonZoomIn: TToolButton;
-    ToolButtonZoomOut: TToolButton;
-    ToolBar: TToolBar;
-    ToolButtonSettings: TToolButton;
-    ToolButtonAbout: TToolButton;
-    ToolButtonShowText: TToolButton;
-    ToolButtonReformat: TToolButton;
+    ToolButtonZoomIn: TStyledToolButton;
+    ToolButtonZoomOut: TStyledToolButton;
+    StyledToolBar: TStyledToolbar;
+    ToolButtonSettings: TStyledToolButton;
+    ToolButtonAbout: TStyledToolButton;
+    ToolButtonShowText: TStyledToolButton;
+    ToolButtonReformat: TStyledToolButton;
     ImagePanel: TPanel;
     Splitter: TSplitter;
     panelPreview: TPanel;
     BackgroundGrayScaleLabel: TLabel;
     BackgroundTrackBar: TTrackBar;
-    ToolButtonPlay: TToolButton;
-    ToolButtonInversePlay: TToolButton;
-    ToolButtonPause: TToolButton;
+    ToolButtonPlay: TStyledToolButton;
+    ToolButtonInversePlay: TStyledToolButton;
+    ToolButtonPause: TStyledToolButton;
     PlayerPanel: TPanel;
     RunLabel: TLabel;
     TrackBar: TTrackBar;
-    ToolButtonStop: TToolButton;
+    ToolButtonStop: TStyledToolButton;
     TogglePanel: TPanel;
     LoopToggleSwitch: TToggleSwitch;
     procedure FormCreate(Sender: TObject);
@@ -298,12 +300,16 @@ procedure TFrmPreview.FormResize(Sender: TObject);
 begin
   PanelEditor.Height := Round(Self.Height * (FPreviewSettings.SplitterPos / 100));
   Splitter.Top := PanelEditor.Height;
-(*
-  if Self.Width < (550 * Self.ScaleFactor) then
-    ToolBar.ShowCaptions := False
+  if Self.Width < (510 * Self.ScaleFactor) then
+  begin
+    StyledToolBar.ShowCaptions := False;
+    StyledToolBar.ButtonWidth := Round(30 * Self.ScaleFactor);
+  end
   else
-    Toolbar.ShowCaptions := True;
-*)
+  begin
+    StyledToolbar.ShowCaptions := True;
+    StyledToolBar.ButtonWidth := Round(90 * Self.ScaleFactor);
+  end;
   UpdateGUI;
 end;
 
@@ -414,7 +420,7 @@ procedure TFrmPreview.SetEditorFontSize(const Value: Integer);
 procedure TFrmPreview.SplitterMoved(Sender: TObject);
 begin
   FPreviewSettings.SplitterPos := splitter.Top * 100 div
-    (Self.Height - Toolbar.Height);
+    (Self.Height - StyledToolbar.Height);
   SaveSettings;
 end;
 
@@ -503,6 +509,8 @@ procedure TFrmPreview.ToolButtonReformatClick(Sender: TObject);
 end;
 
 procedure TFrmPreview.UpdateFromSettings;
+var
+  LStyle: TStyledButtonDrawType;
 begin
   FPreviewSettings.ReadSettings(SynEdit.Highlighter, nil);
   if FPreviewSettings.FontSize >= MinfontSize then
@@ -510,6 +518,29 @@ procedure TFrmPreview.UpdateFromSettings;
   else
     EditorFontSize := MinfontSize;
   SynEdit.Font.Name := FPreviewSettings.FontName;
+
+  //Rounded Buttons for StyledButtons
+  if FPreviewSettings.ButtonDrawRounded then
+    LStyle := btRounded
+  else
+    LStyle := btRoundRect;
+  TStyledButton.RegisterDefaultRenderingStyle(LStyle);
+
+  //Rounded Buttons for StyledToolbars
+  if FPreviewSettings.ToolbarDrawRounded then
+    LStyle := btRounded
+  else
+    LStyle := btRoundRect;
+  TStyledToolbar.RegisterDefaultRenderingStyle(LStyle);
+  StyledToolbar.StyleDrawType := LStyle;
+
+  //Rounded Buttons for menus: StyledCategories and StyledButtonGroup
+  if FPreviewSettings.MenuDrawRounded then
+    LStyle := btRounded
+  else
+    LStyle := btRoundRect;
+  TStyledButtonGroup.RegisterDefaultRenderingStyle(LStyle);
+
   PanelEditor.Visible := FPreviewSettings.ShowEditor;
 {$IFNDEF DISABLE_STYLES}
   TStyleManager.TrySetStyle(FPreviewSettings.StyleName, False);
diff --git a/Source/SKIAShellExtensions.dproj b/Source/SKIAShellExtensions.dproj
index 4080912..ad94a98 100644
--- a/Source/SKIAShellExtensions.dproj
+++ b/Source/SKIAShellExtensions.dproj
@@ -59,17 +59,17 @@
         <Icon_MainIcon>..\Icons\logo.ico</Icon_MainIcon>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA Shell Extensions 64bit;FileVersion=1.5.3.0;InternalName=;LegalCopyright=Copyright © 2022-2024 Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA Shell Extensions 32bit;ProductVersion=1.5;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA Shell Extensions 64bit;FileVersion=1.5.4.0;InternalName=;LegalCopyright=Copyright © 2022-2024 Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA Shell Extensions 32bit;ProductVersion=1.5;Comments=</VerInfo_Keys>
         <Custom_Styles>Glow|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glow.vsf;Sky|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Sky.vsf;Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Dark.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;;&quot;Windows11 Modern Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Dark.vsf&quot;;&quot;Windows11 Modern Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Light.vsf&quot;;&quot;Flat UI Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\FlatUILight.vsf&quot;;&quot;Windows10 BlackPearl|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlackPearl.vsf&quot;;&quot;Windows10 Blue Whale|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhale.vsf&quot;;&quot;Windows10 Blue Whale LE|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhaleLE.vsf&quot;;&quot;Windows10 Clear Day|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10ClearDay.vsf&quot;;&quot;Windows10 Malibu|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Malibu.vsf&quot;</Custom_Styles>
         <DCC_UsePackage>rtl;vcl;vclx;vclactnband;xmlrtl;VclSmp;vclimg;svnui;svn;bdertl;TeeUI;TeeDB;Tee;vcldb;dbrtl;vcldbx;vcltouch;dsnap;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;inet;intrawebdb_110_150;Intraweb_110_150;vclie;websnap;webdsnap;inetdb;inetdbbde;inetdbxpress;soaprtl;vclribbon;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;DbxClientDriver;DataSnapClient;dbxcds;DataSnapServer;AzureCloud;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;Hydra_Core_D15;SynEdit_RXE;mbColorLibDXE;JclDeveloperTools;Jcl;JclVcl;JclContainers;JvCore;JvSystem;JvStdCtrls;JvAppFrm;JvBands;JvDB;JvDlgs;JvBDE;JvControls;JvCmp;JvCrypt;JvCustom;JvDocking;JvDotNetCtrls;JvGlobus;JvHMI;JvJans;JvManagedThreads;JvMM;JvNet;JvPageComps;JvPascalInterpreter;JvPluginSystem;JvPrintPreview;JvRuntimeDesign;JvTimeFramework;JvWizards;JvXPCtrls;WinSkinDXE;bsfd2011;IceTabSet;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_DcuOutput>.\$(Config)\$(Platform)</DCC_DcuOutput>
         <GenDll>true</GenDll>
         <DCC_ImageBase>00400000</DCC_ImageBase>
-        <DCC_UnitSearchPath>..\Ext\SynEdit\Source;..\Ext\SVGIconImageList\Source;..\Ext\VCLStyleUtils\Common;..\Ext\VCLStyleUtils\DDetours\Source;..\Ext\SVGIconImageList\Image32\Source;..\Ext\Skia4DelphiExtensions\Source\VCL;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\Ext\SynEdit\Source;..\Ext\SVGIconImageList\Source;..\Ext\VCLStyleUtils\Common;..\Ext\VCLStyleUtils\DDetours\Source;..\Ext\SVGIconImageList\Image32\Source;..\Ext\Skia4DelphiExtensions\Source\VCL;..\Ext\StyledComponents\source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_ExeOutput>..\Bin64</DCC_ExeOutput>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_MinorVer>5</VerInfo_MinorVer>
-        <VerInfo_Release>3</VerInfo_Release>
+        <VerInfo_Release>4</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <Debugger_HostApplication>D:\ETHEA\SVGShellExtensions\Debug\Preview Handlers\OpenDialog\OpenDialogTest.exe</Debugger_HostApplication>
@@ -199,6 +199,8 @@
                     <Parameters Name="DebugCWD">c:\temp</Parameters>
                 </Parameters>
                 <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISRtl8_6290.bpl">Ethea InstantSolutions 8.6 Rtl Library</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISOpenOffice8_6290.bpl">Ethea InstantSolutions 8.6 LibreOffice/OpenOffice Components</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISVcl8_6290.bpl">Ethea InstantSolutions 8.6 Vcl Library</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISFLib8_6290.bpl">Ethea InstantSolutions 8.6 Framework Library</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
diff --git a/Source/SKIAShellExtensions.res b/Source/SKIAShellExtensions.res
index e5373bd..988154a 100644
Binary files a/Source/SKIAShellExtensions.res and b/Source/SKIAShellExtensions.res differ
diff --git a/Source/SKIAShellExtensions32.dproj b/Source/SKIAShellExtensions32.dproj
index 8eb0c87..b8bed87 100644
--- a/Source/SKIAShellExtensions32.dproj
+++ b/Source/SKIAShellExtensions32.dproj
@@ -59,17 +59,17 @@
         <Icon_MainIcon>..\Icons\logo.ico</Icon_MainIcon>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA Shell Extensions 32bit;FileVersion=1.5.3.0;InternalName=;LegalCopyright=Copyright © 2022-2024 Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA Shell Extensions 32bit;ProductVersion=1.5;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA Shell Extensions 32bit;FileVersion=1.5.4.0;InternalName=;LegalCopyright=Copyright © 2022-2024 Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA Shell Extensions 32bit;ProductVersion=1.5;Comments=</VerInfo_Keys>
         <Custom_Styles>Glow|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glow.vsf;Sky|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Sky.vsf;Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Dark.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;;&quot;Windows11 Modern Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Dark.vsf&quot;;&quot;Windows11 Modern Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Light.vsf&quot;;&quot;Flat UI Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\FlatUILight.vsf&quot;;&quot;Windows10 BlackPearl|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlackPearl.vsf&quot;;&quot;Windows10 Blue Whale|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhale.vsf&quot;;&quot;Windows10 Blue Whale LE|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhaleLE.vsf&quot;;&quot;Windows10 Clear Day|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10ClearDay.vsf&quot;;&quot;Windows10 Malibu|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Malibu.vsf&quot;</Custom_Styles>
         <DCC_UsePackage>rtl;vcl;vclx;vclactnband;xmlrtl;VclSmp;vclimg;svnui;svn;bdertl;TeeUI;TeeDB;Tee;vcldb;dbrtl;vcldbx;vcltouch;dsnap;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;inet;intrawebdb_110_150;Intraweb_110_150;vclie;websnap;webdsnap;inetdb;inetdbbde;inetdbxpress;soaprtl;vclribbon;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;DbxClientDriver;DataSnapClient;dbxcds;DataSnapServer;AzureCloud;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;Hydra_Core_D15;SynEdit_RXE;mbColorLibDXE;JclDeveloperTools;Jcl;JclVcl;JclContainers;JvCore;JvSystem;JvStdCtrls;JvAppFrm;JvBands;JvDB;JvDlgs;JvBDE;JvControls;JvCmp;JvCrypt;JvCustom;JvDocking;JvDotNetCtrls;JvGlobus;JvHMI;JvJans;JvManagedThreads;JvMM;JvNet;JvPageComps;JvPascalInterpreter;JvPluginSystem;JvPrintPreview;JvRuntimeDesign;JvTimeFramework;JvWizards;JvXPCtrls;WinSkinDXE;bsfd2011;IceTabSet;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_DcuOutput>.\$(Config)\$(Platform)</DCC_DcuOutput>
         <GenDll>true</GenDll>
         <DCC_ImageBase>00400000</DCC_ImageBase>
-        <DCC_UnitSearchPath>..\Ext\SynEdit\Source;..\Ext\SVGIconImageList\Source;..\Ext\VCLStyleUtils\Common;..\Ext\VCLStyleUtils\DDetours\Source;..\Ext\SVGIconImageList\Image32\Source;..\Ext\Skia4DelphiExtensions\Source\VCL;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\Ext\SynEdit\Source;..\Ext\SVGIconImageList\Source;..\Ext\VCLStyleUtils\Common;..\Ext\VCLStyleUtils\DDetours\Source;..\Ext\SVGIconImageList\Image32\Source;..\Ext\Skia4DelphiExtensions\Source\VCL;..\Ext\StyledComponents\source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_ExeOutput>..\Bin32</DCC_ExeOutput>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_MinorVer>5</VerInfo_MinorVer>
-        <VerInfo_Release>3</VerInfo_Release>
+        <VerInfo_Release>4</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -200,6 +200,8 @@
                     <Parameters Name="DebugCWD">c:\temp</Parameters>
                 </Parameters>
                 <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISRtl8_6290.bpl">Ethea InstantSolutions 8.6 Rtl Library</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISOpenOffice8_6290.bpl">Ethea InstantSolutions 8.6 LibreOffice/OpenOffice Components</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISVcl8_6290.bpl">Ethea InstantSolutions 8.6 Vcl Library</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISFLib8_6290.bpl">Ethea InstantSolutions 8.6 Framework Library</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
diff --git a/Source/SKIAShellExtensions32.res b/Source/SKIAShellExtensions32.res
index b8c55c2..6b46e0a 100644
Binary files a/Source/SKIAShellExtensions32.res and b/Source/SKIAShellExtensions32.res differ
diff --git a/Source/SettingsForm.dfm b/Source/SettingsForm.dfm
index 380b980..a8ae69e 100644
--- a/Source/SettingsForm.dfm
+++ b/Source/SettingsForm.dfm
@@ -141,7 +141,7 @@ object UserSettingsForm: TUserSettingsForm
           DesignSize = (
             193
             42)
-          object ResetButton: TButton
+          object ResetButton: TStyledButton
             Left = 9
             Top = 6
             Width = 174
@@ -405,8 +405,8 @@ object UserSettingsForm: TUserSettingsForm
     end
     object stGeneral: TTabSheet
       Caption = 'Preview settings'
-      ImageIndex = 3
-      ImageName = 'arrow-left'
+      ImageIndex = 4
+      ImageName = 'eye-settings'
       object PanelTopPreviewSettings: TPanel
         Left = 0
         Top = 0
@@ -416,30 +416,63 @@ object UserSettingsForm: TUserSettingsForm
         Caption = 'PREVIEW SETTINGS'
         TabOrder = 0
       end
-      object AutoPlayToggleSwitch: TToggleSwitch
+      object RoundedButtonsGroupBox: TGroupBox
         AlignWithMargins = True
-        Left = 3
-        Top = 28
-        Width = 648
-        Height = 32
-        Align = alTop
-        AutoSize = False
-        StateCaptions.CaptionOn = 'Autoplay On'
-        StateCaptions.CaptionOff = 'Autoplay Off'
+        Left = 11
+        Top = 115
+        Width = 314
+        Height = 102
+        Caption = 'Rounded Buttons'
         TabOrder = 1
+        object ToolbarRoundedCheckBox: TCheckBox
+          Left = 15
+          Top = 24
+          Width = 185
+          Height = 17
+          Caption = 'Apply to Toolbars'
+          TabOrder = 0
+        end
+        object ButtonsRoundedCheckBox: TCheckBox
+          Left = 15
+          Top = 47
+          Width = 185
+          Height = 17
+          Caption = 'Apply to Buttons'
+          TabOrder = 1
+        end
+        object MenuRoundedCheckBox: TCheckBox
+          Left = 15
+          Top = 70
+          Width = 185
+          Height = 17
+          Caption = 'Apply to Menu Buttons'
+          TabOrder = 2
+        end
       end
-      object LoopToggleSwitch: TToggleSwitch
+      object AnimationsGroupBox: TGroupBox
         AlignWithMargins = True
-        Left = 3
-        Top = 66
-        Width = 648
-        Height = 32
-        Align = alTop
-        AutoSize = False
-        ParentColor = True
-        StateCaptions.CaptionOn = 'Loop'
-        StateCaptions.CaptionOff = 'No Loop'
+        Left = 11
+        Top = 31
+        Width = 314
+        Height = 78
+        Caption = 'Animations'
         TabOrder = 2
+        object AutoPlayCheckBox: TCheckBox
+          Left = 15
+          Top = 20
+          Width = 185
+          Height = 17
+          Caption = 'AutoPlay'
+          TabOrder = 0
+        end
+        object LoopCheckBox: TCheckBox
+          Left = 15
+          Top = 47
+          Width = 185
+          Height = 17
+          Caption = 'Animation in Loop'
+          TabOrder = 1
+        end
       end
     end
   end
@@ -453,7 +486,7 @@ object UserSettingsForm: TUserSettingsForm
     SimplePanel = True
     UseSystemFont = False
   end
-  object MenuButtonGroup: TButtonGroup
+  object MenuButtonGroup: TStyledButtonGroup
     Left = 0
     Top = 41
     Width = 153
diff --git a/Source/SettingsForm.pas b/Source/SettingsForm.pas
index 29bbb44..f21da1a 100644
--- a/Source/SettingsForm.pas
+++ b/Source/SettingsForm.pas
@@ -38,7 +38,8 @@ interface
   Dialogs, ComCtrls, ExtCtrls, ColorGrd, StdCtrls, CheckLst, SynEdit,
   ActnList, SynEditHighlighter, SynUnicode, System.ImageList, Vcl.ImgList,
   SVGIconImageListBase, SVGIconImageList, uSettings, Vcl.ButtonGroup,
-  Vcl.ToolWin, DResources, Vcl.VirtualImageList, uAbout, Vcl.WinXCtrls;
+  Vcl.ToolWin, DResources, Vcl.VirtualImageList, uAbout, Vcl.WinXCtrls,
+  Vcl.ButtonStylesAttributes, Vcl.StyledButtonGroup, Vcl.StyledButton;
 
 type
   TUserSettingsForm = class(TForm)
@@ -75,21 +76,26 @@   TUserSettingsForm = class(TForm)
     ForegroundColorLabel: TLabel;
     BackgroundColorLabel: TLabel;
     BackgroundColorBox: TColorBox;
-    MenuButtonGroup: TButtonGroup;
+    MenuButtonGroup: TStyledButtonGroup;
     TitlePanel: TPanel;
     ThemeLeftPanel: TPanel;
     ThemesRadioGroup: TRadioGroup;
     SelectThemeRadioGroup: TRadioGroup;
     ThemeClientPanel: TPanel;
     ResetPanel: TPanel;
-    ResetButton: TButton;
+    ResetButton: TStyledButton;
     stGeneral: TTabSheet;
-    AutoPlayToggleSwitch: TToggleSwitch;
-    LoopToggleSwitch: TToggleSwitch;
     PanelTopPreviewSettings: TPanel;
     PanelTopTheme: TPanel;
     PanelTopFont: TPanel;
     PanelTopEditor: TPanel;
+    RoundedButtonsGroupBox: TGroupBox;
+    ToolbarRoundedCheckBox: TCheckBox;
+    ButtonsRoundedCheckBox: TCheckBox;
+    MenuRoundedCheckBox: TCheckBox;
+    AnimationsGroupBox: TGroupBox;
+    AutoPlayCheckBox: TCheckBox;
+    LoopCheckBox: TCheckBox;
     procedure BoxElementsClick(Sender: TObject);
     procedure cbForegroundClick(Sender: TObject);
     procedure cbBackgroundClick(Sender: TObject);
@@ -533,9 +539,12 @@ procedure TUserSettingsForm.AssignSettings(ASettings: TSettings);
   ThemesRadioGroup.ItemIndex := Ord(ASettings.ThemeSelection);
   CbFont.ItemIndex := CbFont.Items.IndexOf(ASettings.FontName);
   FontSizeUpDown.Position := ASettings.FontSize;
-  AutoPlayToggleSwitch.State := TToggleSwitchState(Ord(ASettings.AutoPlay));
-  LoopToggleSwitch.State := TToggleSwitchState(Ord(ASettings.PlayInLoop));
+  AutoPlayCheckBox.Checked := ASettings.AutoPlay;
+  LoopCheckBox.Checked := ASettings.PlayInLoop;
 
+  ToolbarRoundedCheckBox.Checked := ASettings.ToolbarDrawRounded;
+  ButtonsRoundedCheckBox.Checked := ASettings.ButtonDrawRounded;
+  MenuRoundedCheckBox.Checked := ASettings.MenuDrawRounded;
   PopulateAvailThemes;
 end;
 
@@ -565,8 +574,11 @@ procedure TUserSettingsForm.UpdateSettings(ASettings: TSettings);
   ASettings.FontName := CbFont.Text;
   ASettings.FontSize := FontSizeUpDown.Position;
   ASettings.StyleName := SelectedStyleName;
-  ASettings.AutoPlay := AutoPlayToggleSwitch.State = tssOn;
-  ASettings.PlayInLoop := LoopToggleSwitch.State = tssOn;
+  ASettings.AutoPlay := AutoPlayCheckBox.Checked;
+  ASettings.PlayInLoop := LoopCheckBox.Checked;
+  ASettings.ToolbarDrawRounded := ToolbarRoundedCheckBox.Checked;
+  ASettings.ButtonDrawRounded := ButtonsRoundedCheckBox.Checked;
+  ASettings.MenuDrawRounded := MenuRoundedCheckBox.Checked;
 end;
 
 procedure TUserSettingsForm.MenuButtonGroupButtonClicked(Sender: TObject;
diff --git a/Source/uAbout.dfm b/Source/uAbout.dfm
index 783d700..48402be 100644
--- a/Source/uAbout.dfm
+++ b/Source/uAbout.dfm
@@ -187,17 +187,18 @@ object FrmAbout: TFrmAbout
     Color = clWindow
     ParentBackground = False
     TabOrder = 0
-    object btnOK: TButton
+    object btnOK: TStyledButton
       Left = 360
       Top = 16
       Width = 75
       Height = 25
+      Cancel = True
       Caption = 'CLOSE'
       Default = True
       TabOrder = 0
       OnClick = btnOKClick
     end
-    object btnIssues: TButton
+    object btnIssues: TStyledButton
       Left = 8
       Top = 16
       Width = 125
@@ -207,7 +208,7 @@ object FrmAbout: TFrmAbout
       TabOrder = 1
       OnClick = btnIssuesClick
     end
-    object btnCheckUpdates: TButton
+    object btnCheckUpdates: TStyledButton
       Left = 139
       Top = 16
       Width = 125
diff --git a/Source/uAbout.pas b/Source/uAbout.pas
index e33ed24..6eb36c6 100644
--- a/Source/uAbout.pas
+++ b/Source/uAbout.pas
@@ -37,7 +37,7 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ExtCtrls, pngimage, Vcl.ImgList, System.ImageList,
-  Vcl.Imaging.GIFImg, SVGIconImage;
+  Vcl.Imaging.GIFImg, SVGIconImage, Vcl.ButtonStylesAttributes, Vcl.StyledButton;
 
 resourcestring
   Title_LottieTextEditor = 'SKIA/Lottie Text Editor';
@@ -46,12 +46,12 @@ interface
 type
   TFrmAbout = class(TForm)
     Panel1:    TPanel;
-    btnOK: TButton;
+    btnOK: TStyledButton;
     TitleLabel: TLabel;
     LabelVersion: TLabel;
     MemoCopyRights: TMemo;
-    btnIssues: TButton;
-    btnCheckUpdates: TButton;
+    btnIssues: TStyledButton;
+    btnCheckUpdates: TStyledButton;
     SKIALinkLabel: TLinkLabel;
     SVGIconImage1: TSVGIconImage;
     SVGIconImage2: TSVGIconImage;
diff --git a/Source/uFilePreviewHandler.pas b/Source/uFilePreviewHandler.pas
index 547cdce..8cb8c2f 100644
--- a/Source/uFilePreviewHandler.pas
+++ b/Source/uFilePreviewHandler.pas
@@ -39,7 +39,8 @@ implementation
   Windows,
   PropSys,
   SysUtils,
-  uLogExcept;
+  uLogExcept,
+  uMisc;
 
 type
   TComFilePreviewHandler = class(TComPreviewHandler, IInitializeWithFile)
@@ -66,6 +67,7 @@ function TComFilePreviewHandler.GetPreviewHandler: TFilePreviewHandler;
 function TComFilePreviewHandler.IInitializeWithFile_Initialize(pszFilePath: LPCWSTR; grfMode: DWORD): HRESULT;
 begin
   FFilePath := pszFilePath;
+  Initialize_GDI;
   FMode := grfMode;
   Result := S_OK;
 end;
diff --git a/Source/uSettings.pas b/Source/uSettings.pas
index c66cbce..967d7cc 100644
--- a/Source/uSettings.pas
+++ b/Source/uSettings.pas
@@ -74,12 +74,18 @@   TSettings = class
     FThemeSelection: TThemeSelection;
     FAutoPlay: Boolean;
     FPlayInLoop: Boolean;
+    FButtonDrawRounded: Boolean;
+    FToolbarDrawRounded: Boolean;
+    FMenuDrawRounded: Boolean;
     function GetUseDarkStyle: Boolean;
     procedure SetPlayInLoop(const Value: Boolean);
     procedure SetAutoPlay(const Value: Boolean);
     function GetThemeSectionName: string;
     function GetButtonTextColor: TColor;
     class function GetSettingsFileName: string; static;
+    procedure SetButtonDrawRounded(const Value: Boolean);
+    procedure SetToolbarDrawRounded(const Value: Boolean);
+    procedure SetMenuDrawRounded(const Value: Boolean);
   protected
     FIniFile: TIniFile;
   public
@@ -111,6 +117,9 @@   TSettings = class
     property PlayInLoop: Boolean read FPlayInLoop write SetPlayInLoop default True;
     property ActivePageIndex: Integer read FActivePageIndex write FActivePageIndex;
     property ThemeSelection: TThemeSelection read FThemeSelection write FThemeSelection;
+    property ButtonDrawRounded: Boolean read FButtonDrawRounded write SetButtonDrawRounded;
+    property ToolbarDrawRounded: Boolean read FToolbarDrawRounded write SetToolbarDrawRounded;
+    property MenuDrawRounded: Boolean read FMenuDrawRounded write SetMenuDrawRounded;
   end;
 
   TPreviewSettings = class(TSettings)
@@ -323,6 +332,9 @@ procedure TSettings.ReadSettings(const ASynEditHighilighter: TSynCustomHighlight
   FActivePageIndex := FIniFile.ReadInteger('Global', 'ActivePageIndex', 0);
   FStyleName := FIniFile.ReadString('Global', 'StyleName', DefaultStyleName);
   FThemeSelection := TThemeSelection(FIniFile.ReadInteger('Global', 'ThemeSelection', 0));
+  FToolbarDrawRounded := FIniFile.ReadBool('Global', 'ToolbarDrawRounded', false);
+  FButtonDrawRounded := FIniFile.ReadBool('Global', 'ButtonDrawRounded', false);
+  FMenuDrawRounded := FIniFile.ReadBool('Global', 'MenuDrawRounded', false);
   //Select Style by default on Actual Windows Theme
   if FThemeSelection = tsAsWindows then
   begin
@@ -389,6 +401,9 @@ procedure TSettings.WriteSettings(const ASynEditHighilighter: TSynCustomHighligh
   FIniFile.WriteInteger('Global', 'PlayInLoop', Ord(FPlayInLoop));
   FIniFile.WriteInteger('Global', 'ActivePageIndex', FActivePageIndex);
   FIniFile.WriteInteger('Global', 'ThemeSelection', Ord(FThemeSelection));
+  FIniFile.WriteBool('Global', 'ToolbarDrawRounded', ToolbarDrawRounded);
+  FIniFile.WriteBool('Global', 'ButtonDrawRounded', ButtonDrawRounded);
+  FIniFile.WriteBool('Global', 'MenuDrawRounded', MenuDrawRounded);
   if (FUseDarkStyle and (LightBackground <> default_darkbackground)) or
     (not FUseDarkStyle and (LightBackground <> default_lightbackground)) then
     FIniFile.WriteInteger('Global', 'LightBackground', LightBackground);
@@ -407,6 +422,22 @@ procedure TSettings.WriteSettings(const ASynEditHighilighter: TSynCustomHighligh
   end;
 end;
 
+procedure TSettings.SetToolbarDrawRounded(
+  const Value: Boolean);
+begin
+  FToolbarDrawRounded := Value;
+end;
+
+procedure TSettings.SetMenuDrawRounded(const Value: Boolean);
+begin
+  FMenuDrawRounded := Value;
+end;
+
+procedure TSettings.SetButtonDrawRounded(const Value: Boolean);
+begin
+  FButtonDrawRounded := Value;
+end;
+
 { TPreviewSettings }
 
 constructor TPreviewSettings.CreateSettings(
diff --git a/Source/uStreamPreviewHandler.pas b/Source/uStreamPreviewHandler.pas
index 2e2355c..f6deb2b 100644
--- a/Source/uStreamPreviewHandler.pas
+++ b/Source/uStreamPreviewHandler.pas
@@ -41,7 +41,8 @@ implementation
 uses
   PropSys,
   SysUtils,
-  uLogExcept;
+  uLogExcept,
+  uMisc;
 
 type
   TComStreamPreviewHandler = class(TComPreviewHandler, IInitializeWithStream)
@@ -72,6 +73,7 @@ function TComStreamPreviewHandler.GetPreviewHandler: TStreamPreviewHandler;
 function TComStreamPreviewHandler.IInitializeWithStream_Initialize(const pstream: IStream; grfMode: Cardinal): HRESULT;
 begin
   TLogPreview.Add('TComStreamPreviewHandler.IInitializeWithStream_Initialize Init');
+  Initialize_GDI;
   FIStream := pstream;
   FMode := grfMode;
   Result := S_OK;
@@ -106,3 +108,4 @@ class function TStreamPreviewHandler.GetComClass: TComClass;
 end;
 
 end.
+