diff --git a/Readme.txt b/Readme.md
similarity index 77%
rename from Readme.txt
rename to Readme.md
index f31a95a..0a822f4 100644
--- a/Readme.txt
+++ b/Readme.md
@@ -22,39 +22,39 @@ SpTBXLib is an add on package for TB2K components, it adds the following feature
 - Form Popup components
 - Skin Editor
 
-For more info go to:
-http://www.silverpointdevelopment.com
+For more info go to:  
+www.silverpointdevelopment.com
 
-# License
+## License
 
-Use and/or distribution of the files requires compliance with the
-SpTBXLib License, found in SpTBXLib-LICENSE.txt or at:
+Use and/or distribution of the files requires compliance with the SpTBXLib License, found in SpTBXLib-LICENSE.txt or at:
 
-  http://www.silverpointdevelopment.com/sptbxlib/SpTBXLib-LICENSE.htm
+www.silverpointdevelopment.com/sptbxlib/SpTBXLib-LICENSE.htm
 
-Alternatively, at your option, the files may be used and/or distributed under
-the terms of the Mozilla Public License Version 1.1, found in MPL-LICENSE.txt or at:
+Alternatively, at your option, the files may be used and/or distributed under the terms of the Mozilla Public License Version 1.1, found in MPL-LICENSE.txt or at:
 
-  http://www.mozilla.org/MPL
+www.mozilla.org/MPL
 
-# Installation
+## Installation
 
 ### Requirements:
 - RAD Studio XE2 or newer:
-- Jordan Russell's Toolbar 2000
-  http://www.jrsoftware.org
+- Jordan Russell's Toolbar 2000 (www.jrsoftware.org)
 
-### Installing with Silverpoint MultiInstaller (http://www.silverpointdevelopment.com/multiinstaller/index.htm):
+### Installing with Silverpoint MultiInstaller (www.silverpointdevelopment.com/multiinstaller/index.htm):
 - Create a new folder for the installation.
 - Download all the component zips to a folder: SpTBXLib + TB2K
 - Download Silverpoint MultiInstaller and the Setup.Ini, extract them to the folder:
 
-The installation folder will end up with this files: 
+The installation folder will end up with this files:
+
+```
 C:\MyInstall
        |-  SpTBXLib.zip
        |-  tb2k-2.2.2.zip
        |-  MultiInstaller.exe
-       |-  Setup.ini 
+       |-  Setup.ini
+```
 
 You are ready to install the component packages, just run MultiInstaller, select the destination folder, and all the components will be unziped, patched, compiled and installed on the Delphi IDE.
 
