diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXColorPickerForm.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXColorPickerForm.dcu
index 66f17fd..21beb9d 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXColorPickerForm.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXColorPickerForm.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXControls.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXControls.dcu
index 0268363..0386cd3 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXControls.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXControls.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizer.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizer.dcu
index d6057da..1b7c74a 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizer.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizer.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizerForm.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizerForm.dcu
index 3429765..904e5e3 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizerForm.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXCustomizerForm.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDefaultSkins.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDefaultSkins.dcu
index bba9805..5d25194 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDefaultSkins.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDefaultSkins.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDkPanels.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDkPanels.dcu
index ce75974..b36365f 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDkPanels.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXDkPanels.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXEditors.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXEditors.dcu
index 0ecabd8..8cee500 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXEditors.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXEditors.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXExtEditors.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXExtEditors.dcu
index 2056918..a77ff79 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXExtEditors.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXExtEditors.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXFormPopupMenu.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXFormPopupMenu.dcu
index 8c3e375..7362bf7 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXFormPopupMenu.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXFormPopupMenu.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXItem.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXItem.dcu
index 1127a39..d8fce1c 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXItem.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXItem.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.bpl b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.bpl
index dcf15af..10f734b 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.bpl and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.bpl differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcp b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcp
index 0687b4b..91560fa 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcp and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcp differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcu
index a88ee69..6280c93 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLibDsgn_d12.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.bpl b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.bpl
index adc34f8..57ec8d5 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.bpl and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.bpl differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcp b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcp
index e64df66..cb4b28f 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcp and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcp differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcu
index c30a7dd..dfe560e 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXLib_d12.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXMDIMRU.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXMDIMRU.dcu
index af6ae4c..8b48746 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXMDIMRU.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXMDIMRU.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXReg.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXReg.dcu
index 0b85343..3070270 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXReg.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXReg.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXSkins.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXSkins.dcu
index cbf6654..f34dfb8 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXSkins.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXSkins.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXTabs.dcu b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXTabs.dcu
index b724002..edd8243 100644
Binary files a/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXTabs.dcu and b/official/2.2.2+2.4/SpTBXLib/Lib/D12/SpTBXTabs.dcu differ
diff --git a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLibDsgn_d12.dpk.~1~ b/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLibDsgn_d12.dpk.~1~
deleted file mode 100644
index 1669b52..0000000
--- a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLibDsgn_d12.dpk.~1~
+++ /dev/null
@@ -1,40 +0,0 @@
-package SpTBXLibDsgn_d12;
-
-{$R *.res}
-{$R '..\Source\SpTBXReg.dcr'}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $4F800000}
-{$DESCRIPTION 'Toolbar2000 -- SpTBXLib Design Package'}
-{$DESIGNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  tb2k_d12,
-  tb2kdsgn_d12,
-  SpTBXLib_d12,
-  dclstd,
-  vcl;
-
-contains
-  SpTBXReg in '..\Source\SpTBXReg.pas';
-
-end.
diff --git a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLibDsgn_d12.dpk.~2~ b/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLibDsgn_d12.dpk.~2~
deleted file mode 100644
index 1669b52..0000000
--- a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLibDsgn_d12.dpk.~2~
+++ /dev/null
@@ -1,40 +0,0 @@
-package SpTBXLibDsgn_d12;
-
-{$R *.res}
-{$R '..\Source\SpTBXReg.dcr'}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $4F800000}
-{$DESCRIPTION 'Toolbar2000 -- SpTBXLib Design Package'}
-{$DESIGNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  tb2k_d12,
-  tb2kdsgn_d12,
-  SpTBXLib_d12,
-  dclstd,
-  vcl;
-
-contains
-  SpTBXReg in '..\Source\SpTBXReg.pas';
-
-end.
diff --git a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLib_d12.dpk.~1~ b/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLib_d12.dpk.~1~
deleted file mode 100644
index f7a1e78..0000000
--- a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLib_d12.dpk.~1~
+++ /dev/null
@@ -1,50 +0,0 @@
-package SpTBXLib_d12;
-
-{$R *.res}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $4FC00000}
-{$DESCRIPTION 'Toolbar2000 -- SpTBXLib'}
-{$RUNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  vcl,
-  tb2k_d12,
-  rtl,
-  vclx;
-
-contains
-  SpTBXItem in '..\Source\SpTBXItem.pas',
-  SpTBXControls in '..\Source\SpTBXControls.pas',
-  SpTBXTabs in '..\Source\SpTBXTabs.pas',
-  SpTBXDkPanels in '..\Source\SpTBXDkPanels.pas',
-  SpTBXEditors in '..\Source\SpTBXEditors.pas',
-  SpTBXExtEditors in '..\Source\SpTBXExtEditors.pas',
-  SpTBXColorPickerForm in '..\Source\SpTBXColorPickerForm.pas',
-  SpTBXMDIMRU in '..\Source\SpTBXMDIMRU.pas',
-  SpTBXFormPopupMenu in '..\Source\SpTBXFormPopupMenu.pas',
-  SpTBXCustomizer in '..\Source\SpTBXCustomizer.pas',
-  SpTBXCustomizerForm in '..\Source\SpTBXCustomizerForm.pas',
-  SpTBXSkins in '..\Source\SpTBXSkins.pas',
-  SpTBXDefaultSkins in '..\Source\SpTBXDefaultSkins.pas';
-
-end.
diff --git a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLib_d12.dpk.~2~ b/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLib_d12.dpk.~2~
deleted file mode 100644
index f7a1e78..0000000
--- a/official/2.2.2+2.4/SpTBXLib/Packages/__history/SpTBXLib_d12.dpk.~2~
+++ /dev/null
@@ -1,50 +0,0 @@
-package SpTBXLib_d12;
-
-{$R *.res}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $4FC00000}
-{$DESCRIPTION 'Toolbar2000 -- SpTBXLib'}
-{$RUNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  vcl,
-  tb2k_d12,
-  rtl,
-  vclx;
-
-contains
-  SpTBXItem in '..\Source\SpTBXItem.pas',
-  SpTBXControls in '..\Source\SpTBXControls.pas',
-  SpTBXTabs in '..\Source\SpTBXTabs.pas',
-  SpTBXDkPanels in '..\Source\SpTBXDkPanels.pas',
-  SpTBXEditors in '..\Source\SpTBXEditors.pas',
-  SpTBXExtEditors in '..\Source\SpTBXExtEditors.pas',
-  SpTBXColorPickerForm in '..\Source\SpTBXColorPickerForm.pas',
-  SpTBXMDIMRU in '..\Source\SpTBXMDIMRU.pas',
-  SpTBXFormPopupMenu in '..\Source\SpTBXFormPopupMenu.pas',
-  SpTBXCustomizer in '..\Source\SpTBXCustomizer.pas',
-  SpTBXCustomizerForm in '..\Source\SpTBXCustomizerForm.pas',
-  SpTBXSkins in '..\Source\SpTBXSkins.pas',
-  SpTBXDefaultSkins in '..\Source\SpTBXDefaultSkins.pas';
-
-end.
diff --git a/official/2.2.2+2.4/SpTBXLib/Source/SpTBXFormPopupMenu.pas b/official/2.2.2+2.4/SpTBXLib/Source/SpTBXFormPopupMenu.pas
index 12dc2af..94b65a8 100644
--- a/official/2.2.2+2.4/SpTBXLib/Source/SpTBXFormPopupMenu.pas
+++ b/official/2.2.2+2.4/SpTBXLib/Source/SpTBXFormPopupMenu.pas
@@ -93,7 +93,7 @@ History:
 interface
 
 {$BOOLEVAL OFF} // Unit depends on short-circuit boolean evaluation
-{$I TB2Ver.inc}
+{$I '..\..\TB2K\Source\TB2Ver.inc'}
 
 uses
   Windows, Messages, Classes, SysUtils, Controls, Graphics, ImgList, Forms,
diff --git a/official/2.2.2+2.4/SpTBXLib/Source/SpTBXItem.pas b/official/2.2.2+2.4/SpTBXLib/Source/SpTBXItem.pas
index e3e30c9..a011bba 100644
--- a/official/2.2.2+2.4/SpTBXLib/Source/SpTBXItem.pas
+++ b/official/2.2.2+2.4/SpTBXLib/Source/SpTBXItem.pas
@@ -348,7 +348,7 @@ History:
 interface
 
 {$BOOLEVAL OFF} // Unit depends on short-circuit boolean evaluation
-{$I TB2Ver.inc}
+{$I '..\..\TB2K\Source\TB2Ver.inc'}
 
 uses
   Windows, Messages, Classes, SysUtils, Forms, Controls, Graphics, ImgList,
diff --git a/official/2.2.2+2.4/SpTBXLib/Source/SpTBXReg.pas b/official/2.2.2+2.4/SpTBXLib/Source/SpTBXReg.pas
index 9a493fb..f20d259 100644
--- a/official/2.2.2+2.4/SpTBXLib/Source/SpTBXReg.pas
+++ b/official/2.2.2+2.4/SpTBXLib/Source/SpTBXReg.pas
@@ -39,7 +39,7 @@ For Delphi/C++Builder 7-2007:
 
 interface
 
-{$I TB2Ver.inc}
+{$I '..\..\TB2K\Source\TB2Ver.inc'}
 
 uses
   Windows, Classes, Controls, SysUtils, Graphics, ImgList, Dialogs,