@@ -76,5 +76,5 @@ Compile and install the components
 - Open the TB2K design package corresponding to the IDE version (tb2kdsgn_d12), press Compile and then press Install, close the package window (don't save the changes).
 - Open the SpTBXLib design package corresponding to the IDE version (SpTBXLibDsgn_*.dpk), press Compile and then press Install, close the package window (don't save the changes).
 
-For more info go to:
-http://www.silverpointdevelopment.com/sptbxlib/support/index.htm
\ No newline at end of file
+For more info go to:  
+www.silverpointdevelopment.com/sptbxlib/support/index.htm
\ No newline at end of file
diff --git a/Release History.txt b/Release History.txt
index 60977f7..8088ef2 100644
--- a/Release History.txt	
+++ b/Release History.txt	
@@ -1,3 +1,21 @@
+18 September 2023 - version 2.5.10
+  - Updated TB2K patch, removed VirtualImageList scaling on 
+    TB2Common.SpGetScaledVirtualImageListSize.
+  - Added ActiveTabVisibleOnResize property to SpTBXTabSet and TSpTBXTabControl, 
+    when set to true the active tab will always be visible when resizing.
+  - Added mouse wheel scrolling to SpTBXTabSet and TSpTBXTabControl.
+  - Fixed #106, scaling back from a very high DPI causes the toolbar items to be 
+    shrinked to 0
+  - Fixed #105, ActiveTab goes out of view when restoring from a minimized state
+  - Fixed Tabs painting on High DPIs, corrected border scaling.
+  - Fixed TabSet and TabControl background painting on the default Windows theme.
+  - Updated TB2K patch, fixed #107: TTBCustomAccObject.Destroy is called after the 
+    critical section is deleted. MSAA client still holds acc. object references.
+  - Added tcbOnHotTrack to TabCloseButton property, the close button will be visible 
+    when the tab is hottracked or if it's the active tab.
+  - Fixed #108: incorrect TSpTBXCustomizer DPI scaling
+  - Fixed #108: TVirtualImageList.Assign doesn't set Width and Height
+
 18 January 2022 - version 2.5.9
   - Added Rad Studio 11 Alexandria support.
   - Added 24x24 images to SpTBXReg.DCR to fix a Rad Studio 11 bug: the IDE doesn't 
diff --git a/Source/SpTBXColorPickerForm.dfm b/Source/SpTBXColorPickerForm.dfm
index 08f65eb..7fb6b79 100644
--- a/Source/SpTBXColorPickerForm.dfm
+++ b/Source/SpTBXColorPickerForm.dfm
@@ -1,8 +1,8 @@
 object SpTBXColorPickerForm: TSpTBXColorPickerForm
   Left = 156
   Top = 89
-  ClientHeight = 193
-  ClientWidth = 213
+  ClientHeight = 192
+  ClientWidth = 209
   Color = clBtnFace
   Constraints.MinHeight = 211
   Constraints.MinWidth = 217
@@ -16,17 +16,18 @@ object SpTBXColorPickerForm: TSpTBXColorPickerForm
   OnDestroy = FormDestroy
   OnResize = FormResize
   OnShow = FormShow
-  PixelsPerInch = 96
   TextHeight = 13
   object SpTBXTabControl1: TSpTBXTabControl
     Left = 0
     Top = 26
-    Width = 213
-    Height = 167
+    Width = 209
+    Height = 166
     Align = alClient
     ActiveTabIndex = 0
     Images = ImageList1
     OnActiveTabChange = SpTBXTabControl1ActiveTabChange
+    ExplicitWidth = 213
+    ExplicitHeight = 167
     HiddenItems = <>
     object SpTBXTabItem1: TSpTBXTabItem
       Checked = True
@@ -46,14 +47,14 @@ object SpTBXColorPickerForm: TSpTBXColorPickerForm
       Caption = ''
       ImageIndex = 3
       DesignSize = (
-        213
-        141)
+        209
+        140)
       TabItem = 'SpTBXTabItem2'
       object SpTBXColorListBox1: TSpTBXColorListBox
         Left = 5
         Top = 5
-        Width = 200
-        Height = 127
+        Width = 192
+        Height = 126
         Style = [clbsSystemColors, clbsIncludeNone, clbsIncludeDefault, clbsPrettyNames, clbsNoneAsTransparent]
         Anchors = [akLeft, akTop, akRight, akBottom]
         TabOrder = 0
@@ -64,24 +65,28 @@ object SpTBXColorPickerForm: TSpTBXColorPickerForm
     object SpTBXTabSheet3: TSpTBXTabSheet
       Left = 0
       Top = 26
-      Width = 213
-      Height = 141
+      Width = 209
+      Height = 140
       Caption = ''
       ImageIndex = 4
+      ExplicitWidth = 213
+      ExplicitHeight = 141
       DesignSize = (
-        213
-        141)
+        209
+        140)
       TabItem = 'SpTBXTabItem3'
       object imgColorPicker: TImage
         Left = 2
         Top = 0
-        Width = 207
-        Height = 137
+        Width = 203
+        Height = 136
         Align = alClient
         Visible = False
+        ExplicitWidth = 207
+        ExplicitHeight = 137
       end
       object btnColorPicker: TSpTBXSpeedButton
-        Left = 48
+        Left = 44
         Top = 58
         Width = 113
         Height = 22
@@ -90,15 +95,18 @@ object SpTBXColorPickerForm: TSpTBXColorPickerForm
         DragMode = dmAutomatic
         OnEndDrag = btnColorPickerEndDrag
         OnStartDrag = btnColorPickerStartDrag
+        ExplicitLeft = 48
       end
     end
     object SpTBXTabSheet1: TSpTBXTabSheet
       Left = 0
       Top = 26
-      Width = 213
-      Height = 141
+      Width = 209
+      Height = 140
       Caption = ''
       ImageIndex = 2
+      ExplicitWidth = 213
+      ExplicitHeight = 141
       TabItem = 'SpTBXTabItem1'
       object imgPalette: TImage
         Left = 5
@@ -2687,17 +2695,18 @@ object SpTBXColorPickerForm: TSpTBXColorPickerForm
   object SpTBXPanel1: TSpTBXPanel
     Left = 0
     Top = 0
-    Width = 213
+    Width = 209
     Height = 26
     Caption = 'SpTBXPanel1'
     Align = alTop
     TabOrder = 1
     OnDrawBackground = SpTBXPanel1DrawBackground
+    ExplicitWidth = 213
     DesignSize = (
-      213
+      209
       26)
     object btnColorNone: TSpTBXSpeedButton
-      Left = 170
+      Left = 162
       Top = 3
       Width = 20
       Height = 20
@@ -2708,9 +2717,10 @@ object SpTBXColorPickerForm: TSpTBXColorPickerForm
       Images = ImageList1
       ImageIndex = 1
       OnDraw = btnColorDialogDraw
+      ExplicitLeft = 170
     end
     object btnColorDialog: TSpTBXSpeedButton
-      Left = 190
+      Left = 182
       Top = 3
       Width = 20
       Height = 20
@@ -2721,6 +2731,7 @@ object SpTBXColorPickerForm: TSpTBXColorPickerForm
       Images = ImageList1
       ImageIndex = 0
       OnDraw = btnColorDialogDraw
+      ExplicitLeft = 190
     end
     object btnColor: TSpTBXSpeedButton
       Left = 2
diff --git a/Source/SpTBXColorPickerForm.pas b/Source/SpTBXColorPickerForm.pas
index c4ee960..0d17a74 100644
--- a/Source/SpTBXColorPickerForm.pas
+++ b/Source/SpTBXColorPickerForm.pas
@@ -40,7 +40,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXControls.pas b/Source/SpTBXControls.pas
index 4966967..57895b0 100644
--- a/Source/SpTBXControls.pas
+++ b/Source/SpTBXControls.pas
@@ -1,7 +1,7 @@
 unit SpTBXControls;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -41,7 +41,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXCustomizer.pas b/Source/SpTBXCustomizer.pas
index dad913a..d92e483 100644
--- a/Source/SpTBXCustomizer.pas
+++ b/Source/SpTBXCustomizer.pas
@@ -1,7 +1,7 @@
 unit SpTBXCustomizer;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -38,7 +38,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXCustomizerForm.dfm b/Source/SpTBXCustomizerForm.dfm
index 5f391db..5b591a5 100644
--- a/Source/SpTBXCustomizerForm.dfm
+++ b/Source/SpTBXCustomizerForm.dfm
@@ -2,8 +2,8 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
   Left = 219
   Top = 115
   Caption = 'Customize...'
-  ClientHeight = 320
-  ClientWidth = 343
+  ClientHeight = 319
+  ClientWidth = 339
   Color = clBtnFace
   Constraints.MinHeight = 355
   Constraints.MinWidth = 355
@@ -24,10 +24,12 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
   object SpTBXTabControl1: TSpTBXTabControl
     Left = 0
     Top = 0
-    Width = 343
-    Height = 285
+    Width = 339
+    Height = 284
     Align = alClient
     ActiveTabIndex = 0
+    ExplicitWidth = 343
+    ExplicitHeight = 285
     HiddenItems = <>
     object tabToolbars: TSpTBXTabItem
       Caption = 'Toolbars'
@@ -42,40 +44,40 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
     object SpTBXTabSheet2: TSpTBXTabSheet
       Left = 0
       Top = 25
-      Width = 347
-      Height = 261
+      Width = 343
+      Height = 260
       Caption = 'Shortcuts'
       ImageIndex = -1
-      ExplicitWidth = 343
-      ExplicitHeight = 260
       DesignSize = (
-        343
-        260)
+        339
+        259)
       TabItem = 'tabShortcuts'
       object SpTBXPanel5: TSpTBXPanel
         Left = 8
-        Top = 226
-        Width = 231
+        Top = 225
+        Width = 223
         Height = 22
         Anchors = [akLeft, akRight, akBottom]
         TabOrder = 1
         HotTrack = True
+        ExplicitTop = 226
         ExplicitWidth = 235
         object Panel1: TPanel
           Left = 2
           Top = 2
-          Width = 231
+          Width = 223
           Height = 18
           Align = alClient
           BevelOuter = bvNone
           TabOrder = 0
+          ExplicitWidth = 231
           DesignSize = (
-            227
+            219
             18)
           object HotKey1: THotKey
             Left = -2
             Top = -2
-            Width = 233
+            Width = 225
             Height = 21
             Anchors = [akLeft, akTop, akRight, akBottom]
             HotKey = 0
@@ -85,8 +87,8 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
         end
       end
       object ChangeShortcut: TSpTBXButton
-        Left = 245
-        Top = 225
+        Left = 237
+        Top = 224
         Width = 75
         Height = 25
         Caption = 'C&hange'
@@ -94,12 +96,13 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
         TabOrder = 2
         OnClick = ChangeShortcutClick
         ExplicitLeft = 249
+        ExplicitTop = 225
       end
       object lbShortcuts: TSpTBXListBox
         Left = 8
         Top = 8
-        Width = 314
-        Height = 207
+        Width = 306
+        Height = 206
         Anchors = [akLeft, akTop, akRight, akBottom]
         TabOrder = 0
         OnClick = lbShortcutsClick
@@ -109,18 +112,20 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
     object SpTBXTabSheet3: TSpTBXTabSheet
       Left = 0
       Top = 25
-      Width = 343
-      Height = 260
+      Width = 339
+      Height = 259
       Caption = 'Commands'
       ImageIndex = -1
+      ExplicitWidth = 343
+      ExplicitHeight = 260
       DesignSize = (
-        343
-        260)
+        339
+        259)
       TabItem = 'tabCommands'
       object SpTBXLabel3: TSpTBXLabel
         Left = 8
-        Top = 212
-        Width = 314
+        Top = 211
+        Width = 306
         Height = 44
         Caption = 
           'To add command buttons, drag and drop commands onto a toolbar. T' +
@@ -129,13 +134,14 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
         Anchors = [akLeft, akRight, akBottom]
         AutoSize = False
         Wrapping = twWrap
+        ExplicitTop = 212
         ExplicitWidth = 318
       end
       object lbCommands: TSpTBXListBox
         Left = 8
         Top = 8
-        Width = 314
-        Height = 201
+        Width = 306
+        Height = 200
         Anchors = [akLeft, akTop, akRight, akBottom]
         DragMode = dmAutomatic
         TabOrder = 0
@@ -149,23 +155,26 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
     object SpTBXTabSheet1: TSpTBXTabSheet
       Left = 0
       Top = 25
-      Width = 343
-      Height = 260
+      Width = 339
+      Height = 259
       Caption = 'Toolbars'
       ImageIndex = -1
+      ExplicitWidth = 343
+      ExplicitHeight = 260
       DesignSize = (
-        343
-        260)
+        339
+        259)
       TabItem = 'tabToolbars'
       object SpTBXGroupBox1: TSpTBXGroupBox
-        Left = 159
+        Left = 151
         Top = 2
         Width = 161
-        Height = 190
+        Height = 189
         Caption = 'Options'
         Anchors = [akTop, akRight, akBottom]
         TabOrder = 1
         ExplicitLeft = 163
+        ExplicitHeight = 190
         object cbText: TSpTBXComboBox
           Left = 6
           Top = 66
@@ -220,14 +229,15 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
         end
       end
       object SpTBXGroupBox2: TSpTBXGroupBox
-        Left = 159
-        Top = 199
+        Left = 151
+        Top = 198
         Width = 161
         Height = 49
         Caption = '&Skins'
         Anchors = [akRight, akBottom]
         TabOrder = 2
         ExplicitLeft = 163
+        ExplicitTop = 199
         object cbSkins: TSpTBXComboBox
           Left = 6
           Top = 20
@@ -242,8 +252,8 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
       object lbToolbars: TSpTBXCheckListBox
         Left = 8
         Top = 8
-        Width = 142
-        Height = 240
+        Width = 134
+        Height = 239
         Anchors = [akLeft, akTop, akRight, akBottom]
         TabOrder = 0
         OnClick = lbToolbarsClick
@@ -253,18 +263,20 @@ object SpTBXCustomizeForm: TSpTBXCustomizeForm
   end
   object ClosePanel: TSpTBXPanel
     Left = 0
-    Top = 285
-    Width = 343
+    Top = 284
+    Width = 339
     Height = 35
     Align = alBottom
     TabOrder = 1
     Borders = False
     TBXStyleBackground = True
+    ExplicitTop = 285
+    ExplicitWidth = 343
     DesignSize = (
-      343
+      339
       35)
     object CloseButton: TSpTBXButton
-      Left = 248
+      Left = 240
       Top = 4
       Width = 78
       Height = 25
diff --git a/Source/SpTBXCustomizerForm.pas b/Source/SpTBXCustomizerForm.pas
index c10c418..a94e5a9 100644
--- a/Source/SpTBXCustomizerForm.pas
+++ b/Source/SpTBXCustomizerForm.pas
@@ -39,7 +39,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXDefaultSkins.pas b/Source/SpTBXDefaultSkins.pas
index 7088640..83b8b12 100644
--- a/Source/SpTBXDefaultSkins.pas
+++ b/Source/SpTBXDefaultSkins.pas
@@ -1,7 +1,7 @@
 unit SpTBXDefaultSkins;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -38,7 +38,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXDkPanels.pas b/Source/SpTBXDkPanels.pas
index c775835..74ac4e5 100644
--- a/Source/SpTBXDkPanels.pas
+++ b/Source/SpTBXDkPanels.pas
@@ -1,7 +1,7 @@
 unit SpTBXDkPanels;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -50,7 +50,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXEditors.pas b/Source/SpTBXEditors.pas
index 6e0e54f..725cc88 100644
--- a/Source/SpTBXEditors.pas
+++ b/Source/SpTBXEditors.pas
@@ -1,7 +1,7 @@
 unit SpTBXEditors;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -45,7 +45,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXExtEditors.pas b/Source/SpTBXExtEditors.pas
index 6057d9f..9bcc547 100644
--- a/Source/SpTBXExtEditors.pas
+++ b/Source/SpTBXExtEditors.pas
@@ -1,7 +1,7 @@
 unit SpTBXExtEditors;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -38,7 +38,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXFormPopupMenu.pas b/Source/SpTBXFormPopupMenu.pas
index 1c16441..d732f38 100644
--- a/Source/SpTBXFormPopupMenu.pas
+++ b/Source/SpTBXFormPopupMenu.pas
@@ -1,7 +1,7 @@
 unit SpTBXFormPopupMenu;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -38,7 +38,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXImageList.pas b/Source/SpTBXImageList.pas
index debcfa1..0886e84 100644
--- a/Source/SpTBXImageList.pas
+++ b/Source/SpTBXImageList.pas
@@ -1,7 +1,7 @@
 unit SpTBXImageList;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -43,7 +43,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXItem.pas b/Source/SpTBXItem.pas
index 22eee8e..b15031f 100644
--- a/Source/SpTBXItem.pas
+++ b/Source/SpTBXItem.pas
@@ -1,7 +1,7 @@
 unit SpTBXItem;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -66,7 +66,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXMDIMRU.pas b/Source/SpTBXMDIMRU.pas
index 5727892..9783ab4 100644
--- a/Source/SpTBXMDIMRU.pas
+++ b/Source/SpTBXMDIMRU.pas
@@ -1,7 +1,7 @@
 unit SpTBXMDIMRU;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -41,7 +41,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXPageScroller.pas b/Source/SpTBXPageScroller.pas
index abc9079..9648394 100644
--- a/Source/SpTBXPageScroller.pas
+++ b/Source/SpTBXPageScroller.pas
@@ -1,7 +1,7 @@
 unit SpTBXPageScroller;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -42,7 +42,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
diff --git a/Source/SpTBXSkins.pas b/Source/SpTBXSkins.pas
index 87a5585..a888d32 100644
--- a/Source/SpTBXSkins.pas
+++ b/Source/SpTBXSkins.pas
@@ -1,7 +1,7 @@
 unit SpTBXSkins;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -44,7 +44,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses
@@ -393,7 +393,7 @@   TSpTBXSkinManager = class
     destructor Destroy; override;
 
     function GetSkinType(AControl: TControl): TSpTBXSkinType;
-    procedure GetSkinsAndDelphiStyles(SkinsAndStyles: TStrings);
+    procedure GetSkinsAndDelphiStyles(SkinsAndStyles: TStrings; OnlySkins: Boolean = False);
     function IsDefaultSkin: Boolean;
 
     procedure AddSkinNotification(AObject: TObject);
@@ -3741,7 +3741,7 @@ function TSpTBXSkinManager.GetSkinType(AControl: TControl): TSpTBXSkinType;
     Result := sknNone;
 end;
 
-procedure TSpTBXSkinManager.GetSkinsAndDelphiStyles(SkinsAndStyles: TStrings);
+procedure TSpTBXSkinManager.GetSkinsAndDelphiStyles(SkinsAndStyles: TStrings; OnlySkins: Boolean = False);
 var
   I: Integer;
   S: string;
@@ -3757,9 +3757,10 @@ procedure TSpTBXSkinManager.GetSkinsAndDelphiStyles(SkinsAndStyles: TStrings);
       L.Add(S);
 
     // Fill Styles
-    for S in TStyleManager.StyleNames do
-      if S <> TStyleManager.SystemStyle.Name then
-        L.Add(S);
+    if not OnlySkins then
+      for S in TStyleManager.StyleNames do
+        if S <> TStyleManager.SystemStyle.Name then
+          L.Add(S);
 
     // Sort the list and move the Default skin to the top
     L.Sort;
diff --git a/Source/SpTBXTabs.pas b/Source/SpTBXTabs.pas
index 39629d2..0bdb100 100644
--- a/Source/SpTBXTabs.pas
+++ b/Source/SpTBXTabs.pas
@@ -1,7 +1,7 @@
 unit SpTBXTabs;
 
 {==============================================================================
-Version 2.5.9
+Version 2.5.10
 
 The contents of this file are subject to the SpTBXLib License; you may
 not use or distribute this file except in compliance with the
@@ -47,7 +47,7 @@ interface
 
 {$BOOLEVAL OFF}   // Unit depends on short-circuit boolean evaluation
 {$IF CompilerVersion >= 25} // for Delphi XE4 and up
-  {$LEGACYIFEND ON} // requires $IF to be terminated with $ENDIF instead of $IFEND
+  {$LEGACYIFEND ON} // requires $IF to be terminated by $IFEND (XE4+ allows both $ENDIF and $IFEND)
 {$IFEND}
 
 uses