diff --git a/components/onguard/examples/all_examples.lpg b/components/onguard/examples/all_examples.lpg
new file mode 100644
index 000000000..abc45fe3e
--- /dev/null
+++ b/components/onguard/examples/all_examples.lpg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectGroup FileVersion="2">
+    <Targets>
+      <Target FileName="codegen\codegen.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exdmod\exdmod.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exdtp21\exdtp21.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exdtreg\exdtreg.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exdyreg\exdyreg.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exdys30\exdys30.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exinst\exinst.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exmachid\exmachid.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exnet\exnet.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exprot\exprot.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exreg\exreg.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exrgreg\exrgreg.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exrgstr\exrgstr.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exselapi\exselapi.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exselect\exselect.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exslcode\exslcode.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exsnreg\exsnreg.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exspname\exspname.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exspreg\exspreg.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exsrnm1\exsrnm1.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exusg1\exusg1.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exusg2\exusg2.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="exusreg\exusreg.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="fixnaf\fixnaf.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="nafmgr\nafmgr.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="regdemo\helloworld.lpi"/>
+      <Target FileName="regdemo\registration.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="stampexe\stampexe.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+    </Targets>
+  </ProjectGroup>
+</CONFIG>
diff --git a/components/onguard/examples/codegen/codegen.lpi b/components/onguard/examples/codegen/codegen.lpi
index bd281740f..ed1e8399f 100644
--- a/components/onguard/examples/codegen/codegen.lpi
+++ b/components/onguard/examples/codegen/codegen.lpi
@@ -1,29 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <Scaled Value="True"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -34,15 +40,15 @@
         <MinVersion Valid="True"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="22">
+    <Units Count="23">
       <Unit0>
         <Filename Value="codegen.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="73" Y="13"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="26"/>
+        <UnitName Value="CodeGen"/>
+        <CursorPos X="73" Y="15"/>
+        <UsageCount Value="27"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="codegenu.pas"/>
@@ -50,60 +56,60 @@
         <ComponentName Value="CodeGenFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="CODEGENU"/>
-        <CursorPos X="59" Y="39"/>
-        <TopLine Value="26"/>
+        <UnitName Value="CodeGenU"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="26"/>
+        <CursorPos X="21" Y="8"/>
+        <UsageCount Value="27"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\..\source\qonguard3.pas"/>
         <ComponentName Value="KeyMaintFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard3"/>
-        <CursorPos X="15" Y="173"/>
-        <TopLine Value="265"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="38"/>
+        <CursorPos X="32" Y="50"/>
         <UsageCount Value="12"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\source\ogconst.pas"/>
-        <UnitName Value="ogconst"/>
-        <CursorPos X="3" Y="62"/>
         <TopLine Value="42"/>
+        <CursorPos X="3" Y="62"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\..\..\lazarus\lcl\include\control.inc"/>
-        <CursorPos X="1" Y="1544"/>
         <TopLine Value="1525"/>
+        <CursorPos Y="1544"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\..\lazarus\lcl\interfaces\gtk\gtkwscontrols.pp"/>
         <UnitName Value="GtkWSControls"/>
-        <CursorPos X="1" Y="270"/>
         <TopLine Value="251"/>
+        <CursorPos Y="270"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\..\lazarus\lcl\include\customlistbox.inc"/>
-        <CursorPos X="1" Y="401"/>
         <TopLine Value="382"/>
+        <CursorPos Y="401"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="usr\share\fpcsrc\fcl\inc\inifiles.pp"/>
         <UnitName Value="IniFiles"/>
-        <CursorPos X="3" Y="598"/>
         <TopLine Value="593"/>
+        <CursorPos X="3" Y="598"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="..\..\source\qonguard5.pas"/>
-        <UnitName Value="qonguard5"/>
-        <CursorPos X="1" Y="1"/>
         <TopLine Value="72"/>
         <UsageCount Value="11"/>
       </Unit8>
@@ -112,26 +118,28 @@
         <ComponentName Value="CodeGenerateFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard2"/>
-        <CursorPos X="18" Y="425"/>
-        <TopLine Value="422"/>
-        <UsageCount Value="11"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="500"/>
+        <CursorPos X="3" Y="504"/>
+        <UsageCount Value="12"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit9>
       <Unit10>
         <Filename Value="..\..\source\onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="19" Y="1186"/>
-        <TopLine Value="1170"/>
-        <UsageCount Value="10"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="1488"/>
+        <CursorPos X="18" Y="1498"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
       </Unit10>
       <Unit11>
         <Filename Value="..\..\source\qonguard1.pas"/>
         <ComponentName Value="KeyGenerateFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard1"/>
-        <CursorPos X="56" Y="7"/>
         <TopLine Value="76"/>
+        <CursorPos X="56" Y="7"/>
         <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
@@ -139,88 +147,121 @@
         <ComponentName Value="EditProductFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard4"/>
-        <CursorPos X="20" Y="37"/>
         <TopLine Value="31"/>
+        <CursorPos X="20" Y="37"/>
         <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="32" Y="693"/>
         <TopLine Value="714"/>
+        <CursorPos X="32" Y="693"/>
         <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
         <Filename Value="codegenu.lfm"/>
         <CursorPos X="18" Y="12"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit14>
       <Unit15>
         <Filename Value="..\..\source\qogabout0.pas"/>
         <ComponentName Value="OgAboutForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qogabout0"/>
-        <CursorPos X="42" Y="25"/>
         <TopLine Value="12"/>
+        <CursorPos X="42" Y="25"/>
         <UsageCount Value="10"/>
       </Unit15>
       <Unit16>
         <Filename Value="..\..\source\qogabout0.lfm"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit16>
       <Unit17>
         <Filename Value="..\..\source\qonguard6.pas"/>
         <ComponentName Value="ModifierFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard6"/>
-        <CursorPos X="50" Y="7"/>
         <TopLine Value="75"/>
+        <CursorPos X="50" Y="7"/>
         <UsageCount Value="10"/>
       </Unit17>
       <Unit18>
         <Filename Value="..\..\source\qonguard6.lfm"/>
         <CursorPos X="28" Y="13"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit18>
       <Unit19>
         <Filename Value="..\..\source\qonguard7.pas"/>
-        <UnitName Value="qonguard7"/>
-        <CursorPos X="1" Y="1"/>
         <TopLine Value="72"/>
         <UsageCount Value="10"/>
       </Unit19>
       <Unit20>
         <Filename Value="..\..\source\idesn.pas"/>
-        <UnitName Value="idesn"/>
-        <CursorPos X="1" Y="23"/>
         <TopLine Value="37"/>
+        <CursorPos Y="23"/>
         <UsageCount Value="11"/>
       </Unit20>
       <Unit21>
         <Filename Value="..\..\..\..\..\..\temp\fpc\rtl\inc\systemh.inc"/>
-        <CursorPos X="11" Y="571"/>
         <TopLine Value="556"/>
+        <CursorPos X="11" Y="571"/>
         <UsageCount Value="11"/>
       </Unit21>
+      <Unit22>
+        <Filename Value="..\..\source\onguard.inc"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="31"/>
+        <UsageCount Value="10"/>
+      </Unit22>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="9" HistoryIndex="8">
+      <Position1>
+        <Filename Value="codegenu.pas"/>
+        <Caret Line="47" Column="51" TopLine="26"/>
+      </Position1>
+      <Position2>
+        <Filename Value="codegenu.pas"/>
+        <Caret Line="17" Column="18"/>
+      </Position2>
+      <Position3>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="273" Column="18" TopLine="247"/>
+      </Position3>
+      <Position4>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1494" TopLine="1488"/>
+      </Position4>
+      <Position5>
+        <Filename Value="..\..\source\qonguard2.pas"/>
+        <Caret Line="86" Column="32" TopLine="57"/>
+      </Position5>
+      <Position6>
+        <Filename Value="..\..\source\qonguard2.pas"/>
+        <Caret Line="19" TopLine="19"/>
+      </Position6>
+      <Position7>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1498" Column="18" TopLine="1488"/>
+      </Position7>
+      <Position8>
+        <Filename Value="..\..\source\qonguard2.pas"/>
+        <Caret Line="76" Column="3" TopLine="58"/>
+      </Position8>
+      <Position9>
+        <Filename Value="..\..\source\qonguard2.pas"/>
+        <Caret Line="504" Column="3" TopLine="500"/>
+      </Position9>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -232,27 +273,36 @@
       </Checks>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <BreakPoints Count="3">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="159"/>
       </Item1>
       <Item2>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="212"/>
       </Item2>
       <Item3>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard2.pas"/>
         <Line Value="236"/>
       </Item3>
diff --git a/components/onguard/examples/codegen/codegen.lpr b/components/onguard/examples/codegen/codegen.lpr
index 2b0015ab0..b1cb52412 100644
--- a/components/onguard/examples/codegen/codegen.lpr
+++ b/components/onguard/examples/codegen/codegen.lpr
@@ -7,10 +7,14 @@ program CodeGen;
 uses
   Interfaces,
   Forms,
-  CODEGENU in 'CODEGENU.pas' {CodeGenFrm}, tponguard;
+  CodeGenU in 'CODEGENU.pas' {CodeGenFrm}, tponguard;
 
 
+{$R *.res}
+
 begin
+  Application.Scaled:=True;
+  Application.Title:='';
   Application.Initialize;
   Application.CreateForm(TCodeGenFrm, CodeGenFrm);
   Application.Run;
diff --git a/components/onguard/examples/codegen/codegenu.lfm b/components/onguard/examples/codegen/codegenu.lfm
index 61722753b..aa53bbbfb 100644
--- a/components/onguard/examples/codegen/codegenu.lfm
+++ b/components/onguard/examples/codegen/codegenu.lfm
@@ -1,26 +1,31 @@
 object CodeGenFrm: TCodeGenFrm
   Left = 315
-  Height = 85
+  Height = 106
   Top = 230
-  Width = 273
+  Width = 293
   ActiveControl = GenerateBtn
+  AutoSize = True
+  BorderStyle = bsDialog
   Caption = 'Example Code Generator'
-  ClientHeight = 85
-  ClientWidth = 273
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 106
+  ClientWidth = 293
+  Font.Color = clWindowText
   Font.Pitch = fpVariable
   Position = poScreenCenter
   ShowHint = True
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object CopySb: TSpeedButton
-    Left = 244
+    AnchorSideLeft.Control = CodeEd
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeEd
+    AnchorSideTop.Side = asrCenter
+    Left = 266
     Height = 22
     Hint = 'Copy code to clipboard'
-    Top = 21
+    Top = 29
     Width = 23
-    Color = clBtnFace
+    BorderSpacing.Left = 4
+    BorderSpacing.Right = 12
     Glyph.Data = {
       42010000424D4201000000000000760000002800000011000000110000000100
       040000000000CC00000000000000000000000000000000000000000000000000
@@ -34,50 +39,68 @@ object CodeGenFrm: TCodeGenFrm
       0000800000088888888880000000888888888888888880000000888888888888
       888880000000
     }
-    NumGlyphs = 0
     OnClick = CopySbClick
   end
   object Label2: TLabel
-    Left = 8
-    Height = 14
-    Top = 3
-    Width = 26
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
+    Height = 15
+    Top = 12
+    Width = 28
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
     Caption = 'Code'
     FocusControl = CodeEd
     ParentColor = False
   end
   object GenerateBtn: TButton
-    Left = 8
+    AnchorSideLeft.Control = CodeEd
+    AnchorSideTop.Control = CodeEd
+    AnchorSideTop.Side = asrBottom
+    Left = 12
     Height = 25
     Hint = 'Display code generation dialog'
-    Top = 51
+    Top = 64
     Width = 105
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     BorderSpacing.InnerBorder = 4
     Caption = 'Generate Code'
     OnClick = GenerateBtnClick
     TabOrder = 0
   end
   object CodeEd: TEdit
-    Left = 8
+    AnchorSideLeft.Control = Label2
+    AnchorSideTop.Control = Label2
+    AnchorSideTop.Side = asrBottom
+    Left = 12
     Height = 23
-    Top = 19
-    Width = 233
+    Top = 29
+    Width = 250
+    BorderSpacing.Top = 2
+    Constraints.MinWidth = 250
     ReadOnly = True
     TabOrder = 1
   end
   object CloseBtn: TBitBtn
-    Left = 192
+    AnchorSideTop.Control = GenerateBtn
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 206
     Height = 25
-    Top = 51
+    Top = 64
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
     Kind = bkClose
-    NumGlyphs = 0
     TabOrder = 2
   end
   object OgMakeCodes1: TOgMakeCodes
     KeyFileName = 'ONGUARD.INI'
     ShowHints = True
-    left = 64
-    top = 56
+    Left = 104
+    Top = 8
   end
 end
diff --git a/components/onguard/examples/codegen/codegenu.lrs b/components/onguard/examples/codegen/codegenu.lrs
index 0afe35381..340482448 100644
--- a/components/onguard/examples/codegen/codegenu.lrs
+++ b/components/onguard/examples/codegen/codegenu.lrs
@@ -1,35 +1,47 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TCodeGenFrm','FORMDATA',[
-  'TPF0'#11'TCodeGenFrm'#10'CodeGenFrm'#4'Left'#3';'#1#6'Height'#2'U'#3'Top'#3
-  +#230#0#5'Width'#3#17#1#13'ActiveControl'#7#11'GenerateBtn'#7'Caption'#6#22'E'
-  +'xample Code Generator'#12'ClientHeight'#2'U'#11'ClientWidth'#3#17#1#10'Font'
-  +'.Color'#7#6'clText'#11'Font.Height'#2#11#9'Font.Name'#6#13'MS Sans Serif'#10
-  +'Font.Pitch'#7#10'fpVariable'#8'Position'#7#14'poScreenCenter'#8'ShowHint'#9
-  +#10'LCLVersion'#6#6'0.9.27'#0#12'TSpeedButton'#6'CopySb'#4'Left'#3#244#0#6'H'
-  +'eight'#2#22#4'Hint'#6#22'Copy code to clipboard'#3'Top'#2#21#5'Width'#2#23#5
-  +'Color'#7#9'clBtnFace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0
-  +'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0
-  +#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255
-  +#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136
-  +#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#132
-  +'DDDD'#128#0#0#0#136#136#136#132#255#255#255#244#128#0#0#0#136#136#136#132
-  +#240#0#0#244#128#0#0#0#128#0#0#4#255#255#255#244#128#0#0#0#128#255#255#244
-  +#240#0#0#244#128#0#0#0#128#240#0#4#255#255#255#244#128#0#0#0#128#255#255#244
-  +#240#15'DD'#128#0#0#0#128#240#0#4#255#255'OH'#128#0#0#0#128#255#255#244#255
-  +#255'D'#136#128#0#0#0#128#240#15#4'DDH'#136#128#0#0#0#128#255#255#15#8#136
-  +#136#136#128#0#0#0#128#255#255#0#136#136#136#136#128#0#0#0#128#0#0#8#136#136
-  +#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136
-  +#136#136#136#136#128#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#11'CopySbClick'#0#0
-  +#6'TLabel'#6'Label2'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#3#5'Width'#2#26#7'C'
-  +'aption'#6#4'Code'#12'FocusControl'#7#6'CodeEd'#11'ParentColor'#8#0#0#7'TBut'
-  +'ton'#11'GenerateBtn'#4'Left'#2#8#6'Height'#2#25#4'Hint'#6#30'Display code g'
-  +'eneration dialog'#3'Top'#2'3'#5'Width'#2'i'#25'BorderSpacing.InnerBorder'#2
-  +#4#7'Caption'#6#13'Generate Code'#7'OnClick'#7#16'GenerateBtnClick'#8'TabOrd'
-  +'er'#2#0#0#0#5'TEdit'#6'CodeEd'#4'Left'#2#8#6'Height'#2#23#3'Top'#2#19#5'Wid'
-  +'th'#3#233#0#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'CloseBtn'#4'Left'
-  +#3#192#0#6'Height'#2#25#3'Top'#2'3'#5'Width'#2'K'#4'Kind'#7#7'bkClose'#9'Num'
-  +'Glyphs'#2#0#8'TabOrder'#2#2#0#0#12'TOgMakeCodes'#12'OgMakeCodes1'#11'KeyFil'
-  +'eName'#6#11'ONGUARD.INI'#9'ShowHints'#9#4'left'#2'@'#3'top'#2'8'#0#0#0
+  'TPF0'#11'TCodeGenFrm'#10'CodeGenFrm'#4'Left'#3';'#1#6'Height'#2'j'#3'Top'#3
+  +#230#0#5'Width'#3'%'#1#13'ActiveControl'#7#11'GenerateBtn'#8'AutoSize'#9#11
+  +'BorderStyle'#7#8'bsDialog'#7'Caption'#6#22'Example Code Generator'#12'Clien'
+  +'tHeight'#2'j'#11'ClientWidth'#3'%'#1#10'Font.Color'#7#12'clWindowText'#10'F'
+  +'ont.Pitch'#7#10'fpVariable'#8'Position'#7#14'poScreenCenter'#8'ShowHint'#9
+  +#10'LCLVersion'#6#7'2.3.0.0'#0#12'TSpeedButton'#6'CopySb'#22'AnchorSideLeft.'
+  +'Control'#7#6'CodeEd'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
+  +'p.Control'#7#6'CodeEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#10#1
+  +#6'Height'#2#22#4'Hint'#6#22'Copy code to clipboard'#3'Top'#2#29#5'Width'#2
+  +#23#18'BorderSpacing.Left'#2#4#19'BorderSpacing.Right'#2#12#10'Glyph.Data'#10
+  +'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0
+  +#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0
+  +#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192
+  +#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255
+  +#255#255#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136
+  +#136#136#128#0#0#0#136#136#136#132'DDDD'#128#0#0#0#136#136#136#132#255#255
+  +#255#244#128#0#0#0#136#136#136#132#240#0#0#244#128#0#0#0#128#0#0#4#255#255
+  +#255#244#128#0#0#0#128#255#255#244#240#0#0#244#128#0#0#0#128#240#0#4#255#255
+  +#255#244#128#0#0#0#128#255#255#244#240#15'DD'#128#0#0#0#128#240#0#4#255#255
+  +'OH'#128#0#0#0#128#255#255#244#255#255'D'#136#128#0#0#0#128#240#15#4'DDH'#136
+  +#128#0#0#0#128#255#255#15#8#136#136#136#128#0#0#0#128#255#255#0#136#136#136
+  +#136#128#0#0#0#128#0#0#8#136#136#136#136#128#0#0#0#136#136#136#136#136#136
+  +#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#7'OnClick'#7#11
+  +'CopySbClick'#0#0#6'TLabel'#6'Label2'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#12#6'Height'#2#15#3'Top'#2#12
+  +#5'Width'#2#28#18'BorderSpacing.Left'#2#12#17'BorderSpacing.Top'#2#12#7'Capt'
+  +'ion'#6#4'Code'#12'FocusControl'#7#6'CodeEd'#11'ParentColor'#8#0#0#7'TButton'
+  +#11'GenerateBtn'#22'AnchorSideLeft.Control'#7#6'CodeEd'#21'AnchorSideTop.Con'
+  +'trol'#7#6'CodeEd'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#12#6'Heig'
+  +'ht'#2#25#4'Hint'#6#30'Display code generation dialog'#3'Top'#2'@'#5'Width'#2
+  +'i'#17'BorderSpacing.Top'#2#12#20'BorderSpacing.Bottom'#2#12#25'BorderSpacin'
+  +'g.InnerBorder'#2#4#7'Caption'#6#13'Generate Code'#7'OnClick'#7#16'GenerateB'
+  +'tnClick'#8'TabOrder'#2#0#0#0#5'TEdit'#6'CodeEd'#22'AnchorSideLeft.Control'#7
+  +#6'Label2'#21'AnchorSideTop.Control'#7#6'Label2'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#12#6'Height'#2#23#3'Top'#2#29#5'Width'#3#250#0#17'Bord'
+  +'erSpacing.Top'#2#2#20'Constraints.MinWidth'#3#250#0#8'ReadOnly'#9#8'TabOrde'
+  +'r'#2#1#0#0#7'TBitBtn'#8'CloseBtn'#21'AnchorSideTop.Control'#7#11'GenerateBt'
+  +'n'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#3#206#0#6'Height'#2#25#3'Top'#2'@'#5'Width'#2'K'#7'Anchors'
+  +#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#12#20'BorderSpacing.Bott'
+  +'om'#2#12#4'Kind'#7#7'bkClose'#8'TabOrder'#2#2#0#0#12'TOgMakeCodes'#12'OgMak'
+  +'eCodes1'#11'KeyFileName'#6#11'ONGUARD.INI'#9'ShowHints'#9#4'Left'#2'h'#3'To'
+  +'p'#2#8#0#0#0
 ]);
diff --git a/components/onguard/examples/codegen/codegenu.pas b/components/onguard/examples/codegen/codegenu.pas
index 01ad0e261..b394a4bdf 100644
--- a/components/onguard/examples/codegen/codegenu.pas
+++ b/components/onguard/examples/codegen/codegenu.pas
@@ -1,4 +1,4 @@
-unit CODEGENU;
+unit CodeGenU;
 
 {$MODE Delphi}
 
diff --git a/components/onguard/examples/exdmod/exdmod.lpi b/components/onguard/examples/exdmod/exdmod.lpi
index ad653139e..7bb836592 100644
--- a/components/onguard/examples/exdmod/exdmod.lpi
+++ b/components/onguard/examples/exdmod/exdmod.lpi
@@ -1,45 +1,54 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <Scaled Value="True"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="14">
       <Unit0>
         <Filename Value="exdmod.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="76" Y="14"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <UnitName Value="Exdmod"/>
+        <CursorPos X="76" Y="18"/>
         <UsageCount Value="26"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exdmodu1.pas"/>
@@ -48,11 +57,12 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exdmodu1"/>
-        <CursorPos X="3" Y="212"/>
-        <TopLine Value="206"/>
         <EditorIndex Value="1"/>
+        <TopLine Value="199"/>
+        <CursorPos X="54" Y="211"/>
         <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="exdmodu2.pas"/>
@@ -61,76 +71,72 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exdmodu2"/>
-        <CursorPos X="67" Y="49"/>
-        <TopLine Value="19"/>
-        <EditorIndex Value="4"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="20"/>
+        <CursorPos X="70" Y="32"/>
         <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\source\onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="1" Y="2088"/>
+        <EditorIndex Value="4"/>
         <TopLine Value="2067"/>
-        <EditorIndex Value="2"/>
+        <CursorPos Y="2088"/>
         <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="1" Y="522"/>
-        <TopLine Value="495"/>
         <EditorIndex Value="3"/>
+        <TopLine Value="495"/>
+        <CursorPos Y="522"/>
         <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\source\onguard.inc"/>
-        <CursorPos X="1" Y="67"/>
         <TopLine Value="47"/>
+        <CursorPos Y="67"/>
         <UsageCount Value="12"/>
       </Unit5>
       <Unit6>
         <Filename Value="usr\share\fpcsrc\rtl\inc\systemh.inc"/>
         <CursorPos X="3" Y="350"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="usr\share\fpcsrc\rtl\inc\system.inc"/>
-        <CursorPos X="14" Y="511"/>
         <TopLine Value="500"/>
+        <CursorPos X="14" Y="511"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="..\..\..\lazarus\lcl\interfaces\gtk\gtklclintf.inc"/>
-        <CursorPos X="1" Y="365"/>
         <TopLine Value="346"/>
+        <CursorPos Y="365"/>
         <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
         <Filename Value="exdmodu2.lfm"/>
         <CursorPos X="28" Y="11"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit9>
       <Unit10>
         <Filename Value="exdmodu1.lfm"/>
         <CursorPos X="28" Y="11"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit10>
       <Unit11>
         <Filename Value="..\..\source\qonguard2.pas"/>
         <ComponentName Value="CodeGenerateFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard2"/>
-        <CursorPos X="17" Y="11"/>
         <TopLine Value="61"/>
+        <CursorPos X="17" Y="11"/>
         <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
@@ -138,9 +144,7 @@
         <ComponentName Value="KeyMaintFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard3"/>
         <CursorPos X="13" Y="4"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
@@ -148,156 +152,154 @@
         <ComponentName Value="ModifierFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qonguard6"/>
-        <CursorPos X="49" Y="61"/>
         <TopLine Value="42"/>
+        <CursorPos X="49" Y="61"/>
         <UsageCount Value="10"/>
       </Unit13>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="510" Column="1" TopLine="489"/>
+        <Caret Line="510" TopLine="489"/>
       </Position1>
       <Position2>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="509" Column="1" TopLine="488"/>
+        <Caret Line="509" TopLine="488"/>
       </Position2>
       <Position3>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="510" Column="1" TopLine="489"/>
+        <Caret Line="510" TopLine="489"/>
       </Position3>
       <Position4>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="509" Column="1" TopLine="488"/>
+        <Caret Line="512" TopLine="491"/>
       </Position4>
       <Position5>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="510" Column="1" TopLine="489"/>
+        <Caret Line="515" TopLine="494"/>
       </Position5>
       <Position6>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="509" Column="1" TopLine="488"/>
+        <Caret Line="516" TopLine="495"/>
       </Position6>
       <Position7>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="510" Column="1" TopLine="489"/>
+        <Caret Line="522" TopLine="495"/>
       </Position7>
       <Position8>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="509" Column="1" TopLine="488"/>
+        <Caret Line="517" TopLine="496"/>
       </Position8>
       <Position9>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="510" Column="1" TopLine="489"/>
+        <Caret Line="516" TopLine="495"/>
       </Position9>
       <Position10>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="512" Column="1" TopLine="491"/>
+        <Caret Line="522" TopLine="495"/>
       </Position10>
       <Position11>
-        <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="515" Column="1" TopLine="494"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="176" TopLine="155"/>
       </Position11>
       <Position12>
-        <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="516" Column="1" TopLine="495"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="177" TopLine="156"/>
       </Position12>
       <Position13>
-        <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="522" Column="1" TopLine="495"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="179" TopLine="158"/>
       </Position13>
       <Position14>
-        <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="517" Column="1" TopLine="496"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="167" Column="37" TopLine="160"/>
       </Position14>
       <Position15>
-        <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="516" Column="1" TopLine="495"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="182" TopLine="161"/>
       </Position15>
       <Position16>
-        <Filename Value="..\..\source\ogutil.pas"/>
-        <Caret Line="522" Column="1" TopLine="495"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1179" TopLine="1158"/>
       </Position16>
       <Position17>
-        <Filename Value="exdmodu1.pas"/>
-        <Caret Line="176" Column="1" TopLine="155"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1180" TopLine="1159"/>
       </Position17>
       <Position18>
-        <Filename Value="exdmodu1.pas"/>
-        <Caret Line="177" Column="1" TopLine="156"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1181" TopLine="1160"/>
       </Position18>
       <Position19>
         <Filename Value="exdmodu1.pas"/>
-        <Caret Line="179" Column="1" TopLine="158"/>
+        <Caret Line="184" TopLine="163"/>
       </Position19>
       <Position20>
-        <Filename Value="exdmodu1.pas"/>
-        <Caret Line="167" Column="37" TopLine="160"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="2085" TopLine="2064"/>
       </Position20>
       <Position21>
-        <Filename Value="exdmodu1.pas"/>
-        <Caret Line="182" Column="1" TopLine="161"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="2086" TopLine="2065"/>
       </Position21>
       <Position22>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1179" Column="1" TopLine="1158"/>
+        <Caret Line="2087" Column="40" TopLine="2066"/>
       </Position22>
       <Position23>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1180" Column="1" TopLine="1159"/>
+        <Caret Line="2088" TopLine="2067"/>
       </Position23>
       <Position24>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1181" Column="1" TopLine="1160"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="188" TopLine="137"/>
       </Position24>
       <Position25>
-        <Filename Value="exdmodu1.pas"/>
-        <Caret Line="184" Column="1" TopLine="163"/>
+        <Filename Value="exdmodu2.pas"/>
+        <Caret Line="24" Column="51" TopLine="20"/>
       </Position25>
       <Position26>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="2085" Column="1" TopLine="2064"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="211" Column="75" TopLine="206"/>
       </Position26>
       <Position27>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="2086" Column="1" TopLine="2065"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="176" TopLine="156"/>
       </Position27>
       <Position28>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="2087" Column="40" TopLine="2066"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="175" TopLine="155"/>
       </Position28>
       <Position29>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="2088" Column="1" TopLine="2067"/>
+        <Filename Value="exdmodu1.pas"/>
+        <Caret Line="178" Column="27" TopLine="156"/>
       </Position29>
       <Position30>
         <Filename Value="exdmodu1.pas"/>
-        <Caret Line="188" Column="1" TopLine="137"/>
+        <Caret Line="45" Column="14" TopLine="24"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
-    <BreakPoints Count="1">
-      <Item1>
-        <Source Value="exdmodu1.pas"/>
-        <Line Value="176"/>
-      </Item1>
-    </BreakPoints>
     <Exceptions Count="2">
       <Item1>
         <Name Value="ECodetoolError"/>
diff --git a/components/onguard/examples/exdmod/exdmod.lpr b/components/onguard/examples/exdmod/exdmod.lpr
index fd54c5dc3..4f6930d01 100644
--- a/components/onguard/examples/exdmod/exdmod.lpr
+++ b/components/onguard/examples/exdmod/exdmod.lpr
@@ -7,7 +7,11 @@ uses
   Exdmodu1 in 'EXDMODU1.PAS' {Form1},
   Exdmodu2 in 'EXDMODU2.PAS' {SNEntryDlg};
 
+{$R *.res}
+
 begin
+  Application.Scaled:=True;
+  Application.Title:='';
   Application.Initialize;
   Application.CreateForm(TfrmMain, frmMain);
   Application.Run;
diff --git a/components/onguard/examples/exdmod/exdmodu1.lfm b/components/onguard/examples/exdmod/exdmodu1.lfm
index e0cc833ca..a26af3f05 100644
--- a/components/onguard/examples/exdmod/exdmodu1.lfm
+++ b/components/onguard/examples/exdmod/exdmodu1.lfm
@@ -3,52 +3,61 @@ object frmMain: TfrmMain
   Height = 186
   Top = 223
   Width = 240
-  ActiveControl = Memo1
+  AutoSize = True
+  BorderStyle = bsDialog
   Caption = 'Serial Number Example'
   ClientHeight = 186
   ClientWidth = 240
   Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   OnActivate = FormActivate
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 38
-    Height = 14
-    Top = 96
-    Width = 43
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 98
+    Height = 15
+    Top = 54
+    Width = 44
     Alignment = taCenter
     Caption = 'Serial #: '
     ParentColor = False
   end
-  object Memo1: TMemo
-    Left = 3
-    Height = 79
-    Top = 4
-    Width = 223
-    Lines.Strings = (
-      'If you can edit this, then your program was '
-      'allowed to run'
-    )
-    ScrollBars = ssVertical
+  object CloseBtn: TBitBtn
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 76
+    Height = 33
+    Top = 81
+    Width = 89
+    BorderSpacing.Around = 12
+    Kind = bkClose
     TabOrder = 0
   end
-  object CloseBtn: TBitBtn
-    Left = 72
-    Height = 33
-    Top = 114
-    Width = 89
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 1
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 30
+    Top = 12
+    Width = 216
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'If you can edit this, then your program was allowed to run'
+    WordWrap = True
   end
   object OgSerialNumberCode1: TOgSerialNumberCode
     OnChecked = OgSerialNumberCode1Checked
     OnGetKey = OgSerialNumberCode1GetKey
     OnGetCode = OgSerialNumberCode1GetCode
     OnGetModifier = OgSerialNumberCode1GetModifier
-    left = 184
-    top = 96
+    Left = 56
+    Top = 64
   end
 end
diff --git a/components/onguard/examples/exdmod/exdmodu1.lrs b/components/onguard/examples/exdmod/exdmodu1.lrs
index 95b08a65f..ced73d8a5 100644
--- a/components/onguard/examples/exdmod/exdmodu1.lrs
+++ b/components/onguard/examples/exdmod/exdmodu1.lrs
@@ -1,20 +1,26 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TfrmMain','FORMDATA',[
   'TPF0'#8'TfrmMain'#7'frmMain'#4'Left'#3't'#1#6'Height'#3#186#0#3'Top'#3#223#0
-  +#5'Width'#3#240#0#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#21'Serial Number'
-  +' Example'#12'ClientHeight'#3#186#0#11'ClientWidth'#3#240#0#10'Font.Color'#7
-  +#7'clBlack'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#10'OnActi'
-  +'vate'#7#12'FormActivate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6
-  +'0.9.27'#0#6'TLabel'#6'Label1'#4'Left'#2'&'#6'Height'#2#14#3'Top'#2'`'#5'Wid'
-  +'th'#2'+'#9'Alignment'#7#8'taCenter'#7'Caption'#6#10'Serial #: '#11'ParentCo'
-  +'lor'#8#0#0#5'TMemo'#5'Memo1'#4'Left'#2#3#6'Height'#2'O'#3'Top'#2#4#5'Width'
-  +#3#223#0#13'Lines.Strings'#1#6',If you can edit this, then your program was '
-  +#6#14'allowed to run'#0#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7
-  +'TBitBtn'#8'CloseBtn'#4'Left'#2'H'#6'Height'#2'!'#3'Top'#2'r'#5'Width'#2'Y'#4
-  +'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#19'TOgSerialNumberC'
-  +'ode'#19'OgSerialNumberCode1'#9'OnChecked'#7#26'OgSerialNumberCode1Checked'#8
-  +'OnGetKey'#7#25'OgSerialNumberCode1GetKey'#9'OnGetCode'#7#26'OgSerialNumberC'
-  +'ode1GetCode'#13'OnGetModifier'#7#30'OgSerialNumberCode1GetModifier'#4'left'
-  +#3#184#0#3'top'#2'`'#0#0#0
+  +#5'Width'#3#240#0#8'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#21
+  +'Serial Number Example'#12'ClientHeight'#3#186#0#11'ClientWidth'#3#240#0#10
+  +'Font.Color'#7#7'clBlack'#10'OnActivate'#7#12'FormActivate'#8'Position'#7#14
+  +'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'Anchor'
+  +'SideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'Anch'
+  +'orSideTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2'b'#6'Height'#2#15#3'Top'#2'6'#5'Width'#2','#9'Alignment'#7#8'taCenter'#7
+  +'Caption'#6#10'Serial #: '#11'ParentColor'#8#0#0#7'TBitBtn'#8'CloseBtn'#22'A'
+  +'nchorSideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21
+  +'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2'L'#6'Height'#2'!'#3'Top'#2'Q'#5'Width'#2'Y'#20'BorderSpacing.Around'
+  +#2#12#4'Kind'#7#7'bkClose'#8'TabOrder'#2#0#0#0#6'TLabel'#5'Memo1'#22'AnchorS'
+  +'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorS'
+  +'ideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#2#12#6'Height'#2#30#3'Top'#2#12#5'Width'#3#216#0#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#12#7'Caption'#6':If you can '
+  +'edit this, then your program was allowed to run'#8'WordWrap'#9#0#0#19'TOgSe'
+  +'rialNumberCode'#19'OgSerialNumberCode1'#9'OnChecked'#7#26'OgSerialNumberCod'
+  +'e1Checked'#8'OnGetKey'#7#25'OgSerialNumberCode1GetKey'#9'OnGetCode'#7#26'Og'
+  +'SerialNumberCode1GetCode'#13'OnGetModifier'#7#30'OgSerialNumberCode1GetModi'
+  +'fier'#4'Left'#2'8'#3'Top'#2'@'#0#0#0
 ]);
diff --git a/components/onguard/examples/exdmod/exdmodu1.pas b/components/onguard/examples/exdmod/exdmodu1.pas
index 9f76ca996..6b39fa1f7 100644
--- a/components/onguard/examples/exdmod/exdmodu1.pas
+++ b/components/onguard/examples/exdmod/exdmodu1.pas
@@ -38,9 +38,9 @@ type
   { TfrmMain }
 
   TfrmMain = class(TForm)
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
     Label1: TLabel;
+    Memo1: TLabel;
     OgSerialNumberCode1: TOgSerialNumberCode;
     procedure FormActivate(Sender: TObject);
     procedure OgSerialNumberCode1GetKey(Sender: TObject; var Key: TKey);
@@ -66,14 +66,11 @@ var
 
 implementation
 
-
-
 uses
   LResources,Exdmodu2;
 
 {=======================================================================}
 
-
 procedure TfrmMain.OgSerialNumberCode1GetKey(Sender: TObject; var Key: TKey);
 begin
   Key := CKey;
@@ -210,6 +207,9 @@ var
   S   : string;
 begin
   FExpired := false;
+
+  //Status := ogValidCode;  // just to check the form
+
   case Status of
     ogValidCode   : begin
                       {check if retrieved Serial Number matches Code}
diff --git a/components/onguard/examples/exdmod/exdmodu2.lfm b/components/onguard/examples/exdmod/exdmodu2.lfm
index 4029b610f..24954847c 100644
--- a/components/onguard/examples/exdmod/exdmodu2.lfm
+++ b/components/onguard/examples/exdmod/exdmodu2.lfm
@@ -4,88 +4,136 @@ object SNEntryDlg: TSNEntryDlg
   Top = 376
   Width = 247
   ActiveControl = SNText
+  AutoSize = True
+  BorderStyle = bsDialog
   Caption = 'Serial Number w/Modifer'
   ClientHeight = 195
   ClientWidth = 247
   Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = SNText
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 14
-    Top = 64
-    Width = 16
+    Height = 15
+    Top = 66
+    Width = 15
+    BorderSpacing.Left = 8
     Caption = 'SN'
     ParentColor = False
   end
   object Label2: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeText
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 14
-    Top = 90
-    Width = 26
+    Height = 15
+    Top = 97
+    Width = 28
+    BorderSpacing.Left = 8
     Caption = 'Code'
     ParentColor = False
   end
   object Label3: TLabel
-    Left = 40
-    Height = 14
-    Top = 7
-    Width = 160
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Owner
+    Left = 34
+    Height = 15
+    Top = 8
+    Width = 178
+    BorderSpacing.Top = 8
     Caption = 'Call your Vendor NOW to register!'
     ParentColor = False
   end
   object Label4: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ModString
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 14
-    Top = 37
-    Width = 38
+    Height = 15
+    Top = 35
+    Width = 45
+    BorderSpacing.Left = 8
     Caption = 'Modifier'
     ParentColor = False
   end
   object SNText: TEdit
-    Left = 52
+    AnchorSideLeft.Control = ModString
+    AnchorSideTop.Control = ModString
+    AnchorSideTop.Side = asrBottom
+    Left = 61
     Height = 23
-    Top = 60
+    Top = 62
     Width = 121
+    BorderSpacing.Top = 8
     TabOrder = 1
   end
   object CodeText: TEdit
-    Left = 52
+    AnchorSideLeft.Control = SNText
+    AnchorSideTop.Control = SNText
+    AnchorSideTop.Side = asrBottom
+    Left = 61
     Height = 23
-    Top = 86
+    Top = 93
     Width = 175
+    BorderSpacing.Top = 8
+    BorderSpacing.Right = 8
     TabOrder = 2
   end
   object OKBtn: TBitBtn
-    Left = 23
+    AnchorSideTop.Control = CancelBtn
+    AnchorSideRight.Control = Bevel1
+    Left = 26
     Height = 33
-    Top = 118
+    Top = 128
     Width = 89
+    Anchors = [akTop, akRight]
+    BorderSpacing.Bottom = 8
     Kind = bkOK
     ModalResult = 1
-    NumGlyphs = 0
     TabOrder = 3
   end
   object CancelBtn: TBitBtn
-    Left = 127
+    AnchorSideLeft.Control = Bevel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeText
+    AnchorSideTop.Side = asrBottom
+    Left = 131
     Height = 33
-    Top = 118
+    Top = 128
     Width = 89
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 8
     Kind = bkCancel
-    NumGlyphs = 0
     OnClick = CancelBtnClick
     TabOrder = 4
   end
   object ModString: TEdit
-    Left = 52
+    AnchorSideLeft.Control = Label4
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Label3
+    AnchorSideTop.Side = asrBottom
+    Left = 61
     Height = 23
-    Top = 33
+    Top = 31
     Width = 121
+    BorderSpacing.Left = 8
+    BorderSpacing.Top = 8
     ReadOnly = True
     TabStop = False
     TabOrder = 0
   end
+  object Bevel1: TBevel
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    Left = 115
+    Height = 37
+    Top = 125
+    Width = 16
+    Shape = bsSpacer
+  end
 end
diff --git a/components/onguard/examples/exdmod/exdmodu2.lrs b/components/onguard/examples/exdmod/exdmodu2.lrs
index aea0eb766..cb3bf5eab 100644
--- a/components/onguard/examples/exdmod/exdmodu2.lrs
+++ b/components/onguard/examples/exdmod/exdmodu2.lrs
@@ -1,25 +1,46 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TSNEntryDlg','FORMDATA',[
   'TPF0'#11'TSNEntryDlg'#10'SNEntryDlg'#4'Left'#3#150#1#6'Height'#3#195#0#3'Top'
-  +#3'x'#1#5'Width'#3#247#0#13'ActiveControl'#7#6'SNText'#7'Caption'#6#23'Seria'
-  +'l Number w/Modifer'#12'ClientHeight'#3#195#0#11'ClientWidth'#3#247#0#10'Fon'
-  +'t.Color'#7#7'clBlack'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'
-  +#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'
-  +#6#6'0.9.27'#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'@'#5
-  +'Width'#2#16#7'Caption'#6#2'SN'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4
-  +'Left'#2#8#6'Height'#2#14#3'Top'#2'Z'#5'Width'#2#26#7'Caption'#6#4'Code'#11
-  +'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'#2'('#6'Height'#2#14#3'Top'#2
-  +#7#5'Width'#3#160#0#7'Caption'#6'!Call your Vendor NOW to register!'#11'Pare'
-  +'ntColor'#8#0#0#6'TLabel'#6'Label4'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'%'#5
-  +'Width'#2'&'#7'Caption'#6#8'Modifier'#11'ParentColor'#8#0#0#5'TEdit'#6'SNTex'
-  +'t'#4'Left'#2'4'#6'Height'#2#23#3'Top'#2'<'#5'Width'#2'y'#8'TabOrder'#2#1#0#0
-  +#5'TEdit'#8'CodeText'#4'Left'#2'4'#6'Height'#2#23#3'Top'#2'V'#5'Width'#3#175
-  +#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#5'OKBtn'#4'Left'#2#23#6'Height'#2'!'#3'Top'
-  +#2'v'#5'Width'#2'Y'#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8
-  +'TabOrder'#2#3#0#0#7'TBitBtn'#9'CancelBtn'#4'Left'#2''#6'Height'#2'!'#3'Top'
-  +#2'v'#5'Width'#2'Y'#4'Kind'#7#8'bkCancel'#9'NumGlyphs'#2#0#7'OnClick'#7#14'C'
-  +'ancelBtnClick'#8'TabOrder'#2#4#0#0#5'TEdit'#9'ModString'#4'Left'#2'4'#6'Hei'
-  +'ght'#2#23#3'Top'#2'!'#5'Width'#2'y'#8'ReadOnly'#9#7'TabStop'#8#8'TabOrder'#2
-  +#0#0#0#0
+  +#3'x'#1#5'Width'#3#247#0#13'ActiveControl'#7#6'SNText'#8'AutoSize'#9#11'Bord'
+  +'erStyle'#7#8'bsDialog'#7'Caption'#6#23'Serial Number w/Modifer'#12'ClientHe'
+  +'ight'#3#195#0#11'ClientWidth'#3#247#0#10'Font.Color'#7#7'clBlack'#8'OnCreat'
+  +'e'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#7'2.3'
+  +'.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anchor'
+  +'SideTop.Control'#7#6'SNText'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2
+  +#8#6'Height'#2#15#3'Top'#2'B'#5'Width'#2#15#18'BorderSpacing.Left'#2#8#7'Cap'
+  +'tion'#6#2'SN'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'CodeText'#18'AnchorSideTop'
+  +'.Side'#7#9'asrCenter'#4'Left'#2#8#6'Height'#2#15#3'Top'#2'a'#5'Width'#2#28
+  +#18'BorderSpacing.Left'#2#8#7'Caption'#6#4'Code'#11'ParentColor'#8#0#0#6'TLa'
+  +'bel'#6'Label3'#22'AnchorSideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'
+  +#7#9'asrCenter'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2'"'#6'Height'#2
+  +#15#3'Top'#2#8#5'Width'#3#178#0#17'BorderSpacing.Top'#2#8#7'Caption'#6'!Call'
+  +' your Vendor NOW to register!'#11'ParentColor'#8#0#0#6'TLabel'#6'Label4'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'ModString'
+  +#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#8#6'Height'#2#15#3'Top'#2'#'
+  +#5'Width'#2'-'#18'BorderSpacing.Left'#2#8#7'Caption'#6#8'Modifier'#11'Parent'
+  +'Color'#8#0#0#5'TEdit'#6'SNText'#22'AnchorSideLeft.Control'#7#9'ModString'#21
+  +'AnchorSideTop.Control'#7#9'ModString'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#2'='#6'Height'#2#23#3'Top'#2'>'#5'Width'#2'y'#17'BorderSpacing.Top'
+  +#2#8#8'TabOrder'#2#1#0#0#5'TEdit'#8'CodeText'#22'AnchorSideLeft.Control'#7#6
+  +'SNText'#21'AnchorSideTop.Control'#7#6'SNText'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#2'='#6'Height'#2#23#3'Top'#2']'#5'Width'#3#175#0#17'Border'
+  +'Spacing.Top'#2#8#19'BorderSpacing.Right'#2#8#8'TabOrder'#2#2#0#0#7'TBitBtn'
+  +#5'OKBtn'#21'AnchorSideTop.Control'#7#9'CancelBtn'#23'AnchorSideRight.Contro'
+  +'l'#7#6'Bevel1'#4'Left'#2#26#6'Height'#2'!'#3'Top'#3#128#0#5'Width'#2'Y'#7'A'
+  +'nchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Bottom'#2#8#4'Kind'#7#4'b'
+  +'kOK'#11'ModalResult'#2#1#8'TabOrder'#2#3#0#0#7'TBitBtn'#9'CancelBtn'#22'Anc'
+  +'horSideLeft.Control'#7#6'Bevel1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#8'CodeText'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#3#131#0#6'Height'#2'!'#3'Top'#3#128#0#5'Width'#2'Y'#17'BorderSpacing.'
+  +'Top'#2#12#20'BorderSpacing.Bottom'#2#8#4'Kind'#7#8'bkCancel'#7'OnClick'#7#14
+  +'CancelBtnClick'#8'TabOrder'#2#4#0#0#5'TEdit'#9'ModString'#22'AnchorSideLeft'
+  +'.Control'#7#6'Label4'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#6'Label3'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'='#6
+  +'Height'#2#23#3'Top'#2#31#5'Width'#2'y'#18'BorderSpacing.Left'#2#8#17'Border'
+  +'Spacing.Top'#2#8#8'ReadOnly'#9#7'TabStop'#8#8'TabOrder'#2#0#0#0#6'TBevel'#6
+  +'Bevel1'#22'AnchorSideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'a'
+  +'srCenter'#4'Left'#2's'#6'Height'#2'%'#3'Top'#2'}'#5'Width'#2#16#5'Shape'#7#8
+  +'bsSpacer'#0#0#0
 ]);
diff --git a/components/onguard/examples/exdmod/exdmodu2.pas b/components/onguard/examples/exdmod/exdmodu2.pas
index bef1f3d2d..7627d57b0 100644
--- a/components/onguard/examples/exdmod/exdmodu2.pas
+++ b/components/onguard/examples/exdmod/exdmodu2.pas
@@ -4,13 +4,14 @@ interface
 
 uses
   SysUtils,Classes,Controls,
-  Forms, Dialogs, StdCtrls, Buttons,LResources;
+  Forms, Dialogs, StdCtrls, Buttons,LResources, ExtCtrls;
 
 type
 
   { TSNEntryDlg }
 
   TSNEntryDlg = class(TForm)
+    Bevel1: TBevel;
     Label1: TLabel;
     Label2: TLabel;
     SNText: TEdit;
diff --git a/components/onguard/examples/exdtp21/exdtp21.lpi b/components/onguard/examples/exdtp21/exdtp21.lpi
index 281822570..f8744135e 100644
--- a/components/onguard/examples/exdtp21/exdtp21.lpi
+++ b/components/onguard/examples/exdtp21/exdtp21.lpi
@@ -1,28 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -38,11 +44,11 @@
       <Unit0>
         <Filename Value="exdtp21.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="44" Y="9"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <UnitName Value="Exdtp21"/>
+        <CursorPos X="44" Y="11"/>
         <UsageCount Value="837"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exdtp21u.pas"/>
@@ -51,23 +57,24 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exdtp21u"/>
-        <CursorPos X="63" Y="113"/>
-        <TopLine Value="72"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
+        <TopLine Value="87"/>
+        <CursorPos X="52" Y="107"/>
         <UsageCount Value="836"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\..\source\onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="41" Y="1207"/>
-        <TopLine Value="1199"/>
         <EditorIndex Value="2"/>
+        <TopLine Value="1199"/>
+        <CursorPos X="41" Y="1207"/>
         <UsageCount Value="418"/>
         <Loaded Value="True"/>
       </Unit2>
     </Units>
-    <JumpHistory Count="13" HistoryIndex="12">
+    <JumpHistory Count="15" HistoryIndex="14">
       <Position1>
         <Filename Value="exdtp21u.pas"/>
         <Caret Line="83" Column="17" TopLine="69"/>
@@ -102,32 +109,41 @@
       </Position8>
       <Position9>
         <Filename Value="exdtp21.lpr"/>
-        <Caret Line="13" Column="40" TopLine="1"/>
+        <Caret Line="13" Column="40"/>
       </Position9>
       <Position10>
         <Filename Value="exdtp21.lpr"/>
-        <Caret Line="9" Column="44" TopLine="1"/>
+        <Caret Line="9" Column="44"/>
       </Position10>
       <Position11>
         <Filename Value="exdtp21u.pas"/>
-        <Caret Line="75" Column="1" TopLine="75"/>
+        <Caret Line="75" TopLine="75"/>
       </Position11>
       <Position12>
         <Filename Value="exdtp21u.pas"/>
-        <Caret Line="106" Column="1" TopLine="91"/>
+        <Caret Line="106" TopLine="91"/>
       </Position12>
       <Position13>
         <Filename Value="..\..\source\onguard.pas"/>
         <Caret Line="1344" Column="8" TopLine="1323"/>
       </Position13>
+      <Position14>
+        <Filename Value="exdtp21u.pas"/>
+        <Caret Line="98" Column="49" TopLine="73"/>
+      </Position14>
+      <Position15>
+        <Filename Value="exdtp21u.pas"/>
+        <Caret Line="97" Column="49" TopLine="72"/>
+      </Position15>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -139,54 +155,67 @@
       </Checks>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
-    <BreakPoints Count="9">
+    <BreakPoints Count="7">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="135"/>
       </Item1>
       <Item2>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="143"/>
       </Item2>
       <Item3>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="159"/>
       </Item3>
       <Item4>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="186"/>
       </Item4>
       <Item5>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="212"/>
       </Item5>
       <Item6>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="235"/>
       </Item6>
       <Item7>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\qonguard3.pas"/>
         <Line Value="130"/>
       </Item7>
-      <Item8>
-        <Source Value="exdtp21u.pas"/>
-        <Line Value="75"/>
-      </Item8>
-      <Item9>
-        <Source Value="exdtp21u.pas"/>
-        <Line Value="106"/>
-      </Item9>
     </BreakPoints>
     <Exceptions Count="2">
       <Item1>
diff --git a/components/onguard/examples/exdtp21/exdtp21.lpr b/components/onguard/examples/exdtp21/exdtp21.lpr
index 85c0d5cf3..5b5213508 100644
--- a/components/onguard/examples/exdtp21/exdtp21.lpr
+++ b/components/onguard/examples/exdtp21/exdtp21.lpr
@@ -6,7 +6,10 @@ uses
   Forms,
   Exdtp21u in 'exdtp21u.pas' {Form1}, tponguard;
 
+{$R *.res}
+
 begin
+  Application.Title:='';
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/components/onguard/examples/exdtp21/exdtp21u.lfm b/components/onguard/examples/exdtp21/exdtp21u.lfm
index 2d94c119c..8e042d6a6 100644
--- a/components/onguard/examples/exdtp21/exdtp21u.lfm
+++ b/components/onguard/examples/exdtp21/exdtp21u.lfm
@@ -3,53 +3,59 @@ object Form1: TForm1
   Height = 155
   Top = 279
   Width = 228
-  ActiveControl = Memo1
+  AutoSize = True
   Caption = 'Form1'
   ClientHeight = 155
   ClientWidth = 228
-  Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   OnActivate = FormActivate
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 50
-    Height = 14
-    Top = 70
-    Width = 99
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 64
+    Height = 15
+    Top = 54
+    Width = 101
     Caption = 'Expires: 00/00/0000'
     ParentColor = False
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 59
-    Top = 8
-    Width = 197
-    Lines.Strings = (
-      'If you can edit this, your program '
-      'was '
-      'allowed to run'
-    )
-    OnDblClick = Memo1DblClick
-    ScrollBars = ssVertical
+  object CloseBtn: TBitBtn
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 70
+    Height = 33
+    Top = 81
+    Width = 89
+    BorderSpacing.Around = 12
+    Kind = bkClose
     TabOrder = 0
   end
-  object CloseBtn: TBitBtn
-    Left = 56
-    Height = 33
-    Top = 89
-    Width = 89
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 1
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 30
+    Top = 12
+    Width = 204
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'If you can edit this, your program was allowed to run'
+    WordWrap = True
+    OnDblClick = Memo1DblClick
   end
   object OgDateCode1: TOgDateCode
     OnChecked = OgDateCode1Checked
     OnGetKey = OgDateCode1GetKey
     OnGetCode = OgDateCode1GetCode
     StoreCode = True
-    left = 158
-    top = 87
+    Left = 176
+    Top = 64
   end
 end
diff --git a/components/onguard/examples/exdtp21/exdtp21u.lrs b/components/onguard/examples/exdtp21/exdtp21u.lrs
index cc316a525..26fe90245 100644
--- a/components/onguard/examples/exdtp21/exdtp21u.lrs
+++ b/components/onguard/examples/exdtp21/exdtp21u.lrs
@@ -1,19 +1,24 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'b'#1#6'Height'#3#155#0#3'Top'#3#23#1#5'Wi'
-  +'dth'#3#228#0#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#5'Form1'#12'ClientHe'
-  +'ight'#3#155#0#11'ClientWidth'#3#228#0#10'Font.Color'#7#7'clBlack'#11'Font.H'
-  +'eight'#2#245#9'Font.Name'#6#13'MS Sans Serif'#10'OnActivate'#7#12'FormActiv'
-  +'ate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'
-  +#6'Label1'#4'Left'#2'2'#6'Height'#2#14#3'Top'#2'F'#5'Width'#2'c'#7'Caption'#6
-  +#19'Expires: 00/00/0000'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8
-  +#6'Height'#2';'#3'Top'#2#8#5'Width'#3#197#0#13'Lines.Strings'#1#6'#If you ca'
-  +'n edit this, your program '#6#4'was '#6#14'allowed to run'#0#10'OnDblClick'
-  +#7#13'Memo1DblClick'#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7'T'
-  +'BitBtn'#8'CloseBtn'#4'Left'#2'8'#6'Height'#2'!'#3'Top'#2'Y'#5'Width'#2'Y'#4
-  +'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#11'TOgDateCode'#11
-  +'OgDateCode1'#9'OnChecked'#7#18'OgDateCode1Checked'#8'OnGetKey'#7#17'OgDateC'
-  +'ode1GetKey'#9'OnGetCode'#7#18'OgDateCode1GetCode'#9'StoreCode'#9#4'left'#3
-  +#158#0#3'top'#2'W'#0#0#0
+  +'dth'#3#228#0#8'AutoSize'#9#7'Caption'#6#5'Form1'#12'ClientHeight'#3#155#0#11
+  +'ClientWidth'#3#228#0#10'OnActivate'#7#12'FormActivate'#8'Position'#7#14'poS'
+  +'creenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSid'
+  +'eLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorS'
+  +'ideTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +'@'#6'Height'#2#15#3'Top'#2'6'#5'Width'#2'e'#7'Caption'#6#19'Expires: 00/00/'
+  +'0000'#11'ParentColor'#8#0#0#7'TBitBtn'#8'CloseBtn'#22'AnchorSideLeft.Contro'
+  +'l'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Contr'
+  +'ol'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'
+  +#2'!'#3'Top'#2'Q'#5'Width'#2'Y'#20'BorderSpacing.Around'#2#12#4'Kind'#7#7'bk'
+  +'Close'#8'TabOrder'#2#0#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Control'#7#5
+  +'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5
+  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#30#3
+  +'Top'#2#12#5'Width'#3#204#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
+  +'BorderSpacing.Around'#2#12#7'Caption'#6'5If you can edit this, your program'
+  +' was allowed to run'#8'WordWrap'#9#10'OnDblClick'#7#13'Memo1DblClick'#0#0#11
+  +'TOgDateCode'#11'OgDateCode1'#9'OnChecked'#7#18'OgDateCode1Checked'#8'OnGetK'
+  +'ey'#7#17'OgDateCode1GetKey'#9'OnGetCode'#7#18'OgDateCode1GetCode'#9'StoreCo'
+  +'de'#9#4'Left'#3#176#0#3'Top'#2'@'#0#0#0
 ]);
diff --git a/components/onguard/examples/exdtp21/exdtp21u.pas b/components/onguard/examples/exdtp21/exdtp21u.pas
index 450a656d6..99319eb4c 100644
--- a/components/onguard/examples/exdtp21/exdtp21u.pas
+++ b/components/onguard/examples/exdtp21/exdtp21u.pas
@@ -22,8 +22,8 @@ type
   { TForm1 }
 
   TForm1 = class(TForm)
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     OgDateCode1: TOgDateCode;
     Label1: TLabel;
     procedure FormActivate(Sender: TObject);
@@ -104,11 +104,10 @@ var
   S  : string;
 begin
   FExpired := false;
-  ShortDateFormat := 'yyy-mm-dd';
+  // Status := ogValidCode;  // -- just for testing the form
   case Status of
     ogValidCode   : begin
-                      Label1.Caption := 'Expires: '
-                                      + DateToStr(OgDateCode1.GetValue);
+                      Label1.Caption := 'Expires: ' + DateToStr(OgDateCode1.GetValue);
                       Exit;
                     end;
 
diff --git a/components/onguard/examples/exdtreg/exdtreg.lpi b/components/onguard/examples/exdtreg/exdtreg.lpi
index e3d6cd855..b3d2885d3 100644
--- a/components/onguard/examples/exdtreg/exdtreg.lpi
+++ b/components/onguard/examples/exdtreg/exdtreg.lpi
@@ -1,46 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="4">
       <Unit0>
         <Filename Value="exdtreg.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="ExDTReg"/>
         <CursorPos X="10" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
-        <SyntaxHighlighter Value="Delphi"/>
+        <LoadedDesigner Value="True"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit0>
       <Unit1>
         <Filename Value="exdtregu.pas"/>
@@ -49,163 +60,162 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ExDTRegU"/>
-        <CursorPos X="56" Y="98"/>
-        <TopLine Value="89"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
+        <TopLine Value="27"/>
+        <CursorPos Y="44"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
-        <SyntaxHighlighter Value="Delphi"/>
+        <LoadedDesigner Value="True"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\..\source\qonguard3.pas"/>
         <ComponentName Value="KeyMaintFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard3"/>
-        <CursorPos X="1" Y="280"/>
         <TopLine Value="252"/>
+        <CursorPos Y="280"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\source\onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="43" Y="1866"/>
-        <TopLine Value="1843"/>
         <EditorIndex Value="2"/>
+        <TopLine Value="1843"/>
+        <CursorPos X="43" Y="1866"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit3>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1320" Column="1" TopLine="1305"/>
+        <Filename Value="exdtregu.pas"/>
+        <Caret Line="73" TopLine="58"/>
       </Position1>
       <Position2>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1322" Column="1" TopLine="1307"/>
+        <Filename Value="exdtregu.pas"/>
+        <Caret Line="75" TopLine="60"/>
       </Position2>
       <Position3>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1323" Column="1" TopLine="1308"/>
+        <Filename Value="exdtregu.pas"/>
+        <Caret Line="77" TopLine="62"/>
       </Position3>
       <Position4>
         <Filename Value="exdtregu.pas"/>
-        <Caret Line="72" Column="1" TopLine="57"/>
+        <Caret Line="79" TopLine="64"/>
       </Position4>
       <Position5>
         <Filename Value="exdtregu.pas"/>
-        <Caret Line="73" Column="1" TopLine="58"/>
+        <Caret Line="81" TopLine="66"/>
       </Position5>
       <Position6>
         <Filename Value="exdtregu.pas"/>
-        <Caret Line="75" Column="1" TopLine="60"/>
+        <Caret Line="83" TopLine="68"/>
       </Position6>
       <Position7>
-        <Filename Value="exdtregu.pas"/>
-        <Caret Line="77" Column="1" TopLine="62"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1217" TopLine="1202"/>
       </Position7>
       <Position8>
-        <Filename Value="exdtregu.pas"/>
-        <Caret Line="79" Column="1" TopLine="64"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1218" TopLine="1203"/>
       </Position8>
       <Position9>
-        <Filename Value="exdtregu.pas"/>
-        <Caret Line="81" Column="1" TopLine="66"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1324" TopLine="1309"/>
       </Position9>
       <Position10>
-        <Filename Value="exdtregu.pas"/>
-        <Caret Line="83" Column="1" TopLine="68"/>
+        <Filename Value="..\..\source\onguard.pas"/>
+        <Caret Line="1326" TopLine="1311"/>
       </Position10>
       <Position11>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1217" Column="1" TopLine="1202"/>
+        <Caret Line="1327" TopLine="1312"/>
       </Position11>
       <Position12>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1218" Column="1" TopLine="1203"/>
+        <Caret Line="1331" TopLine="1316"/>
       </Position12>
       <Position13>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1324" Column="1" TopLine="1309"/>
+        <Caret Line="1864" Column="40" TopLine="1841"/>
       </Position13>
       <Position14>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1326" Column="1" TopLine="1311"/>
+        <Caret Line="1320" TopLine="1305"/>
       </Position14>
       <Position15>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1327" Column="1" TopLine="1312"/>
+        <Caret Line="1322" TopLine="1307"/>
       </Position15>
       <Position16>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1331" Column="1" TopLine="1316"/>
+        <Caret Line="1323" TopLine="1308"/>
       </Position16>
       <Position17>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1864" Column="40" TopLine="1841"/>
+        <Caret Line="1324" TopLine="1309"/>
       </Position17>
       <Position18>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1320" Column="1" TopLine="1305"/>
+        <Caret Line="1326" TopLine="1311"/>
       </Position18>
       <Position19>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1322" Column="1" TopLine="1307"/>
+        <Caret Line="1327" TopLine="1312"/>
       </Position19>
       <Position20>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1323" Column="1" TopLine="1308"/>
+        <Caret Line="1932" TopLine="1917"/>
       </Position20>
       <Position21>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1324" Column="1" TopLine="1309"/>
+        <Caret Line="1933" TopLine="1918"/>
       </Position21>
       <Position22>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1326" Column="1" TopLine="1311"/>
+        <Caret Line="1934" TopLine="1919"/>
       </Position22>
       <Position23>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1327" Column="1" TopLine="1312"/>
+        <Caret Line="1936" TopLine="1921"/>
       </Position23>
       <Position24>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1932" Column="1" TopLine="1917"/>
+        <Caret Line="1331" TopLine="1316"/>
       </Position24>
       <Position25>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1933" Column="1" TopLine="1918"/>
+        <Caret Line="1856" TopLine="1841"/>
       </Position25>
       <Position26>
         <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1934" Column="1" TopLine="1919"/>
+        <Caret Line="1857" TopLine="1842"/>
       </Position26>
       <Position27>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1936" Column="1" TopLine="1921"/>
+        <Filename Value="exdtregu.pas"/>
+        <Caret Line="114" Column="59" TopLine="88"/>
       </Position27>
       <Position28>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1331" Column="1" TopLine="1316"/>
+        <Filename Value="exdtregu.pas"/>
+        <Caret Line="43" TopLine="26"/>
       </Position28>
       <Position29>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1856" Column="1" TopLine="1841"/>
+        <Filename Value="exdtregu.pas"/>
+        <Caret Line="42" TopLine="25"/>
       </Position29>
       <Position30>
-        <Filename Value="..\..\source\onguard.pas"/>
-        <Caret Line="1857" Column="1" TopLine="1842"/>
+        <Filename Value="exdtregu.pas"/>
+        <Caret Line="43" TopLine="26"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Parsing>
       <SyntaxOptions>
         <SyntaxMode Value="Delphi"/>
         <IncludeAssertionCode Value="True"/>
-        <UseAnsiStrings Value="True"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -217,26 +227,25 @@
       </Checks>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
-    <BreakPoints Count="2">
+    <BreakPoints Count="1">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\source\onguard.pas"/>
         <Line Value="1320"/>
       </Item1>
-      <Item2>
-        <Source Value="exdtregu.pas"/>
-        <Line Value="44"/>
-      </Item2>
     </BreakPoints>
     <Exceptions Count="2">
       <Item1>
diff --git a/components/onguard/examples/exdtreg/exdtreg.lpr b/components/onguard/examples/exdtreg/exdtreg.lpr
index 4706c8170..d206c7cd1 100644
--- a/components/onguard/examples/exdtreg/exdtreg.lpr
+++ b/components/onguard/examples/exdtreg/exdtreg.lpr
@@ -7,6 +7,8 @@ uses
   exdtregu in 'exdtregu.pas' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exdtreg/exdtregu.lfm b/components/onguard/examples/exdtreg/exdtregu.lfm
index 58a31be75..55f1f7fe7 100644
--- a/components/onguard/examples/exdtreg/exdtregu.lfm
+++ b/components/onguard/examples/exdtreg/exdtregu.lfm
@@ -5,94 +5,129 @@ object Form1: TForm1
   Width = 484
   HorzScrollBar.Page = 483
   VertScrollBar.Page = 308
+  AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Date Code Example'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 309
+  ClientWidth = 484
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
-    Left = 8
-    Height = 13
-    Top = 262
-    Width = 35
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 12
+    Height = 15
+    Top = 249
+    Width = 32
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object Label1: TLabel
-    Left = 240
-    Height = 13
-    Top = 14
-    Width = 77
+    AnchorSideLeft.Control = CodeBtn
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 181
+    Height = 15
+    Top = 17
+    Width = 72
+    BorderSpacing.Left = 80
     Caption = 'Current code:'
     Color = clNone
     ParentColor = False
   end
   object CodeLbl: TLabel
-    Left = 328
-    Height = 13
-    Top = 14
-    Width = 113
+    AnchorSideLeft.Control = Label1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 265
+    Height = 15
+    Top = 17
+    Width = 96
+    BorderSpacing.Left = 12
     Caption = '0000000000000000'
     Color = clNone
     ParentColor = False
   end
   object CodeBtn: TButton
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
     Height = 25
-    Top = 8
+    Top = 12
     Width = 89
+    BorderSpacing.Around = 12
     BorderSpacing.InnerBorder = 4
     Caption = 'Enter Code'
     OnClick = CodeBtnClick
     TabOrder = 0
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 209
-    Top = 40
-    Width = 465
-    Color = clBtnFace
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the code. An invalid code indicates that '
-      'the code is either the incorrect type or that none has been entered. '
-      ''
-      'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will '
-      'say that the code is invalid.'
-      ''
-      'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate '
-      'the proper "Date" code). '
-      ''
-      'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so '
-      'will cause the TOgDateCode component to report that the code is invalid.'
-    )
-    ReadOnly = True
-    TabOrder = 1
-  end
   object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Bevel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 400
     Height = 25
-    Top = 256
+    Top = 244
     Width = 75
+    Anchors = [akTop]
+    BorderSpacing.Top = 12
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
     Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 2
+    TabOrder = 1
   end
   object RemoveBtn: TButton
-    Left = 288
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideRight.Control = CloseBtn
+    Left = 299
     Height = 25
-    Top = 256
+    Top = 244
     Width = 97
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 4
     BorderSpacing.InnerBorder = 4
     Caption = 'Remove Code'
     OnClick = RemoveBtnClick
-    TabOrder = 3
+    TabOrder = 2
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 165
+    Top = 49
+    Width = 460
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'The label at the bottom of this form indicates the status of the code. An invalid code indicates that the code is either the incorrect type or that none has been entered. '#13#10#13#10'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate the proper "Date" code). '#13#10#13#10'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so will cause the TOgDateCode component to report that the code is invalid.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
+  end
+  object Bevel1: TBevel
+    AnchorSideLeft.Control = Memo1
+    AnchorSideRight.Control = Memo1
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 3
+    Top = 229
+    Width = 460
+    Anchors = [akTop, akLeft, akRight]
+    Shape = bsTopLine
   end
   object OgDateCode1: TOgDateCode
     OnChecked = CodeChecked
     OnGetKey = GetKey
     OnGetCode = GetCode
-    left = 16
-    top = 216
+    Left = 168
+    Top = 192
   end
 end
diff --git a/components/onguard/examples/exdtreg/exdtregu.lrs b/components/onguard/examples/exdtreg/exdtregu.lrs
index 63de9cc8f..f78d7ed8a 100644
--- a/components/onguard/examples/exdtreg/exdtregu.lrs
+++ b/components/onguard/examples/exdtreg/exdtregu.lrs
@@ -1,34 +1,54 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#252#0#6'Height'#3'5'#1#3'Top'#3#138#0#5'W'
-  +'idth'#3#228#1#18'HorzScrollBar.Page'#3#227#1#18'VertScrollBar.Page'#3'4'#1
-  +#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#17'Date Code Example'#11'Font.He'
-  +'ight'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'Position'#7#14'poScreenCente'
-  +'r'#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Height'#2#13#3'Top'#3#6#1#5'Width'
-  +#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TL'
-  +'abel'#6'Label1'#4'Left'#3#240#0#6'Height'#2#13#3'Top'#2#14#5'Width'#2'M'#7
-  +'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'T'
-  +'Label'#7'CodeLbl'#4'Left'#3'H'#1#6'Height'#2#13#3'Top'#2#14#5'Width'#2'q'#7
-  +'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7
-  +'TButton'#7'CodeBtn'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'Y'#25
-  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12
-  +'CodeBtnClick'#8'TabOrder'#2#0#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'Height'#3
-  +#209#0#3'Top'#2'('#5'Width'#3#209#1#5'Color'#7#9'clBtnFace'#13'Lines.Strings'
-  +#1#6'fThe label at the bottom of this form indicates the status of the code.'
-  +' An invalid code indicates that '#6'Ethe code is either the incorrect type '
-  +'or that none has been entered. '#6#0#6'^If the proper code has not been ent'
-  +'ered or the ONGUARD.INI file was deleted, the message will '#6#29'say that '
-  +'the code is invalid.'#6#0#6'YUse the "Enter Code" button to enter a code (t'
-  +'he CODEGEN program can be used to generate '#6#25'the proper "Date" code). '
-  +#6#0#6'\The "Remove Code" button can be used to remove the entered code from'
-  +' the INI file. Doing so '#6'Hwill cause the TOgDateCode component to report'
-  +' that the code is invalid.'#0#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#7'TBitBtn'#8
-  +'CloseBtn'#4'Left'#3#144#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'K'#4'Kind'
-  +#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TButton'#9'RemoveBtn'#4
-  +'Left'#3' '#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'a'#25'BorderSpacing.Inn'
-  +'erBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7#14'RemoveBtnClick'#8
-  +'TabOrder'#2#3#0#0#11'TOgDateCode'#11'OgDateCode1'#9'OnChecked'#7#11'CodeChe'
-  +'cked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCode'#4'left'#2#16#3'top'
-  +#3#216#0#0#0#0
+  +'idth'#3#228#1#18'HorzScrollBar.Page'#3#227#1#18'VertScrollBar.Page'#3'4'#1#8
+  +'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#17'Date Code Example'
+  +#12'ClientHeight'#3'5'#1#11'ClientWidth'#3#228#1#8'Position'#7#14'poScreenCe'
+  +'nter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#9'StatusLbl'#22'AnchorSideLef'
+  +'t.Control'#7#5'Memo1'#21'AnchorSideTop.Control'#7#8'CloseBtn'#18'AnchorSide'
+  +'Top.Side'#7#9'asrCenter'#4'Left'#2#12#6'Height'#2#15#3'Top'#3#249#0#5'Width'
+  +#2' '#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TL'
+  +'abel'#6'Label1'#22'AnchorSideLeft.Control'#7#7'CodeBtn'#19'AnchorSideLeft.S'
+  +'ide'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop'
+  +'.Side'#7#9'asrCenter'#4'Left'#3#181#0#6'Height'#2#15#3'Top'#2#17#5'Width'#2
+  +'H'#18'BorderSpacing.Left'#2'P'#7'Caption'#6#13'Current code:'#5'Color'#7#6
+  +'clNone'#11'ParentColor'#8#0#0#6'TLabel'#7'CodeLbl'#22'AnchorSideLeft.Contro'
+  +'l'#7#6'Label1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont'
+  +'rol'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#9#1#6'Hei'
+  +'ght'#2#15#3'Top'#2#17#5'Width'#2'`'#18'BorderSpacing.Left'#2#12#7'Caption'#6
+  +#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TButton'#7
+  +'CodeBtn'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5
+  +'Owner'#4'Left'#2#12#6'Height'#2#25#3'Top'#2#12#5'Width'#2'Y'#20'BorderSpaci'
+  +'ng.Around'#2#12#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Cod'
+  +'e'#7'OnClick'#7#12'CodeBtnClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'
+  +#21'AnchorSideTop.Control'#7#6'Bevel1'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#3#144#1#6'Height'#2#25#3'Top'#3#244#0#5'Width'#2'K'#7'Anchors'
+  +#11#5'akTop'#0#17'BorderSpacing.Top'#2#12#19'BorderSpacing.Right'#2#12#20'Bo'
+  +'rderSpacing.Bottom'#2#12#4'Kind'#7#7'bkClose'#8'TabOrder'#2#1#0#0#7'TButton'
+  +#9'RemoveBtn'#21'AnchorSideTop.Control'#7#8'CloseBtn'#23'AnchorSideRight.Con'
+  +'trol'#7#8'CloseBtn'#4'Left'#3'+'#1#6'Height'#2#25#3'Top'#3#244#0#5'Width'#2
+  +'a'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#4#25'Borde'
+  +'rSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7#14'Remo'
+  +'veBtnClick'#8'TabOrder'#2#2#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Contro'
+  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#12#6'Height'#3#165#0#3'Top'#2'1'#5'Width'#3#204
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2
+  +#12#7'Caption'#12'H'#2#0#0'The label at the bottom of this form indicates th'
+  +'e status of the code. An invalid code indicates that the code is either the'
+  +' incorrect type or that none has been entered. '#13#10#13#10'If the proper '
+  +'code has not been entered or the ONGUARD.INI file was deleted, the message '
+  +'will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button'
+  +' to enter a code (the CODEGEN program can be used to generate the proper "D'
+  +'ate" code). '#13#10#13#10'The "Remove Code" button can be used to remove th'
+  +'e entered code from the INI file. Doing so will cause the TOgDateCode compo'
+  +'nent to report that the code is invalid.'#5'Color'#7#9'clBtnFace'#11'Parent'
+  +'Color'#8#8'WordWrap'#9#0#0#6'TBevel'#6'Bevel1'#22'AnchorSideLeft.Control'#7
+  +#5'Memo1'#23'AnchorSideRight.Control'#7#5'Memo1'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#12#6'Height'#2#3#3'Top'#3#229#0#5'Width'#3#204#1#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#5'Shape'#7#9'bsTopLine'#0#0#11'TOg'
+  +'DateCode'#11'OgDateCode1'#9'OnChecked'#7#11'CodeChecked'#8'OnGetKey'#7#6'Ge'
+  +'tKey'#9'OnGetCode'#7#7'GetCode'#4'Left'#3#168#0#3'Top'#3#192#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exdtreg/exdtregu.pas b/components/onguard/examples/exdtreg/exdtregu.pas
index 9456a8911..a91b44dc6 100644
--- a/components/onguard/examples/exdtreg/exdtregu.pas
+++ b/components/onguard/examples/exdtreg/exdtregu.pas
@@ -4,16 +4,17 @@ interface
 
 uses
   SysUtils, Classes,Controls, Forms, Dialogs,
-  StdCtrls, Buttons,LResources, OnGuard, IniFiles, OgUtil;
+  StdCtrls, Buttons,LResources, ExtCtrls, OnGuard, IniFiles, OgUtil;
 
 type
 
   { TForm1 }
 
   TForm1 = class(TForm)
+    Bevel1: TBevel;
+    Memo1: TLabel;
     OgDateCode1: TOgDateCode;
     CodeBtn: TButton;
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
     StatusLbl: TLabel;
     Label1: TLabel;
@@ -36,12 +37,10 @@ var
 implementation
 
 
-
 procedure TForm1.CodeChecked(Sender: TObject; Status: TCodeStatus);
 var
   S : string;
 begin
-  ShortDateFormat := 'yyyy-mm-dd';
   case Status of
     ogValidCode    : S := 'Valid Code - Ending date: ' + DateToStr(OgDateCode1.GetValue);
     ogInvalidCode  : S := 'Invalid release code';
diff --git a/components/onguard/examples/exdyreg/ONGUARD.INI b/components/onguard/examples/exdyreg/ONGUARD.INI
index e69de29bb..3d7f51f14 100644
--- a/components/onguard/examples/exdyreg/ONGUARD.INI
+++ b/components/onguard/examples/exdyreg/ONGUARD.INI
@@ -0,0 +1,2 @@
+[Codes]
+DaysCode=089B057D209A4B82B526
diff --git a/components/onguard/examples/exdyreg/exdyreg.lpi b/components/onguard/examples/exdyreg/exdyreg.lpi
index c45584e3e..cdeb6369b 100644
--- a/components/onguard/examples/exdyreg/exdyreg.lpi
+++ b/components/onguard/examples/exdyreg/exdyreg.lpi
@@ -1,120 +1,128 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <Scaled Value="True"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="8">
       <Unit0>
         <Filename Value="exdyreg.lpr"/>
         <IsPartOfProject Value="True"/>
         <CursorPos X="48" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="22"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exdyregu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ExDYRegU"/>
-        <CursorPos X="3" Y="46"/>
-        <TopLine Value="42"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="11"/>
+        <TopLine Value="43"/>
+        <CursorPos X="47" Y="55"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../source/qonguard3.pas"/>
         <ComponentName Value="KeyMaintFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard3"/>
-        <CursorPos X="1" Y="132"/>
         <TopLine Value="132"/>
+        <CursorPos Y="132"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../source/qonguard2.pas"/>
         <ComponentName Value="CodeGenerateFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard2"/>
-        <CursorPos X="4" Y="351"/>
         <TopLine Value="348"/>
+        <CursorPos X="4" Y="351"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../../../fpcfix/fpc/rtl/objpas/sysutils/datih.inc"/>
-        <CursorPos X="11" Y="101"/>
         <TopLine Value="84"/>
+        <CursorPos X="11" Y="101"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../../../fpcfix/fpc/rtl/objpas/sysutils/dati.inc"/>
-        <CursorPos X="3" Y="123"/>
         <TopLine Value="120"/>
+        <CursorPos X="3" Y="123"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="24" Y="1865"/>
         <TopLine Value="1846"/>
+        <CursorPos X="24" Y="1865"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../source/ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="29" Y="506"/>
         <TopLine Value="472"/>
+        <CursorPos X="29" Y="506"/>
         <UsageCount Value="10"/>
       </Unit7>
     </Units>
-    <JumpHistory Count="8" HistoryIndex="7">
+    <JumpHistory Count="11" HistoryIndex="10">
       <Position1>
         <Filename Value="exdyregu.pas"/>
-        <Caret Line="12" Column="24" TopLine="1"/>
+        <Caret Line="12" Column="24"/>
       </Position1>
       <Position2>
         <Filename Value="exdyregu.pas"/>
-        <Caret Line="92" Column="1" TopLine="77"/>
+        <Caret Line="92" TopLine="77"/>
       </Position2>
       <Position3>
         <Filename Value="exdyregu.pas"/>
-        <Caret Line="94" Column="1" TopLine="79"/>
+        <Caret Line="94" TopLine="79"/>
       </Position3>
       <Position4>
         <Filename Value="exdyregu.pas"/>
-        <Caret Line="95" Column="1" TopLine="80"/>
+        <Caret Line="95" TopLine="80"/>
       </Position4>
       <Position5>
         <Filename Value="exdyregu.pas"/>
-        <Caret Line="96" Column="1" TopLine="81"/>
+        <Caret Line="96" TopLine="81"/>
       </Position5>
       <Position6>
         <Filename Value="exdyregu.pas"/>
@@ -128,13 +136,26 @@
         <Filename Value="exdyregu.pas"/>
         <Caret Line="132" Column="3" TopLine="54"/>
       </Position8>
+      <Position9>
+        <Filename Value="exdyregu.pas"/>
+        <Caret Line="54" Column="47" TopLine="42"/>
+      </Position9>
+      <Position10>
+        <Filename Value="exdyregu.pas"/>
+        <Caret Line="53" Column="47" TopLine="41"/>
+      </Position10>
+      <Position11>
+        <Filename Value="exdyregu.pas"/>
+        <Caret Line="54" Column="47" TopLine="42"/>
+      </Position11>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -146,23 +167,29 @@
       </Checks>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <BreakPoints Count="2">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="exdyregu.pas"/>
-        <Line Value="92"/>
+        <Line Value="93"/>
       </Item1>
       <Item2>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="../../source/ogutil.pas"/>
         <Line Value="505"/>
       </Item2>
diff --git a/components/onguard/examples/exdyreg/exdyreg.lpr b/components/onguard/examples/exdyreg/exdyreg.lpr
index 819f50b87..14ad40e2e 100644
--- a/components/onguard/examples/exdyreg/exdyreg.lpr
+++ b/components/onguard/examples/exdyreg/exdyreg.lpr
@@ -7,7 +7,11 @@ uses
   ExDYRegU in 'ExDYRegU.pas' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
+  Application.Scaled:=True;
+  Application.Title:='';
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/components/onguard/examples/exdyreg/exdyregu.lfm b/components/onguard/examples/exdyreg/exdyregu.lfm
index f582abab6..a9e3597dd 100644
--- a/components/onguard/examples/exdyreg/exdyregu.lfm
+++ b/components/onguard/examples/exdyreg/exdyregu.lfm
@@ -5,95 +5,132 @@ object Form1: TForm1
   Width = 493
   HorzScrollBar.Page = 492
   VertScrollBar.Page = 302
+  AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Days Code Example'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 303
+  ClientWidth = 493
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
-    Left = 8
-    Height = 13
-    Top = 262
-    Width = 35
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 12
+    Height = 15
+    Top = 246
+    Width = 32
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object Label1: TLabel
-    Left = 232
-    Height = 13
-    Top = 14
-    Width = 77
+    AnchorSideLeft.Control = CodeBtn
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 181
+    Height = 15
+    Top = 17
+    Width = 72
+    BorderSpacing.Left = 80
     Caption = 'Current code:'
     Color = clNone
     ParentColor = False
   end
   object CodeLbl: TLabel
-    Left = 320
-    Height = 13
-    Top = 14
-    Width = 113
+    AnchorSideLeft.Control = Label1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 265
+    Height = 15
+    Top = 17
+    Width = 96
+    BorderSpacing.Left = 12
     Caption = '0000000000000000'
     Color = clNone
     ParentColor = False
   end
   object CodeBtn: TButton
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
     Height = 25
-    Top = 8
+    Top = 12
     Width = 89
+    BorderSpacing.Around = 12
     BorderSpacing.InnerBorder = 4
     Caption = 'Enter Code'
     OnClick = CodeBtnClick
     TabOrder = 0
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 209
-    Top = 40
-    Width = 465
-    Color = clBtnFace
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the code. An invalid code indicates that '
-      'the code is either the incorrect type or that none has been entered. '
-      ''
-      'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will '
-      'say that the code is invalid.'
-      ''
-      'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate '
-      'the proper "Days" code). '
-      ''
-      'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so '
-      'will cause the TOgDaysCode component to report that the code is invalid.'
-    )
-    ReadOnly = True
-    TabOrder = 1
-  end
   object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Bevel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 400
     Height = 25
-    Top = 256
-    Width = 75
+    Top = 241
+    Width = 81
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 12
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
     Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 2
+    TabOrder = 1
   end
   object RemoveBtn: TButton
-    Left = 288
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideRight.Control = CloseBtn
+    Left = 299
     Height = 25
-    Top = 256
+    Top = 241
     Width = 97
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 4
     BorderSpacing.InnerBorder = 4
     Caption = 'Remove Code'
     OnClick = RemoveBtnClick
-    TabOrder = 3
+    TabOrder = 2
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 165
+    Top = 49
+    Width = 469
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'The label at the bottom of this form indicates the status of the code. An invalid code indicates that the code is either the incorrect type or that none has been entered. '#13#10#13#10'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate the proper "Days" code). '#13#10#13#10'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so will cause the TOgDaysCode component to report that the code is invalid.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
+  end
+  object Bevel1: TBevel
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Memo1
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 3
+    Top = 226
+    Width = 469
+    Anchors = [akTop, akLeft, akRight]
+    Shape = bsTopLine
   end
   object OgDaysCode1: TOgDaysCode
     OnChecked = CodeChecked
     OnGetKey = GetKey
     OnGetCode = GetCode
     OnChangeCode = ChangeCode
-    left = 16
-    top = 208
+    Left = 192
+    Top = 200
   end
 end
diff --git a/components/onguard/examples/exdyreg/exdyregu.lrs b/components/onguard/examples/exdyreg/exdyregu.lrs
index c22b2e718..d2822e234 100644
--- a/components/onguard/examples/exdyreg/exdyregu.lrs
+++ b/components/onguard/examples/exdyreg/exdyregu.lrs
@@ -1,34 +1,56 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#252#0#6'Height'#3'/'#1#3'Top'#3#138#0#5'W'
-  +'idth'#3#237#1#18'HorzScrollBar.Page'#3#236#1#18'VertScrollBar.Page'#3'.'#1
-  +#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#17'Days Code Example'#11'Font.He'
-  +'ight'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'Position'#7#14'poScreenCente'
-  +'r'#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Height'#2#13#3'Top'#3#6#1#5'Width'
-  +#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TL'
-  +'abel'#6'Label1'#4'Left'#3#232#0#6'Height'#2#13#3'Top'#2#14#5'Width'#2'M'#7
-  +'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'T'
-  +'Label'#7'CodeLbl'#4'Left'#3'@'#1#6'Height'#2#13#3'Top'#2#14#5'Width'#2'q'#7
-  +'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7
-  +'TButton'#7'CodeBtn'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'Y'#25
-  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12
-  +'CodeBtnClick'#8'TabOrder'#2#0#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'Height'#3
-  +#209#0#3'Top'#2'('#5'Width'#3#209#1#5'Color'#7#9'clBtnFace'#13'Lines.Strings'
-  +#1#6'fThe label at the bottom of this form indicates the status of the code.'
-  +' An invalid code indicates that '#6'Ethe code is either the incorrect type '
-  +'or that none has been entered. '#6#0#6'^If the proper code has not been ent'
-  +'ered or the ONGUARD.INI file was deleted, the message will '#6#29'say that '
-  +'the code is invalid.'#6#0#6'YUse the "Enter Code" button to enter a code (t'
-  +'he CODEGEN program can be used to generate '#6#25'the proper "Days" code). '
-  +#6#0#6'\The "Remove Code" button can be used to remove the entered code from'
-  +' the INI file. Doing so '#6'Hwill cause the TOgDaysCode component to report'
-  +' that the code is invalid.'#0#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#7'TBitBtn'#8
-  +'CloseBtn'#4'Left'#3#144#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'K'#4'Kind'
-  +#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TButton'#9'RemoveBtn'#4
-  +'Left'#3' '#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'a'#25'BorderSpacing.Inn'
-  +'erBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7#14'RemoveBtnClick'#8
-  +'TabOrder'#2#3#0#0#11'TOgDaysCode'#11'OgDaysCode1'#9'OnChecked'#7#11'CodeChe'
-  +'cked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCode'#12'OnChangeCode'#7
-  +#10'ChangeCode'#4'left'#2#16#3'top'#3#208#0#0#0#0
+  +'idth'#3#237#1#18'HorzScrollBar.Page'#3#236#1#18'VertScrollBar.Page'#3'.'#1#8
+  +'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#17'Days Code Example'
+  +#12'ClientHeight'#3'/'#1#11'ClientWidth'#3#237#1#8'Position'#7#14'poScreenCe'
+  +'nter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#9'StatusLbl'#22'AnchorSideLef'
+  +'t.Control'#7#5'Memo1'#21'AnchorSideTop.Control'#7#8'CloseBtn'#18'AnchorSide'
+  +'Top.Side'#7#9'asrCenter'#4'Left'#2#12#6'Height'#2#15#3'Top'#3#246#0#5'Width'
+  +#2' '#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TL'
+  +'abel'#6'Label1'#22'AnchorSideLeft.Control'#7#7'CodeBtn'#19'AnchorSideLeft.S'
+  +'ide'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop'
+  +'.Side'#7#9'asrCenter'#4'Left'#3#181#0#6'Height'#2#15#3'Top'#2#17#5'Width'#2
+  +'H'#18'BorderSpacing.Left'#2'P'#7'Caption'#6#13'Current code:'#5'Color'#7#6
+  +'clNone'#11'ParentColor'#8#0#0#6'TLabel'#7'CodeLbl'#22'AnchorSideLeft.Contro'
+  +'l'#7#6'Label1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont'
+  +'rol'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#9#1#6'Hei'
+  +'ght'#2#15#3'Top'#2#17#5'Width'#2'`'#18'BorderSpacing.Left'#2#12#7'Caption'#6
+  +#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TButton'#7
+  +'CodeBtn'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5
+  +'Owner'#4'Left'#2#12#6'Height'#2#25#3'Top'#2#12#5'Width'#2'Y'#20'BorderSpaci'
+  +'ng.Around'#2#12#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Cod'
+  +'e'#7'OnClick'#7#12'CodeBtnClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'
+  +#21'AnchorSideTop.Control'#7#6'Bevel1'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#3#144#1#6'Height'#2#25#3'Top'#3#241#0#5'Width'#2'Q'#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#12#19'BorderSpac'
+  +'ing.Right'#2#12#20'BorderSpacing.Bottom'#2#12#4'Kind'#7#7'bkClose'#8'TabOrd'
+  +'er'#2#1#0#0#7'TButton'#9'RemoveBtn'#21'AnchorSideTop.Control'#7#8'CloseBtn'
+  +#23'AnchorSideRight.Control'#7#8'CloseBtn'#4'Left'#3'+'#1#6'Height'#2#25#3'T'
+  +'op'#3#241#0#5'Width'#2'a'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpac'
+  +'ing.Right'#2#4#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Cod'
+  +'e'#7'OnClick'#7#14'RemoveBtnClick'#8'TabOrder'#2#2#0#0#6'TLabel'#5'Memo1'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#3#165#0#3'Top'#2
+  +'1'#5'Width'#3#213#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'Border'
+  +'Spacing.Around'#2#12#7'Caption'#12'H'#2#0#0'The label at the bottom of this'
+  +' form indicates the status of the code. An invalid code indicates that the '
+  +'code is either the incorrect type or that none has been entered. '#13#10#13
+  +#10'If the proper code has not been entered or the ONGUARD.INI file was dele'
+  +'ted, the message will say that the code is invalid.'#13#10#13#10'Use the "E'
+  +'nter Code" button to enter a code (the CODEGEN program can be used to gener'
+  +'ate the proper "Days" code). '#13#10#13#10'The "Remove Code" button can be '
+  +'used to remove the entered code from the INI file. Doing so will cause the '
+  +'TOgDaysCode component to report that the code is invalid.'#5'Color'#7#9'clB'
+  +'tnFace'#11'ParentColor'#8#8'WordWrap'#9#0#0#6'TBevel'#6'Bevel1'#22'AnchorSi'
+  +'deLeft.Control'#7#5'Memo1'#21'AnchorSideTop.Control'#7#5'Memo1'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Memo1'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#3#3'Top'#3#226#0#5
+  +'Width'#3#213#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#5'Shape'#7#9'b'
+  +'sTopLine'#0#0#11'TOgDaysCode'#11'OgDaysCode1'#9'OnChecked'#7#11'CodeChecked'
+  +#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCode'#12'OnChangeCode'#7#10'Cha'
+  +'ngeCode'#4'Left'#3#192#0#3'Top'#3#200#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exdyreg/exdyregu.pas b/components/onguard/examples/exdyreg/exdyregu.pas
index aadbf991a..8994d04f2 100644
--- a/components/onguard/examples/exdyreg/exdyregu.pas
+++ b/components/onguard/examples/exdyreg/exdyregu.pas
@@ -5,16 +5,17 @@ interface
 
 uses
   SysUtils, Classes,Controls, Forms, Dialogs,
-  StdCtrls, Buttons,LResources, OnGuard, IniFiles, OgUtil;
+  StdCtrls, Buttons,LResources, ExtCtrls, OnGuard, IniFiles, OgUtil;
 
 type
 
   { TForm1 }
 
   TForm1 = class(TForm)
+    Bevel1: TBevel;
     CodeBtn: TButton;
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     StatusLbl: TLabel;
     Label1: TLabel;
     CodeLbl: TLabel;
diff --git a/components/onguard/examples/exdys30/Days30.INI b/components/onguard/examples/exdys30/Days30.INI
index 08dec405d..65ac815d2 100644
--- a/components/onguard/examples/exdys30/Days30.INI
+++ b/components/onguard/examples/exdys30/Days30.INI
@@ -1,2 +1,2 @@
 [Codes]
-DaysCode=85A52AA9BB5EEE6C5D13
+DaysCode=1CFD160ECF31269CB526
diff --git a/components/onguard/examples/exdys30/exdys30.lpi b/components/onguard/examples/exdys30/exdys30.lpi
index 21e610f3f..1f534ab9f 100644
--- a/components/onguard/examples/exdys30/exdys30.lpi
+++ b/components/onguard/examples/exdys30/exdys30.lpi
@@ -1,27 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <Scaled Value="True"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -37,11 +43,11 @@
       <Unit0>
         <Filename Value="exdys30.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Exdys30"/>
         <CursorPos X="8" Y="2"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="212"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exdys30u.pas"/>
@@ -50,23 +56,24 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exdys30u"/>
-        <CursorPos X="37" Y="1"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
+        <TopLine Value="108"/>
+        <CursorPos Y="108"/>
         <UsageCount Value="212"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="1" Y="1407"/>
         <TopLine Value="1392"/>
+        <CursorPos Y="1407"/>
         <UsageCount Value="106"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../../../../../temp/fpc/rtl/i386/i386.inc"/>
-        <CursorPos X="1" Y="1462"/>
         <TopLine Value="1447"/>
+        <CursorPos Y="1462"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
@@ -74,50 +81,46 @@
         <ComponentName Value="OgAboutForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="qogabout0"/>
-        <CursorPos X="42" Y="184"/>
         <TopLine Value="179"/>
+        <CursorPos X="42" Y="184"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../../../../../lazarus/lcl/extctrls.pp"/>
         <UnitName Value="ExtCtrls"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../source/ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="3" Y="71"/>
         <TopLine Value="56"/>
+        <CursorPos X="3" Y="71"/>
         <UsageCount Value="10"/>
       </Unit6>
     </Units>
-    <JumpHistory Count="8" HistoryIndex="7">
+    <JumpHistory Count="9" HistoryIndex="8">
       <Position1>
         <Filename Value="exdys30u.pas"/>
-        <Caret Line="130" Column="1" TopLine="115"/>
+        <Caret Line="130" TopLine="115"/>
       </Position1>
       <Position2>
         <Filename Value="exdys30u.pas"/>
-        <Caret Line="132" Column="1" TopLine="117"/>
+        <Caret Line="132" TopLine="117"/>
       </Position2>
       <Position3>
         <Filename Value="exdys30u.pas"/>
-        <Caret Line="133" Column="1" TopLine="118"/>
+        <Caret Line="133" TopLine="118"/>
       </Position3>
       <Position4>
         <Filename Value="exdys30u.pas"/>
-        <Caret Line="134" Column="1" TopLine="119"/>
+        <Caret Line="134" TopLine="119"/>
       </Position4>
       <Position5>
         <Filename Value="exdys30u.pas"/>
-        <Caret Line="151" Column="1" TopLine="127"/>
+        <Caret Line="151" TopLine="127"/>
       </Position5>
       <Position6>
         <Filename Value="exdys30u.pas"/>
-        <Caret Line="113" Column="1" TopLine="98"/>
+        <Caret Line="113" TopLine="98"/>
       </Position6>
       <Position7>
         <Filename Value="exdys30u.pas"/>
@@ -127,13 +130,18 @@
         <Filename Value="exdys30u.pas"/>
         <Caret Line="36" Column="30" TopLine="30"/>
       </Position8>
+      <Position9>
+        <Filename Value="exdys30u.pas"/>
+        <Caret Line="16" Column="19"/>
+      </Position9>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -145,42 +153,46 @@
       </Checks>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
-    <BreakPoints Count="6">
+    <BreakPoints Count="4">
       <Item1>
-        <Source Value="exdys30u.pas"/>
-        <Line Value="125"/>
-      </Item1>
-      <Item2>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="../../source/onguard.pas"/>
         <Line Value="1360"/>
-      </Item2>
-      <Item3>
-        <Source Value="exdys30u.pas"/>
-        <Line Value="108"/>
-      </Item3>
-      <Item4>
+      </Item1>
+      <Item2>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="../../source/qogabout0.pas"/>
         <Line Value="102"/>
-      </Item4>
-      <Item5>
+      </Item2>
+      <Item3>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="../../source/qogabout0.pas"/>
         <Line Value="97"/>
-      </Item5>
-      <Item6>
+      </Item3>
+      <Item4>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="../../source/onguard.pas"/>
         <Line Value="1970"/>
-      </Item6>
+      </Item4>
     </BreakPoints>
     <Exceptions Count="2">
       <Item1>
diff --git a/components/onguard/examples/exdys30/exdys30.lpr b/components/onguard/examples/exdys30/exdys30.lpr
index 1bc4dc6cf..620c8478b 100644
--- a/components/onguard/examples/exdys30/exdys30.lpr
+++ b/components/onguard/examples/exdys30/exdys30.lpr
@@ -7,7 +7,11 @@ uses
   Exdys30u in 'EXDYS30U.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
+  Application.Scaled:=True;
+  Application.Title:='';
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/components/onguard/examples/exdys30/exdys30u.lfm b/components/onguard/examples/exdys30/exdys30u.lfm
index 5f76a0c64..683c1d141 100644
--- a/components/onguard/examples/exdys30/exdys30u.lfm
+++ b/components/onguard/examples/exdys30/exdys30u.lfm
@@ -6,48 +6,57 @@ object Form1: TForm1
   Caption = 'Form1'
   ClientHeight = 158
   ClientWidth = 229
-  Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 64
-    Height = 14
-    Top = 74
-    Width = 84
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 69
+    Height = 15
+    Top = 66
+    Width = 91
     Alignment = taCenter
+    BorderSpacing.Top = 24
     Caption = 'Days Remaining: '
     ParentColor = False
   end
-  object Memo1: TMemo
-    Left = 6
-    Height = 45
-    Top = 14
-    Width = 213
-    Lines.Strings = (
-      'If you can edit this, then your program '
-      'was allowed to run'
-    )
-    ScrollBars = ssVertical
+  object CloseBtn: TBitBtn
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 70
+    Height = 33
+    Top = 105
+    Width = 89
+    BorderSpacing.Top = 24
+    BorderSpacing.Bottom = 12
+    Kind = bkClose
     TabOrder = 0
   end
-  object CloseBtn: TBitBtn
-    Left = 64
-    Height = 33
-    Top = 92
-    Width = 89
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 1
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 30
+    Top = 12
+    Width = 205
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'If you can edit this, then your program was allowed to run'
+    WordWrap = True
   end
   object OgDaysCode1: TOgDaysCode
     OnChecked = OgDaysCode1Checked
     OnGetKey = OgDaysCode1GetKey
     OnGetCode = OgDaysCode1GetCode
     OnChangeCode = OgDaysCode1ChangeCode
-    left = 88
-    top = 130
+    Left = 40
+    Top = 88
   end
 end
diff --git a/components/onguard/examples/exdys30/exdys30u.lrs b/components/onguard/examples/exdys30/exdys30u.lrs
index b2510e101..4ac25f5c4 100644
--- a/components/onguard/examples/exdys30/exdys30u.lrs
+++ b/components/onguard/examples/exdys30/exdys30u.lrs
@@ -1,19 +1,25 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'D'#1#6'Height'#3#158#0#3'Top'#3#4#1#5'Wid'
   +'th'#3#229#0#7'Caption'#6#5'Form1'#12'ClientHeight'#3#158#0#11'ClientWidth'#3
-  +#229#0#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#245#9'Font.Name'#6#13'M'
-  +'S Sans Serif'#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'
-  +#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#6'Label1'#4'Left'#2'@'#6'Height'#2#14
-  +#3'Top'#2'J'#5'Width'#2'T'#9'Alignment'#7#8'taCenter'#7'Caption'#6#16'Days R'
-  +'emaining: '#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#4'Left'#2#6#6'Height'#2
-  +'-'#3'Top'#2#14#5'Width'#3#213#0#13'Lines.Strings'#1#6'(If you can edit this'
-  +', then your program '#6#18'was allowed to run'#0#10'ScrollBars'#7#10'ssVert'
-  +'ical'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#4'Left'#2'@'#6'Height'#2'!'
-  +#3'Top'#2'\'#5'Width'#2'Y'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'
-  +#2#1#0#0#11'TOgDaysCode'#11'OgDaysCode1'#9'OnChecked'#7#18'OgDaysCode1Checke'
-  +'d'#8'OnGetKey'#7#17'OgDaysCode1GetKey'#9'OnGetCode'#7#18'OgDaysCode1GetCode'
-  +#12'OnChangeCode'#7#21'OgDaysCode1ChangeCode'#4'left'#2'X'#3'top'#3#130#0#0#0
-  +#0
+  +#229#0#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#10'LCLV'
+  +'ersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#5'O'
+  +'wner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#5
+  +'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'E'#6'Height'#2#15#3
+  +'Top'#2'B'#5'Width'#2'['#9'Alignment'#7#8'taCenter'#17'BorderSpacing.Top'#2
+  +#24#7'Caption'#6#16'Days Remaining: '#11'ParentColor'#8#0#0#7'TBitBtn'#8'Clo'
+  +'seBtn'#22'AnchorSideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'as'
+  +'rCenter'#21'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'a'
+  +'srBottom'#4'Left'#2'F'#6'Height'#2'!'#3'Top'#2'i'#5'Width'#2'Y'#17'BorderSp'
+  +'acing.Top'#2#24#20'BorderSpacing.Bottom'#2#12#4'Kind'#7#7'bkClose'#8'TabOrd'
+  +'er'#2#0#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
+  +'horSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'An'
+  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#30#3'Top'#2#12#5
+  +'Width'#3#205#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpaci'
+  +'ng.Around'#2#12#7'Caption'#6':If you can edit this, then your program was a'
+  +'llowed to run'#8'WordWrap'#9#0#0#11'TOgDaysCode'#11'OgDaysCode1'#9'OnChecke'
+  +'d'#7#18'OgDaysCode1Checked'#8'OnGetKey'#7#17'OgDaysCode1GetKey'#9'OnGetCode'
+  +#7#18'OgDaysCode1GetCode'#12'OnChangeCode'#7#21'OgDaysCode1ChangeCode'#4'Lef'
+  +'t'#2'('#3'Top'#2'X'#0#0#0
 ]);
diff --git a/components/onguard/examples/exdys30/exdys30u.pas b/components/onguard/examples/exdys30/exdys30u.pas
index 4593165f4..2f0c71258 100644
--- a/components/onguard/examples/exdys30/exdys30u.pas
+++ b/components/onguard/examples/exdys30/exdys30u.pas
@@ -13,8 +13,8 @@ interface
 
 uses
   SysUtils, Classes, Controls,
-  Forms, Dialogs,LResources, StdCtrls, Buttons,
-  OnGuard,OgUtil,IniFiles;
+  Forms, Dialogs, LResources, StdCtrls, Buttons,
+  OnGuard, OgUtil, IniFiles;
 
 const
   CKey : TKey = ($E5,$8F,$84,$D6,$92,$C9,$A4,$D8,
@@ -25,8 +25,8 @@ type
   { TForm1 }
 
   TForm1 = class(TForm)
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     OgDaysCode1: TOgDaysCode;
     Label1: TLabel;
     procedure FormCreate(Sender: TObject);
diff --git a/components/onguard/examples/exinst/exinst.lpi b/components/onguard/examples/exinst/exinst.lpi
index 3df79d6cb..0dee45bc2 100644
--- a/components/onguard/examples/exinst/exinst.lpi
+++ b/components/onguard/examples/exinst/exinst.lpi
@@ -1,43 +1,54 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="27">
       <Unit0>
         <Filename Value="exinst.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="12" Y="18"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <UnitName Value="Exinst"/>
+        <CursorPos X="12" Y="20"/>
         <UsageCount Value="24"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exinstu.pas"/>
@@ -46,208 +57,191 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="EXINSTU"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
         <CursorPos X="22" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="2"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="exinstu.lrs"/>
         <CursorPos X="14" Y="2"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../../../lazarus0915/lcl/forms.pp"/>
         <UnitName Value="Forms"/>
-        <CursorPos X="29" Y="966"/>
         <TopLine Value="962"/>
+        <CursorPos X="29" Y="966"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../../../lazarus0915/lcl/include/application.inc"/>
-        <CursorPos X="15" Y="298"/>
         <TopLine Value="297"/>
+        <CursorPos X="15" Y="298"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../../../lazarus0915/fpcsrc/fcl/inc/custapp.pp"/>
         <UnitName Value="CustApp"/>
-        <CursorPos X="10" Y="200"/>
         <TopLine Value="198"/>
+        <CursorPos X="10" Y="200"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../../../lazarus0915/lcl/include/wincontrol.inc"/>
-        <CursorPos X="23" Y="5008"/>
         <TopLine Value="5004"/>
+        <CursorPos X="23" Y="5008"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../source/ogfirst.pas"/>
-        <UnitName Value="ogfirst"/>
-        <CursorPos X="3" Y="71"/>
+        <EditorIndex Value="2"/>
         <TopLine Value="161"/>
-        <EditorIndex Value="1"/>
+        <CursorPos X="3" Y="71"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit7>
       <Unit8>
         <Filename Value="../../../../lazarus0915/fpcsrc/rtl/win32/wininc/ascdef.inc"/>
-        <CursorPos X="13" Y="55"/>
         <TopLine Value="47"/>
+        <CursorPos X="13" Y="55"/>
         <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
         <Filename Value="../../source/qonguard7.pas"/>
-        <UnitName Value="qonguard7"/>
-        <CursorPos X="33" Y="42"/>
         <TopLine Value="38"/>
+        <CursorPos X="33" Y="42"/>
         <UsageCount Value="10"/>
       </Unit9>
       <Unit10>
         <Filename Value="../../source/qonguard6.pas"/>
         <ComponentName Value="ModifierFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard6"/>
         <CursorPos X="27" Y="2"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit10>
       <Unit11>
         <Filename Value="../../source/qonguard6.lfm"/>
         <CursorPos X="42" Y="8"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit11>
       <Unit12>
         <Filename Value="../../source/qonguard4.pas"/>
         <ComponentName Value="EditProductFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard4"/>
         <CursorPos X="37" Y="8"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
         <Filename Value="../../source/qonguard3.pas"/>
         <ComponentName Value="KeyMaintFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard3"/>
         <CursorPos X="45" Y="9"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
         <Filename Value="../../source/qonguard4.lfm"/>
         <CursorPos X="46" Y="8"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit14>
       <Unit15>
         <Filename Value="../../source/onguard.inc"/>
-        <CursorPos X="14" Y="25"/>
         <TopLine Value="42"/>
+        <CursorPos X="14" Y="25"/>
         <UsageCount Value="10"/>
       </Unit15>
       <Unit16>
         <Filename Value="/usr/share/fpcsrc/rtl/linux/ostypes.inc"/>
-        <CursorPos X="30" Y="108"/>
         <TopLine Value="92"/>
+        <CursorPos X="30" Y="108"/>
         <UsageCount Value="10"/>
       </Unit16>
       <Unit17>
         <Filename Value="/usr/share/fpcsrc/rtl/unix/baseunix.pp"/>
         <UnitName Value="BaseUnix"/>
         <CursorPos X="30" Y="56"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit17>
       <Unit18>
         <Filename Value="/usr/share/fpcsrc/packages/base/libc/sstath.inc"/>
         <CursorPos X="38" Y="37"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit18>
       <Unit19>
         <Filename Value="/usr/share/fpcsrc/rtl/netwlibc/libc.pp"/>
-        <UnitName Value="libc"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit19>
       <Unit20>
         <Filename Value="/usr/share/fpcsrc/rtl/netware/nwserv.pp"/>
-        <UnitName Value="nwserv"/>
-        <CursorPos X="1" Y="4630"/>
         <TopLine Value="4613"/>
+        <CursorPos Y="4630"/>
         <UsageCount Value="10"/>
       </Unit20>
       <Unit21>
         <Filename Value="/usr/share/fpcsrc/packages/base/libc/libc.pp"/>
-        <UnitName Value="libc"/>
-        <CursorPos X="1" Y="57"/>
         <TopLine Value="41"/>
+        <CursorPos Y="57"/>
         <UsageCount Value="10"/>
       </Unit21>
       <Unit22>
         <Filename Value="../../source/ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="34" Y="1514"/>
         <TopLine Value="1499"/>
+        <CursorPos X="34" Y="1514"/>
         <UsageCount Value="10"/>
       </Unit22>
       <Unit23>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="40" Y="941"/>
         <TopLine Value="926"/>
+        <CursorPos X="40" Y="941"/>
         <UsageCount Value="10"/>
       </Unit23>
       <Unit24>
         <Filename Value="../../source/ogfile.pas"/>
-        <UnitName Value="ogfile"/>
-        <CursorPos X="30" Y="140"/>
         <TopLine Value="121"/>
+        <CursorPos X="30" Y="140"/>
         <UsageCount Value="10"/>
       </Unit24>
       <Unit25>
         <Filename Value="/usr/share/fpcsrc/fcl/db/dbase/dbf_wtil.pas"/>
-        <UnitName Value="dbf_wtil"/>
-        <CursorPos X="39" Y="204"/>
         <TopLine Value="185"/>
+        <CursorPos X="39" Y="204"/>
         <UsageCount Value="10"/>
       </Unit25>
       <Unit26>
         <Filename Value="exinstu.lfm"/>
-        <CursorPos X="21" Y="10"/>
-        <TopLine Value="1"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos Y="6"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit26>
     </Units>
-    <JumpHistory Count="2" HistoryIndex="1">
+    <JumpHistory Count="3" HistoryIndex="2">
       <Position1>
         <Filename Value="exinst.lpr"/>
-        <Caret Line="18" Column="12" TopLine="1"/>
+        <Caret Line="18" Column="12"/>
       </Position1>
       <Position2>
         <Filename Value="../../source/ogfirst.pas"/>
         <Caret Line="87" Column="21" TopLine="83"/>
       </Position2>
+      <Position3>
+        <Filename Value="exinstu.pas"/>
+        <Caret Line="7" Column="22"/>
+      </Position3>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <SearchPaths>
-      <OtherUnitFiles Value="../../source/"/>
+      <OtherUnitFiles Value="../../source"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -260,7 +254,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -268,13 +262,13 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <BreakPoints Count="1">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="../../source/ogfirst.pas"/>
         <Line Value="234"/>
       </Item1>
diff --git a/components/onguard/examples/exinst/exinst.lpr b/components/onguard/examples/exinst/exinst.lpr
index 7f389765f..9f0da4dc7 100644
--- a/components/onguard/examples/exinst/exinst.lpr
+++ b/components/onguard/examples/exinst/exinst.lpr
@@ -9,6 +9,8 @@ uses
 
 
 
+{$R *.res}
+
 begin
 
   Application.Initialize;
diff --git a/components/onguard/examples/exinst/exinstu.lfm b/components/onguard/examples/exinst/exinstu.lfm
index ae0d22c8e..107ce573e 100644
--- a/components/onguard/examples/exinst/exinstu.lfm
+++ b/components/onguard/examples/exinst/exinstu.lfm
@@ -1,41 +1,41 @@
 object FirstInstFrm: TFirstInstFrm
-  ActiveControl = Memo1
-  Caption = 'Single Instance Example'
-  ClientHeight = 140
-  ClientWidth = 320
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
-  Font.Pitch = fpVariable
-  PixelsPerInch = 96
-  HorzScrollBar.Page = 319
-  HorzScrollBar.Range = 307
-  VertScrollBar.Page = 139
-  VertScrollBar.Range = 129
   Left = 327
   Height = 140
   Top = 218
   Width = 320
-  object Memo1: TMemo
-    Lines.Strings = (
-      'Attempts to execute this application a second time result in '
-      'the first instance to be activated and the second instance '
-      'terminated.'
-    )
-    ReadOnly = True
-    TabOrder = 0
-    Left = 8
-    Height = 89
-    Top = 8
-    Width = 297
-  end
+  AutoSize = True
+  BorderStyle = bsDialog
+  Caption = 'Single Instance Example'
+  ClientHeight = 140
+  ClientWidth = 320
+  LCLVersion = '2.3.0.0'
   object BitBtn2: TBitBtn
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 1
-    Left = 232
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 233
     Height = 25
-    Top = 104
+    Top = 69
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
+    Kind = bkClose
+    TabOrder = 0
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 45
+    Top = 12
+    Width = 296
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'Attempts to execute this application a second time result in the first instance to be activated and the second instance terminated.'
+    WordWrap = True
   end
 end
diff --git a/components/onguard/examples/exinst/exinstu.lrs b/components/onguard/examples/exinst/exinstu.lrs
index d4e8e2d02..c718e9a68 100644
--- a/components/onguard/examples/exinst/exinstu.lrs
+++ b/components/onguard/examples/exinst/exinstu.lrs
@@ -1,14 +1,17 @@
 LazarusResources.Add('TFirstInstFrm','FORMDATA',[
-  'TPF0'#13'TFirstInstFrm'#12'FirstInstFrm'#13'ActiveControl'#7#5'Memo1'#7'Capt'
-  +'ion'#6#23'Single Instance Example'#12'ClientHeight'#3#140#0#11'ClientWidth'
-  +#3'@'#1#10'Font.Color'#7#6'clText'#11'Font.Height'#2#11#9'Font.Name'#6#13'MS'
-  +' Sans Serif'#10'Font.Pitch'#7#10'fpVariable'#13'PixelsPerInch'#2'`'#18'Horz'
-  +'ScrollBar.Page'#3'?'#1#19'HorzScrollBar.Range'#3'3'#1#18'VertScrollBar.Page'
-  +#3#139#0#19'VertScrollBar.Range'#3#129#0#4'Left'#3'G'#1#6'Height'#3#140#0#3
-  +'Top'#3#218#0#5'Width'#3'@'#1#0#5'TMemo'#5'Memo1'#13'Lines.Strings'#1#6'=Att'
-  +'empts to execute this application a second time result in '#6';the first in'
-  +'stance to be activated and the second instance '#6#11'terminated.'#0#8'Read'
-  +'Only'#9#8'TabOrder'#2#0#4'Left'#2#8#6'Height'#2'Y'#3'Top'#2#8#5'Width'#3')'
-  +#1#0#0#7'TBitBtn'#7'BitBtn2'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrde'
-  +'r'#2#1#4'Left'#3#232#0#6'Height'#2#25#3'Top'#2'h'#5'Width'#2'K'#0#0#0
+  'TPF0'#13'TFirstInstFrm'#12'FirstInstFrm'#4'Left'#3'G'#1#6'Height'#3#140#0#3
+  +'Top'#3#218#0#5'Width'#3'@'#1#8'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7
+  +'Caption'#6#23'Single Instance Example'#12'ClientHeight'#3#140#0#11'ClientWi'
+  +'dth'#3'@'#1#10'LCLVersion'#6#7'2.3.0.0'#0#7'TBitBtn'#7'BitBtn2'#21'AnchorSi'
+  +'deTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSi'
+  +'deRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#3#233#0#6'Height'#2#25#3'Top'#2'E'#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'a'
+  +'kRight'#0#19'BorderSpacing.Right'#2#12#20'BorderSpacing.Bottom'#2#12#4'Kind'
+  +#7#7'bkClose'#8'TabOrder'#2#0#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Contr'
+  +'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Cont'
+  +'rol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Heig'
+  +'ht'#2'-'#3'Top'#2#12#5'Width'#3'('#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
+  +'ight'#0#20'BorderSpacing.Around'#2#12#7'Caption'#6#131'Attempts to execute '
+  +'this application a second time result in the first instance to be activated'
+  +' and the second instance terminated.'#8'WordWrap'#9#0#0#0
 ]);
diff --git a/components/onguard/examples/exinst/exinstu.pas b/components/onguard/examples/exinst/exinstu.pas
index 3b457b68e..18f4cbe09 100644
--- a/components/onguard/examples/exinst/exinstu.pas
+++ b/components/onguard/examples/exinst/exinstu.pas
@@ -11,8 +11,8 @@ type
   { TFirstInstFrm }
 
   TFirstInstFrm = class(TForm)
-    Memo1: TMemo;
     BitBtn2: TBitBtn;
+    Memo1: TLabel;
   private
     { Private declarations }
   public
diff --git a/components/onguard/examples/exmachid/exmachid.lpi b/components/onguard/examples/exmachid/exmachid.lpi
index 786458e18..f3d90c622 100644
--- a/components/onguard/examples/exmachid/exmachid.lpi
+++ b/components/onguard/examples/exmachid/exmachid.lpi
@@ -1,44 +1,54 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
       <Title Value="exmachid"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="14">
       <Unit0>
         <Filename Value="exmachid.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="38" Y="15"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <CursorPos X="38" Y="17"/>
         <UsageCount Value="23"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="umachid.pas"/>
@@ -47,98 +57,100 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uMachID"/>
-        <CursorPos X="31" Y="31"/>
-        <TopLine Value="26"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
+        <TopLine Value="27"/>
+        <CursorPos X="26" Y="44"/>
         <UsageCount Value="22"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
         <CursorPos X="33" Y="11"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="1" Y="604"/>
         <TopLine Value="589"/>
+        <CursorPos Y="604"/>
         <UsageCount Value="11"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../../../lazarus0915/lcl/include/control.inc"/>
-        <CursorPos X="29" Y="1533"/>
         <TopLine Value="1531"/>
+        <CursorPos X="29" Y="1533"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../../../lazarus0915/lcl/include/buttoncontrol.inc"/>
-        <CursorPos X="39" Y="47"/>
         <TopLine Value="45"/>
+        <CursorPos X="39" Y="47"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../../../lazarus0915/lcl/include/buttons.inc"/>
-        <CursorPos X="48" Y="233"/>
         <TopLine Value="230"/>
+        <CursorPos X="48" Y="233"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../../../lazarus0915/lcl/interfaces/win32/win32proc.pp"/>
-        <UnitName Value="win32proc"/>
-        <CursorPos X="30" Y="557"/>
         <TopLine Value="554"/>
+        <CursorPos X="30" Y="557"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="../../../../lazarus0915/lcl/include/customform.inc"/>
-        <CursorPos X="21" Y="1033"/>
         <TopLine Value="1032"/>
+        <CursorPos X="21" Y="1033"/>
         <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
         <Filename Value="umachid.lfm"/>
         <CursorPos X="28" Y="12"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit9>
       <Unit10>
         <Filename Value="../../source/ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="50" Y="1284"/>
         <TopLine Value="1261"/>
+        <CursorPos X="50" Y="1284"/>
         <UsageCount Value="11"/>
       </Unit10>
       <Unit11>
         <Filename Value="../../source/IdeSN.pas"/>
         <UnitName Value="idesn"/>
-        <CursorPos X="53" Y="158"/>
         <TopLine Value="142"/>
+        <CursorPos X="53" Y="158"/>
         <UsageCount Value="11"/>
       </Unit11>
       <Unit12>
         <Filename Value="../../../../../../temp/fpc/rtl/i386/strings.inc"/>
-        <CursorPos X="1" Y="64"/>
         <TopLine Value="49"/>
+        <CursorPos Y="64"/>
         <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
         <Filename Value="../../../../../../temp/fpc/rtl/objpas/sysutils/sysutils.inc"/>
-        <CursorPos X="1" Y="361"/>
         <TopLine Value="346"/>
+        <CursorPos Y="361"/>
         <UsageCount Value="10"/>
       </Unit13>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="1">
+      <Position1>
+        <Filename Value="umachid.pas"/>
+        <Caret Line="43" Column="26" TopLine="26"/>
+      </Position1>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -150,15 +162,15 @@
       </Checks>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exmachid/exmachid.lpr b/components/onguard/examples/exmachid/exmachid.lpr
index ab6be6a74..a89d215e6 100644
--- a/components/onguard/examples/exmachid/exmachid.lpr
+++ b/components/onguard/examples/exmachid/exmachid.lpr
@@ -8,6 +8,8 @@ uses
   umachid in 'umachid.pas';
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TfrmExMachineID,frmExMachineID);
diff --git a/components/onguard/examples/exmachid/umachid.lfm b/components/onguard/examples/exmachid/umachid.lfm
index b05ca92e9..7bd9e7a3b 100644
--- a/components/onguard/examples/exmachid/umachid.lfm
+++ b/components/onguard/examples/exmachid/umachid.lfm
@@ -1,77 +1,118 @@
 object frmExMachineID: TfrmExMachineID
   Left = 364
-  Height = 174
+  Height = 157
   Top = 254
-  Width = 240
+  Width = 277
   ActiveControl = chkUser
+  AutoSize = True
   BorderIcons = [biSystemMenu, biMinimize]
+  BorderStyle = bsDialog
   Caption = 'ExMachineID'
-  ClientHeight = 174
-  ClientWidth = 240
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
-  Font.Pitch = fpVariable
+  ClientHeight = 157
+  ClientWidth = 277
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object GroupBox1: TGroupBox
-    Left = 8
-    Height = 137
-    Top = 8
-    Width = 113
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
+    Height = 110
+    Top = 12
+    Width = 114
+    AutoSize = True
+    BorderSpacing.Around = 12
     Caption = ' Machine Info Set '
-    ClientHeight = 119
-    ClientWidth = 109
+    ClientHeight = 90
+    ClientWidth = 110
     TabOrder = 0
     object chkUser: TCheckBox
-      Left = 24
-      Height = 17
-      Top = 16
-      Width = 40
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = GroupBox1
+      Left = 16
+      Height = 19
+      Top = 4
+      Width = 41
+      BorderSpacing.Left = 16
+      BorderSpacing.Top = 4
+      BorderSpacing.Right = 16
       Caption = 'User'
       TabOrder = 0
     end
     object chkSystem: TCheckBox
-      Left = 24
-      Height = 17
-      Top = 40
-      Width = 52
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = chkUser
+      AnchorSideTop.Side = asrBottom
+      Left = 16
+      Height = 19
+      Top = 23
+      Width = 56
+      BorderSpacing.Left = 16
+      BorderSpacing.Right = 16
       Caption = 'System'
       TabOrder = 1
     end
     object chkNetwork: TCheckBox
-      Left = 24
-      Height = 17
-      Top = 64
-      Width = 58
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = chkSystem
+      AnchorSideTop.Side = asrBottom
+      Left = 16
+      Height = 19
+      Top = 42
+      Width = 63
+      BorderSpacing.Left = 16
+      BorderSpacing.Right = 24
       Caption = 'Network'
       TabOrder = 2
     end
     object chkDrives: TCheckBox
-      Left = 24
-      Height = 17
-      Top = 88
-      Width = 48
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = chkNetwork
+      AnchorSideTop.Side = asrBottom
+      Left = 16
+      Height = 19
+      Top = 61
+      Width = 50
+      BorderSpacing.Left = 16
+      BorderSpacing.Right = 16
+      BorderSpacing.Bottom = 10
       Caption = 'Drives'
       TabOrder = 3
     end
   end
   object btnGenerate: TButton
-    Left = 131
+    AnchorSideLeft.Control = GroupBox1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideBottom.Control = Bevel1
+    Left = 138
     Height = 25
-    Top = 32
+    Top = 38
     Width = 75
+    Anchors = [akLeft, akBottom]
+    BorderSpacing.Left = 12
     BorderSpacing.InnerBorder = 4
     Caption = 'Generate'
     OnClick = btnGenerateClick
     TabOrder = 1
   end
   object edtMachineID: TEdit
-    Left = 128
+    AnchorSideLeft.Control = btnGenerate
+    AnchorSideTop.Control = Bevel1
+    AnchorSideTop.Side = asrBottom
+    Left = 138
     Height = 23
     Top = 72
-    Width = 81
+    Width = 98
+    BorderSpacing.Right = 12
     ReadOnly = True
     TabOrder = 2
   end
+  object Bevel1: TBevel
+    AnchorSideTop.Control = GroupBox1
+    AnchorSideTop.Side = asrCenter
+    Left = 128
+    Height = 9
+    Top = 63
+    Width = 16
+    Shape = bsSpacer
+  end
 end
diff --git a/components/onguard/examples/exmachid/umachid.lrs b/components/onguard/examples/exmachid/umachid.lrs
index 4b11c2bc3..8a4a531a9 100644
--- a/components/onguard/examples/exmachid/umachid.lrs
+++ b/components/onguard/examples/exmachid/umachid.lrs
@@ -1,23 +1,41 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TfrmExMachineID','FORMDATA',[
-  'TPF0'#15'TfrmExMachineID'#14'frmExMachineID'#4'Left'#3'l'#1#6'Height'#3#174#0
-  +#3'Top'#3#254#0#5'Width'#3#240#0#13'ActiveControl'#7#7'chkUser'#11'BorderIco'
-  +'ns'#11#12'biSystemMenu'#10'biMinimize'#0#7'Caption'#6#11'ExMachineID'#12'Cl'
-  +'ientHeight'#3#174#0#11'ClientWidth'#3#240#0#10'Font.Color'#7#6'clText'#11'F'
-  +'ont.Height'#2#11#9'Font.Name'#6#13'MS Sans Serif'#10'Font.Pitch'#7#10'fpVar'
-  +'iable'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9'TGro'
-  +'upBox'#9'GroupBox1'#4'Left'#2#8#6'Height'#3#137#0#3'Top'#2#8#5'Width'#2'q'#7
-  +'Caption'#6#18' Machine Info Set '#12'ClientHeight'#2'w'#11'ClientWidth'#2'm'
-  +#8'TabOrder'#2#0#0#9'TCheckBox'#7'chkUser'#4'Left'#2#24#6'Height'#2#17#3'Top'
-  +#2#16#5'Width'#2'('#7'Caption'#6#4'User'#8'TabOrder'#2#0#0#0#9'TCheckBox'#9
-  +'chkSystem'#4'Left'#2#24#6'Height'#2#17#3'Top'#2'('#5'Width'#2'4'#7'Caption'
-  +#6#6'System'#8'TabOrder'#2#1#0#0#9'TCheckBox'#10'chkNetwork'#4'Left'#2#24#6
-  +'Height'#2#17#3'Top'#2'@'#5'Width'#2':'#7'Caption'#6#7'Network'#8'TabOrder'#2
-  +#2#0#0#9'TCheckBox'#9'chkDrives'#4'Left'#2#24#6'Height'#2#17#3'Top'#2'X'#5'W'
-  +'idth'#2'0'#7'Caption'#6#6'Drives'#8'TabOrder'#2#3#0#0#0#7'TButton'#11'btnGe'
-  +'nerate'#4'Left'#3#131#0#6'Height'#2#25#3'Top'#2' '#5'Width'#2'K'#25'BorderS'
-  +'pacing.InnerBorder'#2#4#7'Caption'#6#8'Generate'#7'OnClick'#7#16'btnGenerat'
-  +'eClick'#8'TabOrder'#2#1#0#0#5'TEdit'#12'edtMachineID'#4'Left'#3#128#0#6'Hei'
-  +'ght'#2#23#3'Top'#2'H'#5'Width'#2'Q'#8'ReadOnly'#9#8'TabOrder'#2#2#0#0#0
+  'TPF0'#15'TfrmExMachineID'#14'frmExMachineID'#4'Left'#3'l'#1#6'Height'#3#157#0
+  +#3'Top'#3#254#0#5'Width'#3#21#1#13'ActiveControl'#7#7'chkUser'#8'AutoSize'#9
+  +#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#0#11'BorderStyle'#7#8'bs'
+  +'Dialog'#7'Caption'#6#11'ExMachineID'#12'ClientHeight'#3#157#0#11'ClientWidt'
+  +'h'#3#21#1#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#9
+  +'TGroupBox'#9'GroupBox1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
+  +'Top.Control'#7#5'Owner'#4'Left'#2#12#6'Height'#2'n'#3'Top'#2#12#5'Width'#2
+  +'r'#8'AutoSize'#9#20'BorderSpacing.Around'#2#12#7'Caption'#6#18' Machine Inf'
+  +'o Set '#12'ClientHeight'#2'Z'#11'ClientWidth'#2'n'#8'TabOrder'#2#0#0#9'TChe'
+  +'ckBox'#7'chkUser'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTo'
+  +'p.Control'#7#9'GroupBox1'#4'Left'#2#16#6'Height'#2#19#3'Top'#2#4#5'Width'#2
+  +')'#18'BorderSpacing.Left'#2#16#17'BorderSpacing.Top'#2#4#19'BorderSpacing.R'
+  +'ight'#2#16#7'Caption'#6#4'User'#8'TabOrder'#2#0#0#0#9'TCheckBox'#9'chkSyste'
+  +'m'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7#7
+  +'chkUser'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#16#6'Height'#2#19#3
+  +'Top'#2#23#5'Width'#2'8'#18'BorderSpacing.Left'#2#16#19'BorderSpacing.Right'
+  +#2#16#7'Caption'#6#6'System'#8'TabOrder'#2#1#0#0#9'TCheckBox'#10'chkNetwork'
+  +#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7#9'chk'
+  +'System'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#16#6'Height'#2#19#3
+  +'Top'#2'*'#5'Width'#2'?'#18'BorderSpacing.Left'#2#16#19'BorderSpacing.Right'
+  +#2#24#7'Caption'#6#7'Network'#8'TabOrder'#2#2#0#0#9'TCheckBox'#9'chkDrives'
+  +#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7#10'ch'
+  +'kNetwork'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#16#6'Height'#2#19
+  +#3'Top'#2'='#5'Width'#2'2'#18'BorderSpacing.Left'#2#16#19'BorderSpacing.Righ'
+  +'t'#2#16#20'BorderSpacing.Bottom'#2#10#7'Caption'#6#6'Drives'#8'TabOrder'#2#3
+  +#0#0#0#7'TButton'#11'btnGenerate'#22'AnchorSideLeft.Control'#7#9'GroupBox1'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#6'Bev'
+  +'el1'#4'Left'#3#138#0#6'Height'#2#25#3'Top'#2'&'#5'Width'#2'K'#7'Anchors'#11
+  +#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#12#25'BorderSpacing.InnerB'
+  +'order'#2#4#7'Caption'#6#8'Generate'#7'OnClick'#7#16'btnGenerateClick'#8'Tab'
+  +'Order'#2#1#0#0#5'TEdit'#12'edtMachineID'#22'AnchorSideLeft.Control'#7#11'bt'
+  +'nGenerate'#21'AnchorSideTop.Control'#7#6'Bevel1'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#3#138#0#6'Height'#2#23#3'Top'#2'H'#5'Width'#2'b'#19'Bord'
+  +'erSpacing.Right'#2#12#8'ReadOnly'#9#8'TabOrder'#2#2#0#0#6'TBevel'#6'Bevel1'
+  +#21'AnchorSideTop.Control'#7#9'GroupBox1'#18'AnchorSideTop.Side'#7#9'asrCent'
+  +'er'#4'Left'#3#128#0#6'Height'#2#9#3'Top'#2'?'#5'Width'#2#16#5'Shape'#7#8'bs'
+  +'Spacer'#0#0#0
 ]);
diff --git a/components/onguard/examples/exmachid/umachid.pas b/components/onguard/examples/exmachid/umachid.pas
index 725de3d79..69cb4a31b 100644
--- a/components/onguard/examples/exmachid/umachid.pas
+++ b/components/onguard/examples/exmachid/umachid.pas
@@ -4,13 +4,14 @@ interface
 
 uses
   SysUtils, Classes,
-  Graphics, Controls, Forms, Dialogs,Buttons, StdCtrls,LResources;
+  Graphics, Controls, Forms, Dialogs,Buttons, StdCtrls,LResources, ExtCtrls;
 
 type
 
   { TfrmExMachineID }
 
   TfrmExMachineID = class(TForm)
+    Bevel1: TBevel;
     GroupBox1: TGroupBox;
     chkUser: TCheckBox;
     chkSystem: TCheckBox;
@@ -30,8 +31,6 @@ var
 
 implementation
 
-
-
 uses
   onguard, ogutil;
 
@@ -53,10 +52,10 @@ begin
 
   { create the machine ID and display in hex }
   try
-  MachineID := CreateMachineID(InfoSet);
-  edtMachineID.Text := '$' + BufferToHex(MachineID, SizeOf(MachineID));
+    MachineID := CreateMachineID(InfoSet);
+    edtMachineID.Text := '$' + BufferToHex(MachineID, SizeOf(MachineID));
   except on E:Exception do
-   ShowMessage(E.Message);
+    ShowMessage(E.Message);
   end;
 end;
 
diff --git a/components/onguard/examples/exnet/EXNET.NAF b/components/onguard/examples/exnet/EXNET.NAF
index 1dd435429..0016134d5 100644
Binary files a/components/onguard/examples/exnet/EXNET.NAF and b/components/onguard/examples/exnet/EXNET.NAF differ
diff --git a/components/onguard/examples/exnet/exnet.lpi b/components/onguard/examples/exnet/exnet.lpi
index edd342f9e..84a71e39e 100644
--- a/components/onguard/examples/exnet/exnet.lpi
+++ b/components/onguard/examples/exnet/exnet.lpi
@@ -1,85 +1,105 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="5">
       <Unit0>
         <Filename Value="exnet.lpr"/>
         <IsPartOfProject Value="True"/>
         <CursorPos X="44" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exnetu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exnetu"/>
-        <CursorPos X="53" Y="159"/>
-        <TopLine Value="118"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="118"/>
+        <CursorPos X="59" Y="141"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../source/ognetwrk.pas"/>
-        <UnitName Value="ognetwrk"/>
-        <CursorPos X="68" Y="478"/>
         <TopLine Value="465"/>
+        <CursorPos X="68" Y="478"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../source/ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="28" Y="1334"/>
         <TopLine Value="1330"/>
+        <CursorPos X="28" Y="1334"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="35" Y="1349"/>
         <TopLine Value="1344"/>
+        <CursorPos X="35" Y="1349"/>
         <UsageCount Value="10"/>
       </Unit4>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="2" HistoryIndex="1">
+      <Position1>
+        <Filename Value="exnetu.pas"/>
+        <Caret Line="141" Column="59" TopLine="118"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exnetu.pas"/>
+        <Caret Line="140" Column="59" TopLine="117"/>
+      </Position2>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -92,7 +112,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -100,9 +120,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exnet/exnet.lpr b/components/onguard/examples/exnet/exnet.lpr
index 0bc106b62..be46baacc 100644
--- a/components/onguard/examples/exnet/exnet.lpr
+++ b/components/onguard/examples/exnet/exnet.lpr
@@ -7,6 +7,8 @@ uses
   Exnetu in 'EXNETU.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exnet/exnetu.lfm b/components/onguard/examples/exnet/exnetu.lfm
index 4c3bcece4..826a08bc6 100644
--- a/components/onguard/examples/exnet/exnetu.lfm
+++ b/components/onguard/examples/exnet/exnetu.lfm
@@ -5,96 +5,119 @@ object Form1: TForm1
   Width = 490
   HorzScrollBar.Page = 489
   VertScrollBar.Page = 316
+  AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Network Code Example'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 317
+  ClientWidth = 490
   OnCreate = FormCreate
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
-    Left = 8
-    Height = 13
-    Top = 262
-    Width = 35
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 12
+    Height = 15
+    Top = 231
+    Width = 32
+    BorderSpacing.Bottom = 12
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object Label1: TLabel
-    Left = 232
-    Height = 13
-    Top = 14
-    Width = 77
+    AnchorSideLeft.Control = CodeBtn
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 181
+    Height = 15
+    Top = 17
+    Width = 72
+    BorderSpacing.Left = 80
     Caption = 'Current code:'
     Color = clNone
     ParentColor = False
   end
   object CodeLbl: TLabel
-    Left = 320
-    Height = 13
-    Top = 14
-    Width = 113
+    AnchorSideLeft.Control = Label1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 265
+    Height = 15
+    Top = 17
+    Width = 96
+    BorderSpacing.Left = 12
     Caption = '0000000000000000'
     Color = clNone
     ParentColor = False
   end
   object CodeBtn: TButton
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
     Height = 25
-    Top = 8
+    Top = 12
     Width = 89
+    BorderSpacing.Around = 12
     BorderSpacing.InnerBorder = 4
     Caption = 'Enter Code'
     OnClick = CodeBtnClick
     TabOrder = 0
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 209
-    Top = 40
-    Width = 465
-    Color = clBtnFace
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the code. An invalid code indicates that '
-      'the code is either the incorrect type or that none has been entered. '
-      ''
-      'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will '
-      'say that the code is invalid.'
-      ''
-      'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate '
-      'the proper "Usage" code). '
-      ''
-      'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so '
-      'will cause the TOgNetCode component to report that the code is invalid.'
-    )
-    ReadOnly = True
+  object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Memo1
+    AnchorSideRight.Side = asrBottom
+    Left = 403
+    Height = 25
+    Top = 226
+    Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Bottom = 12
+    Kind = bkClose
     TabOrder = 1
   end
-  object CloseBtn: TBitBtn
-    Left = 400
-    Height = 25
-    Top = 256
-    Width = 75
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 2
-  end
   object RemoveBtn: TButton
-    Left = 288
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideRight.Control = CloseBtn
+    Left = 302
     Height = 25
-    Top = 256
+    Top = 226
     Width = 97
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 4
     BorderSpacing.InnerBorder = 4
     Caption = 'Remove Code'
     OnClick = RemoveBtnClick
-    TabOrder = 3
+    TabOrder = 2
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 165
+    Top = 49
+    Width = 466
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'The label at the bottom of this form indicates the status of the code. An invalid code indicates that the code is either the incorrect type or that none has been entered. '#13#10#13#10'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate the proper "Usage" code). '#13#10#13#10'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so will cause the TOgNetCode component to report that the code is invalid.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
   end
   object OgNetCode1: TOgNetCode
     OnChecked = CodeChecked
     OnGetKey = GetKey
     OnGetCode = GetCode
     FileName = 'EXNET.NAF'
-    left = 16
-    top = 216
+    Left = 192
+    Top = 208
   end
 end
diff --git a/components/onguard/examples/exnet/exnetu.lrs b/components/onguard/examples/exnet/exnetu.lrs
index 976f18125..1aad29590 100644
--- a/components/onguard/examples/exnet/exnetu.lrs
+++ b/components/onguard/examples/exnet/exnetu.lrs
@@ -1,34 +1,51 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#2#1#6'Height'#3'='#1#3'Top'#3#146#0#5'Wid'
-  +'th'#3#234#1#18'HorzScrollBar.Page'#3#233#1#18'VertScrollBar.Page'#3'<'#1#11
-  +'BorderStyle'#7#8'bsDialog'#7'Caption'#6#20'Network Code Example'#11'Font.He'
-  +'ight'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'OnCreate'#7#10'FormCreate'#8
-  +'Position'#7#14'poScreenCenter'#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Heigh'
-  +'t'#2#13#3'Top'#3#6#1#5'Width'#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNo'
-  +'ne'#11'ParentColor'#8#0#0#6'TLabel'#6'Label1'#4'Left'#3#232#0#6'Height'#2#13
-  +#3'Top'#2#14#5'Width'#2'M'#7'Caption'#6#13'Current code:'#5'Color'#7#6'clNon'
-  +'e'#11'ParentColor'#8#0#0#6'TLabel'#7'CodeLbl'#4'Left'#3'@'#1#6'Height'#2#13
-  +#3'Top'#2#14#5'Width'#2'q'#7'Caption'#6#16'0000000000000000'#5'Color'#7#6'cl'
-  +'None'#11'ParentColor'#8#0#0#7'TButton'#7'CodeBtn'#4'Left'#2#8#6'Height'#2#25
-  +#3'Top'#2#8#5'Width'#2'Y'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10
-  +'Enter Code'#7'OnClick'#7#12'CodeBtnClick'#8'TabOrder'#2#0#0#0#5'TMemo'#5'Me'
-  +'mo1'#4'Left'#2#8#6'Height'#3#209#0#3'Top'#2'('#5'Width'#3#209#1#5'Color'#7#9
-  +'clBtnFace'#13'Lines.Strings'#1#6'fThe label at the bottom of this form indi'
-  +'cates the status of the code. An invalid code indicates that '#6'Ethe code '
-  +'is either the incorrect type or that none has been entered. '#6#0#6'^If the'
-  +' proper code has not been entered or the ONGUARD.INI file was deleted, the '
-  +'message will '#6#29'say that the code is invalid.'#6#0#6'YUse the "Enter Co'
-  +'de" button to enter a code (the CODEGEN program can be used to generate '#6
-  +#26'the proper "Usage" code). '#6#0#6'\The "Remove Code" button can be used '
-  +'to remove the entered code from the INI file. Doing so '#6'Gwill cause the '
-  +'TOgNetCode component to report that the code is invalid.'#0#8'ReadOnly'#9#8
-  +'TabOrder'#2#1#0#0#7'TBitBtn'#8'CloseBtn'#4'Left'#3#144#1#6'Height'#2#25#3'T'
-  +'op'#3#0#1#5'Width'#2'K'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#2#0#0#7'TButton'#9'RemoveBtn'#4'Left'#3' '#1#6'Height'#2#25#3'Top'#3#0#1#5
-  +'Width'#2'a'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7
-  +'OnClick'#7#14'RemoveBtnClick'#8'TabOrder'#2#3#0#0#10'TOgNetCode'#10'OgNetCo'
-  +'de1'#9'OnChecked'#7#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7
-  +'GetCode'#8'FileName'#6#9'EXNET.NAF'#4'left'#2#16#3'top'#3#216#0#0#0#0
+  +'th'#3#234#1#18'HorzScrollBar.Page'#3#233#1#18'VertScrollBar.Page'#3'<'#1#8
+  +'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#20'Network Code Exam'
+  +'ple'#12'ClientHeight'#3'='#1#11'ClientWidth'#3#234#1#8'OnCreate'#7#10'FormC'
+  +'reate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLa'
+  +'bel'#9'StatusLbl'#22'AnchorSideLeft.Control'#7#5'Memo1'#21'AnchorSideTop.Co'
+  +'ntrol'#7#8'CloseBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#12#6'H'
+  +'eight'#2#15#3'Top'#3#231#0#5'Width'#2' '#20'BorderSpacing.Bottom'#2#12#7'Ca'
+  +'ption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'L'
+  +'abel1'#22'AnchorSideLeft.Control'#7#7'CodeBtn'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9
+  +'asrCenter'#4'Left'#3#181#0#6'Height'#2#15#3'Top'#2#17#5'Width'#2'H'#18'Bord'
+  +'erSpacing.Left'#2'P'#7'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11
+  +'ParentColor'#8#0#0#6'TLabel'#7'CodeLbl'#22'AnchorSideLeft.Control'#7#6'Labe'
+  +'l1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'Co'
+  +'deBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#9#1#6'Height'#2#15#3
+  +'Top'#2#17#5'Width'#2'`'#18'BorderSpacing.Left'#2#12#7'Caption'#6#16'0000000'
+  +'000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TButton'#7'CodeBtn'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4
+  +'Left'#2#12#6'Height'#2#25#3'Top'#2#12#5'Width'#2'Y'#20'BorderSpacing.Around'
+  +#2#12#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Code'#7'OnClic'
+  +'k'#7#12'CodeBtnClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#21'AnchorS'
+  +'ideTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorS'
+  +'ideRight.Control'#7#5'Memo1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#3#147#1#6'Height'#2#25#3'Top'#3#226#0#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7
+  +'akRight'#0#20'BorderSpacing.Bottom'#2#12#4'Kind'#7#7'bkClose'#8'TabOrder'#2
+  +#1#0#0#7'TButton'#9'RemoveBtn'#21'AnchorSideTop.Control'#7#8'CloseBtn'#23'An'
+  +'chorSideRight.Control'#7#8'CloseBtn'#4'Left'#3'.'#1#6'Height'#2#25#3'Top'#3
+  +#226#0#5'Width'#2'a'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Ri'
+  +'ght'#2#4#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7'O'
+  +'nClick'#7#14'RemoveBtnClick'#8'TabOrder'#2#2#0#0#6'TLabel'#5'Memo1'#22'Anch'
+  +'orSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#3#165#0#3'Top'#2
+  +'1'#5'Width'#3#210#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'Border'
+  +'Spacing.Around'#2#12#7'Caption'#12'H'#2#0#0'The label at the bottom of this'
+  +' form indicates the status of the code. An invalid code indicates that the '
+  +'code is either the incorrect type or that none has been entered. '#13#10#13
+  +#10'If the proper code has not been entered or the ONGUARD.INI file was dele'
+  +'ted, the message will say that the code is invalid.'#13#10#13#10'Use the "E'
+  +'nter Code" button to enter a code (the CODEGEN program can be used to gener'
+  +'ate the proper "Usage" code). '#13#10#13#10'The "Remove Code" button can be'
+  +' used to remove the entered code from the INI file. Doing so will cause the'
+  +' TOgNetCode component to report that the code is invalid.'#5'Color'#7#9'clB'
+  +'tnFace'#11'ParentColor'#8#8'WordWrap'#9#0#0#10'TOgNetCode'#10'OgNetCode1'#9
+  +'OnChecked'#7#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCo'
+  +'de'#8'FileName'#6#9'EXNET.NAF'#4'Left'#3#192#0#3'Top'#3#208#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exnet/exnetu.pas b/components/onguard/examples/exnet/exnetu.pas
index 40b72aeaf..a63657a0e 100644
--- a/components/onguard/examples/exnet/exnetu.pas
+++ b/components/onguard/examples/exnet/exnetu.pas
@@ -13,8 +13,8 @@ type
 
   TForm1 = class(TForm)
     CodeBtn: TButton;
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     StatusLbl: TLabel;
     Label1: TLabel;
     CodeLbl: TLabel;
diff --git a/components/onguard/examples/exprot/exprot.lpi b/components/onguard/examples/exprot/exprot.lpi
index 9d3259bf7..4aa97efb4 100644
--- a/components/onguard/examples/exprot/exprot.lpi
+++ b/components/onguard/examples/exprot/exprot.lpi
@@ -1,72 +1,107 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="2"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
-    <Units Count="3">
+    <Units Count="4">
       <Unit0>
         <Filename Value="exprot.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="30" Y="17"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <UnitName Value="ExProt"/>
+        <CursorPos X="30" Y="19"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exprotu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="EXPROTU"/>
-        <CursorPos X="15" Y="8"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="13"/>
+        <CursorPos X="72" Y="32"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../source/ogproexe.pas"/>
-        <UnitName Value="ogproexe"/>
-        <CursorPos X="1" Y="453"/>
-        <TopLine Value="432"/>
         <EditorIndex Value="2"/>
+        <TopLine Value="432"/>
+        <CursorPos Y="453"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit2>
+      <Unit3>
+        <Filename Value="exprotu.lfm"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos Y="6"/>
+        <UsageCount Value="10"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
+      </Unit3>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="2" HistoryIndex="1">
+      <Position1>
+        <Filename Value="exprotu.pas"/>
+        <Caret Line="8" Column="15"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exprotu.pas"/>
+        <Caret Line="31" Column="72" TopLine="13"/>
+      </Position2>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -74,9 +109,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exprot/exprot.lpr b/components/onguard/examples/exprot/exprot.lpr
index 738d27985..3c448cd7e 100644
--- a/components/onguard/examples/exprot/exprot.lpr
+++ b/components/onguard/examples/exprot/exprot.lpr
@@ -10,6 +10,8 @@ uses
 
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exprot/exprotu.lfm b/components/onguard/examples/exprot/exprotu.lfm
index 621a32631..b036e09bb 100644
--- a/components/onguard/examples/exprot/exprotu.lfm
+++ b/components/onguard/examples/exprot/exprotu.lfm
@@ -1,55 +1,71 @@
 object Form1: TForm1
   Left = 258
-  Height = 151
+  Height = 200
   Top = 146
-  Width = 446
-  HorzScrollBar.Page = 445
-  HorzScrollBar.Range = 441
-  VertScrollBar.Page = 150
-  VertScrollBar.Range = 145
-  ActiveControl = Memo1
+  Width = 384
+  AutoSize = True
+  BorderStyle = bsDialog
   Caption = 'Protect Exe Example'
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
-  Font.Pitch = fpVariable
+  ClientHeight = 200
+  ClientWidth = 384
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
-    Left = 8
-    Height = 13
-    Top = 126
-    Width = 35
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 12
+    Height = 15
+    Top = 164
+    Width = 32
+    BorderSpacing.Left = 12
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 105
-    Top = 8
-    Width = 433
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the EXE file. '
-      ''
-      'If the EXE file has not been stamped, use the StampEXE program to protect it.'
-      ''
-      'The EXE file will need to be stamped after each compile since this re-writes the EXE file.'
-    )
-    ReadOnly = True
+  object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Bevel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Side = asrBottom
+    Left = 297
+    Height = 25
+    Top = 159
+    Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Around = 12
+    Kind = bkClose
     TabOrder = 0
   end
-  object CloseBtn: TBitBtn
-    Left = 360
-    Height = 25
-    Top = 120
-    Width = 75
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 1
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 120
+    Top = 12
+    Width = 360
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'The label at the bottom of this form indicates the status of the EXE file. '#13#10#13#10'If the EXE file has not been stamped, use the StampEXE program to protect it.'#13#10#13#10'The EXE file will need to be stamped after each compile since this re-writes the EXE file.'
+    WordWrap = True
+  end
+  object Bevel1: TBevel
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Memo1
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 3
+    Top = 144
+    Width = 360
+    Anchors = [akTop, akLeft, akRight]
+    Shape = bsTopLine
   end
   object OgProtectExe1: TOgProtectExe
     OnChecked = OgProtectExe1Checked
-    left = 124
-    top = 120
+    Left = 136
+    Top = 88
   end
 end
diff --git a/components/onguard/examples/exprot/exprotu.lrs b/components/onguard/examples/exprot/exprotu.lrs
index f40b5ba38..5188df1e1 100644
--- a/components/onguard/examples/exprot/exprotu.lrs
+++ b/components/onguard/examples/exprot/exprotu.lrs
@@ -1,20 +1,30 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#2#1#6'Height'#3#151#0#3'Top'#3#146#0#5'Wi'
-  +'dth'#3#190#1#18'HorzScrollBar.Page'#3#189#1#19'HorzScrollBar.Range'#3#185#1
-  +#18'VertScrollBar.Page'#3#150#0#19'VertScrollBar.Range'#3#145#0#13'ActiveCon'
-  +'trol'#7#5'Memo1'#7'Caption'#6#19'Protect Exe Example'#10'Font.Color'#7#6'cl'
-  +'Text'#11'Font.Height'#2#11#9'Font.Name'#6#13'MS Sans Serif'#10'Font.Pitch'#7
-  +#10'fpVariable'#8'Position'#7#14'poScreenCenter'#0#6'TLabel'#9'StatusLbl'#4
-  +'Left'#2#8#6'Height'#2#13#3'Top'#2'~'#5'Width'#2'#'#7'Caption'#6#6'Status'#5
-  +'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'He'
-  +'ight'#2'i'#3'Top'#2#8#5'Width'#3#177#1#13'Lines.Strings'#1#6'KThe label at '
-  +'the bottom of this form indicates the status of the EXE file. '#6#0#6'MIf t'
-  +'he EXE file has not been stamped, use the StampEXE program to protect it.'#6
-  +#0#6'ZThe EXE file will need to be stamped after each compile since this re-'
-  +'writes the EXE file.'#0#8'ReadOnly'#9#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'Clos'
-  +'eBtn'#4'Left'#3'h'#1#6'Height'#2#25#3'Top'#2'x'#5'Width'#2'K'#4'Kind'#7#7'b'
-  +'kClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#13'TOgProtectExe'#13'OgProtect'
-  +'Exe1'#9'OnChecked'#7#20'OgProtectExe1Checked'#4'left'#2'|'#3'top'#2'x'#0#0#0
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#2#1#6'Height'#3#200#0#3'Top'#3#146#0#5'Wi'
+  +'dth'#3#128#1#8'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#19'Pr'
+  +'otect Exe Example'#12'ClientHeight'#3#200#0#11'ClientWidth'#3#128#1#8'Posit'
+  +'ion'#7#14'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#9'StatusL'
+  +'bl'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'Clo'
+  +'seBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#12#6'Height'#2#15#3
+  +'Top'#3#164#0#5'Width'#2' '#18'BorderSpacing.Left'#2#12#7'Caption'#6#6'Statu'
+  +'s'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TBitBtn'#8'CloseBtn'#21'Anc'
+  +'horSideTop.Control'#7#6'Bevel1'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'An'
+  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#3')'#1#6'Height'#2#25#3'Top'#3
+  +#159#0#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Ar'
+  +'ound'#2#12#4'Kind'#7#7'bkClose'#8'TabOrder'#2#0#0#0#6'TLabel'#5'Memo1'#22'A'
+  +'nchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'A'
+  +'nchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#12#6'Height'#2'x'#3'Top'#2#12#5'Width'#3'h'#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#12#7'Caption'#6#250'The l'
+  +'abel at the bottom of this form indicates the status of the EXE file. '#13
+  +#10#13#10'If the EXE file has not been stamped, use the StampEXE program to '
+  +'protect it.'#13#10#13#10'The EXE file will need to be stamped after each co'
+  +'mpile since this re-writes the EXE file.'#8'WordWrap'#9#0#0#6'TBevel'#6'Bev'
+  +'el1'#22'AnchorSideLeft.Control'#7#5'Memo1'#21'AnchorSideTop.Control'#7#5'Me'
+  +'mo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+  +'Memo1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#3#3
+  +'Top'#3#144#0#5'Width'#3'h'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#5
+  +'Shape'#7#9'bsTopLine'#0#0#13'TOgProtectExe'#13'OgProtectExe1'#9'OnChecked'#7
+  +#20'OgProtectExe1Checked'#4'Left'#3#136#0#3'Top'#2'X'#0#0#0
 ]);
diff --git a/components/onguard/examples/exprot/exprotu.pas b/components/onguard/examples/exprot/exprotu.pas
index 845936a2c..cae775de0 100644
--- a/components/onguard/examples/exprot/exprotu.pas
+++ b/components/onguard/examples/exprot/exprotu.pas
@@ -4,13 +4,17 @@ interface
 
 uses
   SysUtils, Classes,
-  Controls, Forms, Dialogs, StdCtrls, Buttons,LResources
-  ,ogutil, ogproexe;
+  Controls, Forms, Dialogs, StdCtrls, Buttons, LResources, ExtCtrls,
+  ogutil, ogproexe;
 
 type
+
+  { TForm1 }
+
   TForm1 = class(TForm)
-    Memo1: TMemo;
+    Bevel1: TBevel;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     StatusLbl: TLabel;
     OgProtectExe1: TOgProtectExe;
     procedure OgProtectExe1Checked(Sender: TObject; Status: TExeStatus);
@@ -25,8 +29,6 @@ var
 
 implementation
 
-
-
 procedure TForm1.OgProtectExe1Checked(Sender: TObject; Status: TExeStatus);
 var
   S : string;
diff --git a/components/onguard/examples/exreg/exreg.lpi b/components/onguard/examples/exreg/exreg.lpi
index b6ef82b1e..0b786cfdb 100644
--- a/components/onguard/examples/exreg/exreg.lpi
+++ b/components/onguard/examples/exreg/exreg.lpi
@@ -1,27 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <Scaled Value="True"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -33,15 +39,15 @@
         <MinVersion Major="1" Valid="True"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="6">
+    <Units Count="8">
       <Unit0>
         <Filename Value="exreg.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="7" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <UnitName Value="ExReg"/>
+        <CursorPos Y="9"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exreg1.pas"/>
@@ -50,111 +56,186 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ExReg1"/>
-        <CursorPos X="1" Y="75"/>
-        <TopLine Value="57"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
+        <TopLine Value="72"/>
+        <CursorPos X="30" Y="96"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="3" Y="2041"/>
+        <EditorIndex Value="2"/>
         <TopLine Value="2036"/>
-        <EditorIndex Value="3"/>
+        <CursorPos X="3" Y="2041"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../../../lazarus0915/lcl/editbtn.pas"/>
         <UnitName Value="EditBtn"/>
-        <CursorPos X="60" Y="313"/>
         <TopLine Value="301"/>
+        <CursorPos X="60" Y="313"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../../../lazarus0915/fpcsrc/rtl/objpas/sysutils/datih.inc"/>
-        <CursorPos X="10" Y="114"/>
         <TopLine Value="101"/>
+        <CursorPos X="10" Y="114"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../../../../../temp/fpc/rtl/objpas/sysutils/datih.inc"/>
-        <CursorPos X="10" Y="127"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="106"/>
-        <EditorIndex Value="2"/>
+        <CursorPos X="10" Y="127"/>
+        <UsageCount Value="10"/>
+        <LoadedDesigner Value="True"/>
+      </Unit5>
+      <Unit6>
+        <Filename Value="C:/Lazarus/fpc-3.2.2/source/rtl/objpas/sysutils/sysinth.inc"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="75"/>
+        <CursorPos X="4" Y="93"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
-      </Unit5>
+      </Unit6>
+      <Unit7>
+        <Filename Value="C:/Lazarus/fpc-3.2.2/source/rtl/win/sysutils.pp"/>
+        <UnitName Value="SysUtils"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="10"/>
+        <CursorPos X="23" Y="13"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit7>
     </Units>
-    <JumpHistory Count="15" HistoryIndex="14">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="exreg1.pas"/>
-        <Caret Line="69" Column="27" TopLine="62"/>
+        <Caret Line="80" Column="19" TopLine="68"/>
       </Position1>
       <Position2>
-        <Filename Value="exreg1.pas"/>
-        <Caret Line="79" Column="16" TopLine="68"/>
+        <Filename Value="../../source/onguard.pas"/>
+        <Caret Line="1985" Column="34" TopLine="1979"/>
       </Position2>
       <Position3>
         <Filename Value="../../source/onguard.pas"/>
-        <Caret Line="1979" Column="61" TopLine="1979"/>
+        <Caret Line="72" Column="16" TopLine="70"/>
       </Position3>
       <Position4>
-        <Filename Value="exreg1.pas"/>
-        <Caret Line="80" Column="19" TopLine="68"/>
+        <Filename Value="../../source/onguard.pas"/>
       </Position4>
       <Position5>
         <Filename Value="../../source/onguard.pas"/>
-        <Caret Line="1985" Column="34" TopLine="1979"/>
+        <Caret Line="90" Column="22" TopLine="75"/>
       </Position5>
       <Position6>
         <Filename Value="../../source/onguard.pas"/>
-        <Caret Line="72" Column="16" TopLine="70"/>
+        <Caret Line="1901" Column="28" TopLine="1886"/>
       </Position6>
       <Position7>
-        <Filename Value="../../source/onguard.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="77" Column="62" TopLine="60"/>
       </Position7>
       <Position8>
-        <Filename Value="../../source/onguard.pas"/>
-        <Caret Line="90" Column="22" TopLine="75"/>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="73" Column="60" TopLine="60"/>
       </Position8>
       <Position9>
-        <Filename Value="../../source/onguard.pas"/>
-        <Caret Line="1901" Column="28" TopLine="1886"/>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="62" Column="13" TopLine="54"/>
       </Position9>
       <Position10>
         <Filename Value="exreg1.pas"/>
-        <Caret Line="77" Column="62" TopLine="60"/>
+        <Caret Line="65" Column="10" TopLine="54"/>
       </Position10>
       <Position11>
         <Filename Value="exreg1.pas"/>
-        <Caret Line="73" Column="60" TopLine="60"/>
+        <Caret Line="61" Column="14" TopLine="54"/>
       </Position11>
       <Position12>
         <Filename Value="exreg1.pas"/>
-        <Caret Line="62" Column="13" TopLine="54"/>
+        <Caret Line="65" Column="9" TopLine="54"/>
       </Position12>
       <Position13>
         <Filename Value="exreg1.pas"/>
-        <Caret Line="65" Column="10" TopLine="54"/>
+        <Caret Line="75" TopLine="57"/>
       </Position13>
       <Position14>
         <Filename Value="exreg1.pas"/>
-        <Caret Line="61" Column="14" TopLine="54"/>
+        <Caret Line="54" Column="37" TopLine="54"/>
       </Position14>
       <Position15>
         <Filename Value="exreg1.pas"/>
-        <Caret Line="65" Column="9" TopLine="54"/>
+        <Caret Line="32" Column="22"/>
       </Position15>
+      <Position16>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="91" Column="18" TopLine="62"/>
+      </Position16>
+      <Position17>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="43" Column="21" TopLine="43"/>
+      </Position17>
+      <Position18>
+        <Filename Value="exreg1.pas"/>
+      </Position18>
+      <Position19>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="91" Column="10" TopLine="61"/>
+      </Position19>
+      <Position20>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="50" Column="8" TopLine="43"/>
+      </Position20>
+      <Position21>
+        <Filename Value="exreg1.pas"/>
+      </Position21>
+      <Position22>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="28" Column="30"/>
+      </Position22>
+      <Position23>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="62" Column="25" TopLine="62"/>
+      </Position23>
+      <Position24>
+        <Filename Value="exreg1.pas"/>
+      </Position24>
+      <Position25>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="14" Column="11"/>
+      </Position25>
+      <Position26>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="61" Column="24" TopLine="31"/>
+      </Position26>
+      <Position27>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="92" TopLine="62"/>
+      </Position27>
+      <Position28>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="54" TopLine="18"/>
+      </Position28>
+      <Position29>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="67" Column="33" TopLine="45"/>
+      </Position29>
+      <Position30>
+        <Filename Value="exreg1.pas"/>
+        <Caret Line="30" Column="15" TopLine="12"/>
+      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -167,7 +248,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -175,11 +256,17 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
+    <BreakPoints Count="1">
+      <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsLocal"/>
+        <WatchKind Value="wpkWrite"/>
+        <Source Value="exreg1.pas"/>
+        <Line Value="61"/>
+      </Item1>
+    </BreakPoints>
     <Exceptions Count="2">
       <Item1>
         <Name Value="ECodetoolError"/>
diff --git a/components/onguard/examples/exreg/exreg.lpr b/components/onguard/examples/exreg/exreg.lpr
index 0874d756a..3ef7d3284 100644
--- a/components/onguard/examples/exreg/exreg.lpr
+++ b/components/onguard/examples/exreg/exreg.lpr
@@ -7,8 +7,11 @@ uses
   Forms,
   ExReg1 in 'ExReg1.pas' {frmExRegCode}, tponguard;
 
+{$R *.res}
 
 begin
+  Application.Scaled:=True;
+  Application.Title:='';
   Application.Initialize;
   Application.CreateForm(TfrmExRegCode, frmExRegCode);
   Application.Run;
diff --git a/components/onguard/examples/exreg/exreg1.lfm b/components/onguard/examples/exreg/exreg1.lfm
index 898198c73..6ddf59bf1 100644
--- a/components/onguard/examples/exreg/exreg1.lfm
+++ b/components/onguard/examples/exreg/exreg1.lfm
@@ -7,54 +7,78 @@ object frmExRegCode: TfrmExRegCode
   Caption = 'Registration Code Example'
   ClientHeight = 298
   ClientWidth = 391
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object GroupBox1: TGroupBox
-    Left = 8
-    Height = 129
-    Top = 8
-    Width = 369
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
+    Height = 121
+    Top = 12
+    Width = 370
+    AutoSize = True
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
     Caption = ' Registration Code Generator (vendor site) '
-    ClientHeight = 111
-    ClientWidth = 365
+    ClientHeight = 101
+    ClientWidth = 366
     TabOrder = 0
     object Label1: TLabel
+      AnchorSideTop.Control = edtUserName1
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = Label3
+      AnchorSideRight.Side = asrBottom
       Left = 39
-      Height = 14
-      Top = 28
-      Width = 57
+      Height = 15
+      Top = 8
+      Width = 70
       Alignment = taRightJustify
+      Anchors = [akTop, akLeft, akRight]
       Caption = 'User Name:'
       ParentColor = False
     end
     object Label2: TLabel
-      Left = 14
-      Height = 14
-      Top = 60
-      Width = 76
+      AnchorSideTop.Control = edDate
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = Label3
+      AnchorSideRight.Side = asrBottom
+      Left = 26
+      Height = 15
+      Top = 39
+      Width = 83
       Alignment = taRightJustify
+      Anchors = [akTop, akRight]
       Caption = 'Expiration Date:'
       ParentColor = False
     end
     object Label3: TLabel
-      Left = 6
-      Height = 14
-      Top = 92
-      Width = 88
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = edtRegCode1
+      AnchorSideTop.Side = asrCenter
+      Left = 12
+      Height = 15
+      Top = 70
+      Width = 97
       Alignment = taRightJustify
+      BorderSpacing.Left = 12
       Caption = 'Registration Code:'
       ParentColor = False
     end
     object btnGenerate: TSpeedButton
-      Left = 328
+      AnchorSideTop.Control = edtRegCode1
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      Left = 331
       Height = 22
       Hint = 'Generate Registration Code'
-      Top = 88
+      Top = 66
       Width = 23
-      Color = clBtnFace
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 12
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000001000000000000000000000000000
@@ -68,78 +92,123 @@ object frmExRegCode: TfrmExRegCode
         0000888800888080088880000000888888000008888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = btnGenerateClick
       ShowHint = True
       ParentShowHint = False
     end
     object edtUserName1: TEdit
-      Left = 120
+      AnchorSideLeft.Control = edtRegCode1
+      AnchorSideTop.Control = GroupBox1
+      Left = 121
       Height = 23
-      Top = 24
+      Top = 4
       Width = 233
+      BorderSpacing.Top = 4
+      BorderSpacing.Right = 12
       TabOrder = 0
     end
     object edtRegCode1: TEdit
-      Left = 120
+      AnchorSideLeft.Control = Label3
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = edDate
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = btnGenerate
+      Left = 121
       Height = 23
-      Top = 88
-      Width = 201
+      Top = 66
+      Width = 206
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 12
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 4
+      BorderSpacing.Bottom = 12
       Color = clBtnFace
       ReadOnly = True
       TabOrder = 1
     end
     object edDate: TEdit
+      AnchorSideLeft.Control = edtRegCode1
+      AnchorSideTop.Control = edtUserName1
+      AnchorSideTop.Side = asrBottom
       Left = 121
       Height = 23
-      Top = 57
+      Top = 35
       Width = 118
+      BorderSpacing.Top = 8
       TabOrder = 2
     end
   end
   object GroupBox2: TGroupBox
-    Left = 8
-    Height = 129
+    AnchorSideLeft.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 121
     Top = 152
-    Width = 369
+    Width = 367
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 24
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
     Caption = ' Registration Code Verification (client site) '
-    ClientHeight = 111
-    ClientWidth = 365
+    ClientHeight = 101
+    ClientWidth = 363
     TabOrder = 1
     object Label4: TLabel
-      Left = 38
-      Height = 14
-      Top = 60
-      Width = 57
+      AnchorSideTop.Control = edtUserName2
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = Label5
+      AnchorSideRight.Side = asrBottom
+      Left = 48
+      Height = 15
+      Top = 39
+      Width = 61
       Alignment = taRightJustify
+      Anchors = [akTop, akRight]
       Caption = 'User Name:'
       ParentColor = False
     end
     object Label5: TLabel
-      Left = 6
-      Height = 14
-      Top = 28
-      Width = 88
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideTop.Control = edtRegCode2
+      AnchorSideTop.Side = asrCenter
+      Left = 12
+      Height = 15
+      Top = 8
+      Width = 97
       Alignment = taRightJustify
+      BorderSpacing.Left = 12
       Caption = 'Registration Code:'
       ParentColor = False
     end
     object Label6: TLabel
-      Left = 70
-      Height = 14
-      Top = 92
-      Width = 34
+      AnchorSideTop.Control = edtStatus
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = Label4
+      AnchorSideRight.Side = asrBottom
+      Left = 74
+      Height = 15
+      Top = 70
+      Width = 35
       Alignment = taRightJustify
+      Anchors = [akTop, akRight]
       Caption = 'Status:'
       ParentColor = False
     end
     object btnVerify: TSpeedButton
-      Left = 224
+      AnchorSideLeft.Control = edtStatus
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = edtStatus
+      AnchorSideTop.Side = asrCenter
+      Left = 254
       Height = 22
       Hint = 'Verify Registration Code'
-      Top = 88
+      Top = 66
       Width = 23
-      Color = clBtnFace
+      BorderSpacing.Left = 4
+      BorderSpacing.Bottom = 12
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000001000000000000000000000000000
@@ -153,30 +222,51 @@ object frmExRegCode: TfrmExRegCode
         0000888888888888888880000000888888888888888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = btnVerifyClick
       ShowHint = True
       ParentShowHint = False
     end
     object edtUserName2: TEdit
-      Left = 120
+      AnchorSideLeft.Control = edtRegCode2
+      AnchorSideTop.Control = edtRegCode2
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 121
       Height = 23
-      Top = 56
-      Width = 233
+      Top = 35
+      Width = 230
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 12
       TabOrder = 0
     end
     object edtRegCode2: TEdit
-      Left = 120
+      AnchorSideLeft.Control = Label5
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 121
       Height = 23
-      Top = 24
-      Width = 233
+      Top = 4
+      Width = 230
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 12
+      BorderSpacing.Top = 4
+      BorderSpacing.Right = 12
       TabOrder = 1
     end
     object edtStatus: TEdit
-      Left = 120
+      AnchorSideLeft.Control = edtRegCode2
+      AnchorSideTop.Control = edtUserName2
+      AnchorSideTop.Side = asrBottom
+      Left = 121
       Height = 23
-      Top = 88
-      Width = 97
+      Top = 66
+      Width = 129
+      BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 12
       Color = clBtnFace
       ReadOnly = True
       TabOrder = 2
diff --git a/components/onguard/examples/exreg/exreg1.lrs b/components/onguard/examples/exreg/exreg1.lrs
index 6a1ae6349..11cb0c38a 100644
--- a/components/onguard/examples/exreg/exreg1.lrs
+++ b/components/onguard/examples/exreg/exreg1.lrs
@@ -1,69 +1,114 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TfrmExRegCode','FORMDATA',[
   'TPF0'#13'TfrmExRegCode'#12'frmExRegCode'#4'Left'#3#135#1#6'Height'#3'*'#1#3
   +'Top'#3#180#0#5'Width'#3#135#1#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#25
-  +'Registration Code Example'#12'ClientHeight'#3'*'#1#11'ClientWidth'#3#135#1
-  +#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'OnCreate'#7#10'For'
-  +'mCreate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9'TG'
-  +'roupBox'#9'GroupBox1'#4'Left'#2#8#6'Height'#3#129#0#3'Top'#2#8#5'Width'#3'q'
-  +#1#7'Caption'#6'+ Registration Code Generator (vendor site) '#12'ClientHeigh'
-  +'t'#2'o'#11'ClientWidth'#3'm'#1#8'TabOrder'#2#0#0#6'TLabel'#6'Label1'#4'Left'
-  +#2''''#6'Height'#2#14#3'Top'#2#28#5'Width'#2'9'#9'Alignment'#7#14'taRightJus'
-  +'tify'#7'Caption'#6#10'User Name:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'
-  +#4'Left'#2#14#6'Height'#2#14#3'Top'#2'<'#5'Width'#2'L'#9'Alignment'#7#14'taR'
-  +'ightJustify'#7'Caption'#6#16'Expiration Date:'#11'ParentColor'#8#0#0#6'TLab'
-  +'el'#6'Label3'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'\'#5'Width'#2'X'#9'Alignm'
-  +'ent'#7#14'taRightJustify'#7'Caption'#6#18'Registration Code:'#11'ParentColo'
-  +'r'#8#0#0#12'TSpeedButton'#11'btnGenerate'#4'Left'#3'H'#1#6'Height'#2#22#4'H'
-  +'int'#6#26'Generate Registration Code'#3'Top'#2'X'#5'Width'#2#23#5'Color'#7#9
-  +'clBtnFace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0
-  +'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#16#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128
-  +#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0
-  +#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128
-  +#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#0#0#8#136#136
-  +#128#0#0#0#136#136#0#136#128#128#8#136#128#0#0#0#136#128#128#136#136#136#0
-  +#136#128#0#0#0#136#8#136#128#0#136#136#8#128#0#0#0#136#0#136#0#0#8#136#8#128
-  +#0#0#0#128#136#128#9#137#0#128#128#128#0#0#0#128#136#128#8#152#0#136#128#128
-  +#0#0#0#128#8#128#8#152#0#136#0#128#0#0#0#128#136#128#9#137#0#136#128#128#0#0
-  +#0#136#8#136#0#0#8#136#8#128#0#0#0#136#8#8#128#0#136#8#8#128#0#0#0#136#128
-  +#136#8#136#136#128#136#128#0#0#0#136#136#0#136#128#128#8#136#128#0#0#0#136
-  +#136#136#0#0#8#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#16'btnGenerateClick'#8'ShowHint'#9#14'ParentSho'
-  +'wHint'#8#0#0#5'TEdit'#12'edtUserName1'#4'Left'#2'x'#6'Height'#2#23#3'Top'#2
-  +#24#5'Width'#3#233#0#8'TabOrder'#2#0#0#0#5'TEdit'#11'edtRegCode1'#4'Left'#2
-  +'x'#6'Height'#2#23#3'Top'#2'X'#5'Width'#3#201#0#5'Color'#7#9'clBtnFace'#8'Re'
-  +'adOnly'#9#8'TabOrder'#2#1#0#0#5'TEdit'#6'edDate'#4'Left'#2'y'#6'Height'#2#23
-  +#3'Top'#2'9'#5'Width'#2'v'#8'TabOrder'#2#2#0#0#0#9'TGroupBox'#9'GroupBox2'#4
-  +'Left'#2#8#6'Height'#3#129#0#3'Top'#3#152#0#5'Width'#3'q'#1#7'Caption'#6'. R'
-  +'egistration Code Verification (client site) '#12'ClientHeight'#2'o'#11'Clie'
-  +'ntWidth'#3'm'#1#8'TabOrder'#2#1#0#6'TLabel'#6'Label4'#4'Left'#2'&'#6'Height'
-  +#2#14#3'Top'#2'<'#5'Width'#2'9'#9'Alignment'#7#14'taRightJustify'#7'Caption'
-  +#6#10'User Name:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label5'#4'Left'#2#6#6'He'
-  +'ight'#2#14#3'Top'#2#28#5'Width'#2'X'#9'Alignment'#7#14'taRightJustify'#7'Ca'
-  +'ption'#6#18'Registration Code:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label6'#4
-  +'Left'#2'F'#6'Height'#2#14#3'Top'#2'\'#5'Width'#2'"'#9'Alignment'#7#14'taRig'
-  +'htJustify'#7'Caption'#6#7'Status:'#11'ParentColor'#8#0#0#12'TSpeedButton'#9
-  +'btnVerify'#4'Left'#3#224#0#6'Height'#2#22#4'Hint'#6#24'Verify Registration '
-  +'Code'#3'Top'#2'X'#5'Width'#2#23#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10'F'
-  +#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4
-  +#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#16#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128
-  +#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192
-  +#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255
-  +#255#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136
-  +#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136
-  +#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#0#8
-  +#136#136#136#136#128#0#0#0#136#128#0#0#136#8#136#128#128#0#0#0#136#0#152#144
-  +#8#8#0#128#128#0#0#0#136#0#137#128#0#0#0#0#128#0#0#0#136#0#137#128#0#0#0#0
-  +#128#0#0#0#136#0#152#144#8#136#136#136#128#0#0#0#136#128#0#0#136#136#136#136
-  +#128#0#0#0#136#136#0#8#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136
-  +#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136
-  +#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#9'NumGlyphs'
-  +#2#0#7'OnClick'#7#14'btnVerifyClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#5
-  +'TEdit'#12'edtUserName2'#4'Left'#2'x'#6'Height'#2#23#3'Top'#2'8'#5'Width'#3
-  +#233#0#8'TabOrder'#2#0#0#0#5'TEdit'#11'edtRegCode2'#4'Left'#2'x'#6'Height'#2
-  +#23#3'Top'#2#24#5'Width'#3#233#0#8'TabOrder'#2#1#0#0#5'TEdit'#9'edtStatus'#4
-  +'Left'#2'x'#6'Height'#2#23#3'Top'#2'X'#5'Width'#2'a'#5'Color'#7#9'clBtnFace'
-  ,#8'ReadOnly'#9#8'TabOrder'#2#2#0#0#0#0
+  +'Registration Code Example'#12'ClientHeight'#3'*'#1#11'ClientWidth'#3#135#1#8
+  +'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6
+  +#7'2.3.0.0'#0#9'TGroupBox'#9'GroupBox1'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#12#6'Height'#2'y'#3'Top'#2#12
+  +#5'Width'#3'r'#1#8'AutoSize'#9#18'BorderSpacing.Left'#2#12#17'BorderSpacing.'
+  +'Top'#2#12#19'BorderSpacing.Right'#2#12#20'BorderSpacing.Bottom'#2#12#7'Capt'
+  +'ion'#6'+ Registration Code Generator (vendor site) '#12'ClientHeight'#2'e'
+  +#11'ClientWidth'#3'n'#1#8'TabOrder'#2#0#0#6'TLabel'#6'Label1'#21'AnchorSideT'
+  +'op.Control'#7#12'edtUserName1'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anc'
+  +'horSideRight.Control'#7#6'Label3'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2''''#6'Height'#2#15#3'Top'#2#8#5'Width'#2'F'#9'Alignment'#7#14'taRig'
+  +'htJustify'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#10'Us'
+  +'er Name:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#21'AnchorSideTop.Contro'
+  +'l'#7#6'edDate'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Con'
+  +'trol'#7#6'Label3'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#26#6'He'
+  +'ight'#2#15#3'Top'#2''''#5'Width'#2'S'#9'Alignment'#7#14'taRightJustify'#7'A'
+  +'nchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#16'Expiration Date:'#11'Paren'
+  +'tColor'#8#0#0#6'TLabel'#6'Label3'#22'AnchorSideLeft.Control'#7#9'GroupBox1'
+  +#21'AnchorSideTop.Control'#7#11'edtRegCode1'#18'AnchorSideTop.Side'#7#9'asrC'
+  +'enter'#4'Left'#2#12#6'Height'#2#15#3'Top'#2'F'#5'Width'#2'a'#9'Alignment'#7
+  +#14'taRightJustify'#18'BorderSpacing.Left'#2#12#7'Caption'#6#18'Registration'
+  +' Code:'#11'ParentColor'#8#0#0#12'TSpeedButton'#11'btnGenerate'#21'AnchorSid'
+  +'eTop.Control'#7#11'edtRegCode1'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'An'
+  +'chorSideRight.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBotto'
+  +'m'#4'Left'#3'K'#1#6'Height'#2#22#4'Hint'#6#26'Generate Registration Code'#3
+  +'Top'#2'B'#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacin'
+  +'g.Right'#2#12#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0
+  +#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#16#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0
+  +#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255
+  +#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136
+  +#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#0#0#8#136
+  +#136#128#0#0#0#136#136#0#136#128#128#8#136#128#0#0#0#136#128#128#136#136#136
+  +#0#136#128#0#0#0#136#8#136#128#0#136#136#8#128#0#0#0#136#0#136#0#0#8#136#8
+  +#128#0#0#0#128#136#128#9#137#0#128#128#128#0#0#0#128#136#128#8#152#0#136#128
+  +#128#0#0#0#128#8#128#8#152#0#136#0#128#0#0#0#128#136#128#9#137#0#136#128#128
+  +#0#0#0#136#8#136#0#0#8#136#8#128#0#0#0#136#8#8#128#0#136#8#8#128#0#0#0#136
+  +#128#136#8#136#136#128#136#128#0#0#0#136#136#0#136#128#128#8#136#128#0#0#0
+  +#136#136#136#0#0#8#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0
+  +#0#7'OnClick'#7#16'btnGenerateClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#5
+  +'TEdit'#12'edtUserName1'#22'AnchorSideLeft.Control'#7#11'edtRegCode1'#21'Anc'
+  +'horSideTop.Control'#7#9'GroupBox1'#4'Left'#2'y'#6'Height'#2#23#3'Top'#2#4#5
+  +'Width'#3#233#0#17'BorderSpacing.Top'#2#4#19'BorderSpacing.Right'#2#12#8'Tab'
+  +'Order'#2#0#0#0#5'TEdit'#11'edtRegCode1'#22'AnchorSideLeft.Control'#7#6'Labe'
+  +'l3'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#6'ed'
+  +'Date'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#11
+  +'btnGenerate'#4'Left'#2'y'#6'Height'#2#23#3'Top'#2'B'#5'Width'#3#206#0#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12#17'Bor'
+  +'derSpacing.Top'#2#8#19'BorderSpacing.Right'#2#4#20'BorderSpacing.Bottom'#2
+  +#12#5'Color'#7#9'clBtnFace'#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#5'TEdit'#6'edD'
+  +'ate'#22'AnchorSideLeft.Control'#7#11'edtRegCode1'#21'AnchorSideTop.Control'
+  +#7#12'edtUserName1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'y'#6'Hei'
+  +'ght'#2#23#3'Top'#2'#'#5'Width'#2'v'#17'BorderSpacing.Top'#2#8#8'TabOrder'#2
+  +#2#0#0#0#9'TGroupBox'#9'GroupBox2'#22'AnchorSideLeft.Control'#7#5'Owner'#23
+  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#2#12#6'Height'#2'y'#3'Top'#3#152#0#5'Width'#3'o'#1#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#12#17
+  +'BorderSpacing.Top'#2#24#19'BorderSpacing.Right'#2#12#20'BorderSpacing.Botto'
+  +'m'#2#12#7'Caption'#6'. Registration Code Verification (client site) '#12'Cl'
+  +'ientHeight'#2'e'#11'ClientWidth'#3'k'#1#8'TabOrder'#2#1#0#6'TLabel'#6'Label'
+  +'4'#21'AnchorSideTop.Control'#7#12'edtUserName2'#18'AnchorSideTop.Side'#7#9
+  +'asrCenter'#23'AnchorSideRight.Control'#7#6'Label5'#20'AnchorSideRight.Side'
+  ,#7#9'asrBottom'#4'Left'#2'0'#6'Height'#2#15#3'Top'#2''''#5'Width'#2'='#9'Ali'
+  +'gnment'#7#14'taRightJustify'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'
+  +#6#10'User Name:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label5'#22'AnchorSideLef'
+  +'t.Control'#7#9'GroupBox2'#21'AnchorSideTop.Control'#7#11'edtRegCode2'#18'An'
+  +'chorSideTop.Side'#7#9'asrCenter'#4'Left'#2#12#6'Height'#2#15#3'Top'#2#8#5'W'
+  +'idth'#2'a'#9'Alignment'#7#14'taRightJustify'#18'BorderSpacing.Left'#2#12#7
+  +'Caption'#6#18'Registration Code:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label6'
+  +#21'AnchorSideTop.Control'#7#9'edtStatus'#18'AnchorSideTop.Side'#7#9'asrCent'
+  +'er'#23'AnchorSideRight.Control'#7#6'Label4'#20'AnchorSideRight.Side'#7#9'as'
+  +'rBottom'#4'Left'#2'J'#6'Height'#2#15#3'Top'#2'F'#5'Width'#2'#'#9'Alignment'
+  +#7#14'taRightJustify'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#7'Sta'
+  +'tus:'#11'ParentColor'#8#0#0#12'TSpeedButton'#9'btnVerify'#22'AnchorSideLeft'
+  +'.Control'#7#9'edtStatus'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSi'
+  +'deTop.Control'#7#9'edtStatus'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
+  +#3#254#0#6'Height'#2#22#4'Hint'#6#24'Verify Registration Code'#3'Top'#2'B'#5
+  +'Width'#2#23#18'BorderSpacing.Left'#2#4#20'BorderSpacing.Bottom'#2#12#10'Gly'
+  +'ph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0
+  +#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#16#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128
+  +#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0
+  +#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136
+  +#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0
+  +#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136
+  +#128#0#0#0#136#136#0#8#136#136#136#136#128#0#0#0#136#128#0#0#136#8#136#128
+  +#128#0#0#0#136#0#152#144#8#8#0#128#128#0#0#0#136#0#137#128#0#0#0#0#128#0#0#0
+  +#136#0#137#128#0#0#0#0#128#0#0#0#136#0#152#144#8#136#136#136#128#0#0#0#136
+  +#128#0#0#136#136#136#136#128#0#0#0#136#136#0#8#136#136#136#136#128#0#0#0#136
+  +#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0
+  +#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136
+  +#136#128#0#0#0#7'OnClick'#7#14'btnVerifyClick'#8'ShowHint'#9#14'ParentShowHi'
+  +'nt'#8#0#0#5'TEdit'#12'edtUserName2'#22'AnchorSideLeft.Control'#7#11'edtRegC'
+  +'ode2'#21'AnchorSideTop.Control'#7#11'edtRegCode2'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#9'GroupBox2'#20'AnchorSideRight.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2'y'#6'Height'#2#23#3'Top'#2'#'#5'Width'#3#230#0
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#8#19
+  +'BorderSpacing.Right'#2#12#8'TabOrder'#2#0#0#0#5'TEdit'#11'edtRegCode2'#22'A'
+  +'nchorSideLeft.Control'#7#6'Label5'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#9'GroupBox2'#23'AnchorSideRight.Control'#7#9'Group'
+  +'Box2'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'y'#6'Height'#2#23#3
+  +'Top'#2#4#5'Width'#3#230#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18
+  +'BorderSpacing.Left'#2#12#17'BorderSpacing.Top'#2#4#19'BorderSpacing.Right'#2
+  +#12#8'TabOrder'#2#1#0#0#5'TEdit'#9'edtStatus'#22'AnchorSideLeft.Control'#7#11
+  +'edtRegCode2'#21'AnchorSideTop.Control'#7#12'edtUserName2'#18'AnchorSideTop.'
+  +'Side'#7#9'asrBottom'#4'Left'#2'y'#6'Height'#2#23#3'Top'#2'B'#5'Width'#3#129
+  +#0#17'BorderSpacing.Top'#2#8#20'BorderSpacing.Bottom'#2#12#5'Color'#7#9'clBt'
+  +'nFace'#8'ReadOnly'#9#8'TabOrder'#2#2#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exreg/exreg1.pas b/components/onguard/examples/exreg/exreg1.pas
index b0e93c0ea..6e405dca1 100644
--- a/components/onguard/examples/exreg/exreg1.pas
+++ b/components/onguard/examples/exreg/exreg1.pas
@@ -49,7 +49,8 @@ uses
 const
   EncryptionKey : TKey = ($E5, $8F, $84, $D6, $92, $C9, $A4, $D8,
                           $1A, $FA, $6F, $8D, $AB, $FC, $DF, $B4);
-
+const
+  DATE_FORMAT = 'yyyy-mm-dd';
 
 procedure TfrmExRegCode.btnGenerateClick(Sender: TObject);
 var
@@ -57,8 +58,13 @@ var
   Code : TCode;
   Modifier : Longint;
   D : TDateTime;
+var
+  fs: TFormatSettings;
 begin
-  D := StrToDate(edDate.Text);
+  fs := FormatSettings;
+  fs.ShortDateFormat := 'yyyy/mm/dd';
+  fs.DateSeparator := '-';
+  D := StrToDate(edDate.Text, fs);
   Key := EncryptionKey;
   Modifier := StringHashELF(edtUserName1.Text);
   ApplyModifierToKeyPrim(Modifier, Key, SizeOf(Key));
@@ -87,9 +93,13 @@ begin
 end;
 
 procedure TfrmExRegCode.FormCreate(Sender: TObject);
+var
+  fs: TFormatSettings;
 begin
-  ShortDateFormat := 'yyyy-mm-dd';
-  edDate.Text := DateToStr(Now);
+  fs := FormatSettings;
+  fs.ShortDateFormat := 'yyyy/mm/dd';
+  fs.DateSeparator := '-';
+  edDate.Text := DateToStr(Now, fs);
 end;
 
 initialization
diff --git a/components/onguard/examples/exrgreg/exrgreg.lpi b/components/onguard/examples/exrgreg/exrgreg.lpi
index 79e95548f..ba699b2e2 100644
--- a/components/onguard/examples/exrgreg/exrgreg.lpi
+++ b/components/onguard/examples/exrgreg/exrgreg.lpi
@@ -1,63 +1,86 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
         <Filename Value="exrgreg.lpr"/>
         <IsPartOfProject Value="True"/>
         <CursorPos X="48" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exrgregu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="exrgregu"/>
-        <CursorPos X="59" Y="108"/>
-        <TopLine Value="80"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="80"/>
+        <CursorPos X="59" Y="108"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="2" HistoryIndex="1">
+      <Position1>
+        <Filename Value="exrgregu.pas"/>
+        <Caret Line="108" Column="59" TopLine="80"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exrgregu.pas"/>
+        <Caret Line="107" Column="59" TopLine="79"/>
+      </Position2>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -70,7 +93,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -78,9 +101,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exrgreg/exrgreg.lpr b/components/onguard/examples/exrgreg/exrgreg.lpr
index a90847398..ed46deb52 100644
--- a/components/onguard/examples/exrgreg/exrgreg.lpr
+++ b/components/onguard/examples/exrgreg/exrgreg.lpr
@@ -7,6 +7,8 @@ uses
   exrgregu in 'exrgregu.pas' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exrgreg/exrgregu.lfm b/components/onguard/examples/exrgreg/exrgregu.lfm
index cde275a8c..ada3b1bd4 100644
--- a/components/onguard/examples/exrgreg/exrgregu.lfm
+++ b/components/onguard/examples/exrgreg/exrgregu.lfm
@@ -5,94 +5,121 @@ object Form1: TForm1
   Width = 493
   HorzScrollBar.Page = 492
   VertScrollBar.Page = 307
+  AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Registration Code Example'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 308
+  ClientWidth = 493
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
-    Left = 8
-    Height = 13
-    Top = 262
-    Width = 35
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 12
+    Height = 15
+    Top = 246
+    Width = 32
+    BorderSpacing.Bottom = 12
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object Label1: TLabel
-    Left = 232
-    Height = 13
-    Top = 14
-    Width = 77
+    AnchorSideLeft.Control = CodeBtn
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 181
+    Height = 15
+    Top = 17
+    Width = 72
+    BorderSpacing.Left = 80
     Caption = 'Current code:'
     Color = clNone
     ParentColor = False
   end
   object CodeLbl: TLabel
-    Left = 320
-    Height = 13
-    Top = 14
-    Width = 113
+    AnchorSideLeft.Control = Label1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 277
+    Height = 15
+    Top = 17
+    Width = 96
+    BorderSpacing.Left = 24
     Caption = '0000000000000000'
     Color = clNone
     ParentColor = False
   end
   object CodeBtn: TButton
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
     Height = 25
-    Top = 8
+    Top = 12
     Width = 89
+    BorderSpacing.Around = 12
     BorderSpacing.InnerBorder = 4
     Caption = 'Enter Code'
     OnClick = CodeBtnClick
     TabOrder = 0
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 209
-    Top = 40
-    Width = 465
-    Color = clBtnFace
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the code. An invalid code indicates that '
-      'the code is either the incorrect type or that none has been entered. '
-      ''
-      'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will '
-      'say that the code is invalid.'
-      ''
-      'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate '
-      'the proper "Usage" code). '
-      ''
-      'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so '
-      'will cause the TOgRegistrationCode component to report that the code is invalid.'
-    )
-    ReadOnly = True
+  object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 406
+    Height = 25
+    Top = 241
+    Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
+    Kind = bkClose
     TabOrder = 1
   end
-  object CloseBtn: TBitBtn
-    Left = 400
-    Height = 25
-    Top = 256
-    Width = 75
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 2
-  end
   object RemoveBtn: TButton
-    Left = 288
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = CloseBtn
+    Left = 305
     Height = 25
-    Top = 256
+    Top = 241
     Width = 97
+    Anchors = [akTop, akRight]
+    BorderSpacing.Top = 12
+    BorderSpacing.Right = 4
+    BorderSpacing.Bottom = 12
     BorderSpacing.InnerBorder = 4
     Caption = 'Remove Code'
     OnClick = RemoveBtnClick
-    TabOrder = 3
+    TabOrder = 2
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 180
+    Top = 49
+    Width = 469
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
+    Caption = 'The label at the bottom of this form indicates the status of the code. An invalid code indicates that the code is either the incorrect type or that none has been entered. '#13#10#13#10'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate the proper "Usage" code). '#13#10#13#10'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so will cause the TOgRegistrationCode component to report that the code is invalid.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
   end
   object OgRegistrationCode1: TOgRegistrationCode
     OnChecked = CodeChecked
     OnGetKey = GetKey
     OnGetCode = GetCode
-    left = 16
-    top = 208
+    Left = 128
+    Top = 208
   end
 end
diff --git a/components/onguard/examples/exrgreg/exrgregu.lrs b/components/onguard/examples/exrgreg/exrgregu.lrs
index 81356aa07..7e58ce70d 100644
--- a/components/onguard/examples/exrgreg/exrgregu.lrs
+++ b/components/onguard/examples/exrgreg/exrgregu.lrs
@@ -1,34 +1,53 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#252#0#6'Height'#3'4'#1#3'Top'#3#138#0#5'W'
-  +'idth'#3#237#1#18'HorzScrollBar.Page'#3#236#1#18'VertScrollBar.Page'#3'3'#1
-  +#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#25'Registration Code Example'#11
-  +'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'Position'#7#14'poScre'
-  +'enCenter'#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Height'#2#13#3'Top'#3#6#1#5
-  +'Width'#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0
-  +#0#6'TLabel'#6'Label1'#4'Left'#3#232#0#6'Height'#2#13#3'Top'#2#14#5'Width'#2
-  +'M'#7'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0
-  +#6'TLabel'#7'CodeLbl'#4'Left'#3'@'#1#6'Height'#2#13#3'Top'#2#14#5'Width'#2'q'
-  +#7'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0
-  +#7'TButton'#7'CodeBtn'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'Y'#25
-  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12
-  +'CodeBtnClick'#8'TabOrder'#2#0#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'Height'#3
-  +#209#0#3'Top'#2'('#5'Width'#3#209#1#5'Color'#7#9'clBtnFace'#13'Lines.Strings'
-  +#1#6'fThe label at the bottom of this form indicates the status of the code.'
-  +' An invalid code indicates that '#6'Ethe code is either the incorrect type '
-  +'or that none has been entered. '#6#0#6'^If the proper code has not been ent'
-  +'ered or the ONGUARD.INI file was deleted, the message will '#6#29'say that '
-  +'the code is invalid.'#6#0#6'YUse the "Enter Code" button to enter a code (t'
-  +'he CODEGEN program can be used to generate '#6#26'the proper "Usage" code).'
-  +' '#6#0#6'\The "Remove Code" button can be used to remove the entered code f'
-  +'rom the INI file. Doing so '#6'Pwill cause the TOgRegistrationCode componen'
-  +'t to report that the code is invalid.'#0#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#7
-  +'TBitBtn'#8'CloseBtn'#4'Left'#3#144#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2
-  +'K'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TButton'#9'R'
-  +'emoveBtn'#4'Left'#3' '#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'a'#25'Borde'
-  +'rSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7#14'Remo'
-  +'veBtnClick'#8'TabOrder'#2#3#0#0#19'TOgRegistrationCode'#19'OgRegistrationCo'
-  +'de1'#9'OnChecked'#7#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7
-  +'GetCode'#4'left'#2#16#3'top'#3#208#0#0#0#0
+  +'idth'#3#237#1#18'HorzScrollBar.Page'#3#236#1#18'VertScrollBar.Page'#3'3'#1#8
+  +'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#25'Registration Code'
+  +' Example'#12'ClientHeight'#3'4'#1#11'ClientWidth'#3#237#1#8'Position'#7#14
+  +'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#9'StatusLbl'#22'Anc'
+  +'horSideLeft.Control'#7#5'Memo1'#21'AnchorSideTop.Control'#7#8'CloseBtn'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#12#6'Height'#2#15#3'Top'#3#246
+  +#0#5'Width'#2' '#20'BorderSpacing.Bottom'#2#12#7'Caption'#6#6'Status'#5'Colo'
+  +'r'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.'
+  +'Control'#7#7'CodeBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#181
+  +#0#6'Height'#2#15#3'Top'#2#17#5'Width'#2'H'#18'BorderSpacing.Left'#2'P'#7'Ca'
+  +'ption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLa'
+  +'bel'#7'CodeLbl'#22'AnchorSideLeft.Control'#7#6'Label1'#19'AnchorSideLeft.Si'
+  +'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.'
+  +'Side'#7#9'asrCenter'#4'Left'#3#21#1#6'Height'#2#15#3'Top'#2#17#5'Width'#2'`'
+  +#18'BorderSpacing.Left'#2#24#7'Caption'#6#16'0000000000000000'#5'Color'#7#6
+  +'clNone'#11'ParentColor'#8#0#0#7'TButton'#7'CodeBtn'#22'AnchorSideLeft.Contr'
+  +'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#12#6'Height'#2
+  +#25#3'Top'#2#12#5'Width'#2'Y'#20'BorderSpacing.Around'#2#12#25'BorderSpacing'
+  +'.InnerBorder'#2#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12'CodeBtnClick'
+  +#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#21'AnchorSideTop.Control'#7#5'Me'
+  +'mo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#150#1#6'Height'#2
+  +#25#3'Top'#3#241#0#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'Bord'
+  +'erSpacing.Right'#2#12#20'BorderSpacing.Bottom'#2#12#4'Kind'#7#7'bkClose'#8
+  +'TabOrder'#2#1#0#0#7'TButton'#9'RemoveBtn'#21'AnchorSideTop.Control'#7#5'Mem'
+  +'o1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'C'
+  +'loseBtn'#4'Left'#3'1'#1#6'Height'#2#25#3'Top'#3#241#0#5'Width'#2'a'#7'Ancho'
+  +'rs'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#12#19'BorderSpacing.Ri'
+  +'ght'#2#4#20'BorderSpacing.Bottom'#2#12#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#11'Remove Code'#7'OnClick'#7#14'RemoveBtnClick'#8'TabOrder'#2#2#0
+  +#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop'
+  +'.Control'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideR'
+  +'ight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+  +#12#6'Height'#3#180#0#3'Top'#2'1'#5'Width'#3#213#1#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#12#7'Caption'#12'Q'#2#0#0'T'
+  +'he label at the bottom of this form indicates the status of the code. An in'
+  +'valid code indicates that the code is either the incorrect type or that non'
+  +'e has been entered. '#13#10#13#10'If the proper code has not been entered o'
+  +'r the ONGUARD.INI file was deleted, the message will say that the code is i'
+  +'nvalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEG'
+  +'EN program can be used to generate the proper "Usage" code). '#13#10#13#10
+  +'The "Remove Code" button can be used to remove the entered code from the IN'
+  +'I file. Doing so will cause the TOgRegistrationCode component to report tha'
+  +'t the code is invalid.'#5'Color'#7#9'clBtnFace'#11'ParentColor'#8#8'WordWra'
+  +'p'#9#0#0#19'TOgRegistrationCode'#19'OgRegistrationCode1'#9'OnChecked'#7#11
+  +'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCode'#4'Left'#3#128
+  +#0#3'Top'#3#208#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exrgreg/exrgregu.pas b/components/onguard/examples/exrgreg/exrgregu.pas
index ac2874dc0..1055aff6e 100644
--- a/components/onguard/examples/exrgreg/exrgregu.pas
+++ b/components/onguard/examples/exrgreg/exrgregu.pas
@@ -14,8 +14,8 @@ type
 
   TForm1 = class(TForm)
     CodeBtn: TButton;
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     StatusLbl: TLabel;
     Label1: TLabel;
     CodeLbl: TLabel;
diff --git a/components/onguard/examples/exrgstr/exrgstr.lpi b/components/onguard/examples/exrgstr/exrgstr.lpi
index c3b10aa1f..99cf6ab1d 100644
--- a/components/onguard/examples/exrgstr/exrgstr.lpi
+++ b/components/onguard/examples/exrgstr/exrgstr.lpi
@@ -1,26 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -32,23 +41,26 @@
       <Unit0>
         <Filename Value="exrgstr.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Exrgstr"/>
         <CursorPos X="48" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exrgstru.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exrgstru"/>
-        <CursorPos X="23" Y="89"/>
-        <TopLine Value="74"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="65"/>
+        <CursorPos Y="92"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
     </Units>
     <JumpHistory Count="8" HistoryIndex="7">
@@ -58,7 +70,6 @@
       </Position1>
       <Position2>
         <Filename Value="exrgstru.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
       </Position2>
       <Position3>
         <Filename Value="exrgstru.pas"/>
@@ -87,10 +98,11 @@
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -103,7 +115,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -111,9 +123,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exrgstr/exrgstr.lpr b/components/onguard/examples/exrgstr/exrgstr.lpr
index bd9f8c79a..fe5863341 100644
--- a/components/onguard/examples/exrgstr/exrgstr.lpr
+++ b/components/onguard/examples/exrgstr/exrgstr.lpr
@@ -7,6 +7,8 @@ uses
   Exrgstru in 'EXRGSTRU.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exrgstr/exrgstru.lfm b/components/onguard/examples/exrgstr/exrgstru.lfm
index ee1bdc412..0a4c81af5 100644
--- a/components/onguard/examples/exrgstr/exrgstru.lfm
+++ b/components/onguard/examples/exrgstr/exrgstru.lfm
@@ -7,45 +7,58 @@ object Form1: TForm1
   ClientHeight = 192
   ClientWidth = 262
   Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 69
-    Height = 14
-    Top = 98
-    Width = 67
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 95
+    Height = 15
+    Top = 103
+    Width = 72
     Alignment = taCenter
+    BorderSpacing.Top = 6
     Caption = 'Registered to:'
     ParentColor = False
   end
   object Memo1: TMemo
-    Left = 13
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 12
     Height = 79
-    Top = 10
-    Width = 223
+    Top = 12
+    Width = 238
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 12
     Lines.Strings = (
-      'If you can edit this, then your program was '
-      'allowed to run'
+      'If you can edit this, then your program was allowed to run'
     )
     ScrollBars = ssVertical
     TabOrder = 0
   end
   object CloseBtn: TBitBtn
-    Left = 75
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 87
     Height = 33
-    Top = 116
+    Top = 130
     Width = 89
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     Kind = bkClose
-    NumGlyphs = 0
     TabOrder = 1
   end
   object OgRegistrationCode1: TOgRegistrationCode
     OnChecked = OgRegistrationCode1Checked
     OnGetKey = OgRegistrationCode1GetKey
     OnGetCode = OgRegistrationCode1GetCode
-    left = 165
-    top = 118
+    Left = 104
+    Top = 40
   end
 end
diff --git a/components/onguard/examples/exrgstr/exrgstru.lrs b/components/onguard/examples/exrgstr/exrgstru.lrs
index 9f1353db9..f14247286 100644
--- a/components/onguard/examples/exrgstr/exrgstru.lrs
+++ b/components/onguard/examples/exrgstr/exrgstru.lrs
@@ -1,18 +1,25 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'-'#1#6'Height'#3#192#0#3'Top'#3#218#0#5'W'
   +'idth'#3#6#1#7'Caption'#6#5'Form1'#12'ClientHeight'#3#192#0#11'ClientWidth'#3
-  +#6#1#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS '
-  +'Sans Serif'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6
-  +'TLabel'#6'Label1'#4'Left'#2'E'#6'Height'#2#14#3'Top'#2'b'#5'Width'#2'C'#9'A'
-  +'lignment'#7#8'taCenter'#7'Caption'#6#14'Registered to:'#11'ParentColor'#8#0
-  +#0#5'TMemo'#5'Memo1'#4'Left'#2#13#6'Height'#2'O'#3'Top'#2#10#5'Width'#3#223#0
-  +#13'Lines.Strings'#1#6',If you can edit this, then your program was '#6#14'a'
-  +'llowed to run'#0#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7'TBit'
-  +'Btn'#8'CloseBtn'#4'Left'#2'K'#6'Height'#2'!'#3'Top'#2't'#5'Width'#2'Y'#4'Ki'
-  +'nd'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#19'TOgRegistrationCod'
-  +'e'#19'OgRegistrationCode1'#9'OnChecked'#7#26'OgRegistrationCode1Checked'#8
-  +'OnGetKey'#7#25'OgRegistrationCode1GetKey'#9'OnGetCode'#7#26'OgRegistrationC'
-  +'ode1GetCode'#4'left'#3#165#0#3'top'#2'v'#0#0#0
+  +#6#1#10'Font.Color'#7#7'clBlack'#8'Position'#7#14'poScreenCenter'#10'LCLVers'
+  +'ion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#5'Owne'
+  +'r'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#5'Mem'
+  +'o1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'_'#6'Height'#2#15#3'Top'
+  +#2'g'#5'Width'#2'H'#9'Alignment'#7#8'taCenter'#17'BorderSpacing.Top'#2#6#7'C'
+  +'aption'#6#14'Registered to:'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#22'Anc'
+  +'horSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'Anc'
+  +'horSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#12#6'Height'#2'O'#3'Top'#2#12#5'Width'#3#238#0#7'Anchors'#11#5'akTo'
+  +'p'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#12#13'Lines.Strings'#1
+  +#6':If you can edit this, then your program was allowed to run'#0#10'ScrollB'
+  +'ars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#22'AnchorS'
+  +'ideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'Ancho'
+  +'rSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2'W'#6'Height'#2'!'#3'Top'#3#130#0#5'Width'#2'Y'#17'BorderSpacing.Top'#2#12
+  +#20'BorderSpacing.Bottom'#2#12#4'Kind'#7#7'bkClose'#8'TabOrder'#2#1#0#0#19'T'
+  +'OgRegistrationCode'#19'OgRegistrationCode1'#9'OnChecked'#7#26'OgRegistratio'
+  +'nCode1Checked'#8'OnGetKey'#7#25'OgRegistrationCode1GetKey'#9'OnGetCode'#7#26
+  +'OgRegistrationCode1GetCode'#4'Left'#2'h'#3'Top'#2'('#0#0#0
 ]);
diff --git a/components/onguard/examples/exselapi/exselap1.lfm b/components/onguard/examples/exselapi/exselap1.lfm
index 079648fa2..7a5fcbb0e 100644
--- a/components/onguard/examples/exselapi/exselap1.lfm
+++ b/components/onguard/examples/exselapi/exselap1.lfm
@@ -3,49 +3,47 @@ object Form1: TForm1
   Height = 266
   Top = 322
   Width = 357
-  ActiveControl = Memo1
+  AutoSize = True
   Caption = 'ExSelAPI: '
-  ClientHeight = 246
+  ClientHeight = 266
   ClientWidth = 357
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   Menu = MainMenu1
   OnCreate = FormCreate
-  LCLVersion = '0.9.27'
-  object Memo1: TMemo
-    Left = 16
-    Height = 145
-    Top = 8
-    Width = 313
-    Color = clAqua
-    Lines.Strings = (
-      '   This example uses the OgUsageCode and the OgSpecialCode'
-      '   (via OnGuard API functions) to implement a limited use'
-      '   "demo" application which allows only the required features.'
-      '   The program can be run 3 times and then a special code'
-      '   must be obtained to register the program and to enable'
-      '   various features.  A machine modifier is used to prevent'
-      '   the application from being copied and run on another'
-      '   machine.  To obtain the release code you need to run the'
-      '   companion example EXSLCODE.  The release codes will be '
-      '   stored in a data file called EXSELECT.DAT'
-    )
-    ReadOnly = True
-    TabOrder = 0
-  end
+  LCLVersion = '2.3.0.0'
   object ModifyBtn: TButton
-    Left = 120
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 122
     Height = 25
-    Top = 176
+    Top = 182
     Width = 113
+    BorderSpacing.Bottom = 16
     BorderSpacing.InnerBorder = 4
     Caption = 'Modify Features'
     OnClick = ModifyBtnClick
-    TabOrder = 1
+    TabOrder = 0
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 16
+    Height = 150
+    Top = 16
+    Width = 325
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 16
+    Caption = 'This example uses the OgUsageCode and the OgSpecialCode (via OnGuard API functions) to implement a limited use "demo" application which allows only the required features. The program can be run 3 times and then a special code st be obtained to register the program and to enable various features.  A machine modifier is used to prevent the application from being copied and run on another machine.  To obtain the release code you need to run the companion example EXSLCODE.  The release codes will be stored in a data file called EXSELECT.DAT'
+    Color = clAqua
+    ParentColor = False
+    WordWrap = True
   end
   object MainMenu1: TMainMenu
-    left = 32
-    top = 168
+    Left = 32
+    Top = 168
     object FeaturesMenu: TMenuItem
       Caption = 'Features'
       object FeaturesRequired: TMenuItem
diff --git a/components/onguard/examples/exselapi/exselap1.lrs b/components/onguard/examples/exselapi/exselap1.lrs
index 4451c7d9f..326594bc0 100644
--- a/components/onguard/examples/exselapi/exselap1.lrs
+++ b/components/onguard/examples/exselapi/exselap1.lrs
@@ -1,29 +1,33 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#150#1#6'Height'#3#10#1#3'Top'#3'B'#1#5'Wi'
-  +'dth'#3'e'#1#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#10'ExSelAPI: '#12'Cli'
-  +'entHeight'#3#246#0#11'ClientWidth'#3'e'#1#11'Font.Height'#2#245#9'Font.Name'
-  +#6#13'MS Sans Serif'#4'Menu'#7#9'MainMenu1'#8'OnCreate'#7#10'FormCreate'#10
-  +'LCLVersion'#6#6'0.9.27'#0#5'TMemo'#5'Memo1'#4'Left'#2#16#6'Height'#3#145#0#3
-  +'Top'#2#8#5'Width'#3'9'#1#5'Color'#7#6'clAqua'#13'Lines.Strings'#1#6':   Thi'
-  +'s example uses the OgUsageCode and the OgSpecialCode'#6'9   (via OnGuard AP'
-  +'I functions) to implement a limited use'#6'>   "demo" application which all'
-  +'ows only the required features.'#6'9   The program can be run 3 times and t'
-  +'hen a special code'#6'9   must be obtained to register the program and to e'
-  +'nable'#6';   various features.  A machine modifier is used to prevent'#6'7 '
-  +'  the application from being copied and run on another'#6';   machine.  To '
-  +'obtain the release code you need to run the'#6':   companion example EXSLCO'
-  +'DE.  The release codes will be '#6',   stored in a data file called EXSELEC'
-  +'T.DAT'#0#8'ReadOnly'#9#8'TabOrder'#2#0#0#0#7'TButton'#9'ModifyBtn'#4'Left'#2
-  +'x'#6'Height'#2#25#3'Top'#3#176#0#5'Width'#2'q'#25'BorderSpacing.InnerBorder'
-  +#2#4#7'Caption'#6#15'Modify Features'#7'OnClick'#7#14'ModifyBtnClick'#8'TabO'
-  +'rder'#2#1#0#0#9'TMainMenu'#9'MainMenu1'#4'left'#2' '#3'top'#3#168#0#0#9'TMe'
-  +'nuItem'#12'FeaturesMenu'#7'Caption'#6#8'Features'#0#9'TMenuItem'#16'Feature'
-  +'sRequired'#7'Caption'#6#8'Required'#7'Checked'#9#0#0#9'TMenuItem'#12'Featur'
-  +'esHelp'#7'Caption'#6#4'Help'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesExamp'
-  +'les'#7'Caption'#6#8'Examples'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesData'
-  +'base'#7'Caption'#6#8'Database'#7'Enabled'#8#0#0#9'TMenuItem'#11'FeaturesFax'
-  +#7'Caption'#6#3'Fax'#7'Enabled'#8#0#0#9'TMenuItem'#15'FeaturesGoodies'#7'Cap'
-  +'tion'#6#7'Goodies'#7'Enabled'#8#0#0#0#0#0
+  +'dth'#3'e'#1#8'AutoSize'#9#7'Caption'#6#10'ExSelAPI: '#12'ClientHeight'#3#10
+  +#1#11'ClientWidth'#3'e'#1#4'Menu'#7#9'MainMenu1'#8'OnCreate'#7#10'FormCreate'
+  +#10'LCLVersion'#6#7'2.3.0.0'#0#7'TButton'#9'ModifyBtn'#22'AnchorSideLeft.Con'
+  +'trol'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Co'
+  +'ntrol'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Heig'
+  +'ht'#2#25#3'Top'#3#182#0#5'Width'#2'q'#20'BorderSpacing.Bottom'#2#16#25'Bord'
+  +'erSpacing.InnerBorder'#2#4#7'Caption'#6#15'Modify Features'#7'OnClick'#7#14
+  +'ModifyBtnClick'#8'TabOrder'#2#0#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.C'
+  +'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#16#6'H'
+  +'eight'#3#150#0#3'Top'#2#16#5'Width'#3'E'#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#20'BorderSpacing.Around'#2#16#7'Caption'#12#30#2#0#0'This exam'
+  +'ple uses the OgUsageCode and the OgSpecialCode (via OnGuard API functions) '
+  +'to implement a limited use "demo" application which allows only the require'
+  +'d features. The program can be run 3 times and then a special code st be ob'
+  +'tained to register the program and to enable various features.  A machine m'
+  +'odifier is used to prevent the application from being copied and run on ano'
+  +'ther machine.  To obtain the release code you need to run the companion exa'
+  +'mple EXSLCODE.  The release codes will be stored in a data file called EXSE'
+  +'LECT.DAT'#5'Color'#7#6'clAqua'#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TMainM'
+  +'enu'#9'MainMenu1'#4'Left'#2' '#3'Top'#3#168#0#0#9'TMenuItem'#12'FeaturesMen'
+  +'u'#7'Caption'#6#8'Features'#0#9'TMenuItem'#16'FeaturesRequired'#7'Caption'#6
+  +#8'Required'#7'Checked'#9#0#0#9'TMenuItem'#12'FeaturesHelp'#7'Caption'#6#4'H'
+  +'elp'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesExamples'#7'Caption'#6#8'Exam'
+  +'ples'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesDatabase'#7'Caption'#6#8'Dat'
+  +'abase'#7'Enabled'#8#0#0#9'TMenuItem'#11'FeaturesFax'#7'Caption'#6#3'Fax'#7
+  +'Enabled'#8#0#0#9'TMenuItem'#15'FeaturesGoodies'#7'Caption'#6#7'Goodies'#7'E'
+  +'nabled'#8#0#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exselapi/exselap1.pas b/components/onguard/examples/exselapi/exselap1.pas
index 0bbb6d7b2..ef60ade40 100644
--- a/components/onguard/examples/exselapi/exselap1.pas
+++ b/components/onguard/examples/exselapi/exselap1.pas
@@ -29,8 +29,8 @@ type
   { TForm1 }
 
   TForm1 = class(TForm)
+    Memo1: TLabel;
     ModifyBtn: TButton;
-    Memo1: TMemo;
     MainMenu1: TMainMenu;
     FeaturesMenu: TMenuItem;
     FeaturesRequired: TMenuItem;
diff --git a/components/onguard/examples/exselapi/exselapi.lpi b/components/onguard/examples/exselapi/exselapi.lpi
index 2c3d7e866..886c7e93e 100644
--- a/components/onguard/examples/exselapi/exselapi.lpi
+++ b/components/onguard/examples/exselapi/exselapi.lpi
@@ -1,42 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="9">
       <Unit0>
         <Filename Value="exselapi.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Exselapi"/>
+        <EditorIndex Value="1"/>
         <CursorPos X="37" Y="9"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="23"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exselap1.pas"/>
@@ -45,59 +58,57 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exselap1"/>
-        <CursorPos X="3" Y="71"/>
+        <IsVisibleTab Value="True"/>
         <TopLine Value="50"/>
-        <EditorIndex Value="1"/>
+        <CursorPos X="57" Y="68"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../source/ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="1" Y="112"/>
         <TopLine Value="108"/>
+        <CursorPos Y="112"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="25" Y="1192"/>
         <TopLine Value="1179"/>
+        <CursorPos X="25" Y="1192"/>
         <UsageCount Value="11"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../source/ogproexe.pas"/>
-        <UnitName Value="ogproexe"/>
-        <CursorPos X="63" Y="711"/>
         <TopLine Value="693"/>
+        <CursorPos X="63" Y="711"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../../../fpcfix/fpc/rtl/unix/sysunixh.inc"/>
-        <CursorPos X="2" Y="30"/>
         <TopLine Value="13"/>
+        <CursorPos X="2" Y="30"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../../../fpcfix/fpc/rtl/inc/systemh.inc"/>
-        <CursorPos X="32" Y="71"/>
         <TopLine Value="47"/>
+        <CursorPos X="32" Y="71"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../../../fpcfix/fpc/rtl/objpas/sysutils/filutilh.inc"/>
-        <CursorPos X="3" Y="69"/>
         <TopLine Value="52"/>
+        <CursorPos X="3" Y="69"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="../../../../../../temp/fpc/rtl/inc/systemh.inc"/>
-        <CursorPos X="11" Y="882"/>
         <TopLine Value="861"/>
+        <CursorPos X="11" Y="882"/>
         <UsageCount Value="10"/>
       </Unit8>
     </Units>
-    <JumpHistory Count="6" HistoryIndex="5">
+    <JumpHistory Count="7" HistoryIndex="6">
       <Position1>
         <Filename Value="exselap1.pas"/>
         <Caret Line="155" Column="45" TopLine="43"/>
@@ -112,23 +123,27 @@
       </Position3>
       <Position4>
         <Filename Value="exselap1.pas"/>
-        <Caret Line="120" Column="67" TopLine="211"/>
+        <Caret Line="93" Column="12" TopLine="61"/>
       </Position4>
       <Position5>
         <Filename Value="exselap1.pas"/>
-        <Caret Line="93" Column="12" TopLine="61"/>
       </Position5>
       <Position6>
         <Filename Value="exselap1.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="71" Column="3" TopLine="50"/>
       </Position6>
+      <Position7>
+        <Filename Value="exselap1.pas"/>
+        <Caret Line="70" Column="3" TopLine="49"/>
+      </Position7>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -141,7 +156,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -149,17 +164,20 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <BreakPoints Count="2">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="exselap1.pas"/>
         <Line Value="114"/>
       </Item1>
       <Item2>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="../../source/onguard.pas"/>
         <Line Value="1010"/>
       </Item2>
diff --git a/components/onguard/examples/exselapi/exselapi.lpr b/components/onguard/examples/exselapi/exselapi.lpr
index 2573a1763..90109f120 100644
--- a/components/onguard/examples/exselapi/exselapi.lpr
+++ b/components/onguard/examples/exselapi/exselapi.lpr
@@ -9,6 +9,8 @@ uses
   Exselap1 in 'EXSELAP1.PAS' {Form1};
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exselect/exselec1.lfm b/components/onguard/examples/exselect/exselec1.lfm
index b64af12f2..40d2e4f4b 100644
--- a/components/onguard/examples/exselect/exselec1.lfm
+++ b/components/onguard/examples/exselect/exselec1.lfm
@@ -5,47 +5,48 @@ object Form1: TForm1
   Width = 369
   HorzScrollBar.Page = 368
   VertScrollBar.Page = 249
-  ActiveControl = Memo1
+  AutoSize = True
   Caption = 'ExSelect: '
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 274
+  ClientWidth = 369
   Menu = MainMenu1
   OnCreate = FormCreate
-  object Memo1: TMemo
-    Left = 16
-    Height = 145
-    Top = 8
-    Width = 329
-    Color = clAqua
-    Lines.Strings = (
-      '   This example uses the TOgUsageCode and the TOgSpecialCode'
-      '   components to implement a limited use "demo" application'
-      '   which allows only the required features.  The program can be '
-      '   run 3 times and then a special code  must be obtained to '
-      '   register the program and to enable various features.  A'
-      '   machine modifier is used to prevent the application from being '
-      '   copied and run on another machine.  To obtain the release '
-      '   release code you need to run the companion example '
-      '   EXSLCODE.  The release codes will be stored in a data file '
-      '   called EXSELECT.DAT'
-    )
-    ReadOnly = True
-    TabOrder = 0
-  end
+  LCLVersion = '2.3.0.0'
   object ModifyBtn: TButton
-    Left = 120
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 128
     Height = 25
-    Top = 176
+    Top = 182
     Width = 113
+    BorderSpacing.Bottom = 16
     BorderSpacing.InnerBorder = 4
     Caption = 'Modify Features'
     Enabled = False
     OnClick = ModifyBtnClick
-    TabOrder = 1
+    TabOrder = 0
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 16
+    Height = 150
+    Top = 16
+    Width = 337
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 16
+    Caption = '   This example uses the TOgUsageCode and the TOgSpecialCode  components to implement a limited use "demo" application which allows only the required features.  The program can be run 3 times and then a special code  must be obtained to register the program and to enable various features.  A machine modifier is used to prevent the application from being copied and run on another machine.  To obtain the release release code you need to run the companion example EXSLCODE.  The release codes will be stored in a data file called EXSELECT.DAT'
+    Color = clAqua
+    ParentColor = False
+    WordWrap = True
   end
   object MainMenu1: TMainMenu
-    left = 32
-    top = 168
+    Left = 32
+    Top = 168
     object FeaturesMenu: TMenuItem
       Caption = 'Features'
       object FeaturesRequired: TMenuItem
@@ -81,8 +82,8 @@ object Form1: TForm1
     OnGetCode = OgUsageCode1GetCode
     AutoDecrease = False
     OnChangeCode = OgUsageCode1ChangeCode
-    left = 168
-    top = 48
+    Left = 168
+    Top = 48
   end
   object OgSpecialCode1: TOgSpecialCode
     AutoCheck = False
@@ -90,7 +91,7 @@ object Form1: TForm1
     OnGetKey = OgSpecialCode1GetKey
     OnGetCode = OgSpecialCode1GetCode
     OnGetModifier = OgSpecialCode1GetModifier
-    left = 168
-    top = 16
+    Left = 168
+    Top = 16
   end
 end
diff --git a/components/onguard/examples/exselect/exselec1.lrs b/components/onguard/examples/exselect/exselec1.lrs
index 65b95cc75..366344863 100644
--- a/components/onguard/examples/exselect/exselec1.lrs
+++ b/components/onguard/examples/exselect/exselec1.lrs
@@ -1,36 +1,41 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#31#1#6'Height'#3#18#1#3'Top'#2'f'#5'Width'
-  +#3'q'#1#18'HorzScrollBar.Page'#3'p'#1#18'VertScrollBar.Page'#3#249#0#13'Acti'
-  +'veControl'#7#5'Memo1'#7'Caption'#6#10'ExSelect: '#11'Font.Height'#2#245#9'F'
-  +'ont.Name'#6#13'MS Sans Serif'#4'Menu'#7#9'MainMenu1'#8'OnCreate'#7#10'FormC'
-  +'reate'#0#5'TMemo'#5'Memo1'#4'Left'#2#16#6'Height'#3#145#0#3'Top'#2#8#5'Widt'
-  +'h'#3'I'#1#5'Color'#7#6'clAqua'#13'Lines.Strings'#1#6'<   This example uses '
-  +'the TOgUsageCode and the TOgSpecialCode'#6';   components to implement a li'
-  +'mited use "demo" application'#6'@   which allows only the required features'
-  +'.  The program can be '#6'<   run 3 times and then a special code  must be '
-  +'obtained to '#6':   register the program and to enable various features.  A'
-  +#6'B   machine modifier is used to prevent the application from being '#6'= '
-  +'  copied and run on another machine.  To obtain the release '#6'6   release'
-  +' code you need to run the companion example '#6'>   EXSLCODE.  The release '
-  +'codes will be stored in a data file '#6#22'   called EXSELECT.DAT'#0#8'Read'
-  +'Only'#9#8'TabOrder'#2#0#0#0#7'TButton'#9'ModifyBtn'#4'Left'#2'x'#6'Height'#2
-  +#25#3'Top'#3#176#0#5'Width'#2'q'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
-  +#6#15'Modify Features'#7'Enabled'#8#7'OnClick'#7#14'ModifyBtnClick'#8'TabOrd'
-  +'er'#2#1#0#0#9'TMainMenu'#9'MainMenu1'#4'left'#2' '#3'top'#3#168#0#0#9'TMenu'
-  +'Item'#12'FeaturesMenu'#7'Caption'#6#8'Features'#0#9'TMenuItem'#16'FeaturesR'
-  +'equired'#7'Caption'#6#8'Required'#7'Checked'#9#0#0#9'TMenuItem'#12'Features'
-  +'Help'#7'Caption'#6#4'Help'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesExample'
-  +'s'#7'Caption'#6#8'Examples'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesDataba'
-  +'se'#7'Caption'#6#8'Database'#7'Enabled'#8#0#0#9'TMenuItem'#11'FeaturesFax'#7
-  +'Caption'#6#3'Fax'#7'Enabled'#8#0#0#9'TMenuItem'#15'FeaturesGoodies'#7'Capti'
-  +'on'#6#7'Goodies'#7'Enabled'#8#0#0#0#0#12'TOgUsageCode'#12'OgUsageCode1'#9'A'
-  +'utoCheck'#8#9'OnChecked'#7#19'OgUsageCode1Checked'#8'OnGetKey'#7#18'OgUsage'
-  +'Code1GetKey'#9'OnGetCode'#7#19'OgUsageCode1GetCode'#12'AutoDecrease'#8#12'O'
-  +'nChangeCode'#7#22'OgUsageCode1ChangeCode'#4'left'#3#168#0#3'top'#2'0'#0#0#14
-  +'TOgSpecialCode'#14'OgSpecialCode1'#9'AutoCheck'#8#9'OnChecked'#7#21'OgSpeci'
-  +'alCode1Checked'#8'OnGetKey'#7#20'OgSpecialCode1GetKey'#9'OnGetCode'#7#21'Og'
-  +'SpecialCode1GetCode'#13'OnGetModifier'#7#25'OgSpecialCode1GetModifier'#4'le'
-  +'ft'#3#168#0#3'top'#2#16#0#0#0
+  +#3'q'#1#18'HorzScrollBar.Page'#3'p'#1#18'VertScrollBar.Page'#3#249#0#8'AutoS'
+  +'ize'#9#7'Caption'#6#10'ExSelect: '#12'ClientHeight'#3#18#1#11'ClientWidth'#3
+  +'q'#1#4'Menu'#7#9'MainMenu1'#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#7
+  +'2.3.0.0'#0#7'TButton'#9'ModifyBtn'#22'AnchorSideLeft.Control'#7#5'Owner'#19
+  +'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#5'Memo1'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#128#0#6'Height'#2#25#3'Top'#3
+  +#182#0#5'Width'#2'q'#20'BorderSpacing.Bottom'#2#16#25'BorderSpacing.InnerBor'
+  +'der'#2#4#7'Caption'#6#15'Modify Features'#7'Enabled'#8#7'OnClick'#7#14'Modi'
+  +'fyBtnClick'#8'TabOrder'#2#0#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Contro'
+  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Contr'
+  +'ol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#16#6'Heigh'
+  +'t'#3#150#0#3'Top'#2#16#5'Width'#3'Q'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
+  +'kRight'#0#20'BorderSpacing.Around'#2#16#7'Caption'#12#31#2#0#0'   This exam'
+  +'ple uses the TOgUsageCode and the TOgSpecialCode  components to implement a'
+  +' limited use "demo" application which allows only the required features.  T'
+  +'he program can be run 3 times and then a special code  must be obtained to '
+  +'register the program and to enable various features.  A machine modifier is'
+  +' used to prevent the application from being copied and run on another machi'
+  +'ne.  To obtain the release release code you need to run the companion examp'
+  +'le EXSLCODE.  The release codes will be stored in a data file called EXSELE'
+  +'CT.DAT'#5'Color'#7#6'clAqua'#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TMainMen'
+  +'u'#9'MainMenu1'#4'Left'#2' '#3'Top'#3#168#0#0#9'TMenuItem'#12'FeaturesMenu'
+  +#7'Caption'#6#8'Features'#0#9'TMenuItem'#16'FeaturesRequired'#7'Caption'#6#8
+  +'Required'#7'Checked'#9#0#0#9'TMenuItem'#12'FeaturesHelp'#7'Caption'#6#4'Hel'
+  +'p'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesExamples'#7'Caption'#6#8'Exampl'
+  +'es'#7'Enabled'#8#0#0#9'TMenuItem'#16'FeaturesDatabase'#7'Caption'#6#8'Datab'
+  +'ase'#7'Enabled'#8#0#0#9'TMenuItem'#11'FeaturesFax'#7'Caption'#6#3'Fax'#7'En'
+  +'abled'#8#0#0#9'TMenuItem'#15'FeaturesGoodies'#7'Caption'#6#7'Goodies'#7'Ena'
+  +'bled'#8#0#0#0#0#12'TOgUsageCode'#12'OgUsageCode1'#9'AutoCheck'#8#9'OnChecke'
+  +'d'#7#19'OgUsageCode1Checked'#8'OnGetKey'#7#18'OgUsageCode1GetKey'#9'OnGetCo'
+  +'de'#7#19'OgUsageCode1GetCode'#12'AutoDecrease'#8#12'OnChangeCode'#7#22'OgUs'
+  +'ageCode1ChangeCode'#4'Left'#3#168#0#3'Top'#2'0'#0#0#14'TOgSpecialCode'#14'O'
+  +'gSpecialCode1'#9'AutoCheck'#8#9'OnChecked'#7#21'OgSpecialCode1Checked'#8'On'
+  +'GetKey'#7#20'OgSpecialCode1GetKey'#9'OnGetCode'#7#21'OgSpecialCode1GetCode'
+  +#13'OnGetModifier'#7#25'OgSpecialCode1GetModifier'#4'Left'#3#168#0#3'Top'#2
+  +#16#0#0#0
 ]);
diff --git a/components/onguard/examples/exselect/exselec1.pas b/components/onguard/examples/exselect/exselec1.pas
index b1dcf18e1..3d9948a34 100644
--- a/components/onguard/examples/exselect/exselec1.pas
+++ b/components/onguard/examples/exselect/exselec1.pas
@@ -29,8 +29,8 @@ type
   { TForm1 }
 
   TForm1 = class(TForm)
+    Memo1: TLabel;
     ModifyBtn: TButton;
-    Memo1: TMemo;
     MainMenu1: TMainMenu;
     FeaturesMenu: TMenuItem;
     FeaturesRequired: TMenuItem;
diff --git a/components/onguard/examples/exselect/exselect.lpi b/components/onguard/examples/exselect/exselect.lpi
index e16dc48bb..c66f3c658 100644
--- a/components/onguard/examples/exselect/exselect.lpi
+++ b/components/onguard/examples/exselect/exselect.lpi
@@ -1,69 +1,92 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="3">
       <Unit0>
         <Filename Value="exselect.lpr"/>
         <IsPartOfProject Value="True"/>
+        <EditorIndex Value="1"/>
         <CursorPos X="48" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exselec1.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exselec1"/>
-        <CursorPos X="36" Y="313"/>
-        <TopLine Value="289"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="290"/>
+        <CursorPos X="22" Y="300"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="exselec1.lrs"/>
         <CursorPos X="24" Y="5"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit2>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="2" HistoryIndex="1">
+      <Position1>
+        <Filename Value="exselec1.pas"/>
+        <Caret Line="300" Column="22" TopLine="290"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exselec1.pas"/>
+        <Caret Line="299" Column="22" TopLine="289"/>
+      </Position2>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -76,7 +99,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -84,9 +107,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exselect/exselect.lpr b/components/onguard/examples/exselect/exselect.lpr
index 6d260487a..1abc07a8a 100644
--- a/components/onguard/examples/exselect/exselect.lpr
+++ b/components/onguard/examples/exselect/exselect.lpr
@@ -8,6 +8,8 @@ uses
   Exselec1 in 'EXSELEC1.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exslcode/exslcod1.lfm b/components/onguard/examples/exslcode/exslcod1.lfm
index fa77cbdd1..587e35b89 100644
--- a/components/onguard/examples/exslcode/exslcod1.lfm
+++ b/components/onguard/examples/exslcode/exslcod1.lfm
@@ -1,111 +1,166 @@
 object Form1: TForm1
-  ActiveControl = MachineID
-  Caption = ' Special Code Generator '
-  ClientHeight = 243
-  ClientWidth = 288
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  PixelsPerInch = 96
-  HorzScrollBar.Page = 287
-  VertScrollBar.Page = 242
   Left = 237
   Height = 243
   Top = 152
   Width = 288
+  HorzScrollBar.Page = 287
+  VertScrollBar.Page = 242
+  ActiveControl = MachineID
+  AutoSize = True
+  BorderStyle = bsDialog
+  Caption = ' Special Code Generator '
+  ClientHeight = 243
+  ClientWidth = 288
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
+    AnchorSideLeft.Control = GroupBox1
+    AnchorSideTop.Control = MachineID
+    AnchorSideTop.Side = asrCenter
+    Left = 16
+    Height = 15
+    Top = 20
+    Width = 60
     Caption = 'Machine ID'
     Color = clNone
     ParentColor = False
-    Left = 35
-    Height = 14
-    Top = 20
-    Width = 54
   end
   object GenBtn: TButton
+    AnchorSideLeft.Control = GroupBox1
+    AnchorSideTop.Control = GroupBox1
+    AnchorSideTop.Side = asrBottom
+    Left = 16
+    Height = 25
+    Top = 161
+    Width = 96
+    BorderSpacing.Top = 16
+    BorderSpacing.Bottom = 16
     BorderSpacing.InnerBorder = 4
     Caption = 'Generate Code'
     OnClick = GenBtnClick
     TabOrder = 1
-    Left = 18
-    Height = 25
-    Top = 176
-    Width = 89
   end
   object MachineID: TEdit
+    AnchorSideLeft.Control = Label1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = GroupBox1
+    AnchorSideRight.Side = asrBottom
+    Left = 100
+    Height = 23
+    Top = 16
+    Width = 150
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 24
+    BorderSpacing.Top = 16
     MaxLength = 8
     TabOrder = 0
-    Left = 123
-    Height = 21
-    Top = 16
-    Width = 89
   end
   object GroupBox1: TGroupBox
-    Caption = 'Features'
-    ClientHeight = 79
-    ClientWidth = 221
-    TabOrder = 2
-    Left = 24
-    Height = 97
+    AnchorSideLeft.Control = Owner
+    Left = 16
+    Height = 89
     Top = 56
-    Width = 225
+    Width = 234
+    AutoSize = True
+    BorderSpacing.Left = 16
+    BorderSpacing.Right = 16
+    Caption = 'Features'
+    ClientHeight = 69
+    ClientWidth = 230
+    TabOrder = 2
     object ReqFeat: TCheckBox
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = GroupBox1
+      Left = 32
+      Height = 19
+      Top = 0
+      Width = 65
+      BorderSpacing.Left = 32
       Caption = 'Required'
       Checked = True
       Enabled = False
       State = cbChecked
       TabOrder = 0
-      Left = 16
-      Height = 17
-      Top = 24
-      Width = 81
     end
     object HelpFeat: TCheckBox
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = ReqFeat
+      AnchorSideTop.Side = asrBottom
+      Left = 32
+      Height = 19
+      Top = 19
+      Width = 43
+      BorderSpacing.Left = 32
       Caption = 'Help'
       TabOrder = 1
-      Left = 16
-      Height = 17
-      Top = 40
-      Width = 81
     end
     object ExamplesFeat: TCheckBox
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = HelpFeat
+      AnchorSideTop.Side = asrBottom
+      Left = 32
+      Height = 19
+      Top = 38
+      Width = 68
+      BorderSpacing.Left = 32
+      BorderSpacing.Bottom = 12
       Caption = 'Examples'
       TabOrder = 2
-      Left = 16
-      Height = 17
-      Top = 56
-      Width = 81
     end
     object DBFeat: TCheckBox
+      AnchorSideLeft.Control = ExamplesFeat
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = ReqFeat
+      Left = 132
+      Height = 19
+      Top = 0
+      Width = 66
+      BorderSpacing.Left = 32
+      BorderSpacing.Right = 32
       Caption = 'Database'
       TabOrder = 3
-      Left = 120
-      Height = 17
-      Top = 24
-      Width = 81
     end
     object FaxFeat: TCheckBox
+      AnchorSideLeft.Control = ExamplesFeat
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = HelpFeat
+      Left = 132
+      Height = 19
+      Top = 19
+      Width = 36
+      BorderSpacing.Left = 32
       Caption = 'Fax'
       TabOrder = 4
-      Left = 120
-      Height = 17
-      Top = 40
-      Width = 81
     end
     object GoodiesFeat: TCheckBox
+      AnchorSideLeft.Control = ExamplesFeat
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = ExamplesFeat
+      Left = 132
+      Height = 19
+      Top = 38
+      Width = 61
+      BorderSpacing.Left = 32
+      BorderSpacing.Right = 32
       Caption = 'Goodies'
       TabOrder = 5
-      Left = 120
-      Height = 17
-      Top = 56
-      Width = 81
     end
   end
   object CodeDisplay: TEdit
+    AnchorSideLeft.Control = GenBtn
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = GenBtn
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = GroupBox1
+    AnchorSideRight.Side = asrBottom
+    Left = 124
+    Height = 23
+    Top = 162
+    Width = 126
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 12
+    BorderSpacing.Bottom = 16
     Color = clAqua
     TabOrder = 3
-    Left = 123
-    Height = 21
-    Top = 178
-    Width = 126
   end
 end
diff --git a/components/onguard/examples/exslcode/exslcod1.lrs b/components/onguard/examples/exslcode/exslcod1.lrs
index cc5237d04..61138115d 100644
--- a/components/onguard/examples/exslcode/exslcod1.lrs
+++ b/components/onguard/examples/exslcode/exslcod1.lrs
@@ -1,27 +1,56 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#13'ActiveControl'#7#9'MachineID'#7'Caption'#6#24' S'
-  +'pecial Code Generator '#12'ClientHeight'#3#243#0#11'ClientWidth'#3' '#1#11
-  +'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#13'PixelsPerInch'#2'`'
-  +#18'HorzScrollBar.Page'#3#31#1#18'VertScrollBar.Page'#3#242#0#4'Left'#3#237#0
-  +#6'Height'#3#243#0#3'Top'#3#152#0#5'Width'#3' '#1#0#6'TLabel'#6'Label1'#7'Ca'
-  +'ption'#6#10'Machine ID'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2'#'
-  +#6'Height'#2#14#3'Top'#2#20#5'Width'#2'6'#0#0#7'TButton'#6'GenBtn'#25'Border'
-  +'Spacing.InnerBorder'#2#4#7'Caption'#6#13'Generate Code'#7'OnClick'#7#11'Gen'
-  +'BtnClick'#8'TabOrder'#2#1#4'Left'#2#18#6'Height'#2#25#3'Top'#3#176#0#5'Widt'
-  +'h'#2'Y'#0#0#5'TEdit'#9'MachineID'#9'MaxLength'#2#8#8'TabOrder'#2#0#4'Left'#2
-  +'{'#6'Height'#2#21#3'Top'#2#16#5'Width'#2'Y'#0#0#9'TGroupBox'#9'GroupBox1'#7
-  +'Caption'#6#8'Features'#12'ClientHeight'#2'O'#11'ClientWidth'#3#221#0#8'TabO'
-  +'rder'#2#2#4'Left'#2#24#6'Height'#2'a'#3'Top'#2'8'#5'Width'#3#225#0#0#9'TChe'
-  +'ckBox'#7'ReqFeat'#7'Caption'#6#8'Required'#7'Checked'#9#7'Enabled'#8#5'Stat'
-  +'e'#7#9'cbChecked'#8'TabOrder'#2#0#4'Left'#2#16#6'Height'#2#17#3'Top'#2#24#5
-  +'Width'#2'Q'#0#0#9'TCheckBox'#8'HelpFeat'#7'Caption'#6#4'Help'#8'TabOrder'#2
-  +#1#4'Left'#2#16#6'Height'#2#17#3'Top'#2'('#5'Width'#2'Q'#0#0#9'TCheckBox'#12
-  +'ExamplesFeat'#7'Caption'#6#8'Examples'#8'TabOrder'#2#2#4'Left'#2#16#6'Heigh'
-  +'t'#2#17#3'Top'#2'8'#5'Width'#2'Q'#0#0#9'TCheckBox'#6'DBFeat'#7'Caption'#6#8
-  +'Database'#8'TabOrder'#2#3#4'Left'#2'x'#6'Height'#2#17#3'Top'#2#24#5'Width'#2
-  +'Q'#0#0#9'TCheckBox'#7'FaxFeat'#7'Caption'#6#3'Fax'#8'TabOrder'#2#4#4'Left'#2
-  +'x'#6'Height'#2#17#3'Top'#2'('#5'Width'#2'Q'#0#0#9'TCheckBox'#11'GoodiesFeat'
-  +#7'Caption'#6#7'Goodies'#8'TabOrder'#2#5#4'Left'#2'x'#6'Height'#2#17#3'Top'#2
-  +'8'#5'Width'#2'Q'#0#0#0#5'TEdit'#11'CodeDisplay'#5'Color'#7#6'clAqua'#8'TabO'
-  +'rder'#2#3#4'Left'#2'{'#6'Height'#2#21#3'Top'#3#178#0#5'Width'#2'~'#0#0#0
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#237#0#6'Height'#3#243#0#3'Top'#3#152#0#5
+  +'Width'#3' '#1#18'HorzScrollBar.Page'#3#31#1#18'VertScrollBar.Page'#3#242#0
+  +#13'ActiveControl'#7#9'MachineID'#8'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'
+  +#7'Caption'#6#24' Special Code Generator '#12'ClientHeight'#3#243#0#11'Clien'
+  +'tWidth'#3' '#1#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorS'
+  +'ideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7#9'MachineID'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Height'#2#15#3'Top'#2#20#5
+  +'Width'#2'<'#7'Caption'#6#10'Machine ID'#5'Color'#7#6'clNone'#11'ParentColor'
+  +#8#0#0#7'TButton'#6'GenBtn'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'Anc'
+  +'horSideTop.Control'#7#9'GroupBox1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#16#6'Height'#2#25#3'Top'#3#161#0#5'Width'#2'`'#17'BorderSpacing.Top'
+  +#2#16#20'BorderSpacing.Bottom'#2#16#25'BorderSpacing.InnerBorder'#2#4#7'Capt'
+  +'ion'#6#13'Generate Code'#7'OnClick'#7#11'GenBtnClick'#8'TabOrder'#2#1#0#0#5
+  +'TEdit'#9'MachineID'#22'AnchorSideLeft.Control'#7#6'Label1'#19'AnchorSideLef'
+  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRi'
+  +'ght.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#2'd'#6'Height'#2#23#3'Top'#2#16#5'Width'#3#150#0#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#24#17'BorderSpacing.Top'#2#16#9
+  +'MaxLength'#2#8#8'TabOrder'#2#0#0#0#9'TGroupBox'#9'GroupBox1'#22'AnchorSideL'
+  +'eft.Control'#7#5'Owner'#4'Left'#2#16#6'Height'#2'Y'#3'Top'#2'8'#5'Width'#3
+  +#234#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#16#19'BorderSpacing.Right'#2#16
+  +#7'Caption'#6#8'Features'#12'ClientHeight'#2'E'#11'ClientWidth'#3#230#0#8'Ta'
+  +'bOrder'#2#2#0#9'TCheckBox'#7'ReqFeat'#22'AnchorSideLeft.Control'#7#9'GroupB'
+  +'ox1'#21'AnchorSideTop.Control'#7#9'GroupBox1'#4'Left'#2' '#6'Height'#2#19#3
+  +'Top'#2#0#5'Width'#2'A'#18'BorderSpacing.Left'#2' '#7'Caption'#6#8'Required'
+  +#7'Checked'#9#7'Enabled'#8#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#9'TCh'
+  +'eckBox'#8'HelpFeat'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSide'
+  +'Top.Control'#7#7'ReqFeat'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2' '
+  +#6'Height'#2#19#3'Top'#2#19#5'Width'#2'+'#18'BorderSpacing.Left'#2' '#7'Capt'
+  +'ion'#6#4'Help'#8'TabOrder'#2#1#0#0#9'TCheckBox'#12'ExamplesFeat'#22'AnchorS'
+  +'ideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7#8'HelpFeat'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2' '#6'Height'#2#19#3'Top'#2'&'#5
+  +'Width'#2'D'#18'BorderSpacing.Left'#2' '#20'BorderSpacing.Bottom'#2#12#7'Cap'
+  +'tion'#6#8'Examples'#8'TabOrder'#2#2#0#0#9'TCheckBox'#6'DBFeat'#22'AnchorSid'
+  +'eLeft.Control'#7#12'ExamplesFeat'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#7'ReqFeat'#4'Left'#3#132#0#6'Height'#2#19#3'Top'#2
+  +#0#5'Width'#2'B'#18'BorderSpacing.Left'#2' '#19'BorderSpacing.Right'#2' '#7
+  +'Caption'#6#8'Database'#8'TabOrder'#2#3#0#0#9'TCheckBox'#7'FaxFeat'#22'Ancho'
+  +'rSideLeft.Control'#7#12'ExamplesFeat'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#8'HelpFeat'#4'Left'#3#132#0#6'Height'#2#19#3'To'
+  +'p'#2#19#5'Width'#2'$'#18'BorderSpacing.Left'#2' '#7'Caption'#6#3'Fax'#8'Tab'
+  +'Order'#2#4#0#0#9'TCheckBox'#11'GoodiesFeat'#22'AnchorSideLeft.Control'#7#12
+  +'ExamplesFeat'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contr'
+  +'ol'#7#12'ExamplesFeat'#4'Left'#3#132#0#6'Height'#2#19#3'Top'#2'&'#5'Width'#2
+  +'='#18'BorderSpacing.Left'#2' '#19'BorderSpacing.Right'#2' '#7'Caption'#6#7
+  +'Goodies'#8'TabOrder'#2#5#0#0#0#5'TEdit'#11'CodeDisplay'#22'AnchorSideLeft.C'
+  +'ontrol'#7#6'GenBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop'
+  +'.Control'#7#6'GenBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRi'
+  +'ght.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#2'|'#6'Height'#2#23#3'Top'#3#162#0#5'Width'#2'~'#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12#20'BorderSpacing.Bottom'#2
+  +#16#5'Color'#7#6'clAqua'#8'TabOrder'#2#3#0#0#0
 ]);
diff --git a/components/onguard/examples/exslcode/exslcode.lpi b/components/onguard/examples/exslcode/exslcode.lpi
index 0deb163cd..77b2735ce 100644
--- a/components/onguard/examples/exslcode/exslcode.lpi
+++ b/components/onguard/examples/exslcode/exslcode.lpi
@@ -1,42 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="3">
       <Unit0>
         <Filename Value="exslcode.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Exslcode"/>
+        <EditorIndex Value="1"/>
         <CursorPos X="48" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exslcod1.pas"/>
@@ -45,27 +58,41 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exslcod1"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="32"/>
         <CursorPos X="34" Y="68"/>
-        <TopLine Value="27"/>
-        <EditorIndex Value="1"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="exslcod1.lfm"/>
         <CursorPos X="11" Y="2"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit2>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="3" HistoryIndex="2">
+      <Position1>
+        <Filename Value="exslcod1.pas"/>
+        <Caret Line="68" Column="34" TopLine="27"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exslcod1.pas"/>
+        <Caret Line="69" Column="34" TopLine="33"/>
+      </Position2>
+      <Position3>
+        <Filename Value="exslcod1.pas"/>
+        <Caret Line="68" Column="34" TopLine="32"/>
+      </Position3>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -78,7 +105,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -86,9 +113,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exslcode/exslcode.lpr b/components/onguard/examples/exslcode/exslcode.lpr
index a5bfb31df..0b1abd0cf 100644
--- a/components/onguard/examples/exslcode/exslcode.lpr
+++ b/components/onguard/examples/exslcode/exslcode.lpr
@@ -8,6 +8,8 @@ uses
   Exslcod1 in 'EXSLCOD1.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exsnreg/exsnreg.lpi b/components/onguard/examples/exsnreg/exsnreg.lpi
index 77c3d1427..638c3da7c 100644
--- a/components/onguard/examples/exsnreg/exsnreg.lpi
+++ b/components/onguard/examples/exsnreg/exsnreg.lpi
@@ -1,66 +1,90 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
         <Filename Value="exsnreg.lpr"/>
         <IsPartOfProject Value="True"/>
         <CursorPos X="48" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exsnregu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exsnregu"/>
-        <CursorPos X="74" Y="19"/>
-        <TopLine Value="88"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="88"/>
+        <CursorPos X="24" Y="102"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="2" HistoryIndex="1">
+      <Position1>
+        <Filename Value="exsnregu.pas"/>
+        <Caret Line="102" Column="24" TopLine="88"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exsnregu.pas"/>
+        <Caret Line="101" Column="24" TopLine="87"/>
+      </Position2>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -73,7 +97,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -81,9 +105,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exsnreg/exsnreg.lpr b/components/onguard/examples/exsnreg/exsnreg.lpr
index 2de0ac8b4..228732434 100644
--- a/components/onguard/examples/exsnreg/exsnreg.lpr
+++ b/components/onguard/examples/exsnreg/exsnreg.lpr
@@ -8,6 +8,8 @@ uses
   ExSNRegU in 'ExSNRegU.pas' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exsnreg/exsnregu.lfm b/components/onguard/examples/exsnreg/exsnregu.lfm
index 912c6140b..d8c88edc2 100644
--- a/components/onguard/examples/exsnreg/exsnregu.lfm
+++ b/components/onguard/examples/exsnreg/exsnregu.lfm
@@ -5,94 +5,118 @@ object Form1: TForm1
   Width = 495
   HorzScrollBar.Page = 494
   VertScrollBar.Page = 303
+  AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Serial Number Code Example'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 304
+  ClientWidth = 495
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 13
-    Top = 262
-    Width = 35
+    Height = 15
+    Top = 234
+    Width = 32
+    BorderSpacing.Left = 8
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object Label1: TLabel
-    Left = 232
-    Height = 13
-    Top = 14
-    Width = 77
+    AnchorSideLeft.Control = CodeBtn
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 177
+    Height = 15
+    Top = 13
+    Width = 72
+    BorderSpacing.Left = 80
     Caption = 'Current code:'
     Color = clNone
     ParentColor = False
   end
   object CodeLbl: TLabel
-    Left = 320
-    Height = 13
-    Top = 14
-    Width = 113
+    AnchorSideLeft.Control = Label1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 257
+    Height = 15
+    Top = 13
+    Width = 96
+    BorderSpacing.Left = 8
     Caption = '0000000000000000'
     Color = clNone
     ParentColor = False
   end
   object CodeBtn: TButton
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
     Left = 8
     Height = 25
     Top = 8
     Width = 89
+    BorderSpacing.Around = 8
     BorderSpacing.InnerBorder = 4
     Caption = 'Enter Code'
     OnClick = CodeBtnClick
     TabOrder = 0
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 209
-    Top = 40
-    Width = 465
-    Color = clBtnFace
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the code. An invalid code indicates that '
-      'the code is either the incorrect type or that none has been entered. '
-      ''
-      'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will '
-      'say that the code is invalid.'
-      ''
-      'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate '
-      'the proper "Usage" code). '
-      ''
-      'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so '
-      'will cause the TOgSerialNumberCode component to report that the code is invalid.'
-    )
-    ReadOnly = True
+  object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 412
+    Height = 25
+    Top = 229
+    Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 8
+    BorderSpacing.Bottom = 8
+    Kind = bkClose
     TabOrder = 1
   end
-  object CloseBtn: TBitBtn
-    Left = 400
-    Height = 25
-    Top = 256
-    Width = 75
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 2
-  end
   object RemoveBtn: TButton
-    Left = 288
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideRight.Control = CloseBtn
+    Left = 311
     Height = 25
-    Top = 256
+    Top = 229
     Width = 97
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 4
     BorderSpacing.InnerBorder = 4
     Caption = 'Remove Code'
     OnClick = RemoveBtnClick
-    TabOrder = 3
+    TabOrder = 2
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 8
+    Height = 180
+    Top = 41
+    Width = 479
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 8
+    Caption = 'The label at the bottom of this form indicates the status of the code. An invalid code indicates that the code is either the incorrect type or that none has been entered. '#13#10#13#10'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate the proper "Usage" code). '#13#10#13#10'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so will cause the TOgSerialNumberCode component to report that the code is invalid.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
   end
   object OgSerialNumberCode1: TOgSerialNumberCode
     OnChecked = CodeChecked
     OnGetKey = GetKey
     OnGetCode = GetCode
-    left = 16
-    top = 208
+    Left = 160
+    Top = 208
   end
 end
diff --git a/components/onguard/examples/exsnreg/exsnregu.lrs b/components/onguard/examples/exsnreg/exsnregu.lrs
index 73d436cff..f905e76e9 100644
--- a/components/onguard/examples/exsnreg/exsnregu.lrs
+++ b/components/onguard/examples/exsnreg/exsnregu.lrs
@@ -1,34 +1,51 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#252#0#6'Height'#3'0'#1#3'Top'#3#138#0#5'W'
-  +'idth'#3#239#1#18'HorzScrollBar.Page'#3#238#1#18'VertScrollBar.Page'#3'/'#1
-  +#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#26'Serial Number Code Example'#11
-  +'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'Position'#7#14'poScre'
-  +'enCenter'#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Height'#2#13#3'Top'#3#6#1#5
-  +'Width'#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0
-  +#0#6'TLabel'#6'Label1'#4'Left'#3#232#0#6'Height'#2#13#3'Top'#2#14#5'Width'#2
-  +'M'#7'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0
-  +#6'TLabel'#7'CodeLbl'#4'Left'#3'@'#1#6'Height'#2#13#3'Top'#2#14#5'Width'#2'q'
-  +#7'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0
-  +#7'TButton'#7'CodeBtn'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'Y'#25
-  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12
-  +'CodeBtnClick'#8'TabOrder'#2#0#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'Height'#3
-  +#209#0#3'Top'#2'('#5'Width'#3#209#1#5'Color'#7#9'clBtnFace'#13'Lines.Strings'
-  +#1#6'fThe label at the bottom of this form indicates the status of the code.'
-  +' An invalid code indicates that '#6'Ethe code is either the incorrect type '
-  +'or that none has been entered. '#6#0#6'^If the proper code has not been ent'
-  +'ered or the ONGUARD.INI file was deleted, the message will '#6#29'say that '
-  +'the code is invalid.'#6#0#6'YUse the "Enter Code" button to enter a code (t'
-  +'he CODEGEN program can be used to generate '#6#26'the proper "Usage" code).'
-  +' '#6#0#6'\The "Remove Code" button can be used to remove the entered code f'
-  +'rom the INI file. Doing so '#6'Pwill cause the TOgSerialNumberCode componen'
-  +'t to report that the code is invalid.'#0#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#7
-  +'TBitBtn'#8'CloseBtn'#4'Left'#3#144#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2
-  +'K'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TButton'#9'R'
-  +'emoveBtn'#4'Left'#3' '#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'a'#25'Borde'
-  +'rSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7#14'Remo'
-  +'veBtnClick'#8'TabOrder'#2#3#0#0#19'TOgSerialNumberCode'#19'OgSerialNumberCo'
-  +'de1'#9'OnChecked'#7#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7
-  +'GetCode'#4'left'#2#16#3'top'#3#208#0#0#0#0
+  +'idth'#3#239#1#18'HorzScrollBar.Page'#3#238#1#18'VertScrollBar.Page'#3'/'#1#8
+  +'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#26'Serial Number Cod'
+  +'e Example'#12'ClientHeight'#3'0'#1#11'ClientWidth'#3#239#1#8'Position'#7#14
+  +'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#9'StatusLbl'#22'Anc'
+  +'horSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'CloseBtn'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#8#6'Height'#2#15#3'Top'#3#234#0
+  +#5'Width'#2' '#18'BorderSpacing.Left'#2#8#7'Caption'#6#6'Status'#5'Color'#7#6
+  +'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'
+  +#7#7'CodeBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#177#0#6'Hei'
+  +'ght'#2#15#3'Top'#2#13#5'Width'#2'H'#18'BorderSpacing.Left'#2'P'#7'Caption'#6
+  +#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#7'Co'
+  +'deLbl'#22'AnchorSideLeft.Control'#7#6'Label1'#19'AnchorSideLeft.Side'#7#9'a'
+  +'srBottom'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9
+  +'asrCenter'#4'Left'#3#1#1#6'Height'#2#15#3'Top'#2#13#5'Width'#2'`'#18'Border'
+  +'Spacing.Left'#2#8#7'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11
+  +'ParentColor'#8#0#0#7'TButton'#7'CodeBtn'#22'AnchorSideLeft.Control'#7#5'Own'
+  +'er'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#8#6'Height'#2#25#3'Top'#2
+  +#8#5'Width'#2'Y'#20'BorderSpacing.Around'#2#8#25'BorderSpacing.InnerBorder'#2
+  +#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12'CodeBtnClick'#8'TabOrder'#2#0
+  +#0#0#7'TBitBtn'#8'CloseBtn'#21'AnchorSideTop.Control'#7#5'Memo1'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#3#156#1#6'Height'#2#25#3'Top'#3#229#0
+  +#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2
+  +#8#20'BorderSpacing.Bottom'#2#8#4'Kind'#7#7'bkClose'#8'TabOrder'#2#1#0#0#7'T'
+  +'Button'#9'RemoveBtn'#21'AnchorSideTop.Control'#7#8'CloseBtn'#23'AnchorSideR'
+  +'ight.Control'#7#8'CloseBtn'#4'Left'#3'7'#1#6'Height'#2#25#3'Top'#3#229#0#5
+  +'Width'#2'a'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#4
+  +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7
+  +#14'RemoveBtnClick'#8'TabOrder'#2#2#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft'
+  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#3#180#0#3'Top'#2')'#5'Widt'
+  +'h'#3#223#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.A'
+  +'round'#2#8#7'Caption'#12'Q'#2#0#0'The label at the bottom of this form indi'
+  +'cates the status of the code. An invalid code indicates that the code is ei'
+  +'ther the incorrect type or that none has been entered. '#13#10#13#10'If the'
+  +' proper code has not been entered or the ONGUARD.INI file was deleted, the '
+  +'message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code'
+  +'" button to enter a code (the CODEGEN program can be used to generate the p'
+  +'roper "Usage" code). '#13#10#13#10'The "Remove Code" button can be used to '
+  +'remove the entered code from the INI file. Doing so will cause the TOgSeria'
+  +'lNumberCode component to report that the code is invalid.'#5'Color'#7#9'clB'
+  +'tnFace'#11'ParentColor'#8#8'WordWrap'#9#0#0#19'TOgSerialNumberCode'#19'OgSe'
+  +'rialNumberCode1'#9'OnChecked'#7#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'O'
+  +'nGetCode'#7#7'GetCode'#4'Left'#3#160#0#3'Top'#3#208#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exsnreg/exsnregu.pas b/components/onguard/examples/exsnreg/exsnregu.pas
index 21ea1ce1c..1689268dd 100644
--- a/components/onguard/examples/exsnreg/exsnregu.pas
+++ b/components/onguard/examples/exsnreg/exsnregu.pas
@@ -13,8 +13,8 @@ type
 
   TForm1 = class(TForm)
     CodeBtn: TButton;
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     StatusLbl: TLabel;
     Label1: TLabel;
     CodeLbl: TLabel;
diff --git a/components/onguard/examples/exspname/exspname.lpi b/components/onguard/examples/exspname/exspname.lpi
index eec6a25ea..2f2fe72fb 100644
--- a/components/onguard/examples/exspname/exspname.lpi
+++ b/components/onguard/examples/exspname/exspname.lpi
@@ -1,26 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -28,36 +37,57 @@
         <MinVersion Major="1" Valid="True"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="2">
+    <Units Count="4">
       <Unit0>
         <Filename Value="exspname.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="48" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="20"/>
+        <UnitName Value="ExSpName"/>
+        <CursorPos X="25" Y="9"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exspnamu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ExSpNamu"/>
-        <CursorPos X="86" Y="14"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <CursorPos X="73" Y="24"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
+      <Unit2>
+        <Filename Value="C:/Lazarus/lazarus-main_fpc3.2.2/lcl/controls.pp"/>
+        <UnitName Value="Controls"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit2>
+      <Unit3>
+        <Filename Value="C:/Lazarus/lazarus-main_fpc3.2.2/lcl/graphics.pp"/>
+        <UnitName Value="Graphics"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos X="22" Y="5"/>
+        <UsageCount Value="10"/>
+      </Unit3>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="1">
+      <Position1>
+        <Filename Value="exspnamu.pas"/>
+        <Caret Line="6" Column="24"/>
+      </Position1>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -70,7 +100,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -78,9 +108,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exspname/exspname.lpr b/components/onguard/examples/exspname/exspname.lpr
index 26a061426..066d8ace7 100644
--- a/components/onguard/examples/exspname/exspname.lpr
+++ b/components/onguard/examples/exspname/exspname.lpr
@@ -8,6 +8,8 @@ uses
 
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exspname/exspnamu.lfm b/components/onguard/examples/exspname/exspnamu.lfm
index e171870d1..7e4ac5792 100644
--- a/components/onguard/examples/exspname/exspnamu.lfm
+++ b/components/onguard/examples/exspname/exspnamu.lfm
@@ -5,104 +5,179 @@ object Form1: TForm1
   Width = 372
   HorzScrollBar.Page = 371
   VertScrollBar.Page = 294
+  AutoSize = True
+  BorderStyle = bsDialog
   Caption = 'Build/Check Special Code with Name string'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 295
+  ClientWidth = 372
+  LCLVersion = '2.3.0.0'
   object GroupBox1: TGroupBox
-    Left = 16
-    Height = 97
-    Top = 16
-    Width = 337
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
+    Height = 87
+    Top = 12
+    Width = 342
+    BorderSpacing.Around = 12
     Caption = ' Generate the Code '
+    ClientHeight = 67
+    ClientWidth = 338
     TabOrder = 0
     object Label1: TLabel
-      Left = 24
-      Height = 13
-      Top = 28
-      Width = 53
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = edtUserName1
+      AnchorSideTop.Side = asrCenter
+      Left = 16
+      Height = 15
+      Top = 8
+      Width = 58
+      BorderSpacing.Left = 16
       Caption = 'User Name'
       Color = clNone
       ParentColor = False
     end
     object edtUserName1: TEdit
-      Left = 104
-      Height = 21
-      Top = 24
-      Width = 217
+      AnchorSideLeft.Control = edtCode1
+      AnchorSideTop.Control = GroupBox1
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      Left = 102
+      Height = 23
+      Top = 4
+      Width = 224
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 4
+      BorderSpacing.Right = 12
       TabOrder = 0
     end
     object btnGenCode: TButton
-      Left = 6
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = edtCode1
+      AnchorSideTop.Side = asrCenter
+      Left = 8
       Height = 25
-      Top = 54
-      Width = 85
+      Top = 34
+      Width = 86
+      BorderSpacing.Around = 8
       BorderSpacing.InnerBorder = 4
       Caption = 'Gen Code'
       OnClick = btnGenCodeClick
       TabOrder = 1
     end
     object edtCode1: TEdit
-      Left = 104
-      Height = 21
-      Top = 56
-      Width = 217
+      AnchorSideLeft.Control = btnGenCode
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = edtUserName1
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      Left = 102
+      Height = 23
+      Top = 35
+      Width = 224
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 12
       ReadOnly = True
       TabOrder = 2
     end
   end
   object GroupBox2: TGroupBox
-    Left = 16
-    Height = 129
-    Top = 128
-    Width = 337
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = GroupBox1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = GroupBox1
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 116
+    Top = 111
+    Width = 342
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     Caption = ' Check the Code '
+    ClientHeight = 96
+    ClientWidth = 338
     TabOrder = 1
     object Label2: TLabel
-      Left = 24
-      Height = 13
-      Top = 28
-      Width = 53
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideTop.Control = edtUserName2
+      AnchorSideTop.Side = asrCenter
+      Left = 16
+      Height = 15
+      Top = 8
+      Width = 58
+      BorderSpacing.Left = 16
       Caption = 'User Name'
       Color = clNone
       ParentColor = False
     end
     object Label3: TLabel
-      Left = 24
-      Height = 13
-      Top = 60
-      Width = 25
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideTop.Control = edtCode2
+      AnchorSideTop.Side = asrCenter
+      Left = 16
+      Height = 15
+      Top = 39
+      Width = 28
+      BorderSpacing.Left = 16
       Caption = 'Code'
       Color = clNone
       ParentColor = False
     end
     object lblCheckResult: TLabel
-      Left = 104
-      Height = 13
-      Top = 96
-      Width = 71
+      AnchorSideLeft.Control = edtUserName2
+      AnchorSideTop.Control = edtCode2
+      AnchorSideTop.Side = asrBottom
+      Left = 101
+      Height = 15
+      Top = 68
+      Width = 78
+      BorderSpacing.Top = 10
       Caption = 'lblCheckResult'
       Color = clNone
       ParentColor = False
     end
     object edtUserName2: TEdit
-      Left = 104
-      Height = 21
-      Top = 24
-      Width = 217
+      AnchorSideLeft.Control = btnCheckCode
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 101
+      Height = 23
+      Top = 4
+      Width = 225
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 4
+      BorderSpacing.Right = 12
       TabOrder = 0
     end
     object edtCode2: TEdit
-      Left = 104
-      Height = 21
-      Top = 56
-      Width = 217
+      AnchorSideLeft.Control = edtUserName2
+      AnchorSideTop.Control = edtUserName2
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 101
+      Height = 23
+      Top = 35
+      Width = 225
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 12
       TabOrder = 1
     end
     object btnCheckCode: TButton
-      Left = 6
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideTop.Control = lblCheckResult
+      AnchorSideTop.Side = asrCenter
+      Left = 8
       Height = 25
-      Top = 88
+      Top = 63
       Width = 85
+      BorderSpacing.Around = 8
       BorderSpacing.InnerBorder = 4
       Caption = 'Check Code'
       OnClick = btnCheckCodeClick
diff --git a/components/onguard/examples/exspname/exspnamu.lrs b/components/onguard/examples/exspname/exspnamu.lrs
index e1d6d0d2d..9c1d55629 100644
--- a/components/onguard/examples/exspname/exspnamu.lrs
+++ b/components/onguard/examples/exspname/exspnamu.lrs
@@ -1,30 +1,66 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#200#0#6'Height'#3''''#1#3'Top'#2'l'#5'Wid'
-  +'th'#3't'#1#18'HorzScrollBar.Page'#3's'#1#18'VertScrollBar.Page'#3'&'#1#7'Ca'
-  +'ption'#6')Build/Check Special Code with Name string'#11'Font.Height'#2#245#9
-  +'Font.Name'#6#13'MS Sans Serif'#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#16#6'H'
-  +'eight'#2'a'#3'Top'#2#16#5'Width'#3'Q'#1#7'Caption'#6#19' Generate the Code '
-  +#8'TabOrder'#2#0#0#6'TLabel'#6'Label1'#4'Left'#2#24#6'Height'#2#13#3'Top'#2
-  +#28#5'Width'#2'5'#7'Caption'#6#9'User Name'#5'Color'#7#6'clNone'#11'ParentCo'
-  +'lor'#8#0#0#5'TEdit'#12'edtUserName1'#4'Left'#2'h'#6'Height'#2#21#3'Top'#2#24
-  +#5'Width'#3#217#0#8'TabOrder'#2#0#0#0#7'TButton'#10'btnGenCode'#4'Left'#2#6#6
-  +'Height'#2#25#3'Top'#2'6'#5'Width'#2'U'#25'BorderSpacing.InnerBorder'#2#4#7
-  +'Caption'#6#8'Gen Code'#7'OnClick'#7#15'btnGenCodeClick'#8'TabOrder'#2#1#0#0
-  +#5'TEdit'#8'edtCode1'#4'Left'#2'h'#6'Height'#2#21#3'Top'#2'8'#5'Width'#3#217
-  +#0#8'ReadOnly'#9#8'TabOrder'#2#2#0#0#0#9'TGroupBox'#9'GroupBox2'#4'Left'#2#16
-  +#6'Height'#3#129#0#3'Top'#3#128#0#5'Width'#3'Q'#1#7'Caption'#6#16' Check the'
-  +' Code '#8'TabOrder'#2#1#0#6'TLabel'#6'Label2'#4'Left'#2#24#6'Height'#2#13#3
-  +'Top'#2#28#5'Width'#2'5'#7'Caption'#6#9'User Name'#5'Color'#7#6'clNone'#11'P'
-  +'arentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'#2#24#6'Height'#2#13#3'Top'#2
-  +'<'#5'Width'#2#25#7'Caption'#6#4'Code'#5'Color'#7#6'clNone'#11'ParentColor'#8
-  +#0#0#6'TLabel'#14'lblCheckResult'#4'Left'#2'h'#6'Height'#2#13#3'Top'#2'`'#5
-  +'Width'#2'G'#7'Caption'#6#14'lblCheckResult'#5'Color'#7#6'clNone'#11'ParentC'
-  +'olor'#8#0#0#5'TEdit'#12'edtUserName2'#4'Left'#2'h'#6'Height'#2#21#3'Top'#2
-  +#24#5'Width'#3#217#0#8'TabOrder'#2#0#0#0#5'TEdit'#8'edtCode2'#4'Left'#2'h'#6
-  +'Height'#2#21#3'Top'#2'8'#5'Width'#3#217#0#8'TabOrder'#2#1#0#0#7'TButton'#12
-  +'btnCheckCode'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'X'#5'Width'#2'U'#25'Borde'
-  +'rSpacing.InnerBorder'#2#4#7'Caption'#6#10'Check Code'#7'OnClick'#7#17'btnCh'
-  +'eckCodeClick'#8'TabOrder'#2#2#0#0#0#0
+  +'th'#3't'#1#18'HorzScrollBar.Page'#3's'#1#18'VertScrollBar.Page'#3'&'#1#8'Au'
+  +'toSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6')Build/Check Special C'
+  +'ode with Name string'#12'ClientHeight'#3''''#1#11'ClientWidth'#3't'#1#10'LC'
+  +'LVersion'#6#7'2.3.0.0'#0#9'TGroupBox'#9'GroupBox1'#22'AnchorSideLeft.Contro'
+  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#12#6'Height'#2
+  +'W'#3'Top'#2#12#5'Width'#3'V'#1#20'BorderSpacing.Around'#2#12#7'Caption'#6#19
+  +' Generate the Code '#12'ClientHeight'#2'C'#11'ClientWidth'#3'R'#1#8'TabOrde'
+  +'r'#2#0#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'A'
+  +'nchorSideTop.Control'#7#12'edtUserName1'#18'AnchorSideTop.Side'#7#9'asrCent'
+  +'er'#4'Left'#2#16#6'Height'#2#15#3'Top'#2#8#5'Width'#2':'#18'BorderSpacing.L'
+  +'eft'#2#16#7'Caption'#6#9'User Name'#5'Color'#7#6'clNone'#11'ParentColor'#8#0
+  +#0#5'TEdit'#12'edtUserName1'#22'AnchorSideLeft.Control'#7#8'edtCode1'#21'Anc'
+  +'horSideTop.Control'#7#9'GroupBox1'#23'AnchorSideRight.Control'#7#9'GroupBox'
+  +'1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'f'#6'Height'#2#23#3'To'
+  +'p'#2#4#5'Width'#3#224#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'Bo'
+  +'rderSpacing.Top'#2#4#19'BorderSpacing.Right'#2#12#8'TabOrder'#2#0#0#0#7'TBu'
+  +'tton'#10'btnGenCode'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSid'
+  +'eTop.Control'#7#8'edtCode1'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2
+  +#8#6'Height'#2#25#3'Top'#2'"'#5'Width'#2'V'#20'BorderSpacing.Around'#2#8#25
+  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#8'Gen Code'#7'OnClick'#7#15'btn'
+  +'GenCodeClick'#8'TabOrder'#2#1#0#0#5'TEdit'#8'edtCode1'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#10'btnGenCode'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+  +'eTop.Control'#7#12'edtUserName1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'A'
+  +'nchorSideRight.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#2'f'#6'Height'#2#23#3'Top'#2'#'#5'Width'#3#224#0#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#8#19'BorderSpacing.Ri'
+  +'ght'#2#12#8'ReadOnly'#9#8'TabOrder'#2#2#0#0#0#9'TGroupBox'#9'GroupBox2'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'GroupBox1'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'Group'
+  +'Box1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2't'#3
+  +'Top'#2'o'#5'Width'#3'V'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18
+  +'BorderSpacing.Left'#2#12#17'BorderSpacing.Top'#2#12#20'BorderSpacing.Bottom'
+  +#2#12#7'Caption'#6#16' Check the Code '#12'ClientHeight'#2'`'#11'ClientWidth'
+  +#3'R'#1#8'TabOrder'#2#1#0#6'TLabel'#6'Label2'#22'AnchorSideLeft.Control'#7#9
+  +'GroupBox2'#21'AnchorSideTop.Control'#7#12'edtUserName2'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrCenter'#4'Left'#2#16#6'Height'#2#15#3'Top'#2#8#5'Width'#2':'#18
+  +'BorderSpacing.Left'#2#16#7'Caption'#6#9'User Name'#5'Color'#7#6'clNone'#11
+  +'ParentColor'#8#0#0#6'TLabel'#6'Label3'#22'AnchorSideLeft.Control'#7#9'Group'
+  +'Box2'#21'AnchorSideTop.Control'#7#8'edtCode2'#18'AnchorSideTop.Side'#7#9'as'
+  +'rCenter'#4'Left'#2#16#6'Height'#2#15#3'Top'#2''''#5'Width'#2#28#18'BorderSp'
+  +'acing.Left'#2#16#7'Caption'#6#4'Code'#5'Color'#7#6'clNone'#11'ParentColor'#8
+  +#0#0#6'TLabel'#14'lblCheckResult'#22'AnchorSideLeft.Control'#7#12'edtUserNam'
+  +'e2'#21'AnchorSideTop.Control'#7#8'edtCode2'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2'e'#6'Height'#2#15#3'Top'#2'D'#5'Width'#2'N'#17'BorderSpaci'
+  +'ng.Top'#2#10#7'Caption'#6#14'lblCheckResult'#5'Color'#7#6'clNone'#11'Parent'
+  +'Color'#8#0#0#5'TEdit'#12'edtUserName2'#22'AnchorSideLeft.Control'#7#12'btnC'
+  +'heckCode'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
+  +#9'GroupBox2'#23'AnchorSideRight.Control'#7#9'GroupBox2'#20'AnchorSideRight.'
+  +'Side'#7#9'asrBottom'#4'Left'#2'e'#6'Height'#2#23#3'Top'#2#4#5'Width'#3#225#0
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#4#19
+  +'BorderSpacing.Right'#2#12#8'TabOrder'#2#0#0#0#5'TEdit'#8'edtCode2'#22'Ancho'
+  +'rSideLeft.Control'#7#12'edtUserName2'#21'AnchorSideTop.Control'#7#12'edtUse'
+  +'rName2'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+  +#9'GroupBox2'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'e'#6'Height'
+  +#2#23#3'Top'#2'#'#5'Width'#3#225#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +'t'#0#17'BorderSpacing.Top'#2#8#19'BorderSpacing.Right'#2#12#8'TabOrder'#2#1
+  +#0#0#7'TButton'#12'btnCheckCode'#22'AnchorSideLeft.Control'#7#9'GroupBox2'#21
+  +'AnchorSideTop.Control'#7#14'lblCheckResult'#18'AnchorSideTop.Side'#7#9'asrC'
+  +'enter'#4'Left'#2#8#6'Height'#2#25#3'Top'#2'?'#5'Width'#2'U'#20'BorderSpacin'
+  +'g.Around'#2#8#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Check Code'
+  +#7'OnClick'#7#17'btnCheckCodeClick'#8'TabOrder'#2#2#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exspreg/ONGUARD.INI b/components/onguard/examples/exspreg/ONGUARD.INI
index f2533271d..858151501 100644
--- a/components/onguard/examples/exspreg/ONGUARD.INI
+++ b/components/onguard/examples/exspreg/ONGUARD.INI
@@ -1,2 +1 @@
 [Codes]
-SpecialCode=B52A3ABB5EA876AC
diff --git a/components/onguard/examples/exspreg/exspreg.lpi b/components/onguard/examples/exspreg/exspreg.lpi
index 0eed30074..d7f4279c7 100644
--- a/components/onguard/examples/exspreg/exspreg.lpi
+++ b/components/onguard/examples/exspreg/exspreg.lpi
@@ -1,63 +1,86 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
         <Filename Value="exspreg.lpr"/>
         <IsPartOfProject Value="True"/>
         <CursorPos X="48" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exspregu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exspregu"/>
-        <CursorPos X="46" Y="20"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <CursorPos X="39" Y="22"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="2" HistoryIndex="1">
+      <Position1>
+        <Filename Value="exspregu.pas"/>
+        <Caret Line="22" Column="39"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exspregu.pas"/>
+        <Caret Line="21" Column="39"/>
+      </Position2>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -70,7 +93,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -78,9 +101,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exspreg/exspreg.lpr b/components/onguard/examples/exspreg/exspreg.lpr
index a1a376236..575872238 100644
--- a/components/onguard/examples/exspreg/exspreg.lpr
+++ b/components/onguard/examples/exspreg/exspreg.lpr
@@ -8,6 +8,8 @@ uses
   Exspregu in 'EXSPREGU.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exspreg/exspregu.lfm b/components/onguard/examples/exspreg/exspregu.lfm
index 180573119..37aa86bf9 100644
--- a/components/onguard/examples/exspreg/exspregu.lfm
+++ b/components/onguard/examples/exspreg/exspregu.lfm
@@ -2,97 +2,120 @@ object Form1: TForm1
   Left = 252
   Height = 303
   Top = 138
-  Width = 487
+  Width = 450
   HorzScrollBar.Page = 486
   VertScrollBar.Page = 302
+  AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Special Registration Data Code Example'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 303
+  ClientWidth = 450
+  Constraints.MinWidth = 450
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 13
-    Top = 262
-    Width = 35
+    Height = 15
+    Top = 249
+    Width = 32
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object Label1: TLabel
-    Left = 224
-    Height = 13
-    Top = 14
-    Width = 77
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = CodeLbl
+    Left = 266
+    Height = 15
+    Top = 13
+    Width = 72
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 8
     Caption = 'Current code:'
     Color = clNone
     ParentColor = False
   end
   object CodeLbl: TLabel
-    Left = 320
-    Height = 13
-    Top = 14
-    Width = 113
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 346
+    Height = 15
+    Top = 13
+    Width = 96
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 8
     Caption = '0000000000000000'
     Color = clNone
     ParentColor = False
   end
   object CodeBtn: TButton
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
     Left = 8
     Height = 25
     Top = 8
     Width = 89
+    BorderSpacing.Around = 8
     BorderSpacing.InnerBorder = 4
     Caption = 'Enter Code'
     OnClick = CodeBtnClick
     TabOrder = 0
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 209
-    Top = 40
-    Width = 465
-    Color = clBtnFace
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the code. An invalid code indicates that '
-      'the code is either the incorrect type or that none has been entered. '
-      ''
-      'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will '
-      'say that the code is invalid.'
-      ''
-      'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate '
-      'the proper "Special" code). '
-      ''
-      'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so '
-      'will cause the TOgSpecialCode component to report that the code is invalid.'
-    )
-    ReadOnly = True
+  object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 367
+    Height = 25
+    Top = 244
+    Width = 75
+    Anchors = [akTop]
+    BorderSpacing.Around = 8
+    Kind = bkClose
     TabOrder = 1
   end
-  object CloseBtn: TBitBtn
-    Left = 400
-    Height = 25
-    Top = 256
-    Width = 75
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 2
-  end
   object RemoveBtn: TButton
-    Left = 288
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideRight.Control = CloseBtn
+    Left = 262
     Height = 25
-    Top = 256
+    Top = 244
     Width = 97
+    Anchors = [akTop, akRight]
     BorderSpacing.InnerBorder = 4
     Caption = 'Remove Code'
     OnClick = RemoveBtnClick
-    TabOrder = 3
+    TabOrder = 2
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 8
+    Height = 195
+    Top = 41
+    Width = 434
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 8
+    Caption = 'The label at the bottom of this form indicates the status of the code. An invalid code indicates that the code is either the incorrect type or that none has been entered. '#13#10#13#10'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate the proper "Special" code). '#13#10#13#10'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so will cause the TOgSpecialCode component to report that the code is invalid.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
   end
   object OgSpecialCode1: TOgSpecialCode
     OnChecked = CodeChecked
     OnGetKey = GetKey
     OnGetCode = GetCode
-    left = 16
-    top = 216
+    Left = 168
+    Top = 136
   end
 end
diff --git a/components/onguard/examples/exspreg/exspregu.lrs b/components/onguard/examples/exspreg/exspregu.lrs
index 63bd4402c..509808ae5 100644
--- a/components/onguard/examples/exspreg/exspregu.lrs
+++ b/components/onguard/examples/exspreg/exspregu.lrs
@@ -1,34 +1,51 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#252#0#6'Height'#3'/'#1#3'Top'#3#138#0#5'W'
-  +'idth'#3#231#1#18'HorzScrollBar.Page'#3#230#1#18'VertScrollBar.Page'#3'.'#1
-  +#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6'&Special Registration Data Code '
-  +'Example'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'Position'
-  +#7#14'poScreenCenter'#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Height'#2#13#3
-  +'Top'#3#6#1#5'Width'#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'Par'
-  +'entColor'#8#0#0#6'TLabel'#6'Label1'#4'Left'#3#224#0#6'Height'#2#13#3'Top'#2
-  +#14#5'Width'#2'M'#7'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'Par'
-  +'entColor'#8#0#0#6'TLabel'#7'CodeLbl'#4'Left'#3'@'#1#6'Height'#2#13#3'Top'#2
-  +#14#5'Width'#2'q'#7'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11
-  +'ParentColor'#8#0#0#7'TButton'#7'CodeBtn'#4'Left'#2#8#6'Height'#2#25#3'Top'#2
-  +#8#5'Width'#2'Y'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Cod'
-  +'e'#7'OnClick'#7#12'CodeBtnClick'#8'TabOrder'#2#0#0#0#5'TMemo'#5'Memo1'#4'Le'
-  +'ft'#2#8#6'Height'#3#209#0#3'Top'#2'('#5'Width'#3#209#1#5'Color'#7#9'clBtnFa'
-  +'ce'#13'Lines.Strings'#1#6'fThe label at the bottom of this form indicates t'
-  +'he status of the code. An invalid code indicates that '#6'Ethe code is eith'
-  +'er the incorrect type or that none has been entered. '#6#0#6'^If the proper'
-  +' code has not been entered or the ONGUARD.INI file was deleted, the message'
-  +' will '#6#29'say that the code is invalid.'#6#0#6'YUse the "Enter Code" but'
-  +'ton to enter a code (the CODEGEN program can be used to generate '#6#28'the'
-  +' proper "Special" code). '#6#0#6'\The "Remove Code" button can be used to r'
-  +'emove the entered code from the INI file. Doing so '#6'Kwill cause the TOgS'
-  +'pecialCode component to report that the code is invalid.'#0#8'ReadOnly'#9#8
-  +'TabOrder'#2#1#0#0#7'TBitBtn'#8'CloseBtn'#4'Left'#3#144#1#6'Height'#2#25#3'T'
-  +'op'#3#0#1#5'Width'#2'K'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#2#0#0#7'TButton'#9'RemoveBtn'#4'Left'#3' '#1#6'Height'#2#25#3'Top'#3#0#1#5
-  +'Width'#2'a'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7
-  +'OnClick'#7#14'RemoveBtnClick'#8'TabOrder'#2#3#0#0#14'TOgSpecialCode'#14'OgS'
-  +'pecialCode1'#9'OnChecked'#7#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGet'
-  +'Code'#7#7'GetCode'#4'left'#2#16#3'top'#3#216#0#0#0#0
+  +'idth'#3#194#1#18'HorzScrollBar.Page'#3#230#1#18'VertScrollBar.Page'#3'.'#1#8
+  +'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6'&Special Registratio'
+  +'n Data Code Example'#12'ClientHeight'#3'/'#1#11'ClientWidth'#3#194#1#20'Con'
+  +'straints.MinWidth'#3#194#1#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6
+  +#7'2.3.0.0'#0#6'TLabel'#9'StatusLbl'#22'AnchorSideLeft.Control'#7#5'Memo1'#21
+  +'AnchorSideTop.Control'#7#8'CloseBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
+  +'Left'#2#8#6'Height'#2#15#3'Top'#3#249#0#5'Width'#2' '#7'Caption'#6#6'Status'
+  +#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label1'#21'AnchorSid'
+  +'eTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorS'
+  +'ideRight.Control'#7#7'CodeLbl'#4'Left'#3#10#1#6'Height'#2#15#3'Top'#2#13#5
+  +'Width'#2'H'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#8
+  +#7'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6
+  +'TLabel'#7'CodeLbl'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.'
+  +'Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#3'Z'#1#6'Height'#2#15#3'Top'#2#13#5'Width'
+  +#2'`'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#8#7'Capt'
+  +'ion'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TB'
+  +'utton'#7'CodeBtn'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
+  +'ntrol'#7#5'Owner'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'Y'#20'Bo'
+  +'rderSpacing.Around'#2#8#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'E'
+  +'nter Code'#7'OnClick'#7#12'CodeBtnClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'C'
+  +'loseBtn'#21'AnchorSideTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#3'o'#1#6'Height'#2#25#3'Top'#3#244#0#5'Width'#2'K'#7'Anc'
+  +'hors'#11#5'akTop'#0#20'BorderSpacing.Around'#2#8#4'Kind'#7#7'bkClose'#8'Tab'
+  +'Order'#2#1#0#0#7'TButton'#9'RemoveBtn'#21'AnchorSideTop.Control'#7#8'CloseB'
+  +'tn'#23'AnchorSideRight.Control'#7#8'CloseBtn'#4'Left'#3#6#1#6'Height'#2#25#3
+  +'Top'#3#244#0#5'Width'#2'a'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpa'
+  +'cing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7#14'RemoveBt'
+  +'nClick'#8'TabOrder'#2#2#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Control'#7
+  +#5'Owner'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#2#8#6'Height'#3#195#0#3'Top'#2')'#5'Width'#3#178#1#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#8#7'C'
+  +'aption'#12'N'#2#0#0'The label at the bottom of this form indicates the stat'
+  +'us of the code. An invalid code indicates that the code is either the incor'
+  +'rect type or that none has been entered. '#13#10#13#10'If the proper code h'
+  +'as not been entered or the ONGUARD.INI file was deleted, the message will s'
+  +'ay that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to en'
+  +'ter a code (the CODEGEN program can be used to generate the proper "Special'
+  +'" code). '#13#10#13#10'The "Remove Code" button can be used to remove the e'
+  +'ntered code from the INI file. Doing so will cause the TOgSpecialCode compo'
+  +'nent to report that the code is invalid.'#5'Color'#7#9'clBtnFace'#11'Parent'
+  +'Color'#8#8'WordWrap'#9#0#0#14'TOgSpecialCode'#14'OgSpecialCode1'#9'OnChecke'
+  +'d'#7#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCode'#4'Le'
+  +'ft'#3#168#0#3'Top'#3#136#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exspreg/exspregu.pas b/components/onguard/examples/exspreg/exspregu.pas
index 502009be6..7279fbb1d 100644
--- a/components/onguard/examples/exspreg/exspregu.pas
+++ b/components/onguard/examples/exspreg/exspregu.pas
@@ -14,8 +14,8 @@ type
 
   TForm1 = class(TForm)
     CodeBtn: TButton;
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     StatusLbl: TLabel;
     Label1: TLabel;
     CodeLbl: TLabel;
diff --git a/components/onguard/examples/exsrnm1/exsrnm1.lpi b/components/onguard/examples/exsrnm1/exsrnm1.lpi
index 2b8be548f..37704fa6f 100644
--- a/components/onguard/examples/exsrnm1/exsrnm1.lpi
+++ b/components/onguard/examples/exsrnm1/exsrnm1.lpi
@@ -1,196 +1,213 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="2"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="3">
       <Unit0>
         <Filename Value="exsrnm1.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Exsrnm1"/>
         <CursorPos X="9" Y="9"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="22"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exsrnmu1.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exsrnmu1"/>
-        <CursorPos X="27" Y="6"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="11"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="164"/>
+        <CursorPos X="48" Y="181"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="exsrnmu2.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="SNEntryDlg"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exsrnmu2"/>
-        <CursorPos X="3" Y="35"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="11"/>
+        <EditorIndex Value="2"/>
+        <CursorPos X="16" Y="23"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit2>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="124" Column="1" TopLine="107"/>
+        <Caret Line="143" TopLine="126"/>
       </Position1>
       <Position2>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="125" Column="1" TopLine="108"/>
+        <Caret Line="122" TopLine="105"/>
       </Position2>
       <Position3>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="127" Column="1" TopLine="110"/>
+        <Caret Line="161" TopLine="144"/>
       </Position3>
       <Position4>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="128" Column="1" TopLine="111"/>
+        <Caret Line="122" TopLine="105"/>
       </Position4>
       <Position5>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="129" Column="1" TopLine="112"/>
+        <Caret Line="120" TopLine="103"/>
       </Position5>
       <Position6>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="131" Column="1" TopLine="114"/>
+        <Caret Line="163" TopLine="146"/>
       </Position6>
       <Position7>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="137" Column="1" TopLine="120"/>
+        <Caret Line="120" TopLine="103"/>
       </Position7>
       <Position8>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="138" Column="1" TopLine="121"/>
+        <Caret Line="86" TopLine="69"/>
       </Position8>
       <Position9>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="142" Column="1" TopLine="125"/>
+        <Caret Line="97" TopLine="80"/>
       </Position9>
       <Position10>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="143" Column="1" TopLine="126"/>
+        <Caret Line="101" TopLine="84"/>
       </Position10>
       <Position11>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="152" Column="1" TopLine="135"/>
+        <Caret Line="102" TopLine="85"/>
       </Position11>
       <Position12>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="153" Column="1" TopLine="136"/>
+        <Caret Line="104" TopLine="87"/>
       </Position12>
       <Position13>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="154" Column="1" TopLine="137"/>
+        <Caret Line="105" TopLine="88"/>
       </Position13>
       <Position14>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="155" Column="1" TopLine="138"/>
+        <Caret Line="108" TopLine="91"/>
       </Position14>
       <Position15>
-        <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="143" Column="1" TopLine="126"/>
+        <Filename Value="exsrnmu2.pas"/>
+        <Caret Line="35" Column="3"/>
       </Position15>
       <Position16>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="157" Column="1" TopLine="140"/>
+        <Caret Line="86" TopLine="73"/>
       </Position16>
       <Position17>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="143" Column="1" TopLine="126"/>
+        <Caret Line="97" TopLine="73"/>
       </Position17>
       <Position18>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="122" Column="1" TopLine="105"/>
+        <Caret Line="101" TopLine="73"/>
       </Position18>
       <Position19>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="161" Column="1" TopLine="144"/>
+        <Caret Line="102" TopLine="73"/>
       </Position19>
       <Position20>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="122" Column="1" TopLine="105"/>
+        <Caret Line="104" TopLine="74"/>
       </Position20>
       <Position21>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="120" Column="1" TopLine="103"/>
+        <Caret Line="105" TopLine="75"/>
       </Position21>
       <Position22>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="163" Column="1" TopLine="146"/>
+        <Caret Line="108" TopLine="78"/>
       </Position22>
       <Position23>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="120" Column="1" TopLine="103"/>
+        <Caret Line="102" TopLine="78"/>
       </Position23>
       <Position24>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="86" Column="1" TopLine="69"/>
+        <Caret Line="110" TopLine="80"/>
       </Position24>
       <Position25>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="97" Column="1" TopLine="80"/>
+        <Caret Line="111" TopLine="82"/>
       </Position25>
       <Position26>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="101" Column="1" TopLine="84"/>
+        <Caret Line="84" TopLine="76"/>
       </Position26>
       <Position27>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="102" Column="1" TopLine="85"/>
+        <Caret Line="176" TopLine="151"/>
       </Position27>
       <Position28>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="104" Column="1" TopLine="87"/>
+        <Caret Line="179" TopLine="151"/>
       </Position28>
       <Position29>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="105" Column="1" TopLine="88"/>
+        <Caret Line="86" TopLine="68"/>
       </Position29>
       <Position30>
         <Filename Value="exsrnmu1.pas"/>
-        <Caret Line="108" Column="1" TopLine="91"/>
+        <Caret Line="78" Column="16" TopLine="68"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -203,7 +220,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -211,13 +228,13 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <BreakPoints Count="1">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="exsrnmu1.pas"/>
         <Line Value="121"/>
       </Item1>
diff --git a/components/onguard/examples/exsrnm1/exsrnm1.lpr b/components/onguard/examples/exsrnm1/exsrnm1.lpr
index f82737dfb..933f71731 100644
--- a/components/onguard/examples/exsrnm1/exsrnm1.lpr
+++ b/components/onguard/examples/exsrnm1/exsrnm1.lpr
@@ -9,6 +9,8 @@ uses
   Exsrnmu2 in 'EXSRNMU2.PAS' {SNEntryDlg}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exsrnm1/exsrnmu1.lfm b/components/onguard/examples/exsrnm1/exsrnmu1.lfm
index d535d5390..5b2fd3367 100644
--- a/components/onguard/examples/exsrnm1/exsrnmu1.lfm
+++ b/components/onguard/examples/exsrnm1/exsrnmu1.lfm
@@ -7,46 +7,56 @@ object Form1: TForm1
   VertScrollBar.Page = 185
   ActiveControl = Memo1
   Caption = 'Serial Number Example'
-  Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 186
+  ClientWidth = 240
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 38
-    Height = 13
-    Top = 96
-    Width = 51
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 15
+    Top = 91
+    Width = 44
     Alignment = taCenter
+    BorderSpacing.Left = 6
     Caption = 'Serial #: '
     Color = clNone
     ParentColor = False
   end
   object Memo1: TMemo
-    Left = 3
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 6
     Height = 79
-    Top = 4
+    Top = 6
     Width = 223
+    BorderSpacing.Around = 6
     Lines.Strings = (
-      'If you can edit this, then your program was '
-      'allowed to run'
+      'If you can edit this, then your program was allowed to run'
     )
     ScrollBars = ssVertical
     TabOrder = 0
   end
   object CloseBtn: TBitBtn
-    Left = 72
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 76
     Height = 33
-    Top = 114
+    Top = 112
     Width = 89
+    BorderSpacing.Top = 6
     Kind = bkClose
-    NumGlyphs = 0
     TabOrder = 1
   end
   object OgSerialNumberCode1: TOgSerialNumberCode
     OnChecked = OgSerialNumberCode1Checked
     OnGetKey = OgSerialNumberCode1GetKey
     OnGetCode = OgSerialNumberCode1GetCode
-    left = 128
-    top = 16
+    Left = 128
+    Top = 16
   end
 end
diff --git a/components/onguard/examples/exsrnm1/exsrnmu1.lrs b/components/onguard/examples/exsrnm1/exsrnmu1.lrs
index e96f6b98a..57a0cc5bc 100644
--- a/components/onguard/examples/exsrnm1/exsrnmu1.lrs
+++ b/components/onguard/examples/exsrnm1/exsrnmu1.lrs
@@ -1,19 +1,24 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#157#1#6'Height'#3#186#0#3'Top'#3#202#1#5
   +'Width'#3#240#0#18'HorzScrollBar.Page'#3#239#0#18'VertScrollBar.Page'#3#185#0
-  +#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#21'Serial Number Example'#10'Font'
-  +'.Color'#7#7'clBlack'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'
-  +#8'Position'#7#14'poScreenCenter'#0#6'TLabel'#6'Label1'#4'Left'#2'&'#6'Heigh'
-  +'t'#2#13#3'Top'#2'`'#5'Width'#2'3'#9'Alignment'#7#8'taCenter'#7'Caption'#6#10
-  +'Serial #: '#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#4
-  +'Left'#2#3#6'Height'#2'O'#3'Top'#2#4#5'Width'#3#223#0#13'Lines.Strings'#1#6
-  +',If you can edit this, then your program was '#6#14'allowed to run'#0#10'Sc'
-  +'rollBars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#4'Lef'
-  +'t'#2'H'#6'Height'#2'!'#3'Top'#2'r'#5'Width'#2'Y'#4'Kind'#7#7'bkClose'#9'Num'
-  +'Glyphs'#2#0#8'TabOrder'#2#1#0#0#19'TOgSerialNumberCode'#19'OgSerialNumberCo'
-  +'de1'#9'OnChecked'#7#26'OgSerialNumberCode1Checked'#8'OnGetKey'#7#25'OgSeria'
-  +'lNumberCode1GetKey'#9'OnGetCode'#7#26'OgSerialNumberCode1GetCode'#4'left'#3
-  +#128#0#3'top'#2#16#0#0#0
+  +#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#21'Serial Number Example'#12'Clie'
+  +'ntHeight'#3#186#0#11'ClientWidth'#3#240#0#8'Position'#7#14'poScreenCenter'
+  +#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'
+  +#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#15#3'Top'#2'['#5'Width'#2','#9'Alignment'
+  +#7#8'taCenter'#18'BorderSpacing.Left'#2#6#7'Caption'#6#10'Serial #: '#5'Colo'
+  +'r'#7#6'clNone'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'Height'
+  +#2'O'#3'Top'#2#6#5'Width'#3#223#0#20'BorderSpacing.Around'#2#6#13'Lines.Stri'
+  +'ngs'#1#6':If you can edit this, then your program was allowed to run'#0#10
+  +'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21
+  +'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2'L'#6'Height'#2'!'#3'Top'#2'p'#5'Width'#2'Y'#17'BorderSpacing.Top'#2
+  +#6#4'Kind'#7#7'bkClose'#8'TabOrder'#2#1#0#0#19'TOgSerialNumberCode'#19'OgSer'
+  +'ialNumberCode1'#9'OnChecked'#7#26'OgSerialNumberCode1Checked'#8'OnGetKey'#7
+  +#25'OgSerialNumberCode1GetKey'#9'OnGetCode'#7#26'OgSerialNumberCode1GetCode'
+  +#4'Left'#3#128#0#3'Top'#2#16#0#0#0
 ]);
diff --git a/components/onguard/examples/exsrnm1/exsrnmu2.lfm b/components/onguard/examples/exsrnm1/exsrnmu2.lfm
index 1ef62e63b..a5949acd8 100644
--- a/components/onguard/examples/exsrnm1/exsrnmu2.lfm
+++ b/components/onguard/examples/exsrnm1/exsrnmu2.lfm
@@ -6,69 +6,104 @@ object SNEntryDlg: TSNEntryDlg
   HorzScrollBar.Page = 246
   VertScrollBar.Page = 165
   ActiveControl = SNText
+  AutoSize = True
   Caption = 'Serial Number'
-  Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 166
+  ClientWidth = 247
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = SNText
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 13
-    Top = 40
-    Width = 18
+    Height = 15
+    Top = 35
+    Width = 15
+    BorderSpacing.Left = 8
     Caption = 'SN'
     Color = clNone
     ParentColor = False
   end
   object Label2: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeText
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 13
+    Height = 15
     Top = 66
-    Width = 31
+    Width = 28
+    BorderSpacing.Left = 8
     Caption = 'Code'
     Color = clNone
     ParentColor = False
   end
   object Label3: TLabel
-    Left = 40
-    Height = 13
-    Top = 7
-    Width = 193
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Owner
+    Left = 34
+    Height = 15
+    Top = 8
+    Width = 178
+    BorderSpacing.Around = 8
     Caption = 'Call your Vendor NOW to register!'
     Color = clNone
     ParentColor = False
   end
   object SNText: TEdit
+    AnchorSideLeft.Control = CodeText
+    AnchorSideTop.Control = Label3
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = CodeText
+    AnchorSideRight.Side = asrBottom
     Left = 44
-    Height = 20
-    Top = 36
-    Width = 121
+    Height = 23
+    Top = 31
+    Width = 185
+    Anchors = [akTop, akLeft, akRight]
     TabOrder = 0
   end
   object CodeText: TEdit
+    AnchorSideLeft.Control = Label2
+    AnchorSideLeft.Side = asrBottom
     Left = 44
-    Height = 20
+    Height = 23
     Top = 62
     Width = 185
+    BorderSpacing.Left = 8
     TabOrder = 1
   end
   object OKBtn: TBitBtn
-    Left = 23
+    AnchorSideRight.Control = Bevel1
+    Left = 28
     Height = 33
     Top = 94
     Width = 89
+    Anchors = [akTop, akRight]
     Kind = bkOK
     ModalResult = 1
-    NumGlyphs = 0
     TabOrder = 2
   end
   object CancelBtn: TBitBtn
-    Left = 127
+    AnchorSideLeft.Control = Bevel1
+    AnchorSideLeft.Side = asrBottom
+    Left = 129
     Height = 33
     Top = 94
     Width = 89
+    BorderSpacing.Right = 8
+    BorderSpacing.Bottom = 8
     Kind = bkCancel
-    NumGlyphs = 0
     OnClick = CancelBtnClick
     TabOrder = 3
   end
+  object Bevel1: TBevel
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    Left = 117
+    Height = 32
+    Top = 89
+    Width = 12
+    Shape = bsSpacer
+  end
 end
diff --git a/components/onguard/examples/exsrnm1/exsrnmu2.lrs b/components/onguard/examples/exsrnm1/exsrnmu2.lrs
index c3a860a5b..18e61174a 100644
--- a/components/onguard/examples/exsrnm1/exsrnmu2.lrs
+++ b/components/onguard/examples/exsrnm1/exsrnmu2.lrs
@@ -1,21 +1,36 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TSNEntryDlg','FORMDATA',[
   'TPF0'#11'TSNEntryDlg'#10'SNEntryDlg'#4'Left'#3#147#1#6'Height'#3#166#0#3'Top'
   +#3#26#1#5'Width'#3#247#0#18'HorzScrollBar.Page'#3#246#0#18'VertScrollBar.Pag'
-  +'e'#3#165#0#13'ActiveControl'#7#6'SNText'#7'Caption'#6#13'Serial Number'#10
-  +'Font.Color'#7#7'clBlack'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Se'
-  +'rif'#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#13#3'Top'#2'('#5'Width'#2
-  +#18#7'Caption'#6#2'SN'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6
-  +'Label2'#4'Left'#2#8#6'Height'#2#13#3'Top'#2'B'#5'Width'#2#31#7'Caption'#6#4
-  +'Code'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'
-  +#2'('#6'Height'#2#13#3'Top'#2#7#5'Width'#3#193#0#7'Caption'#6'!Call your Ven'
-  +'dor NOW to register!'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#6
-  +'SNText'#4'Left'#2','#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'y'#8'TabOrder'#2
-  +#0#0#0#5'TEdit'#8'CodeText'#4'Left'#2','#6'Height'#2#20#3'Top'#2'>'#5'Width'
-  +#3#185#0#8'TabOrder'#2#1#0#0#7'TBitBtn'#5'OKBtn'#4'Left'#2#23#6'Height'#2'!'
-  +#3'Top'#2'^'#5'Width'#2'Y'#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'
-  +#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#9'CancelBtn'#4'Left'#2''#6'Height'#2'!'
-  +#3'Top'#2'^'#5'Width'#2'Y'#4'Kind'#7#8'bkCancel'#9'NumGlyphs'#2#0#7'OnClick'
-  +#7#14'CancelBtnClick'#8'TabOrder'#2#3#0#0#0
+  +'e'#3#165#0#13'ActiveControl'#7#6'SNText'#8'AutoSize'#9#7'Caption'#6#13'Seri'
+  +'al Number'#12'ClientHeight'#3#166#0#11'ClientWidth'#3#247#0#10'LCLVersion'#6
+  +#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'A'
+  +'nchorSideTop.Control'#7#6'SNText'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'L'
+  +'eft'#2#8#6'Height'#2#15#3'Top'#2'#'#5'Width'#2#15#18'BorderSpacing.Left'#2#8
+  +#7'Caption'#6#2'SN'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'L'
+  +'abel2'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8
+  +'CodeText'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#8#6'Height'#2#15#3
+  +'Top'#2'B'#5'Width'#2#28#18'BorderSpacing.Left'#2#8#7'Caption'#6#4'Code'#5'C'
+  +'olor'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label3'#22'AnchorSideLe'
+  +'ft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSide'
+  +'Top.Control'#7#5'Owner'#4'Left'#2'"'#6'Height'#2#15#3'Top'#2#8#5'Width'#3
+  +#178#0#20'BorderSpacing.Around'#2#8#7'Caption'#6'!Call your Vendor NOW to re'
+  +'gister!'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#6'SNText'#22'A'
+  +'nchorSideLeft.Control'#7#8'CodeText'#21'AnchorSideTop.Control'#7#6'Label3'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'CodeT'
+  +'ext'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2','#6'Height'#2#23#3
+  +'Top'#2#31#5'Width'#3#185#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+  +'TabOrder'#2#0#0#0#5'TEdit'#8'CodeText'#22'AnchorSideLeft.Control'#7#6'Label'
+  +'2'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2','#6'Height'#2#23#3'Top'
+  +#2'>'#5'Width'#3#185#0#18'BorderSpacing.Left'#2#8#8'TabOrder'#2#1#0#0#7'TBit'
+  +'Btn'#5'OKBtn'#23'AnchorSideRight.Control'#7#6'Bevel1'#4'Left'#2#28#6'Height'
+  +#2'!'#3'Top'#2'^'#5'Width'#2'Y'#7'Anchors'#11#5'akTop'#7'akRight'#0#4'Kind'#7
+  +#4'bkOK'#11'ModalResult'#2#1#8'TabOrder'#2#2#0#0#7'TBitBtn'#9'CancelBtn'#22
+  +'AnchorSideLeft.Control'#7#6'Bevel1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4
+  +'Left'#3#129#0#6'Height'#2'!'#3'Top'#2'^'#5'Width'#2'Y'#19'BorderSpacing.Rig'
+  +'ht'#2#8#20'BorderSpacing.Bottom'#2#8#4'Kind'#7#8'bkCancel'#7'OnClick'#7#14
+  +'CancelBtnClick'#8'TabOrder'#2#3#0#0#6'TBevel'#6'Bevel1'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#4'Left'#2'u'#6'He'
+  +'ight'#2' '#3'Top'#2'Y'#5'Width'#2#12#5'Shape'#7#8'bsSpacer'#0#0#0
 ]);
diff --git a/components/onguard/examples/exsrnm1/exsrnmu2.pas b/components/onguard/examples/exsrnm1/exsrnmu2.pas
index 27f336df5..6325994c4 100644
--- a/components/onguard/examples/exsrnm1/exsrnmu2.pas
+++ b/components/onguard/examples/exsrnm1/exsrnmu2.pas
@@ -5,10 +5,14 @@ interface
 
 uses
   SysUtils,Classes,Controls,
-  Forms, Dialogs, StdCtrls, Buttons,LResources;
+  Forms, Dialogs, StdCtrls, Buttons,LResources, ExtCtrls;
 
 type
+
+  { TSNEntryDlg }
+
   TSNEntryDlg = class(TForm)
+    Bevel1: TBevel;
     Label1: TLabel;
     Label2: TLabel;
     SNText: TEdit;
@@ -28,8 +32,6 @@ var
 
 implementation
 
-
-
 procedure TSNEntryDlg.CancelBtnClick(Sender: TObject);
 begin
   Close;
diff --git a/components/onguard/examples/exusg1/Usage1.ini b/components/onguard/examples/exusg1/Usage1.ini
index 849a1dbb0..c45608ac0 100644
--- a/components/onguard/examples/exusg1/Usage1.ini
+++ b/components/onguard/examples/exusg1/Usage1.ini
@@ -1,2 +1,2 @@
 [Codes]
-Uses=B6203E9DBF2E46BD5D13
+Uses=B6203E9DBF2E46BDB526
diff --git a/components/onguard/examples/exusg1/exusg1.lpi b/components/onguard/examples/exusg1/exusg1.lpi
index bc1b249e6..bc0ca2181 100644
--- a/components/onguard/examples/exusg1/exusg1.lpi
+++ b/components/onguard/examples/exusg1/exusg1.lpi
@@ -1,26 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -32,23 +41,26 @@
       <Unit0>
         <Filename Value="exusg1.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Exusg1"/>
         <CursorPos X="46" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exusg1u.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exusg1u"/>
-        <CursorPos X="56" Y="106"/>
-        <TopLine Value="106"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="72"/>
+        <CursorPos X="25" Y="90"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
     </Units>
     <JumpHistory Count="3" HistoryIndex="2">
@@ -67,10 +79,11 @@
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -83,7 +96,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -91,9 +104,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exusg1/exusg1.lpr b/components/onguard/examples/exusg1/exusg1.lpr
index efb2698c8..cae323330 100644
--- a/components/onguard/examples/exusg1/exusg1.lpr
+++ b/components/onguard/examples/exusg1/exusg1.lpr
@@ -8,6 +8,8 @@ uses
   Exusg1u in 'EXUSG1U.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exusg1/exusg1u.lfm b/components/onguard/examples/exusg1/exusg1u.lfm
index 66b9bb2ed..78afa850c 100644
--- a/components/onguard/examples/exusg1/exusg1u.lfm
+++ b/components/onguard/examples/exusg1/exusg1u.lfm
@@ -4,42 +4,49 @@ object Form1: TForm1
   Top = 289
   Width = 218
   ActiveControl = Memo1
+  AutoSize = True
   Caption = 'Usage Code Example'
   ClientHeight = 155
   ClientWidth = 218
-  Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 56
-    Height = 14
-    Top = 72
-    Width = 84
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 65
+    Height = 15
+    Top = 71
+    Width = 89
     Caption = 'Available Runs: 0'
     ParentColor = False
   end
   object Memo1: TMemo
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 6
     Height = 59
-    Top = 8
+    Top = 6
     Width = 197
+    BorderSpacing.Around = 6
     Lines.Strings = (
-      'If you can edit this, your program '
-      'was '
-      'allowed to run'
+      'If you can edit this, your program was allowed to run'
     )
     ScrollBars = ssVertical
     TabOrder = 0
   end
   object CloseBtn: TBitBtn
-    Left = 56
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 65
     Height = 33
-    Top = 89
+    Top = 92
     Width = 89
+    BorderSpacing.Around = 6
     Kind = bkClose
-    NumGlyphs = 0
     TabOrder = 1
   end
   object OgUsageCode1: TOgUsageCode
@@ -47,7 +54,7 @@ object Form1: TForm1
     OnGetKey = OgUsageCode1GetKey
     OnGetCode = OgUsageCode1GetCode
     OnChangeCode = OgUsageCode1ChangeCode
-    left = 88
-    top = 160
+    Left = 88
+    Top = 160
   end
 end
diff --git a/components/onguard/examples/exusg1/exusg1u.lrs b/components/onguard/examples/exusg1/exusg1u.lrs
index 7e3bf3c86..d0425fd0a 100644
--- a/components/onguard/examples/exusg1/exusg1u.lrs
+++ b/components/onguard/examples/exusg1/exusg1u.lrs
@@ -1,18 +1,23 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'o'#1#6'Height'#3#155#0#3'Top'#3'!'#1#5'Wi'
-  +'dth'#3#218#0#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#18'Usage Code Exampl'
-  +'e'#12'ClientHeight'#3#155#0#11'ClientWidth'#3#218#0#10'Font.Color'#7#7'clBl'
-  +'ack'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'Position'#7#14
-  +'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#6'Label1'#4'Left'#2
-  +'8'#6'Height'#2#14#3'Top'#2'H'#5'Width'#2'T'#7'Caption'#6#17'Available Runs:'
-  +' 0'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'Height'#2';'#3'To'
-  +'p'#2#8#5'Width'#3#197#0#13'Lines.Strings'#1#6'#If you can edit this, your p'
-  +'rogram '#6#4'was '#6#14'allowed to run'#0#10'ScrollBars'#7#10'ssVertical'#8
-  +'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#4'Left'#2'8'#6'Height'#2'!'#3'Top'
-  +#2'Y'#5'Width'#2'Y'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0
-  +#12'TOgUsageCode'#12'OgUsageCode1'#9'OnChecked'#7#19'OgUsageCode1Checked'#8
-  +'OnGetKey'#7#18'OgUsageCode1GetKey'#9'OnGetCode'#7#19'OgUsageCode1GetCode'#12
-  +'OnChangeCode'#7#22'OgUsageCode1ChangeCode'#4'left'#2'X'#3'top'#3#160#0#0#0#0
+  +'dth'#3#218#0#13'ActiveControl'#7#5'Memo1'#8'AutoSize'#9#7'Caption'#6#18'Usa'
+  +'ge Code Example'#12'ClientHeight'#3#155#0#11'ClientWidth'#3#218#0#8'Positio'
+  +'n'#7#14'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21
+  +'AnchorSideTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
+  +'eft'#2'A'#6'Height'#2#15#3'Top'#2'G'#5'Width'#2'Y'#7'Caption'#6#17'Availabl'
+  +'e Runs: 0'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#22'AnchorSideLeft.Contro'
+  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'Height'#2
+  +';'#3'Top'#2#6#5'Width'#3#197#0#20'BorderSpacing.Around'#2#6#13'Lines.String'
+  +'s'#1#6'5If you can edit this, your program was allowed to run'#0#10'ScrollB'
+  +'ars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#22'AnchorS'
+  +'ideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'Ancho'
+  +'rSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2'A'#6'Height'#2'!'#3'Top'#2'\'#5'Width'#2'Y'#20'BorderSpacing.Around'#2#6#4
+  +'Kind'#7#7'bkClose'#8'TabOrder'#2#1#0#0#12'TOgUsageCode'#12'OgUsageCode1'#9
+  +'OnChecked'#7#19'OgUsageCode1Checked'#8'OnGetKey'#7#18'OgUsageCode1GetKey'#9
+  +'OnGetCode'#7#19'OgUsageCode1GetCode'#12'OnChangeCode'#7#22'OgUsageCode1Chan'
+  +'geCode'#4'Left'#2'X'#3'Top'#3#160#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exusg2/Usage2.ini b/components/onguard/examples/exusg2/Usage2.ini
index 87b2fabc8..3218dc4f0 100644
--- a/components/onguard/examples/exusg2/Usage2.ini
+++ b/components/onguard/examples/exusg2/Usage2.ini
@@ -1,2 +1,2 @@
 [Codes]
-Uses=C48C080E8F9257705D13
+Uses=C48C080E8F925770B526
diff --git a/components/onguard/examples/exusg2/exusg2.lpi b/components/onguard/examples/exusg2/exusg2.lpi
index 09d77eec6..d6f655b0a 100644
--- a/components/onguard/examples/exusg2/exusg2.lpi
+++ b/components/onguard/examples/exusg2/exusg2.lpi
@@ -1,26 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -32,32 +41,49 @@
       <Unit0>
         <Filename Value="exusg2.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Exusg2"/>
         <CursorPos X="46" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exusg2u.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Exusg2u"/>
-        <CursorPos X="34" Y="46"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="112"/>
+        <CursorPos Y="94"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="3" HistoryIndex="2">
+      <Position1>
+        <Filename Value="exusg2u.pas"/>
+        <Caret Line="102" Column="28" TopLine="85"/>
+      </Position1>
+      <Position2>
+        <Filename Value="exusg2u.pas"/>
+        <Caret Line="101" TopLine="85"/>
+      </Position2>
+      <Position3>
+        <Filename Value="exusg2u.pas"/>
+        <Caret Line="94" Column="25" TopLine="85"/>
+      </Position3>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -70,7 +96,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -78,9 +104,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exusg2/exusg2.lpr b/components/onguard/examples/exusg2/exusg2.lpr
index 93de40ed4..c5ecbcd2f 100644
--- a/components/onguard/examples/exusg2/exusg2.lpr
+++ b/components/onguard/examples/exusg2/exusg2.lpr
@@ -8,6 +8,8 @@ uses
   Exusg2u in 'EXUSG2U.PAS' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
diff --git a/components/onguard/examples/exusg2/exusg2u.lfm b/components/onguard/examples/exusg2/exusg2u.lfm
index bb17d6441..421d13a35 100644
--- a/components/onguard/examples/exusg2/exusg2u.lfm
+++ b/components/onguard/examples/exusg2/exusg2u.lfm
@@ -6,40 +6,50 @@ object Form1: TForm1
   HorzScrollBar.Page = 217
   VertScrollBar.Page = 154
   ActiveControl = Memo1
+  AutoSize = True
   Caption = 'Usage Code Example'
-  Font.Color = clBlack
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 155
+  ClientWidth = 218
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 56
-    Height = 13
-    Top = 72
-    Width = 100
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    Left = 65
+    Height = 15
+    Top = 71
+    Width = 89
     Caption = 'Available Runs: 0'
     Color = clNone
     ParentColor = False
   end
   object Memo1: TMemo
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 6
     Height = 59
-    Top = 8
+    Top = 6
     Width = 197
+    BorderSpacing.Around = 6
     Lines.Strings = (
-      'If you can edit this, your program '
-      'was '
-      'allowed to run'
+      'If you can edit this, your program was allowed to run'
     )
     ScrollBars = ssVertical
     TabOrder = 0
   end
   object CloseBtn: TBitBtn
-    Left = 56
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 65
     Height = 33
-    Top = 89
+    Top = 92
     Width = 89
+    BorderSpacing.Around = 6
     Kind = bkClose
-    NumGlyphs = 0
     TabOrder = 1
   end
   object OgUsageCode2: TOgUsageCode
@@ -47,7 +57,7 @@ object Form1: TForm1
     OnGetKey = OgUsageCode2GetKey
     OnGetCode = OgUsageCode2GetCode
     OnChangeCode = OgUsageCode2ChangeCode
-    left = 88
-    top = 160
+    Left = 88
+    Top = 160
   end
 end
diff --git a/components/onguard/examples/exusg2/exusg2u.lrs b/components/onguard/examples/exusg2/exusg2u.lrs
index 7975051f8..e16ba94a7 100644
--- a/components/onguard/examples/exusg2/exusg2u.lrs
+++ b/components/onguard/examples/exusg2/exusg2u.lrs
@@ -1,19 +1,24 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'K'#1#6'Height'#3#155#0#3'Top'#3#225#0#5'W'
   +'idth'#3#218#0#18'HorzScrollBar.Page'#3#217#0#18'VertScrollBar.Page'#3#154#0
-  +#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#18'Usage Code Example'#10'Font.Co'
-  +'lor'#7#7'clBlack'#11'Font.Height'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8
-  +'Position'#7#14'poScreenCenter'#0#6'TLabel'#6'Label1'#4'Left'#2'8'#6'Height'
-  +#2#13#3'Top'#2'H'#5'Width'#2'd'#7'Caption'#6#17'Available Runs: 0'#5'Color'#7
-  +#6'clNone'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'Height'#2';'
-  +#3'Top'#2#8#5'Width'#3#197#0#13'Lines.Strings'#1#6'#If you can edit this, yo'
-  +'ur program '#6#4'was '#6#14'allowed to run'#0#10'ScrollBars'#7#10'ssVertica'
-  +'l'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#4'Left'#2'8'#6'Height'#2'!'#3
-  +'Top'#2'Y'#5'Width'#2'Y'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#1#0#0#12'TOgUsageCode'#12'OgUsageCode2'#9'OnChecked'#7#19'OgUsageCode2Check'
-  +'ed'#8'OnGetKey'#7#18'OgUsageCode2GetKey'#9'OnGetCode'#7#19'OgUsageCode2GetC'
-  +'ode'#12'OnChangeCode'#7#22'OgUsageCode2ChangeCode'#4'left'#2'X'#3'top'#3#160
-  +#0#0#0#0
+  +#13'ActiveControl'#7#5'Memo1'#8'AutoSize'#9#7'Caption'#6#18'Usage Code Examp'
+  +'le'#12'ClientHeight'#3#155#0#11'ClientWidth'#3#218#0#8'Position'#7#14'poScr'
+  +'eenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSideL'
+  +'eft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSid'
+  +'eTop.Control'#7#5'Memo1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'A'
+  +#6'Height'#2#15#3'Top'#2'G'#5'Width'#2'Y'#7'Caption'#6#17'Available Runs: 0'
+  +#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TMemo'#5'Memo1'#22'AnchorSideL'
+  +'eft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6
+  +'Height'#2';'#3'Top'#2#6#5'Width'#3#197#0#20'BorderSpacing.Around'#2#6#13'Li'
+  +'nes.Strings'#1#6'5If you can edit this, your program was allowed to run'#0
+  +#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'CloseBtn'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'
+  +#21'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#2'A'#6'Height'#2'!'#3'Top'#2'\'#5'Width'#2'Y'#20'BorderSpacing.Arou'
+  +'nd'#2#6#4'Kind'#7#7'bkClose'#8'TabOrder'#2#1#0#0#12'TOgUsageCode'#12'OgUsag'
+  +'eCode2'#9'OnChecked'#7#19'OgUsageCode2Checked'#8'OnGetKey'#7#18'OgUsageCode'
+  +'2GetKey'#9'OnGetCode'#7#19'OgUsageCode2GetCode'#12'OnChangeCode'#7#22'OgUsa'
+  +'geCode2ChangeCode'#4'Left'#2'X'#3'Top'#3#160#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exusg2/exusg2u.pas b/components/onguard/examples/exusg2/exusg2u.pas
index f40ac320e..1e96ce53d 100644
--- a/components/onguard/examples/exusg2/exusg2u.pas
+++ b/components/onguard/examples/exusg2/exusg2u.pas
@@ -42,8 +42,8 @@ type
     { Private declarations }
   public
     { Public declarations }
-    TheDir   : string;
-    IniFile     : TIniFile;
+    TheDir  : string;
+    IniFile : TIniFile;
   end;
 
 var
diff --git a/components/onguard/examples/exusreg/ONGUARD.INI b/components/onguard/examples/exusreg/ONGUARD.INI
index 85788ffc6..5986db6d7 100644
--- a/components/onguard/examples/exusreg/ONGUARD.INI
+++ b/components/onguard/examples/exusreg/ONGUARD.INI
@@ -1,2 +1,2 @@
 [Codes]
-UsageCode=C48C080E8F9257705D13
+UsageCode=7FFC19D80E5A776AB526
diff --git a/components/onguard/examples/exusreg/exusreg.lpi b/components/onguard/examples/exusreg/exusreg.lpi
index 052dfd88e..fc2e365ef 100644
--- a/components/onguard/examples/exusreg/exusreg.lpi
+++ b/components/onguard/examples/exusreg/exusreg.lpi
@@ -1,63 +1,80 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
         <Filename Value="exusreg.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="20" Y="3"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="20"/>
+        <UnitName Value="ExUSReg"/>
+        <CursorPos X="33" Y="18"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="exusregu.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ExUSRegU"/>
-        <CursorPos X="36" Y="13"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <CursorPos X="108" Y="27"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="1">
+      <Position1>
+        <Filename Value="exusregu.pas"/>
+        <Caret Line="13" Column="36"/>
+      </Position1>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -70,7 +87,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -78,9 +95,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/exusreg/exusreg.lpr b/components/onguard/examples/exusreg/exusreg.lpr
index a7005170d..4217e6955 100644
--- a/components/onguard/examples/exusreg/exusreg.lpr
+++ b/components/onguard/examples/exusreg/exusreg.lpr
@@ -8,7 +8,10 @@ uses
   ExUSRegU in 'ExUSRegU.pas' {Form1}, tponguard;
 
 
+{$R *.res}
+
 begin
+  Application.Title:='';
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/components/onguard/examples/exusreg/exusregu.lfm b/components/onguard/examples/exusreg/exusregu.lfm
index 10d750ee1..05a08c63a 100644
--- a/components/onguard/examples/exusreg/exusregu.lfm
+++ b/components/onguard/examples/exusreg/exusregu.lfm
@@ -1,99 +1,125 @@
 object Form1: TForm1
   Left = 252
-  Height = 300
+  Height = 314
   Top = 138
   Width = 492
   HorzScrollBar.Page = 491
   VertScrollBar.Page = 299
+  AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Usage Code Example'
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 314
+  ClientWidth = 492
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object StatusLbl: TLabel
+    AnchorSideLeft.Control = Memo1
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
     Left = 8
-    Height = 13
-    Top = 262
-    Width = 35
+    Height = 15
+    Top = 223
+    Width = 32
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object Label1: TLabel
-    Left = 232
-    Height = 13
-    Top = 14
-    Width = 77
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = CodeLbl
+    Left = 304
+    Height = 15
+    Top = 13
+    Width = 72
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 12
     Caption = 'Current code:'
     Color = clNone
     ParentColor = False
   end
   object CodeLbl: TLabel
-    Left = 320
-    Height = 13
-    Top = 14
-    Width = 113
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 388
+    Height = 15
+    Top = 13
+    Width = 96
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 8
     Caption = '0000000000000000'
     Color = clNone
     ParentColor = False
   end
   object CodeBtn: TButton
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
     Left = 8
     Height = 25
     Top = 8
     Width = 89
+    BorderSpacing.Around = 8
     BorderSpacing.InnerBorder = 4
     Caption = 'Enter Code'
     OnClick = CodeBtnClick
     TabOrder = 0
   end
-  object Memo1: TMemo
-    Left = 8
-    Height = 209
-    Top = 40
-    Width = 465
-    Color = clBtnFace
-    Lines.Strings = (
-      'The label at the bottom of this form indicates the status of the code. An invalid code indicates that '
-      'the code is either the incorrect type or that none has been entered. '
-      ''
-      'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will '
-      'say that the code is invalid.'
-      ''
-      'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate '
-      'the proper "Usage" code). '
-      ''
-      'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so '
-      'will cause the TOgUsageCode component to report that the code is invalid.'
-    )
-    ReadOnly = True
+  object CloseBtn: TBitBtn
+    AnchorSideTop.Control = Memo1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 409
+    Height = 25
+    Top = 218
+    Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Top = 12
+    BorderSpacing.Right = 8
+    BorderSpacing.Bottom = 8
+    Kind = bkClose
     TabOrder = 1
   end
-  object CloseBtn: TBitBtn
-    Left = 400
-    Height = 25
-    Top = 256
-    Width = 75
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 2
-  end
   object RemoveBtn: TButton
-    Left = 288
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideRight.Control = CloseBtn
+    Left = 304
     Height = 25
-    Top = 256
+    Top = 218
     Width = 97
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 8
     BorderSpacing.InnerBorder = 4
     Caption = 'Remove Code'
     OnClick = RemoveBtnClick
-    TabOrder = 3
+    TabOrder = 2
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CodeBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 8
+    Height = 165
+    Top = 41
+    Width = 476
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 8
+    BorderSpacing.Right = 8
+    Caption = 'The label at the bottom of this form indicates the status of the code. An invalid code indicates that the code is either the incorrect type or that none has been entered. '#13#10#13#10'If the proper code has not been entered or the ONGUARD.INI file was deleted, the message will say that the code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code (the CODEGEN program can be used to generate the proper "Usage" code). '#13#10#13#10'The "Remove Code" button can be used to remove the entered code from the INI file. Doing so will cause the TOgUsageCode component to report that the code is invalid.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
   end
   object OgUsageCode1: TOgUsageCode
     OnChecked = CodeChecked
     OnGetKey = GetKey
     OnGetCode = GetCode
     OnChangeCode = ChangeCode
-    left = 16
-    top = 216
+    Left = 184
+    Top = 184
   end
 end
diff --git a/components/onguard/examples/exusreg/exusregu.lrs b/components/onguard/examples/exusreg/exusregu.lrs
index 0a26935c3..1d3fd18ce 100644
--- a/components/onguard/examples/exusreg/exusregu.lrs
+++ b/components/onguard/examples/exusreg/exusregu.lrs
@@ -1,34 +1,52 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#252#0#6'Height'#3','#1#3'Top'#3#138#0#5'W'
-  +'idth'#3#236#1#18'HorzScrollBar.Page'#3#235#1#18'VertScrollBar.Page'#3'+'#1
-  +#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#18'Usage Code Example'#11'Font.H'
-  +'eight'#2#245#9'Font.Name'#6#13'MS Sans Serif'#8'Position'#7#14'poScreenCent'
-  +'er'#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Height'#2#13#3'Top'#3#6#1#5'Widt'
-  +'h'#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6
-  +'TLabel'#6'Label1'#4'Left'#3#232#0#6'Height'#2#13#3'Top'#2#14#5'Width'#2'M'#7
-  +'Caption'#6#13'Current code:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'T'
-  +'Label'#7'CodeLbl'#4'Left'#3'@'#1#6'Height'#2#13#3'Top'#2#14#5'Width'#2'q'#7
-  +'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7
-  +'TButton'#7'CodeBtn'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'Y'#25
-  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12
-  +'CodeBtnClick'#8'TabOrder'#2#0#0#0#5'TMemo'#5'Memo1'#4'Left'#2#8#6'Height'#3
-  +#209#0#3'Top'#2'('#5'Width'#3#209#1#5'Color'#7#9'clBtnFace'#13'Lines.Strings'
-  +#1#6'fThe label at the bottom of this form indicates the status of the code.'
-  +' An invalid code indicates that '#6'Ethe code is either the incorrect type '
-  +'or that none has been entered. '#6#0#6'^If the proper code has not been ent'
-  +'ered or the ONGUARD.INI file was deleted, the message will '#6#29'say that '
-  +'the code is invalid.'#6#0#6'YUse the "Enter Code" button to enter a code (t'
-  +'he CODEGEN program can be used to generate '#6#26'the proper "Usage" code).'
-  +' '#6#0#6'\The "Remove Code" button can be used to remove the entered code f'
-  +'rom the INI file. Doing so '#6'Iwill cause the TOgUsageCode component to re'
-  +'port that the code is invalid.'#0#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#7'TBitB'
-  +'tn'#8'CloseBtn'#4'Left'#3#144#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'K'#4
-  +'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TButton'#9'Remove'
-  +'Btn'#4'Left'#3' '#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'#2'a'#25'BorderSpac'
-  +'ing.InnerBorder'#2#4#7'Caption'#6#11'Remove Code'#7'OnClick'#7#14'RemoveBtn'
-  +'Click'#8'TabOrder'#2#3#0#0#12'TOgUsageCode'#12'OgUsageCode1'#9'OnChecked'#7
-  +#11'CodeChecked'#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCode'#12'OnChan'
-  +'geCode'#7#10'ChangeCode'#4'left'#2#16#3'top'#3#216#0#0#0#0
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#252#0#6'Height'#3':'#1#3'Top'#3#138#0#5'W'
+  +'idth'#3#236#1#18'HorzScrollBar.Page'#3#235#1#18'VertScrollBar.Page'#3'+'#1#8
+  +'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#18'Usage Code Exampl'
+  +'e'#12'ClientHeight'#3':'#1#11'ClientWidth'#3#236#1#8'Position'#7#14'poScree'
+  +'nCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#9'StatusLbl'#22'AnchorSide'
+  +'Left.Control'#7#5'Memo1'#21'AnchorSideTop.Control'#7#8'CloseBtn'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrCenter'#4'Left'#2#8#6'Height'#2#15#3'Top'#3#223#0#5'Wid'
+  +'th'#2' '#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6
+  +'TLabel'#6'Label1'#21'AnchorSideTop.Control'#7#7'CodeBtn'#18'AnchorSideTop.S'
+  +'ide'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#7'CodeLbl'#4'Left'#3'0'#1
+  +#6'Height'#2#15#3'Top'#2#13#5'Width'#2'H'#7'Anchors'#11#5'akTop'#7'akRight'#0
+  +#19'BorderSpacing.Right'#2#12#7'Caption'#6#13'Current code:'#5'Color'#7#6'cl'
+  +'None'#11'ParentColor'#8#0#0#6'TLabel'#7'CodeLbl'#21'AnchorSideTop.Control'#7
+  +#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'
+  +#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#132#1#6'Height'
+  +#2#15#3'Top'#2#13#5'Width'#2'`'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'Borde'
+  +'rSpacing.Right'#2#8#7'Caption'#6#16'0000000000000000'#5'Color'#7#6'clNone'
+  +#11'ParentColor'#8#0#0#7'TButton'#7'CodeBtn'#22'AnchorSideLeft.Control'#7#5
+  +'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#8#6'Height'#2#25#3'To'
+  +'p'#2#8#5'Width'#2'Y'#20'BorderSpacing.Around'#2#8#25'BorderSpacing.InnerBor'
+  +'der'#2#4#7'Caption'#6#10'Enter Code'#7'OnClick'#7#12'CodeBtnClick'#8'TabOrd'
+  +'er'#2#0#0#0#7'TBitBtn'#8'CloseBtn'#21'AnchorSideTop.Control'#7#5'Memo1'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#153#1#6'Height'#2#25#3'Top'#3
+  +#218#0#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.To'
+  +'p'#2#12#19'BorderSpacing.Right'#2#8#20'BorderSpacing.Bottom'#2#8#4'Kind'#7#7
+  +'bkClose'#8'TabOrder'#2#1#0#0#7'TButton'#9'RemoveBtn'#21'AnchorSideTop.Contr'
+  +'ol'#7#8'CloseBtn'#23'AnchorSideRight.Control'#7#8'CloseBtn'#4'Left'#3'0'#1#6
+  +'Height'#2#25#3'Top'#3#218#0#5'Width'#2'a'#7'Anchors'#11#5'akTop'#7'akRight'
+  +#0#19'BorderSpacing.Right'#2#8#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
+  +#11'Remove Code'#7'OnClick'#7#14'RemoveBtnClick'#8'TabOrder'#2#2#0#0#6'TLabe'
+  +'l'#5'Memo1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#7'CodeBtn'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contr'
+  +'ol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'
+  +#3#165#0#3'Top'#2')'#5'Width'#3#220#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
+  +'ight'#0#18'BorderSpacing.Left'#2#8#19'BorderSpacing.Right'#2#8#7'Caption'#12
+  +'J'#2#0#0'The label at the bottom of this form indicates the status of the c'
+  +'ode. An invalid code indicates that the code is either the incorrect type o'
+  +'r that none has been entered. '#13#10#13#10'If the proper code has not been'
+  +' entered or the ONGUARD.INI file was deleted, the message will say that the'
+  +' code is invalid.'#13#10#13#10'Use the "Enter Code" button to enter a code '
+  +'(the CODEGEN program can be used to generate the proper "Usage" code). '#13
+  +#10#13#10'The "Remove Code" button can be used to remove the entered code fr'
+  +'om the INI file. Doing so will cause the TOgUsageCode component to report t'
+  +'hat the code is invalid.'#5'Color'#7#9'clBtnFace'#11'ParentColor'#8#8'WordW'
+  +'rap'#9#0#0#12'TOgUsageCode'#12'OgUsageCode1'#9'OnChecked'#7#11'CodeChecked'
+  +#8'OnGetKey'#7#6'GetKey'#9'OnGetCode'#7#7'GetCode'#12'OnChangeCode'#7#10'Cha'
+  +'ngeCode'#4'Left'#3#184#0#3'Top'#3#184#0#0#0#0
 ]);
diff --git a/components/onguard/examples/exusreg/exusregu.pas b/components/onguard/examples/exusreg/exusregu.pas
index a85e0e6d2..520b4d0a1 100644
--- a/components/onguard/examples/exusreg/exusregu.pas
+++ b/components/onguard/examples/exusreg/exusregu.pas
@@ -14,8 +14,8 @@ type
 
   TForm1 = class(TForm)
     CodeBtn: TButton;
-    Memo1: TMemo;
     CloseBtn: TBitBtn;
+    Memo1: TLabel;
     StatusLbl: TLabel;
     Label1: TLabel;
     CodeLbl: TLabel;
diff --git a/components/onguard/examples/fixnaf/fixnaf.lpi b/components/onguard/examples/fixnaf/fixnaf.lpi
index 3d11265db..c5d540ba3 100644
--- a/components/onguard/examples/fixnaf/fixnaf.lpi
+++ b/components/onguard/examples/fixnaf/fixnaf.lpi
@@ -1,42 +1,51 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="9">
       <Unit0>
         <Filename Value="fixnaf.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="59" Y="15"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <UnitName Value="FixNAF"/>
+        <CursorPos X="34" Y="17"/>
         <UsageCount Value="22"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="fixnaf1.pas"/>
@@ -45,83 +54,83 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="FIXNAF1"/>
-        <CursorPos X="72" Y="7"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
+        <CursorPos X="11" Y="8"/>
         <UsageCount Value="22"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../source/qonguard4.pas"/>
         <ComponentName Value="EditProductFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard4"/>
-        <CursorPos X="33" Y="36"/>
         <TopLine Value="30"/>
+        <CursorPos X="33" Y="36"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../source/qonguard3.pas"/>
         <ComponentName Value="KeyMaintFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard3"/>
-        <CursorPos X="44" Y="37"/>
         <TopLine Value="30"/>
+        <CursorPos X="44" Y="37"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../source/ognetwrk.pas"/>
-        <UnitName Value="ognetwrk"/>
-        <CursorPos X="45" Y="349"/>
         <TopLine Value="343"/>
+        <CursorPos X="45" Y="349"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../source/qonguard2.pas"/>
         <ComponentName Value="CodeGenerateFrm"/>
         <HasResources Value="True"/>
-        <UnitName Value="qonguard2"/>
-        <CursorPos X="20" Y="339"/>
         <TopLine Value="337"/>
+        <CursorPos X="20" Y="339"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../source/onguard.pas"/>
-        <UnitName Value="onguard"/>
-        <CursorPos X="45" Y="1184"/>
         <TopLine Value="1179"/>
+        <CursorPos X="45" Y="1184"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../../../lazarus0915/fpcsrc/rtl/objpas/sysutils/sysutilh.inc"/>
-        <CursorPos X="26" Y="165"/>
         <TopLine Value="161"/>
+        <CursorPos X="26" Y="165"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="../../source/ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="32" Y="15"/>
         <TopLine Value="7"/>
+        <CursorPos X="32" Y="15"/>
         <UsageCount Value="10"/>
       </Unit8>
     </Units>
-    <JumpHistory Count="2" HistoryIndex="1">
+    <JumpHistory Count="3" HistoryIndex="2">
       <Position1>
         <Filename Value="fixnaf.lpr"/>
-        <Caret Line="8" Column="37" TopLine="1"/>
+        <Caret Line="8" Column="37"/>
       </Position1>
       <Position2>
         <Filename Value="fixnaf1.pas"/>
-        <Caret Line="7" Column="72" TopLine="1"/>
+        <Caret Line="7" Column="72"/>
       </Position2>
+      <Position3>
+        <Filename Value="fixnaf1.pas"/>
+        <Caret Line="18" Column="28"/>
+      </Position3>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -134,7 +143,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -142,9 +151,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/fixnaf/fixnaf.lpr b/components/onguard/examples/fixnaf/fixnaf.lpr
index 3474a95e0..385a6bd70 100644
--- a/components/onguard/examples/fixnaf/fixnaf.lpr
+++ b/components/onguard/examples/fixnaf/fixnaf.lpr
@@ -10,9 +10,11 @@ uses
 
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
-  Application.Title := 'Fix Network Access File';
+  Application.Title:='';
   Application.CreateForm(TMainFrm, MainFrm);
   
   if IsFirstInstance then Application.Run
diff --git a/components/onguard/examples/fixnaf/fixnaf1.lfm b/components/onguard/examples/fixnaf/fixnaf1.lfm
index 7b54ce121..6b5e20d39 100644
--- a/components/onguard/examples/fixnaf/fixnaf1.lfm
+++ b/components/onguard/examples/fixnaf/fixnaf1.lfm
@@ -1,80 +1,128 @@
 object MainFrm: TMainFrm
   Left = 373
-  Height = 216
+  Height = 228
   Top = 235
-  Width = 342
+  Width = 380
   HorzScrollBar.Page = 341
   HorzScrollBar.Range = 325
   VertScrollBar.Page = 215
   VertScrollBar.Range = 169
   ActiveControl = AccessCodeEd
+  AutoSize = True
   BorderIcons = [biSystemMenu, biMinimize]
   Caption = 'Fix Network Access File'
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
-  Font.Pitch = fpVariable
+  ClientHeight = 228
+  ClientWidth = 380
   OnCreate = FormCreate
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object GroupBox1: TGroupBox
-    Left = 8
-    Height = 96
-    Top = 8
-    Width = 315
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = DeleteBt
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 88
+    Top = 12
+    Width = 312
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     Caption = 'File Settings'
+    ClientHeight = 68
+    ClientWidth = 308
     TabOrder = 0
     object Label4: TLabel
-      Left = 8
-      Height = 18
-      Top = 48
-      Width = 38
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = AccessCodeEd
+      AnchorSideTop.Side = asrCenter
+      Left = 12
+      Height = 15
+      Top = 37
+      Width = 31
+      BorderSpacing.Left = 12
       Caption = 'C&ode:'
       Color = clNone
       ParentColor = False
     end
     object Label5: TLabel
-      Left = 6
-      Height = 18
-      Top = 17
-      Width = 52
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = FileNamePn
+      AnchorSideTop.Side = asrCenter
+      Left = 12
+      Height = 15
+      Top = 7
+      Width = 51
+      BorderSpacing.Left = 12
+      BorderSpacing.Right = 8
       Caption = '&Filename:'
       Color = clNone
       ParentColor = False
     end
     object AccessCodeEd: TEdit
-      Left = 64
-      Height = 21
-      Top = 44
-      Width = 245
+      AnchorSideLeft.Control = FileNamePn
+      AnchorSideTop.Control = FileNamePn
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = FileNamePn
+      AnchorSideRight.Side = asrBottom
+      Left = 71
+      Height = 23
+      Top = 33
+      Width = 225
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 12
       OnChange = AccessCodeEdChange
       TabOrder = 1
     end
     object FileNamePn: TPanel
-      Left = 64
+      AnchorSideLeft.Control = Label5
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GroupBox1
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      Left = 71
       Height = 21
-      Top = 16
-      Width = 245
+      Top = 4
+      Width = 225
       Alignment = taLeftJustify
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 4
+      BorderSpacing.Right = 12
       BevelOuter = bvLowered
       BorderWidth = 2
       TabOrder = 0
     end
   end
   object UpdateBt: TButton
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 12
     Height = 25
-    Top = 176
+    Top = 175
     Width = 75
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Update'
     OnClick = UpdateBtClick
     TabOrder = 2
   end
   object CreateBt: TButton
-    Left = 88
+    AnchorSideLeft.Control = UpdateBt
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 91
     Height = 25
-    Top = 176
+    Top = 175
     Width = 75
+    BorderSpacing.Left = 4
+    BorderSpacing.Top = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Create'
     Enabled = False
@@ -82,82 +130,149 @@ object MainFrm: TMainFrm
     TabOrder = 3
   end
   object ResetBt: TButton
-    Left = 168
+    AnchorSideLeft.Control = CreateBt
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 170
     Height = 25
-    Top = 176
+    Top = 175
     Width = 75
+    BorderSpacing.Left = 4
+    BorderSpacing.Top = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Reset'
     OnClick = ResetBtClick
     TabOrder = 4
   end
   object GroupBox2: TGroupBox
-    Left = 8
-    Height = 65
-    Top = 104
-    Width = 319
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = GroupBox1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = DeleteBt
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 51
+    Top = 112
+    Width = 312
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
     Caption = 'Access Slots'
+    ClientHeight = 31
+    ClientWidth = 308
     TabOrder = 1
     object Label1: TLabel
-      Left = 8
-      Height = 18
-      Top = 20
-      Width = 38
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideTop.Control = GroupBox2
+      Left = 24
+      Height = 15
+      Top = 8
+      Width = 28
+      BorderSpacing.Left = 24
+      BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 8
       Caption = 'Total:'
       Color = clNone
       ParentColor = False
     end
     object Label2: TLabel
-      Left = 94
-      Height = 18
-      Top = 20
-      Width = 46
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = Bevel1
+      Left = 109
+      Height = 15
+      Top = 8
+      Width = 41
+      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 8
       Caption = 'Locked:'
       Color = clNone
       ParentColor = False
     end
     object Label3: TLabel
-      Left = 182
-      Height = 18
-      Top = 20
-      Width = 49
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = InvalidSlotsLb
+      Left = 232
+      Height = 15
+      Top = 8
+      Width = 38
+      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 8
+      BorderSpacing.Bottom = 8
       Caption = 'Invalid:'
       Color = clNone
       ParentColor = False
     end
     object TotalSlotsLb: TLabel
-      Left = 54
-      Height = 18
-      Top = 20
+      AnchorSideLeft.Control = Label1
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GroupBox2
+      Left = 60
+      Height = 15
+      Top = 8
       Width = 6
+      BorderSpacing.Left = 8
+      BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 8
       Caption = '0'
       Color = clNone
       ParentColor = False
     end
     object LockedSlotsLb: TLabel
-      Left = 156
-      Height = 18
-      Top = 20
+      AnchorSideLeft.Control = Bevel1
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GroupBox2
+      Left = 158
+      Height = 15
+      Top = 8
       Width = 6
+      BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 8
       Caption = '0'
       Color = clNone
       ParentColor = False
     end
     object InvalidSlotsLb: TLabel
-      Left = 248
-      Height = 18
-      Top = 20
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 278
+      Height = 15
+      Top = 8
       Width = 6
+      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 24
+      BorderSpacing.Bottom = 8
       Caption = '0'
       Color = clNone
       ParentColor = False
     end
+    object Bevel1: TBevel
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideLeft.Side = asrCenter
+      Left = 150
+      Height = 14
+      Top = 9
+      Width = 8
+      Shape = bsSpacer
+    end
   end
   object DeleteBt: TButton
-    Left = 248
+    AnchorSideLeft.Control = ResetBt
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 249
     Height = 25
-    Top = 176
+    Top = 175
     Width = 75
+    BorderSpacing.Left = 4
+    BorderSpacing.Top = 12
+    BorderSpacing.Right = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Delete'
     OnClick = DeleteBtClick
diff --git a/components/onguard/examples/fixnaf/fixnaf1.lrs b/components/onguard/examples/fixnaf/fixnaf1.lrs
index b31d9d3ff..34aca6373 100644
--- a/components/onguard/examples/fixnaf/fixnaf1.lrs
+++ b/components/onguard/examples/fixnaf/fixnaf1.lrs
@@ -1,44 +1,95 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TMainFrm','FORMDATA',[
-  'TPF0'#8'TMainFrm'#7'MainFrm'#4'Left'#3'u'#1#6'Height'#3#216#0#3'Top'#3#235#0
-  +#5'Width'#3'V'#1#18'HorzScrollBar.Page'#3'U'#1#19'HorzScrollBar.Range'#3'E'#1
+  'TPF0'#8'TMainFrm'#7'MainFrm'#4'Left'#3'u'#1#6'Height'#3#228#0#3'Top'#3#235#0
+  +#5'Width'#3'|'#1#18'HorzScrollBar.Page'#3'U'#1#19'HorzScrollBar.Range'#3'E'#1
   +#18'VertScrollBar.Page'#3#215#0#19'VertScrollBar.Range'#3#169#0#13'ActiveCon'
-  +'trol'#7#12'AccessCodeEd'#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'
-  +#0#7'Caption'#6#23'Fix Network Access File'#10'Font.Color'#7#6'clText'#11'Fo'
-  +'nt.Height'#2#11#9'Font.Name'#6#13'MS Sans Serif'#10'Font.Pitch'#7#10'fpVari'
-  +'able'#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#0#9'TGr'
-  +'oupBox'#9'GroupBox1'#4'Left'#2#8#6'Height'#2'`'#3'Top'#2#8#5'Width'#3';'#1#7
-  +'Caption'#6#13'File Settings'#8'TabOrder'#2#0#0#6'TLabel'#6'Label4'#4'Left'#2
-  +#8#6'Height'#2#18#3'Top'#2'0'#5'Width'#2'&'#7'Caption'#6#6'C&ode:'#5'Color'#7
-  +#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label5'#4'Left'#2#6#6'Height'#2
-  +#18#3'Top'#2#17#5'Width'#2'4'#7'Caption'#6#10'&Filename:'#5'Color'#7#6'clNon'
-  +'e'#11'ParentColor'#8#0#0#5'TEdit'#12'AccessCodeEd'#4'Left'#2'@'#6'Height'#2
-  +#21#3'Top'#2','#5'Width'#3#245#0#8'OnChange'#7#18'AccessCodeEdChange'#8'TabO'
-  +'rder'#2#1#0#0#6'TPanel'#10'FileNamePn'#4'Left'#2'@'#6'Height'#2#21#3'Top'#2
-  +#16#5'Width'#3#245#0#9'Alignment'#7#13'taLeftJustify'#10'BevelOuter'#7#9'bvL'
-  +'owered'#11'BorderWidth'#2#2#8'TabOrder'#2#0#0#0#0#7'TButton'#8'UpdateBt'#4
-  +'Left'#2#8#6'Height'#2#25#3'Top'#3#176#0#5'Width'#2'K'#25'BorderSpacing.Inne'
-  +'rBorder'#2#4#7'Caption'#6#7'&Update'#7'OnClick'#7#13'UpdateBtClick'#8'TabOr'
-  +'der'#2#2#0#0#7'TButton'#8'CreateBt'#4'Left'#2'X'#6'Height'#2#25#3'Top'#3#176
-  +#0#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'&Create'#7
-  +'Enabled'#8#7'OnClick'#7#13'CreateBtClick'#8'TabOrder'#2#3#0#0#7'TButton'#7
-  +'ResetBt'#4'Left'#3#168#0#6'Height'#2#25#3'Top'#3#176#0#5'Width'#2'K'#25'Bor'
-  +'derSpacing.InnerBorder'#2#4#7'Caption'#6#6'&Reset'#7'OnClick'#7#12'ResetBtC'
-  +'lick'#8'TabOrder'#2#4#0#0#9'TGroupBox'#9'GroupBox2'#4'Left'#2#8#6'Height'#2
-  +'A'#3'Top'#2'h'#5'Width'#3'?'#1#7'Caption'#6#12'Access Slots'#8'TabOrder'#2#1
-  +#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#18#3'Top'#2#20#5'Width'#2'&'#7
-  +'Caption'#6#6'Total:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6
-  +'Label2'#4'Left'#2'^'#6'Height'#2#18#3'Top'#2#20#5'Width'#2'.'#7'Caption'#6#7
-  +'Locked:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'L'
-  +'eft'#3#182#0#6'Height'#2#18#3'Top'#2#20#5'Width'#2'1'#7'Caption'#6#8'Invali'
-  +'d:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#12'TotalSlotsLb'#4
-  +'Left'#2'6'#6'Height'#2#18#3'Top'#2#20#5'Width'#2#6#7'Caption'#6#1'0'#5'Colo'
-  +'r'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#13'LockedSlotsLb'#4'Left'#3
-  +#156#0#6'Height'#2#18#3'Top'#2#20#5'Width'#2#6#7'Caption'#6#1'0'#5'Color'#7#6
-  +'clNone'#11'ParentColor'#8#0#0#6'TLabel'#14'InvalidSlotsLb'#4'Left'#3#248#0#6
-  +'Height'#2#18#3'Top'#2#20#5'Width'#2#6#7'Caption'#6#1'0'#5'Color'#7#6'clNone'
-  +#11'ParentColor'#8#0#0#0#7'TButton'#8'DeleteBt'#4'Left'#3#248#0#6'Height'#2
-  +#25#3'Top'#3#176#0#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
-  +#6#7'&Delete'#7'OnClick'#7#13'DeleteBtClick'#8'TabOrder'#2#5#0#0#0
+  +'trol'#7#12'AccessCodeEd'#8'AutoSize'#9#11'BorderIcons'#11#12'biSystemMenu'
+  +#10'biMinimize'#0#7'Caption'#6#23'Fix Network Access File'#12'ClientHeight'#3
+  +#228#0#11'ClientWidth'#3'|'#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14
+  +'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#9'TGroupBox'#9'GroupBox1'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23
+  +'AnchorSideRight.Control'#7#8'DeleteBt'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#12#6'Height'#2'X'#3'Top'#2#12#5'Width'#3'8'#1#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#12#17
+  +'BorderSpacing.Top'#2#12#20'BorderSpacing.Bottom'#2#12#7'Caption'#6#13'File '
+  +'Settings'#12'ClientHeight'#2'D'#11'ClientWidth'#3'4'#1#8'TabOrder'#2#0#0#6
+  +'TLabel'#6'Label4'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTo'
+  +'p.Control'#7#12'AccessCodeEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
+  +#2#12#6'Height'#2#15#3'Top'#2'%'#5'Width'#2#31#18'BorderSpacing.Left'#2#12#7
+  +'Caption'#6#6'C&ode:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6
+  +'Label5'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'
+  +#7#10'FileNamePn'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#12#6'Heigh'
+  +'t'#2#15#3'Top'#2#7#5'Width'#2'3'#18'BorderSpacing.Left'#2#12#19'BorderSpaci'
+  +'ng.Right'#2#8#7'Caption'#6#10'&Filename:'#5'Color'#7#6'clNone'#11'ParentCol'
+  +'or'#8#0#0#5'TEdit'#12'AccessCodeEd'#22'AnchorSideLeft.Control'#7#10'FileNam'
+  +'ePn'#21'AnchorSideTop.Control'#7#10'FileNamePn'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#10'FileNamePn'#20'AnchorSideRight.'
+  +'Side'#7#9'asrBottom'#4'Left'#2'G'#6'Height'#2#23#3'Top'#2'!'#5'Width'#3#225
+  +#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#8#20
+  +'BorderSpacing.Bottom'#2#12#8'OnChange'#7#18'AccessCodeEdChange'#8'TabOrder'
+  +#2#1#0#0#6'TPanel'#10'FileNamePn'#22'AnchorSideLeft.Control'#7#6'Label5'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'GroupBox1'
+  +#23'AnchorSideRight.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asr'
+  +'Bottom'#4'Left'#2'G'#6'Height'#2#21#3'Top'#2#4#5'Width'#3#225#0#9'Alignment'
+  +#7#13'taLeftJustify'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'Border'
+  +'Spacing.Top'#2#4#19'BorderSpacing.Right'#2#12#10'BevelOuter'#7#9'bvLowered'
+  +#11'BorderWidth'#2#2#8'TabOrder'#2#0#0#0#0#7'TButton'#8'UpdateBt'#22'AnchorS'
+  +'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'GroupBox2'#18'Anc'
+  +'horSideTop.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#25#3'Top'#3#175#0#5
+  +'Width'#2'K'#18'BorderSpacing.Left'#2#12#17'BorderSpacing.Top'#2#12#20'Borde'
+  +'rSpacing.Bottom'#2#12#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'&Upd'
+  +'ate'#7'OnClick'#7#13'UpdateBtClick'#8'TabOrder'#2#2#0#0#7'TButton'#8'Create'
+  +'Bt'#22'AnchorSideLeft.Control'#7#8'UpdateBt'#19'AnchorSideLeft.Side'#7#9'as'
+  +'rBottom'#21'AnchorSideTop.Control'#7#9'GroupBox2'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2'['#6'Height'#2#25#3'Top'#3#175#0#5'Width'#2'K'#18'Bord'
+  +'erSpacing.Left'#2#4#17'BorderSpacing.Top'#2#12#25'BorderSpacing.InnerBorder'
+  +#2#4#7'Caption'#6#7'&Create'#7'Enabled'#8#7'OnClick'#7#13'CreateBtClick'#8'T'
+  +'abOrder'#2#3#0#0#7'TButton'#7'ResetBt'#22'AnchorSideLeft.Control'#7#8'Creat'
+  +'eBt'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'G'
+  +'roupBox2'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#170#0#6'Height'#2
+  +#25#3'Top'#3#175#0#5'Width'#2'K'#18'BorderSpacing.Left'#2#4#17'BorderSpacing'
+  +'.Top'#2#12#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#6'&Reset'#7'OnCli'
+  +'ck'#7#12'ResetBtClick'#8'TabOrder'#2#4#0#0#9'TGroupBox'#9'GroupBox2'#22'Anc'
+  +'horSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'GroupBox1'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'DeleteBt'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2'3'#3'Top'#2
+  +'p'#5'Width'#3'8'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'
+  +#9#18'BorderSpacing.Left'#2#12#17'BorderSpacing.Top'#2#12#7'Caption'#6#12'Ac'
+  +'cess Slots'#12'ClientHeight'#2#31#11'ClientWidth'#3'4'#1#8'TabOrder'#2#1#0#6
+  +'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#9'GroupBox2'#21'AnchorSideTo'
+  +'p.Control'#7#9'GroupBox2'#4'Left'#2#24#6'Height'#2#15#3'Top'#2#8#5'Width'#2
+  +#28#18'BorderSpacing.Left'#2#24#17'BorderSpacing.Top'#2#8#20'BorderSpacing.B'
+  +'ottom'#2#8#7'Caption'#6#6'Total:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0
+  +#6'TLabel'#6'Label2'#21'AnchorSideTop.Control'#7#9'GroupBox2'#23'AnchorSideR'
+  +'ight.Control'#7#6'Bevel1'#4'Left'#2'm'#6'Height'#2#15#3'Top'#2#8#5'Width'#2
+  +')'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#8#20'BorderS'
+  +'pacing.Bottom'#2#8#7'Caption'#6#7'Locked:'#5'Color'#7#6'clNone'#11'ParentCo'
+  ,'lor'#8#0#0#6'TLabel'#6'Label3'#21'AnchorSideTop.Control'#7#9'GroupBox2'#23
+  +'AnchorSideRight.Control'#7#14'InvalidSlotsLb'#4'Left'#3#232#0#6'Height'#2#15
+  +#3'Top'#2#8#5'Width'#2'&'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpaci'
+  +'ng.Top'#2#8#19'BorderSpacing.Right'#2#8#20'BorderSpacing.Bottom'#2#8#7'Capt'
+  +'ion'#6#8'Invalid:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#12
+  +'TotalSlotsLb'#22'AnchorSideLeft.Control'#7#6'Label1'#19'AnchorSideLeft.Side'
+  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'GroupBox2'#4'Left'#2'<'#6'Heig'
+  +'ht'#2#15#3'Top'#2#8#5'Width'#2#6#18'BorderSpacing.Left'#2#8#17'BorderSpacin'
+  +'g.Top'#2#8#20'BorderSpacing.Bottom'#2#8#7'Caption'#6#1'0'#5'Color'#7#6'clNo'
+  +'ne'#11'ParentColor'#8#0#0#6'TLabel'#13'LockedSlotsLb'#22'AnchorSideLeft.Con'
+  +'trol'#7#6'Bevel1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.C'
+  +'ontrol'#7#9'GroupBox2'#4'Left'#3#158#0#6'Height'#2#15#3'Top'#2#8#5'Width'#2
+  +#6#17'BorderSpacing.Top'#2#8#20'BorderSpacing.Bottom'#2#8#7'Caption'#6#1'0'#5
+  +'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#14'InvalidSlotsLb'#21'An'
+  +'chorSideTop.Control'#7#9'GroupBox2'#23'AnchorSideRight.Control'#7#9'GroupBo'
+  +'x2'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#22#1#6'Height'#2#15#3
+  +'Top'#2#8#5'Width'#2#6#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.'
+  +'Top'#2#8#19'BorderSpacing.Right'#2#24#20'BorderSpacing.Bottom'#2#8#7'Captio'
+  +'n'#6#1'0'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TBevel'#6'Bevel1'#22
+  +'AnchorSideLeft.Control'#7#9'GroupBox2'#19'AnchorSideLeft.Side'#7#9'asrCente'
+  +'r'#4'Left'#3#150#0#6'Height'#2#14#3'Top'#2#9#5'Width'#2#8#5'Shape'#7#8'bsSp'
+  +'acer'#0#0#0#7'TButton'#8'DeleteBt'#22'AnchorSideLeft.Control'#7#7'ResetBt'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'GroupB'
+  +'ox2'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#249#0#6'Height'#2#25#3
+  +'Top'#3#175#0#5'Width'#2'K'#18'BorderSpacing.Left'#2#4#17'BorderSpacing.Top'
+  +#2#12#19'BorderSpacing.Right'#2#12#25'BorderSpacing.InnerBorder'#2#4#7'Capti'
+  +'on'#6#7'&Delete'#7'OnClick'#7#13'DeleteBtClick'#8'TabOrder'#2#5#0#0#0
 ]);
diff --git a/components/onguard/examples/fixnaf/fixnaf1.pas b/components/onguard/examples/fixnaf/fixnaf1.pas
index 4b9f48054..2ed6e97aa 100644
--- a/components/onguard/examples/fixnaf/fixnaf1.pas
+++ b/components/onguard/examples/fixnaf/fixnaf1.pas
@@ -11,6 +11,7 @@ type
   { TMainFrm }
 
   TMainFrm = class(TForm)
+    Bevel1: TBevel;
     GroupBox1: TGroupBox;
     UpdateBt: TButton;
     CreateBt: TButton;
diff --git a/components/onguard/examples/nafmgr/nafmgr.lpi b/components/onguard/examples/nafmgr/nafmgr.lpi
index d866e9a3e..799dbb230 100644
--- a/components/onguard/examples/nafmgr/nafmgr.lpi
+++ b/components/onguard/examples/nafmgr/nafmgr.lpi
@@ -1,42 +1,54 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="3">
       <Unit0>
         <Filename Value="nafmgr.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="36" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="21"/>
+        <UnitName Value="NAFMgr"/>
+        <CursorPos X="8" Y="16"/>
+        <UsageCount Value="22"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="nafmgr1.pas"/>
@@ -45,31 +57,41 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="NAFMGR1"/>
-        <CursorPos X="1" Y="70"/>
-        <TopLine Value="29"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="20"/>
+        <CursorPos X="41" Y="19"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../../lazarus/lcl/include/fileutil.inc"/>
-        <CursorPos X="13" Y="577"/>
         <TopLine Value="568"/>
+        <CursorPos X="13" Y="577"/>
         <UsageCount Value="10"/>
       </Unit2>
     </Units>
-    <JumpHistory Count="1" HistoryIndex="0">
+    <JumpHistory Count="3" HistoryIndex="2">
       <Position1>
         <Filename Value="nafmgr1.pas"/>
-        <Caret Line="70" Column="1" TopLine="53"/>
+        <Caret Line="70" TopLine="53"/>
       </Position1>
+      <Position2>
+        <Filename Value="nafmgr1.pas"/>
+        <Caret Line="7" Column="12"/>
+      </Position2>
+      <Position3>
+        <Filename Value="nafmgr1.pas"/>
+        <Caret Line="19" Column="14"/>
+      </Position3>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -82,7 +104,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -90,9 +112,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/nafmgr/nafmgr.lpr b/components/onguard/examples/nafmgr/nafmgr.lpr
index d74448da5..f93318751 100644
--- a/components/onguard/examples/nafmgr/nafmgr.lpr
+++ b/components/onguard/examples/nafmgr/nafmgr.lpr
@@ -1,4 +1,5 @@
 program NAFMgr;
+
 {$mode objfpc}{$H+}
 
 uses
@@ -7,16 +8,15 @@ uses
   ogfirst,
   NAFMGR1 in 'NAFMGR1.pas' {NafFrm};
 
-
-
+{$R *.res}
 
 begin
   Application.Initialize;
   Application.Title := 'Network File Access Manager';
   Application.CreateForm(TNafFrm, NafFrm);
   
-  if IsFirstInstance then Application.Run
+  if IsFirstInstance then
+    Application.Run
   else
-  ActivateFirstInstance;
-  
+    ActivateFirstInstance;
 end.
diff --git a/components/onguard/examples/nafmgr/nafmgr1.lfm b/components/onguard/examples/nafmgr/nafmgr1.lfm
index d329c00fb..7a3b8a715 100644
--- a/components/onguard/examples/nafmgr/nafmgr1.lfm
+++ b/components/onguard/examples/nafmgr/nafmgr1.lfm
@@ -1,36 +1,51 @@
 object NafFrm: TNafFrm
   Left = 307
-  Height = 232
+  Height = 223
   Top = 291
-  Width = 334
+  Width = 355
   HorzScrollBar.Page = 333
   HorzScrollBar.Range = 325
   VertScrollBar.Page = 231
   VertScrollBar.Range = 177
   ActiveControl = AccessCodeEd
+  AutoSize = True
   BorderIcons = [biSystemMenu, biMinimize]
   Caption = 'Network Access File Manager'
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
-  Font.Pitch = fpVariable
+  ClientHeight = 223
+  ClientWidth = 355
   OnCreate = FormCreate
   Position = poScreenCenter
   ShowHint = True
+  LCLVersion = '2.3.0.0'
   object GroupBox1: TGroupBox
-    Left = 8
-    Height = 97
-    Top = 8
-    Width = 317
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = DeleteBt
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 90
+    Top = 12
+    Width = 324
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     Caption = 'File Settings'
+    ClientHeight = 70
+    ClientWidth = 320
     TabOrder = 0
     object GenerateCodeSb: TSpeedButton
-      Left = 288
+      AnchorSideTop.Control = AccessCodeEd
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      Left = 285
       Height = 23
       Hint = 'Generate code'
-      Top = 19
+      Top = 4
       Width = 23
-      Color = clBtnFace
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 12
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -44,61 +59,98 @@ object NafFrm: TNafFrm
         0000888800888080088880000000888888000008888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = GenerateCodeSbClick
     end
     object Label4: TLabel
-      Left = 8
-      Height = 18
-      Top = 24
-      Width = 38
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = AccessCodeEd
+      AnchorSideTop.Side = asrCenter
+      Left = 12
+      Height = 15
+      Top = 8
+      Width = 31
+      BorderSpacing.Left = 12
       Caption = 'C&ode:'
       Color = clNone
       ParentColor = False
     end
     object Label5: TLabel
-      Left = 8
-      Height = 18
-      Top = 52
-      Width = 54
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = FileNameEd
+      AnchorSideTop.Side = asrCenter
+      Left = 12
+      Height = 15
+      Top = 41
+      Width = 51
+      BorderSpacing.Left = 12
       Caption = '&Filename:'
       Color = clNone
       ParentColor = False
     end
     object FileNameEd: TEdit
-      Left = 64
-      Height = 22
-      Top = 48
-      Width = 185
+      AnchorSideLeft.Control = Label5
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GenerateCodeSb
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = BrowseBt
+      Left = 71
+      Height = 23
+      Top = 37
+      Width = 210
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 8
+      BorderSpacing.Top = 10
+      BorderSpacing.Right = 4
+      BorderSpacing.Bottom = 10
       OnChange = FileNameEdChange
       TabOrder = 1
     end
-    object BrowseBt: TButton
-      Left = 253
-      Height = 25
-      Hint = 'Browse for network access file'
-      Top = 46
-      Width = 59
-      BorderSpacing.InnerBorder = 4
-      Caption = '&Browse...'
-      OnClick = BrowseBtClick
-      TabOrder = 2
-    end
     object AccessCodeEd: TEdit
-      Left = 64
-      Height = 22
-      Top = 20
-      Width = 221
+      AnchorSideLeft.Control = FileNameEd
+      AnchorSideTop.Control = GroupBox1
+      AnchorSideRight.Control = GenerateCodeSb
+      Left = 71
+      Height = 23
+      Top = 4
+      Width = 210
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 4
+      BorderSpacing.Right = 4
       OnChange = AccessCodeEdChange
       TabOrder = 0
     end
+    object BrowseBt: TSpeedButton
+      AnchorSideLeft.Control = FileNameEd
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = FileNameEd
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Control = FileNameEd
+      AnchorSideBottom.Side = asrBottom
+      Left = 285
+      Height = 23
+      Hint = 'Browse for network access file'
+      Top = 37
+      Width = 23
+      Anchors = [akTop, akRight, akBottom]
+      BorderSpacing.Right = 12
+      BorderSpacing.InnerBorder = 4
+      Caption = '...'
+      OnClick = BrowseBtClick
+    end
   end
   object UpdateBt: TButton
-    Left = 10
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 12
     Height = 25
     Hint = 'Update the selected NAF using the specified code'
-    Top = 200
+    Top = 182
     Width = 75
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Update'
     Enabled = False
@@ -106,11 +158,17 @@ object NafFrm: TNafFrm
     TabOrder = 2
   end
   object CreateBt: TButton
-    Left = 90
+    AnchorSideLeft.Control = UpdateBt
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 95
     Height = 25
     Hint = 'Create teh NAF using the specified code'
-    Top = 200
+    Top = 182
     Width = 75
+    BorderSpacing.Left = 8
+    BorderSpacing.Top = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Create'
     Enabled = False
@@ -118,11 +176,17 @@ object NafFrm: TNafFrm
     TabOrder = 3
   end
   object ResetBt: TButton
-    Left = 170
+    AnchorSideLeft.Control = CreateBt
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 178
     Height = 25
     Hint = 'Reset the specified NAF, removing invalid slots'
-    Top = 200
+    Top = 182
     Width = 75
+    BorderSpacing.Left = 8
+    BorderSpacing.Top = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Reset'
     Enabled = False
@@ -130,73 +194,128 @@ object NafFrm: TNafFrm
     TabOrder = 4
   end
   object GroupBox2: TGroupBox
-    Left = 8
-    Height = 72
-    Top = 112
-    Width = 320
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = GroupBox1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = DeleteBt
+    AnchorSideRight.Side = asrBottom
+    Left = 12
+    Height = 56
+    Top = 114
+    Width = 324
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Left = 12
     Caption = 'Access Slots'
+    ClientHeight = 36
+    ClientWidth = 320
     TabOrder = 1
     object Label1: TLabel
-      Left = 8
-      Height = 18
-      Top = 20
-      Width = 33
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideTop.Control = GroupBox2
+      Left = 24
+      Height = 15
+      Top = 8
+      Width = 28
+      BorderSpacing.Left = 24
+      BorderSpacing.Top = 8
       Caption = 'Total:'
       Color = clNone
       ParentColor = False
     end
     object Label2: TLabel
-      Left = 96
-      Height = 18
-      Top = 20
-      Width = 46
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = Bevel1
+      Left = 115
+      Height = 15
+      Top = 8
+      Width = 41
+      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 8
       Caption = 'Locked:'
       Color = clNone
       ParentColor = False
     end
     object Label3: TLabel
-      Left = 196
-      Height = 18
-      Top = 20
-      Width = 42
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = InvalidSlotsLb
+      Left = 244
+      Height = 15
+      Top = 8
+      Width = 38
+      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 8
       Caption = 'Invalid:'
       Color = clNone
       ParentColor = False
     end
     object TotalSlotsLb: TLabel
-      Left = 44
-      Height = 18
-      Top = 20
+      AnchorSideLeft.Control = Label1
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GroupBox2
+      Left = 60
+      Height = 15
+      Top = 8
       Width = 6
+      BorderSpacing.Left = 8
+      BorderSpacing.Top = 8
       Caption = '0'
       Color = clNone
       ParentColor = False
     end
     object LockedSlotsLb: TLabel
-      Left = 148
-      Height = 18
-      Top = 20
+      AnchorSideLeft.Control = Bevel1
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GroupBox2
+      Left = 164
+      Height = 15
+      Top = 8
       Width = 6
+      BorderSpacing.Top = 8
       Caption = '0'
       Color = clNone
       ParentColor = False
     end
     object InvalidSlotsLb: TLabel
-      Left = 240
-      Height = 18
-      Top = 20
+      AnchorSideTop.Control = GroupBox2
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 290
+      Height = 15
+      Top = 8
       Width = 6
+      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 24
       Caption = '0'
       Color = clNone
       ParentColor = False
     end
+    object Bevel1: TBevel
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideLeft.Side = asrCenter
+      Left = 156
+      Height = 36
+      Top = 0
+      Width = 8
+      Shape = bsSpacer
+    end
   end
   object DeleteBt: TButton
-    Left = 250
+    AnchorSideLeft.Control = ResetBt
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    Left = 261
     Height = 25
     Hint = 'Delete teh selected NAF'
-    Top = 200
+    Top = 182
     Width = 75
+    BorderSpacing.Left = 8
+    BorderSpacing.Top = 12
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 12
     BorderSpacing.InnerBorder = 4
     Caption = '&Delete'
     Enabled = False
@@ -209,11 +328,11 @@ object NafFrm: TNafFrm
     Filter = 'Network Access Files (*.naf)|*.naf|All Files (*.*)|*.*'
     FilterIndex = 0
     Options = []
-    left = 160
-    top = 72
+    Left = 160
+    Top = 48
   end
   object OgMakeCodes1: TOgMakeCodes
-    left = 136
-    top = 288
+    Left = 136
+    Top = 288
   end
 end
diff --git a/components/onguard/examples/nafmgr/nafmgr1.lrs b/components/onguard/examples/nafmgr/nafmgr1.lrs
index 47b62a8a9..4c1ed63ff 100644
--- a/components/onguard/examples/nafmgr/nafmgr1.lrs
+++ b/components/onguard/examples/nafmgr/nafmgr1.lrs
@@ -1,70 +1,125 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TNafFrm','FORMDATA',[
-  'TPF0'#7'TNafFrm'#6'NafFrm'#4'Left'#3'3'#1#6'Height'#3#232#0#3'Top'#3'#'#1#5
-  +'Width'#3'N'#1#18'HorzScrollBar.Page'#3'M'#1#19'HorzScrollBar.Range'#3'E'#1
+  'TPF0'#7'TNafFrm'#6'NafFrm'#4'Left'#3'3'#1#6'Height'#3#223#0#3'Top'#3'#'#1#5
+  +'Width'#3'c'#1#18'HorzScrollBar.Page'#3'M'#1#19'HorzScrollBar.Range'#3'E'#1
   +#18'VertScrollBar.Page'#3#231#0#19'VertScrollBar.Range'#3#177#0#13'ActiveCon'
-  +'trol'#7#12'AccessCodeEd'#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'
-  +#0#7'Caption'#6#27'Network Access File Manager'#10'Font.Color'#7#6'clText'#11
-  +'Font.Height'#2#11#9'Font.Name'#6#13'MS Sans Serif'#10'Font.Pitch'#7#10'fpVa'
-  +'riable'#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#8'Sho'
-  +'wHint'#9#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#8#6'Height'#2'a'#3'Top'#2#8#5
-  +'Width'#3'='#1#7'Caption'#6#13'File Settings'#8'TabOrder'#2#0#0#12'TSpeedBut'
-  +'ton'#14'GenerateCodeSb'#4'Left'#3' '#1#6'Height'#2#23#4'Hint'#6#13'Generate'
-  +' code'#3'Top'#2#19#5'Width'#2#23#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10
-  +'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0
-  +#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0
-  +#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192
-  +#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255
-  +#255#255#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136
-  +#136#136#128#0#0#0#136#136#136#0#0#8#136#136#128#0#0#0#136#136#0#136#128#128
-  +#8#136#128#0#0#0#136#128#128#136#136#136#0#136#128#0#0#0#136#8#136#128#0#136
-  +#136#8#128#0#0#0#136#0#136#0#0#8#136#8#128#0#0#0#128#136#128#9#137#0#128#128
-  +#128#0#0#0#128#136#128#8#152#0#136#128#128#0#0#0#128#8#128#8#152#0#136#0#128
-  +#0#0#0#128#136#128#9#137#0#136#128#128#0#0#0#136#8#136#0#0#8#136#8#128#0#0#0
-  +#136#8#8#128#0#136#8#8#128#0#0#0#136#128#136#8#136#136#128#136#128#0#0#0#136
-  +#136#0#136#128#128#8#136#128#0#0#0#136#136#136#0#0#8#136#136#128#0#0#0#136
-  +#136#136#136#136#136#136#136#128#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#19'Gene'
-  +'rateCodeSbClick'#0#0#6'TLabel'#6'Label4'#4'Left'#2#8#6'Height'#2#18#3'Top'#2
-  +#24#5'Width'#2'&'#7'Caption'#6#6'C&ode:'#5'Color'#7#6'clNone'#11'ParentColor'
-  +#8#0#0#6'TLabel'#6'Label5'#4'Left'#2#8#6'Height'#2#18#3'Top'#2'4'#5'Width'#2
-  +'6'#7'Caption'#6#10'&Filename:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5
-  +'TEdit'#10'FileNameEd'#4'Left'#2'@'#6'Height'#2#22#3'Top'#2'0'#5'Width'#3#185
-  +#0#8'OnChange'#7#16'FileNameEdChange'#8'TabOrder'#2#1#0#0#7'TButton'#8'Brows'
-  +'eBt'#4'Left'#3#253#0#6'Height'#2#25#4'Hint'#6#30'Browse for network access '
-  +'file'#3'Top'#2'.'#5'Width'#2';'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
-  +#6#10'&Browse...'#7'OnClick'#7#13'BrowseBtClick'#8'TabOrder'#2#2#0#0#5'TEdit'
-  +#12'AccessCodeEd'#4'Left'#2'@'#6'Height'#2#22#3'Top'#2#20#5'Width'#3#221#0#8
-  +'OnChange'#7#18'AccessCodeEdChange'#8'TabOrder'#2#0#0#0#0#7'TButton'#8'Updat'
-  +'eBt'#4'Left'#2#10#6'Height'#2#25#4'Hint'#6'0Update the selected NAF using t'
-  +'he specified code'#3'Top'#3#200#0#5'Width'#2'K'#25'BorderSpacing.InnerBorde'
-  +'r'#2#4#7'Caption'#6#7'&Update'#7'Enabled'#8#7'OnClick'#7#13'UpdateBtClick'#8
-  +'TabOrder'#2#2#0#0#7'TButton'#8'CreateBt'#4'Left'#2'Z'#6'Height'#2#25#4'Hint'
-  +#6'''Create teh NAF using the specified code'#3'Top'#3#200#0#5'Width'#2'K'#25
+  +'trol'#7#12'AccessCodeEd'#8'AutoSize'#9#11'BorderIcons'#11#12'biSystemMenu'
+  +#10'biMinimize'#0#7'Caption'#6#27'Network Access File Manager'#12'ClientHeig'
+  +'ht'#3#223#0#11'ClientWidth'#3'c'#1#8'OnCreate'#7#10'FormCreate'#8'Position'
+  +#7#14'poScreenCenter'#8'ShowHint'#9#10'LCLVersion'#6#7'2.3.0.0'#0#9'TGroupBo'
+  +'x'#9'GroupBox1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Cont'
+  +'rol'#7#5'Owner'#23'AnchorSideRight.Control'#7#8'DeleteBt'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2'Z'#3'Top'#2#12#5'Width'#3'D'
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12
+  +#17'BorderSpacing.Top'#2#12#20'BorderSpacing.Bottom'#2#12#7'Caption'#6#13'Fi'
+  +'le Settings'#12'ClientHeight'#2'F'#11'ClientWidth'#3'@'#1#8'TabOrder'#2#0#0
+  +#12'TSpeedButton'#14'GenerateCodeSb'#21'AnchorSideTop.Control'#7#12'AccessCo'
+  +'deEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#9
+  +'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#29#1#6'Height'
+  +#2#23#4'Hint'#6#13'Generate code'#3'Top'#2#4#5'Width'#2#23#7'Anchors'#11#5'a'
+  +'kTop'#7'akRight'#0#19'BorderSpacing.Right'#2#12#10'Glyph.Data'#10'F'#1#0#0
+  +'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0
+  +#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0
+  +#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0
+  +#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0
+  +#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136
+  +#128#0#0#0#136#136#136#0#0#8#136#136#128#0#0#0#136#136#0#136#128#128#8#136
+  +#128#0#0#0#136#128#128#136#136#136#0#136#128#0#0#0#136#8#136#128#0#136#136#8
+  +#128#0#0#0#136#0#136#0#0#8#136#8#128#0#0#0#128#136#128#9#137#0#128#128#128#0
+  +#0#0#128#136#128#8#152#0#136#128#128#0#0#0#128#8#128#8#152#0#136#0#128#0#0#0
+  +#128#136#128#9#137#0#136#128#128#0#0#0#136#8#136#0#0#8#136#8#128#0#0#0#136#8
+  +#8#128#0#136#8#8#128#0#0#0#136#128#136#8#136#136#128#136#128#0#0#0#136#136#0
+  +#136#128#128#8#136#128#0#0#0#136#136#136#0#0#8#136#136#128#0#0#0#136#136#136
+  +#136#136#136#136#136#128#0#0#0#7'OnClick'#7#19'GenerateCodeSbClick'#0#0#6'TL'
+  +'abel'#6'Label4'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.'
+  +'Control'#7#12'AccessCodeEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2
+  +#12#6'Height'#2#15#3'Top'#2#8#5'Width'#2#31#18'BorderSpacing.Left'#2#12#7'Ca'
+  +'ption'#6#6'C&ode:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'L'
+  +'abel5'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7
+  +#10'FileNameEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#12#6'Height'
+  +#2#15#3'Top'#2')'#5'Width'#2'3'#18'BorderSpacing.Left'#2#12#7'Caption'#6#10
+  +'&Filename:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#10'FileName'
+  +'Ed'#22'AnchorSideLeft.Control'#7#6'Label5'#19'AnchorSideLeft.Side'#7#9'asrB'
+  +'ottom'#21'AnchorSideTop.Control'#7#14'GenerateCodeSb'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'BrowseBt'#4'Left'#2'G'#6'Hei'
+  +'ght'#2#23#3'Top'#2'%'#5'Width'#3#210#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
+  +'kRight'#0#18'BorderSpacing.Left'#2#8#17'BorderSpacing.Top'#2#10#19'BorderSp'
+  +'acing.Right'#2#4#20'BorderSpacing.Bottom'#2#10#8'OnChange'#7#16'FileNameEdC'
+  +'hange'#8'TabOrder'#2#1#0#0#5'TEdit'#12'AccessCodeEd'#22'AnchorSideLeft.Cont'
+  +'rol'#7#10'FileNameEd'#21'AnchorSideTop.Control'#7#9'GroupBox1'#23'AnchorSid'
+  +'eRight.Control'#7#14'GenerateCodeSb'#4'Left'#2'G'#6'Height'#2#23#3'Top'#2#4
+  +#5'Width'#3#210#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpa'
+  +'cing.Top'#2#4#19'BorderSpacing.Right'#2#4#8'OnChange'#7#18'AccessCodeEdChan'
+  +'ge'#8'TabOrder'#2#0#0#0#12'TSpeedButton'#8'BrowseBt'#22'AnchorSideLeft.Cont'
+  +'rol'#7#10'FileNameEd'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#10'FileNameEd'#23'AnchorSideRight.Control'#7#9'GroupBox1'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#10'File'
+  +'NameEd'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#29#1#6'Height'#2
+  +#23#4'Hint'#6#30'Browse for network access file'#3'Top'#2'%'#5'Width'#2#23#7
+  +'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#19'BorderSpacing.Right'#2#12
+  +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7#13'Brows'
+  +'eBtClick'#0#0#0#7'TButton'#8'UpdateBt'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#9'GroupBox2'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#12#6'Height'#2#25#4'Hint'#6'0Update the selected NAF using th'
+  +'e specified code'#3'Top'#3#182#0#5'Width'#2'K'#18'BorderSpacing.Left'#2#12
+  +#17'BorderSpacing.Top'#2#12#20'BorderSpacing.Bottom'#2#12#25'BorderSpacing.I'
+  +'nnerBorder'#2#4#7'Caption'#6#7'&Update'#7'Enabled'#8#7'OnClick'#7#13'Update'
+  ,'BtClick'#8'TabOrder'#2#2#0#0#7'TButton'#8'CreateBt'#22'AnchorSideLeft.Contr'
+  +'ol'#7#8'UpdateBt'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.C'
+  +'ontrol'#7#9'GroupBox2'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'_'#6
+  +'Height'#2#25#4'Hint'#6'''Create teh NAF using the specified code'#3'Top'#3
+  +#182#0#5'Width'#2'K'#18'BorderSpacing.Left'#2#8#17'BorderSpacing.Top'#2#12#25
   +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'&Create'#7'Enabled'#8#7'OnCli'
-  +'ck'#7#13'CreateBtClick'#8'TabOrder'#2#3#0#0#7'TButton'#7'ResetBt'#4'Left'#3
-  +#170#0#6'Height'#2#25#4'Hint'#6'/Reset the specified NAF, removing invalid s'
-  +'lots'#3'Top'#3#200#0#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Capt'
-  +'ion'#6#6'&Reset'#7'Enabled'#8#7'OnClick'#7#12'ResetBtClick'#8'TabOrder'#2#4
-  +#0#0#9'TGroupBox'#9'GroupBox2'#4'Left'#2#8#6'Height'#2'H'#3'Top'#2'p'#5'Widt'
-  +'h'#3'@'#1#7'Caption'#6#12'Access Slots'#8'TabOrder'#2#1#0#6'TLabel'#6'Label'
-  +'1'#4'Left'#2#8#6'Height'#2#18#3'Top'#2#20#5'Width'#2'!'#7'Caption'#6#6'Tota'
-  +'l:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2
-  +'`'#6'Height'#2#18#3'Top'#2#20#5'Width'#2'.'#7'Caption'#6#7'Locked:'#5'Color'
-  +#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'#3#196#0#6'Hei'
-  +'ght'#2#18#3'Top'#2#20#5'Width'#2'*'#7'Caption'#6#8'Invalid:'#5'Color'#7#6'c'
-  +'lNone'#11'ParentColor'#8#0#0#6'TLabel'#12'TotalSlotsLb'#4'Left'#2','#6'Heig'
-  +'ht'#2#18#3'Top'#2#20#5'Width'#2#6#7'Caption'#6#1'0'#5'Color'#7#6'clNone'#11
-  +'ParentColor'#8#0#0#6'TLabel'#13'LockedSlotsLb'#4'Left'#3#148#0#6'Height'#2
-  +#18#3'Top'#2#20#5'Width'#2#6#7'Caption'#6#1'0'#5'Color'#7#6'clNone'#11'Paren'
-  +'tColor'#8#0#0#6'TLabel'#14'InvalidSlotsLb'#4'Left'#3#240#0#6'Height'#2#18#3
-  +'Top'#2#20#5'Width'#2#6#7'Caption'#6#1'0'#5'Color'#7#6'clNone'#11'ParentColo'
-  +'r'#8#0#0#0#7'TButton'#8'DeleteBt'#4'Left'#3#250#0#6'Height'#2#25#4'Hint'#6
-  +#23'Delete teh selected NAF'#3'Top'#3#200#0#5'Width'#2'K'#25'BorderSpacing.I'
-  +'nnerBorder'#2#4#7'Caption'#6#7'&Delete'#7'Enabled'#8#7'OnClick'#7#13'Delete'
-  +'BtClick'#8'TabOrder'#2#5#0#0#11'TOpenDialog'#6'OpenDg'#5'Title'#6#22'Otw'
-  +#243'rz istniej'#185'cy plik'#10'DefaultExt'#6#4'.naf'#6'Filter'#6'6Network '
-  +'Access Files (*.naf)|*.naf|All Files (*.*)|*.*'#11'FilterIndex'#2#0#7'Optio'
-  ,'ns'#11#0#4'left'#3#160#0#3'top'#2'H'#0#0#12'TOgMakeCodes'#12'OgMakeCodes1'#4
-  +'left'#3#136#0#3'top'#3' '#1#0#0#0
+  +'ck'#7#13'CreateBtClick'#8'TabOrder'#2#3#0#0#7'TButton'#7'ResetBt'#22'Anchor'
+  +'SideLeft.Control'#7#8'CreateBt'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'A'
+  +'nchorSideTop.Control'#7#9'GroupBox2'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#3#178#0#6'Height'#2#25#4'Hint'#6'/Reset the specified NAF, removing i'
+  +'nvalid slots'#3'Top'#3#182#0#5'Width'#2'K'#18'BorderSpacing.Left'#2#8#17'Bo'
+  +'rderSpacing.Top'#2#12#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#6'&Res'
+  +'et'#7'Enabled'#8#7'OnClick'#7#12'ResetBtClick'#8'TabOrder'#2#4#0#0#9'TGroup'
+  +'Box'#9'GroupBox2'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
+  +'ntrol'#7#9'GroupBox1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRi'
+  +'ght.Control'#7#8'DeleteBt'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+  +#12#6'Height'#2'8'#3'Top'#2'r'#5'Width'#3'D'#1#7'Anchors'#11#5'akTop'#6'akLe'
+  +'ft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#12#7'Caption'#6#12
+  +'Access Slots'#12'ClientHeight'#2'$'#11'ClientWidth'#3'@'#1#8'TabOrder'#2#1#0
+  +#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#9'GroupBox2'#21'AnchorSide'
+  +'Top.Control'#7#9'GroupBox2'#4'Left'#2#24#6'Height'#2#15#3'Top'#2#8#5'Width'
+  +#2#28#18'BorderSpacing.Left'#2#24#17'BorderSpacing.Top'#2#8#7'Caption'#6#6'T'
+  +'otal:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#21'An'
+  +'chorSideTop.Control'#7#9'GroupBox2'#23'AnchorSideRight.Control'#7#6'Bevel1'
+  +#4'Left'#2's'#6'Height'#2#15#3'Top'#2#8#5'Width'#2')'#7'Anchors'#11#5'akTop'
+  +#7'akRight'#0#17'BorderSpacing.Top'#2#8#7'Caption'#6#7'Locked:'#5'Color'#7#6
+  +'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label3'#21'AnchorSideTop.Control'
+  +#7#9'GroupBox2'#23'AnchorSideRight.Control'#7#14'InvalidSlotsLb'#4'Left'#3
+  +#244#0#6'Height'#2#15#3'Top'#2#8#5'Width'#2'&'#7'Anchors'#11#5'akTop'#7'akRi'
+  +'ght'#0#17'BorderSpacing.Top'#2#8#19'BorderSpacing.Right'#2#8#7'Caption'#6#8
+  +'Invalid:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#12'TotalSlot'
+  +'sLb'#22'AnchorSideLeft.Control'#7#6'Label1'#19'AnchorSideLeft.Side'#7#9'asr'
+  +'Bottom'#21'AnchorSideTop.Control'#7#9'GroupBox2'#4'Left'#2'<'#6'Height'#2#15
+  +#3'Top'#2#8#5'Width'#2#6#18'BorderSpacing.Left'#2#8#17'BorderSpacing.Top'#2#8
+  +#7'Caption'#6#1'0'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#13'L'
+  +'ockedSlotsLb'#22'AnchorSideLeft.Control'#7#6'Bevel1'#19'AnchorSideLeft.Side'
+  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'GroupBox2'#4'Left'#3#164#0#6'H'
+  +'eight'#2#15#3'Top'#2#8#5'Width'#2#6#17'BorderSpacing.Top'#2#8#7'Caption'#6#1
+  +'0'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#14'InvalidSlotsLb'
+  +#21'AnchorSideTop.Control'#7#9'GroupBox2'#23'AnchorSideRight.Control'#7#9'Gr'
+  +'oupBox2'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'"'#1#6'Height'#2
+  +#15#3'Top'#2#8#5'Width'#2#6#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpa'
+  +'cing.Top'#2#8#19'BorderSpacing.Right'#2#24#7'Caption'#6#1'0'#5'Color'#7#6'c'
+  +'lNone'#11'ParentColor'#8#0#0#6'TBevel'#6'Bevel1'#22'AnchorSideLeft.Control'
+  +#7#9'GroupBox2'#19'AnchorSideLeft.Side'#7#9'asrCenter'#4'Left'#3#156#0#6'Hei'
+  +'ght'#2'$'#3'Top'#2#0#5'Width'#2#8#5'Shape'#7#8'bsSpacer'#0#0#0#7'TButton'#8
+  +'DeleteBt'#22'AnchorSideLeft.Control'#7#7'ResetBt'#19'AnchorSideLeft.Side'#7
+  +#9'asrBottom'#21'AnchorSideTop.Control'#7#9'GroupBox2'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#3#5#1#6'Height'#2#25#4'Hint'#6#23'Delete teh selecte'
+  +'d NAF'#3'Top'#3#182#0#5'Width'#2'K'#18'BorderSpacing.Left'#2#8#17'BorderSpa'
+  +'cing.Top'#2#12#19'BorderSpacing.Right'#2#12#20'BorderSpacing.Bottom'#2#12#25
+  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'&Delete'#7'Enabled'#8#7'OnCli'
+  +'ck'#7#13'DeleteBtClick'#8'TabOrder'#2#5#0#0#11'TOpenDialog'#6'OpenDg'#5'Tit'
+  +'le'#6#24'Otw'#195#179'rz istniej'#194#185'cy plik'#10'DefaultExt'#6#4'.naf'
+  +#6'Filter'#6'6Network Access Files (*.naf)|*.naf|All Files (*.*)|*.*'#11'Fil'
+  +'terIndex'#2#0#7'Options'#11#0#4'Left'#3#160#0#3'Top'#2'0'#0#0#12'TOgMakeCod'
+  +'es'#12'OgMakeCodes1'#4'Left'#3#136#0#3'Top'#3' '#1#0#0#0
 ]);
diff --git a/components/onguard/examples/nafmgr/nafmgr1.pas b/components/onguard/examples/nafmgr/nafmgr1.pas
index b5005d3a5..135971b0d 100644
--- a/components/onguard/examples/nafmgr/nafmgr1.pas
+++ b/components/onguard/examples/nafmgr/nafmgr1.pas
@@ -4,16 +4,17 @@ interface
 
 uses
   IniFiles, SysUtils, Dialogs, StdCtrls, Controls, Classes, Forms,
-  Buttons,LResources,onguard, ognetwrk, ogutil;
+  Buttons, LResources, ExtCtrls,onguard, ognetwrk, ogutil;
 
 type
 
   { TNafFrm }
 
   TNafFrm = class(TForm)
+    Bevel1: TBevel;
+    BrowseBt: TSpeedButton;
     GroupBox1: TGroupBox;
     FileNameEd: TEdit;
-    BrowseBt: TButton;
     UpdateBt: TButton;
     CreateBt: TButton;
     ResetBt: TButton;
diff --git a/components/onguard/examples/regdemo/frm_readme.lfm b/components/onguard/examples/regdemo/frm_readme.lfm
index a1943cd7f..6415328e7 100644
--- a/components/onguard/examples/regdemo/frm_readme.lfm
+++ b/components/onguard/examples/regdemo/frm_readme.lfm
@@ -2,136 +2,62 @@ object frmReadme: TfrmReadme
   Left = 192
   Height = 462
   Top = 107
-  Width = 539
+  Width = 536
   ActiveControl = Memo1
   Caption = 'Readme.txt'
   ClientHeight = 462
-  ClientWidth = 539
+  ClientWidth = 536
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
   OnActivate = FormActivate
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Memo1: TMemo
     Left = 0
     Height = 462
     Top = 0
-    Width = 539
+    Width = 536
     Align = alClient
-    Font.Height = -13
+    Font.Height = -12
     Font.Name = 'Courier New'
     Lines.Strings = (
       'Registration Demo by Bill Mullen [TPX]'
       '--------------------------------------'
       ''
-      'This demo consists of three applications and complete project '
-      'code.'
-      'The three applications are:'
+      'This demo consists of three applications and complete project code. The three applications are:'
       ''
-      'RCG.EXE - This is the application you use to gather information '
-      'from '
-      'your user.  That information is then used to generate a release '
-      'code '
-      'that you will give back to the user. '
+      'RCG.EXE - This is the application you use to gather information from your user.  That information is then used to generate a release code that you will give back to the user. '
       ''
-      'REGISTRATION.EXE - A sample registration application that your '
-      'user would run when they are ready to register their product '
-      'with you.'
-      'They enter the serial number that was on their disk or CD.  When '
-      'they call you, they will read you their serial number, and the '
-      'machine '
-      'identifier (MachineModifier).  You will enter this information '
-      'into RCG '
-      '(above) and calculate a release code.  You will then read them '
-      'the '
-      'release code and they will enter it into the Release Code field. '
+      'REGISTRATION.EXE - A sample registration application that your user would run when they are ready to register their product with you. They enter the serial number that was on their disk or CD.  When they call you, they will read you their serial number, and the machine identifier (MachineModifier).  You will enter this information into RCG (above) and calculate a release code.  You will then read them the release code and they will enter it into the Release Code field. '
       ''
-      'When they click the SAVE button, it validates the release code '
-      'and '
-      'if it is valid, the serial number and release code are saved to '
-      'a file'
-      'called REGISTRATION.DAT. '
+      'When they click the SAVE button, it validates the release code and if it is valid, the serial number and release code are saved to a filecalled REGISTRATION.DAT. '
       ''
-      'HELLOWORLD.EXE - A simple application that demonstrates the '
-      'use of the registration information found in the '
-      'REGISTRATION.DAT'
-      'file that was created by the REGISTRATION.EXE application.  The '
-      'serial number stored in the REGISTRATION.DAT file is used to '
-      'calculate a release code on the machine the application is '
-      'running '
-      'on and it them compares this release code with the one stored in '
-      'the '
-      'REGISTRATION.DAT file.  If the two release codes are the same, '
-      'the application runs (displays "Hello World") otherwise it '
-      'informs the '
-      'user that they have an unregistered demo.'
+      'HELLOWORLD.EXE - A simple application that demonstrates the use of the registration information found in the REGISTRATION.DAT file that was created by the REGISTRATION.EXE application.  The serial number stored in the REGISTRATION.DAT file is used to calculate a release code on the machine the application is running on and it them compares this release code with the one stored in the REGISTRATION.DAT file.  If the two release codes are the same, the application runs (displays "Hello World") otherwise it informs the user that they have an unregistered demo.'
       ''
-      'An OnGuard.ini file is included that contains the KEY that I use '
-      'in '
-      'this demo. When running the demo as shipped, you should use the '
-      'supplied OnGuard.ini file when getting the application key.'
+      'An OnGuard.ini file is included that contains the KEY that I use in this demo. When running the demo as shipped, you should use the supplied OnGuard.ini file when getting the application key.'
       ''
-      'Before opening and modifying any code, you should run the '
-      'following '
-      'test  to see how these applications work with one another.  '
+      'Before opening and modifying any code, you should run the following test  to see how these applications work with one another.  '
       ''
-      '1.  Run the HELLOWORLD.EXE application.  As you can see, it is '
-      'not registered.'
+      '1.  Run the HELLOWORLD.EXE application.  As you can see, it is not registered.'
       ''
-      '2.  Execute REGISTRATION.EXE.  Enter any valid long integer '
-      'value in the serial number field in the REGISTRATION.EXE '
-      'application.'
-      'Execute RCG.EXE and arrange the windows so that you can view '
-      'both.  '
+      '2.  Execute REGISTRATION.EXE.  Enter any valid long integer value in the serial number field in the REGISTRATION.EXE application.Execute RCG.EXE and arrange the windows so that you can view both.  '
       ''
-      'a.  In the RCG application, load the key by pressing the speed '
-      'button '
-      'and selecting the Hello World application from the OnGuard.ini '
-      'file that '
-      'was supplied.  '
+      'a.  In the RCG application, load the key by pressing the speed button and selecting the Hello World application from the OnGuard.ini file that was supplied.  '
       ''
-      'b.  Select the "Apply a Machine Modifier" checkbox and enter the '
-      'machine modifier that is displayed in the REGISTRATION.EXE '
-      'application (this simulates the user reading that information to '
-      'you).  '
+      'b.  Select the "Apply a Machine Modifier" checkbox and enter the machine modifier that is displayed in the REGISTRATION.EXE application (this simulates the user reading that information to you).  '
       ''
-      'c.  Skip the Expiration portion as I did not use this feature in '
-      'the '
-      'other programs.  '
+      'c.  Skip the Expiration portion as I did not use this feature in the other programs.  '
       ''
-      'd.  Next enter the serial number that is displayed in the '
-      'REGISTRATION.EXE application (again, a simulation).  '
+      'd.  Next enter the serial number that is displayed in the REGISTRATION.EXE application (again, a simulation).  '
       ''
-      'e.  Generate a release code by pressing the speed button next to '
-      'the Release Code edit field.'
+      'e.  Generate a release code by pressing the speed button next to the Release Code edit field.'
       ''
-      'f.  Have the user enter the release code in their '
-      'REGISTRATION.EXE'
-      'application that you read them from your RGC.EXE application '
-      '(simulated).  For testing purposes, change any single character '
-      'as '
-      'you enter the data so you can see how the application will '
-      'reject an'
-      'invalid code.  (Now simply copy and paste the release code from '
-      'RGC to REGISTRATION to save yourself having to enter the whole'
-      'string again.)'
+      'f.  Have the user enter the release code in their REGISTRATION.EXE application that you read them from your RGC.EXE application (simulated).  For testing purposes, change any single character as you enter the data so you can see how the application will reject an invalid code.  (Now simply copy and paste the release code from RGC to REGISTRATION to save yourself having to enter the whole string again.)'
       ''
-      'If you entered everything correctly, the REGISTRASTION.EXE '
-      'application will inform you and save the data.  Now let''s test '
-      'the '
-      'registration information.'
+      'If you entered everything correctly, the REGISTRASTION.EXE application will inform you and save the data.  Now let''s test the registration information.'
       ''
-      '3.  Run the HELLOWORLD.EXE application.  If you entered '
-      'everything correctly in step 2, you will see that the '
-      'application is '
-      'registered (It displays "HELLO WORLD").'
-      ''
-      'If you have another computer, copy HELLOWORLD.EXE and '
-      'REGISTRASTION.DAT to that machine and try to execute '
-      'HELLOWORLD.EXE - you should be told that the application is '
-      'an unregistered demo.    You can also edit the any single '
-      'character in REGISTRASTION.DAT and try to run '
-      'HELLOWORLD.EXE.  '
+      '3.  Run the HELLOWORLD.EXE application.  If you entered everything correctly in step 2, you will see that the application is registered (It displays "HELLO WORLD").'
       ''
+      'If you have another computer, copy HELLOWORLD.EXE and REGISTRASTION.DAT to that machine and try to execute HELLOWORLD.EXE - you should be told that the application is an unregistered demo.    You can also edit the any single character in REGISTRASTION.DAT and try to run HELLOWORLD.EXE.  '
     )
     ParentFont = False
     ReadOnly = True
diff --git a/components/onguard/examples/regdemo/frm_readme.lrs b/components/onguard/examples/regdemo/frm_readme.lrs
index bbe27ece1..53adec80f 100644
--- a/components/onguard/examples/regdemo/frm_readme.lrs
+++ b/components/onguard/examples/regdemo/frm_readme.lrs
@@ -1,70 +1,66 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TfrmReadme','FORMDATA',[
   'TPF0'#10'TfrmReadme'#9'frmReadme'#4'Left'#3#192#0#6'Height'#3#206#1#3'Top'#2
-  +'k'#5'Width'#3#27#2#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#10'Readme.txt'
-  +#12'ClientHeight'#3#206#1#11'ClientWidth'#3#27#2#11'Font.Height'#2#245#9'Fon'
+  +'k'#5'Width'#3#24#2#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#10'Readme.txt'
+  +#12'ClientHeight'#3#206#1#11'ClientWidth'#3#24#2#11'Font.Height'#2#245#9'Fon'
   +'t.Name'#6#13'MS Sans Serif'#10'OnActivate'#7#12'FormActivate'#10'LCLVersion'
-  +#6#6'0.9.27'#0#5'TMemo'#5'Memo1'#4'Left'#2#0#6'Height'#3#206#1#3'Top'#2#0#5
-  +'Width'#3#27#2#5'Align'#7#8'alClient'#11'Font.Height'#2#243#9'Font.Name'#6#11
+  +#6#7'2.3.0.0'#0#5'TMemo'#5'Memo1'#4'Left'#2#0#6'Height'#3#206#1#3'Top'#2#0#5
+  +'Width'#3#24#2#5'Align'#7#8'alClient'#11'Font.Height'#2#244#9'Font.Name'#6#11
   +'Courier New'#13'Lines.Strings'#1#6'&Registration Demo by Bill Mullen [TPX]'
-  +#6'&--------------------------------------'#6#0#6'>This demo consists of thr'
-  +'ee applications and complete project '#6#5'code.'#6#27'The three applicatio'
-  +'ns are:'#6#0#6'@RCG.EXE - This is the application you use to gather informa'
-  +'tion '#6#5'from '#6'@your user.  That information is then used to generate '
-  +'a release '#6#5'code '#6'%that you will give back to the user. '#6#0#6'?REG'
-  +'ISTRATION.EXE - A sample registration application that your '#6'=user would'
-  +' run when they are ready to register their product '#6#9'with you.'#6'AThey'
-  +' enter the serial number that was on their disk or CD.  When '#6'?they call'
-  +' you, they will read you their serial number, and the '#6#8'machine '#6'?id'
-  +'entifier (MachineModifier).  You will enter this information '#6#9'into RCG'
-  +' '#6'?(above) and calculate a release code.  You will then read them '#6#4
-  +'the '#6'Arelease code and they will enter it into the Release Code field. '
-  +#6#0#6'?When they click the SAVE button, it validates the release code '#6#4
-  +'and '#6'@if it is valid, the serial number and release code are saved to '#6
-  +#6'a file'#6#25'called REGISTRATION.DAT. '#6#0#6'<HELLOWORLD.EXE - A simple '
-  +'application that demonstrates the '#6'1use of the registration information '
-  +'found in the '#6#16'REGISTRATION.DAT'#6'@file that was created by the REGIS'
-  +'TRATION.EXE application.  The '#6'=serial number stored in the REGISTRATION'
-  +'.DAT file is used to '#6';calculate a release code on the machine the appli'
-  +'cation is '#6#8'running '#6'Aon and it them compares this release code with'
-  +' the one stored in '#6#4'the '#6'?REGISTRATION.DAT file.  If the two releas'
-  +'e codes are the same, '#6';the application runs (displays "Hello World") ot'
-  +'herwise it '#6#12'informs the '#6')user that they have an unregistered demo'
-  +'.'#6#0#6'AAn OnGuard.ini file is included that contains the KEY that I use '
-  +#6#3'in '#6'@this demo. When running the demo as shipped, you should use the'
-  +' '#6';supplied OnGuard.ini file when getting the application key.'#6#0#6':B'
-  +'efore opening and modifying any code, you should run the '#6#10'following '
-  +#6'<test  to see how these applications work with one another.  '#6#0#6'?1. '
-  +' Run the HELLOWORLD.EXE application.  As you can see, it is '#6#15'not regi'
-  +'stered.'#6#0#6'<2.  Execute REGISTRATION.EXE.  Enter any valid long integer'
-  +' '#6'9value in the serial number field in the REGISTRATION.EXE '#6#12'appli'
-  +'cation.'#6'=Execute RCG.EXE and arrange the windows so that you can view '#6
-  +#7'both.  '#6#0#6'?a.  In the RCG application, load the key by pressing the '
-  +'speed '#6#7'button '#6'?and selecting the Hello World application from the '
-  +'OnGuard.ini '#6#10'file that '#6#15'was supplied.  '#6#0#6'Ab.  Select the '
-  +'"Apply a Machine Modifier" checkbox and enter the '#6';machine modifier tha'
-  +'t is displayed in the REGISTRATION.EXE '#6'Aapplication (this simulates the'
-  +' user reading that information to '#6#7'you).  '#6#0#6'Ac.  Skip the Expira'
-  +'tion portion as I did not use this feature in '#6#4'the '#6#17'other progra'
-  +'ms.  '#6#0#6':d.  Next enter the serial number that is displayed in the '#6
-  +'5REGISTRATION.EXE application (again, a simulation).  '#6#0#6'Ae.  Generate'
-  +' a release code by pressing the speed button next to '#6#28'the Release Cod'
-  +'e edit field.'#6#0#6'2f.  Have the user enter the release code in their '#6
-  +#16'REGISTRATION.EXE'#6'=application that you read them from your RGC.EXE ap'
-  +'plication '#6'@(simulated).  For testing purposes, change any single charac'
-  +'ter '#6#3'as '#6';you enter the data so you can see how the application wil'
-  +'l '#6#9'reject an'#6'@invalid code.  (Now simply copy and paste the release'
-  +' code from '#6'>RGC to REGISTRATION to save yourself having to enter the wh'
-  +'ole'#6#14'string again.)'#6#0#6';If you entered everything correctly, the R'
-  +'EGISTRASTION.EXE '#6'?application will inform you and save the data.  Now l'
-  +'et''s test '#6#4'the '#6#25'registration information.'#6#0#6'83.  Run the H'
-  +'ELLOWORLD.EXE application.  If you entered '#6'6everything correctly in ste'
-  +'p 2, you will see that the '#6#15'application is '#6'''registered (It displ'
-  +'ays "HELLO WORLD").'#6#0#6'6If you have another computer, copy HELLOWORLD.E'
-  +'XE and '#6'5REGISTRASTION.DAT to that machine and try to execute '#6'<HELLO'
-  +'WORLD.EXE - you should be told that the application is '#6':an unregistered'
-  +' demo.    You can also edit the any single '#6'.character in REGISTRASTION.'
-  ,'DAT and try to run '#6#17'HELLOWORLD.EXE.  '#6#0#0#10'ParentFont'#8#8'ReadO'
-  +'nly'#9#10'ScrollBars'#7#6'ssBoth'#8'TabOrder'#2#0#0#0#0
+  +#6'&--------------------------------------'#6#0#6'_This demo consists of thr'
+  +'ee applications and complete project code. The three applications are:'#6#0
+  +#6#175'RCG.EXE - This is the application you use to gather information from '
+  +'your user.  That information is then used to generate a release code that y'
+  +'ou will give back to the user. '#6#0#12#218#1#0#0'REGISTRATION.EXE - A samp'
+  +'le registration application that your user would run when they are ready to'
+  +' register their product with you. They enter the serial number that was on '
+  +'their disk or CD.  When they call you, they will read you their serial numb'
+  +'er, and the machine identifier (MachineModifier).  You will enter this info'
+  +'rmation into RCG (above) and calculate a release code.  You will then read '
+  +'them the release code and they will enter it into the Release Code field. '
+  +#6#0#6#162'When they click the SAVE button, it validates the release code an'
+  +'d if it is valid, the serial number and release code are saved to a filecal'
+  +'led REGISTRATION.DAT. '#6#0#12'2'#2#0#0'HELLOWORLD.EXE - A simple applicati'
+  +'on that demonstrates the use of the registration information found in the R'
+  +'EGISTRATION.DAT file that was created by the REGISTRATION.EXE application. '
+  +' The serial number stored in the REGISTRATION.DAT file is used to calculate'
+  +' a release code on the machine the application is running on and it them co'
+  +'mpares this release code with the one stored in the REGISTRATION.DAT file. '
+  +' If the two release codes are the same, the application runs (displays "Hel'
+  +'lo World") otherwise it informs the user that they have an unregistered dem'
+  +'o.'#6#0#6#191'An OnGuard.ini file is included that contains the KEY that I '
+  +'use in this demo. When running the demo as shipped, you should use the supp'
+  +'lied OnGuard.ini file when getting the application key.'#6#0#6#128'Before o'
+  +'pening and modifying any code, you should run the following test  to see ho'
+  +'w these applications work with one another.  '#6#0#6'N1.  Run the HELLOWORL'
+  +'D.EXE application.  As you can see, it is not registered.'#6#0#6#197'2.  Ex'
+  +'ecute REGISTRATION.EXE.  Enter any valid long integer value in the serial n'
+  +'umber field in the REGISTRATION.EXE application.Execute RCG.EXE and arrange'
+  +' the windows so that you can view both.  '#6#0#6#158'a.  In the RCG applica'
+  +'tion, load the key by pressing the speed button and selecting the Hello Wor'
+  +'ld application from the OnGuard.ini file that was supplied.  '#6#0#6#196'b.'
+  +'  Select the "Apply a Machine Modifier" checkbox and enter the machine modi'
+  +'fier that is displayed in the REGISTRATION.EXE application (this simulates '
+  +'the user reading that information to you).  '#6#0#6'Vc.  Skip the Expiratio'
+  +'n portion as I did not use this feature in the other programs.  '#6#0#6'od.'
+  +'  Next enter the serial number that is displayed in the REGISTRATION.EXE ap'
+  +'plication (again, a simulation).  '#6#0#6']e.  Generate a release code by p'
+  +'ressing the speed button next to the Release Code edit field.'#6#0#12#149#1
+  +#0#0'f.  Have the user enter the release code in their REGISTRATION.EXE appl'
+  +'ication that you read them from your RGC.EXE application (simulated).  For '
+  +'testing purposes, change any single character as you enter the data so you '
+  +'can see how the application will reject an invalid code.  (Now simply copy '
+  +'and paste the release code from RGC to REGISTRATION to save yourself having'
+  +' to enter the whole string again.)'#6#0#6#151'If you entered everything cor'
+  +'rectly, the REGISTRASTION.EXE application will inform you and save the data'
+  +'.  Now let''s test the registration information.'#6#0#6#164'3.  Run the HEL'
+  +'LOWORLD.EXE application.  If you entered everything correctly in step 2, yo'
+  +'u will see that the application is registered (It displays "HELLO WORLD").'
+  +#6#0#12' '#1#0#0'If you have another computer, copy HELLOWORLD.EXE and REGIS'
+  +'TRASTION.DAT to that machine and try to execute HELLOWORLD.EXE - you should'
+  +' be told that the application is an unregistered demo.    You can also edit'
+  +' the any single character in REGISTRASTION.DAT and try to run HELLOWORLD.EX'
+  +'E.  '#0#10'ParentFont'#8#8'ReadOnly'#9#10'ScrollBars'#7#6'ssBoth'#8'TabOrde'
+  +'r'#2#0#0#0#0
 ]);
diff --git a/components/onguard/examples/regdemo/frm_readme.pas b/components/onguard/examples/regdemo/frm_readme.pas
index bb2fc02dc..4d9819789 100644
--- a/components/onguard/examples/regdemo/frm_readme.pas
+++ b/components/onguard/examples/regdemo/frm_readme.pas
@@ -9,6 +9,9 @@ uses
   StdCtrls,LResources;
 
 type
+
+  { TfrmReadme }
+
   TfrmReadme = class(TForm)
     Memo1: TMemo;
     procedure FormActivate(Sender: TObject);
diff --git a/components/onguard/examples/regdemo/reg_main.lfm b/components/onguard/examples/regdemo/reg_main.lfm
index 264704a78..6e88d0c27 100644
--- a/components/onguard/examples/regdemo/reg_main.lfm
+++ b/components/onguard/examples/regdemo/reg_main.lfm
@@ -1,105 +1,143 @@
 object regMain: TregMain
-  ActiveControl = edtSerial
-  BorderStyle = bsDialog
-  Caption = 'Registration Tools'
-  ClientHeight = 261
-  ClientWidth = 300
-  Font.Height = -13
-  Font.Name = 'Arial'
-  OnActivate = FormActivate
-  PixelsPerInch = 96
-  HorzScrollBar.Page = 299
-  VertScrollBar.Page = 260
   Left = 468
   Height = 261
   Top = 153
   Width = 300
+  HorzScrollBar.Page = 299
+  VertScrollBar.Page = 260
+  ActiveControl = edtSerial
+  AutoSize = True
+  BorderStyle = bsDialog
+  Caption = 'Registration Tools'
+  ClientHeight = 261
+  ClientWidth = 300
+  OnActivate = FormActivate
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Side = asrBottom
+    Left = 10
+    Height = 15
+    Top = 67
+    Width = 204
+    BorderSpacing.Left = 10
     Caption = 'Enter your serial number from your CD'
     Color = clNone
     ParentColor = False
-    Left = 10
-    Height = 14
-    Top = 67
-    Width = 186
   end
   object Label2: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = edtSerial
+    AnchorSideTop.Side = asrBottom
+    Left = 10
+    Height = 15
+    Top = 115
+    Width = 96
+    BorderSpacing.Left = 10
+    BorderSpacing.Top = 8
     Caption = 'Machine Identifier'
     Color = clNone
     ParentColor = False
-    Left = 10
-    Height = 14
-    Top = 115
-    Width = 87
   end
   object Label3: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = edtMachine
+    AnchorSideTop.Side = asrBottom
+    Left = 10
+    Height = 15
+    Top = 163
+    Width = 229
+    BorderSpacing.Left = 10
+    BorderSpacing.Top = 8
     Caption = 'Enter the release code you were given by us'
     Color = clNone
     ParentColor = False
-    Left = 10
-    Height = 14
-    Top = 163
-    Width = 216
   end
   object edtSerial: TEdit
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 10
+    Height = 23
+    Top = 84
+    Width = 268
+    BorderSpacing.Left = 10
+    BorderSpacing.Top = 2
+    BorderSpacing.Right = 10
     MaxLength = 10
-    TabOrder = 1
-    Left = 10
-    Height = 24
-    Top = 83
-    Width = 268
-  end
-  object Memo1: TMemo
-    Color = clBtnFace
-    Lines.Strings = (
-      'Thank you for registering HelloWorld.  To '
-      'complete your registration, please contact us '
-      'at (800) 555-1212.'
-    )
-    OnEnter = Memo1Enter
-    ReadOnly = True
     TabOrder = 0
-    TabStop = False
-    Left = 10
-    Height = 49
-    Top = 8
-    Width = 268
   end
   object edtMachine: TEdit
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Label2
+    AnchorSideTop.Side = asrBottom
+    Left = 10
+    Height = 23
+    Top = 132
+    Width = 268
+    BorderSpacing.Left = 10
+    BorderSpacing.Top = 2
     ReadOnly = True
     TabStop = False
-    TabOrder = 2
-    Left = 10
-    Height = 24
-    Top = 131
-    Width = 268
+    TabOrder = 1
   end
   object edtRelease: TEdit
-    MaxLength = 19
-    TabOrder = 3
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Label3
+    AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 24
-    Top = 179
+    Height = 23
+    Top = 180
     Width = 268
+    BorderSpacing.Left = 10
+    BorderSpacing.Top = 2
+    MaxLength = 19
+    TabOrder = 2
   end
   object btnSave: TButton
-    BorderSpacing.InnerBorder = 4
-    Caption = 'Save'
-    OnClick = btnSaveClick
-    TabOrder = 4
+    AnchorSideTop.Control = btnReadme
+    AnchorSideRight.Control = edtRelease
+    AnchorSideRight.Side = asrBottom
     Left = 203
     Height = 25
     Top = 215
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Bottom = 10
+    BorderSpacing.InnerBorder = 4
+    Caption = 'Save'
+    OnClick = btnSaveClick
+    TabOrder = 3
   end
   object btnReadme: TButton
-    BorderSpacing.InnerBorder = 4
-    Caption = 'Readme...'
-    OnClick = btnReadmeClick
-    TabOrder = 5
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = edtRelease
+    AnchorSideTop.Side = asrBottom
     Left = 10
     Height = 25
     Top = 215
     Width = 75
+    BorderSpacing.Left = 10
+    BorderSpacing.Top = 12
+    BorderSpacing.InnerBorder = 4
+    Caption = 'Readme...'
+    OnClick = btnReadmeClick
+    TabOrder = 4
+  end
+  object Memo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = edtSerial
+    AnchorSideRight.Side = asrBottom
+    Left = 10
+    Height = 45
+    Top = 10
+    Width = 258
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 10
+    Caption = 'Thank you for registering HelloWorld.  To complete your registration, please contact us at (800) 555-1212.'
+    Color = clBtnFace
+    ParentColor = False
+    WordWrap = True
   end
 end
diff --git a/components/onguard/examples/regdemo/reg_main.lrs b/components/onguard/examples/regdemo/reg_main.lrs
index 8fae77d97..67f001626 100644
--- a/components/onguard/examples/regdemo/reg_main.lrs
+++ b/components/onguard/examples/regdemo/reg_main.lrs
@@ -1,28 +1,50 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TregMain','FORMDATA',[
-  'TPF0'#8'TregMain'#7'regMain'#13'ActiveControl'#7#9'edtSerial'#11'BorderStyle'
-  +#7#8'bsDialog'#7'Caption'#6#18'Registration Tools'#12'ClientHeight'#3#5#1#11
-  +'ClientWidth'#3','#1#11'Font.Height'#2#243#9'Font.Name'#6#5'Arial'#10'OnActi'
-  +'vate'#7#12'FormActivate'#13'PixelsPerInch'#2'`'#18'HorzScrollBar.Page'#3'+'
-  +#1#18'VertScrollBar.Page'#3#4#1#4'Left'#3#212#1#6'Height'#3#5#1#3'Top'#3#153
-  +#0#5'Width'#3','#1#0#6'TLabel'#6'Label1'#7'Caption'#6'%Enter your serial num'
-  +'ber from your CD'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#10#6'Hei'
-  +'ght'#2#14#3'Top'#2'C'#5'Width'#3#186#0#0#0#6'TLabel'#6'Label2'#7'Caption'#6
-  +#18'Machine Identifier'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#10#6
-  +'Height'#2#14#3'Top'#2's'#5'Width'#2'W'#0#0#6'TLabel'#6'Label3'#7'Caption'#6
-  +'+Enter the release code you were given by us'#5'Color'#7#6'clNone'#11'Paren'
-  +'tColor'#8#4'Left'#2#10#6'Height'#2#14#3'Top'#3#163#0#5'Width'#3#216#0#0#0#5
-  +'TEdit'#9'edtSerial'#9'MaxLength'#2#10#8'TabOrder'#2#1#4'Left'#2#10#6'Height'
-  +#2#24#3'Top'#2'S'#5'Width'#3#12#1#0#0#5'TMemo'#5'Memo1'#5'Color'#7#9'clBtnFa'
-  +'ce'#13'Lines.Strings'#1#6'*Thank you for registering HelloWorld.  To '#6'.c'
-  +'omplete your registration, please contact us '#6#18'at (800) 555-1212.'#0#7
-  +'OnEnter'#7#10'Memo1Enter'#8'ReadOnly'#9#8'TabOrder'#2#0#7'TabStop'#8#4'Left'
-  +#2#10#6'Height'#2'1'#3'Top'#2#8#5'Width'#3#12#1#0#0#5'TEdit'#10'edtMachine'#8
-  +'ReadOnly'#9#7'TabStop'#8#8'TabOrder'#2#2#4'Left'#2#10#6'Height'#2#24#3'Top'
-  +#3#131#0#5'Width'#3#12#1#0#0#5'TEdit'#10'edtRelease'#9'MaxLength'#2#19#8'Tab'
-  +'Order'#2#3#4'Left'#2#10#6'Height'#2#24#3'Top'#3#179#0#5'Width'#3#12#1#0#0#7
-  +'TButton'#7'btnSave'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Save'#7
-  +'OnClick'#7#12'btnSaveClick'#8'TabOrder'#2#4#4'Left'#3#203#0#6'Height'#2#25#3
-  +'Top'#3#215#0#5'Width'#2'K'#0#0#7'TButton'#9'btnReadme'#25'BorderSpacing.Inn'
-  +'erBorder'#2#4#7'Caption'#6#9'Readme...'#7'OnClick'#7#14'btnReadmeClick'#8'T'
-  +'abOrder'#2#5#4'Left'#2#10#6'Height'#2#25#3'Top'#3#215#0#5'Width'#2'K'#0#0#0
+  'TPF0'#8'TregMain'#7'regMain'#4'Left'#3#212#1#6'Height'#3#5#1#3'Top'#3#153#0#5
+  +'Width'#3','#1#18'HorzScrollBar.Page'#3'+'#1#18'VertScrollBar.Page'#3#4#1#13
+  +'ActiveControl'#7#9'edtSerial'#8'AutoSize'#9#11'BorderStyle'#7#8'bsDialog'#7
+  +'Caption'#6#18'Registration Tools'#12'ClientHeight'#3#5#1#11'ClientWidth'#3
+  +','#1#10'OnActivate'#7#12'FormActivate'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLab'
+  +'el'#6'Label1'#22'AnchorSideLeft.Control'#7#5'Owner'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#10#6'Height'#2#15#3'Top'#2'C'#5'Width'#3#204#0#18'Bo'
+  +'rderSpacing.Left'#2#10#7'Caption'#6'%Enter your serial number from your CD'
+  +#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#22'AnchorSid'
+  +'eLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'edtSerial'#18'Ancho'
+  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2#10#6'Height'#2#15#3'Top'#2's'#5'Wid'
+  +'th'#2'`'#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#8#7'Caption'#6
+  +#18'Machine Identifier'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'
+  +#6'Label3'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#10'edtMachine'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#10#6'Height'
+  +#2#15#3'Top'#3#163#0#5'Width'#3#229#0#18'BorderSpacing.Left'#2#10#17'BorderS'
+  +'pacing.Top'#2#8#7'Caption'#6'+Enter the release code you were given by us'#5
+  +'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#9'edtSerial'#22'AnchorSid'
+  +'eLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#4'Left'#2#10#6'Height'#2#23#3'Top'#2'T'#5'Width'
+  +#3#12#1#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#2#19'BorderSpaci'
+  +'ng.Right'#2#10#9'MaxLength'#2#10#8'TabOrder'#2#0#0#0#5'TEdit'#10'edtMachine'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#6'Label2'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#10#6'Height'#2#23#3'Top'#3
+  +#132#0#5'Width'#3#12#1#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#2
+  +#8'ReadOnly'#9#7'TabStop'#8#8'TabOrder'#2#1#0#0#5'TEdit'#10'edtRelease'#22'A'
+  +'nchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#6'Label3'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#10#6'Height'#2#23#3'Top'#3#180
+  +#0#5'Width'#3#12#1#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#2#9'M'
+  +'axLength'#2#19#8'TabOrder'#2#2#0#0#7'TButton'#7'btnSave'#21'AnchorSideTop.C'
+  +'ontrol'#7#9'btnReadme'#23'AnchorSideRight.Control'#7#10'edtRelease'#20'Anch'
+  +'orSideRight.Side'#7#9'asrBottom'#4'Left'#3#203#0#6'Height'#2#25#3'Top'#3#215
+  +#0#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Bottom'
+  +#2#10#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Save'#7'OnClick'#7#12
+  +'btnSaveClick'#8'TabOrder'#2#3#0#0#7'TButton'#9'btnReadme'#22'AnchorSideLeft'
+  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#10'edtRelease'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#4'Left'#2#10#6'Height'#2#25#3'Top'#3#215#0#5'Wid'
+  +'th'#2'K'#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#12#25'BorderSp'
+  +'acing.InnerBorder'#2#4#7'Caption'#6#9'Readme...'#7'OnClick'#7#14'btnReadmeC'
+  +'lick'#8'TabOrder'#2#4#0#0#6'TLabel'#5'Memo1'#22'AnchorSideLeft.Control'#7#5
+  +'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#9
+  +'edtSerial'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#10#6'Height'#2
+  +'-'#3'Top'#2#10#5'Width'#3#2#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#20'BorderSpacing.Around'#2#10#7'Caption'#6'jThank you for registering Hello'
+  +'World.  To complete your registration, please contact us at (800) 555-1212.'
+  +#5'Color'#7#9'clBtnFace'#11'ParentColor'#8#8'WordWrap'#9#0#0#0
 ]);
diff --git a/components/onguard/examples/regdemo/reg_main.pas b/components/onguard/examples/regdemo/reg_main.pas
index 84237d5d1..e9d59002f 100644
--- a/components/onguard/examples/regdemo/reg_main.pas
+++ b/components/onguard/examples/regdemo/reg_main.pas
@@ -15,13 +15,13 @@ type
   TregMain = class(TForm)
     Label1: TLabel;
     edtSerial: TEdit;
-    Memo1: TMemo;
     Label2: TLabel;
     edtMachine: TEdit;
     Label3: TLabel;
     edtRelease: TEdit;
     btnSave: TButton;
     btnReadme: TButton;
+    Memo1: TLabel;
     procedure Memo1Enter(Sender: TObject);
     procedure FormActivate(Sender: TObject);
     procedure btnSaveClick(Sender: TObject);
@@ -57,9 +57,8 @@ var
   SerialNum : longint;
 begin
   // Validate the serial number
-  try
-    SerialNum := StrToInt(edtSerial.Text);
-  except
+  if not TryStrToInt(edtSerial.Text, SerialNum) then
+  begin
     MessageDlg('Invalid Serial Number.  Please check your entry and try again.', mtError, [mbOK], 0);
     edtSerial.SetFocus;
     edtSerial.SelectAll;
diff --git a/components/onguard/examples/regdemo/registration.lpi b/components/onguard/examples/regdemo/registration.lpi
index eba38993e..132c62a87 100644
--- a/components/onguard/examples/regdemo/registration.lpi
+++ b/components/onguard/examples/regdemo/registration.lpi
@@ -1,42 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="12"/>
     <General>
       <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
         <PackageName Value="tponguard"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="5">
       <Unit0>
         <Filename Value="registration.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="48" Y="19"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
+        <UnitName Value="Registration"/>
+        <EditorIndex Value="2"/>
+        <CursorPos X="48" Y="21"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="reg_main.pas"/>
@@ -44,20 +57,22 @@
         <ComponentName Value="regMain"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="reg_main"/>
-        <CursorPos X="26" Y="77"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
         <TopLine Value="51"/>
-        <EditorIndex Value="2"/>
+        <CursorPos X="42" Y="62"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="uni_regcommon.pas"/>
+        <IsPartOfProject Value="True"/>
         <UnitName Value="uni_RegCommon"/>
-        <CursorPos X="11" Y="17"/>
+        <EditorIndex Value="3"/>
         <TopLine Value="17"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <CursorPos X="45" Y="29"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
@@ -67,32 +82,49 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="frm_Readme"/>
-        <CursorPos X="12" Y="6"/>
-        <TopLine Value="3"/>
+        <TopLine Value="4"/>
+        <CursorPos X="30" Y="17"/>
         <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="reg_main.lfm"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="21" Y="10"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="3"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-        <SyntaxHighlighter Value="LFM"/>
+        <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit4>
     </Units>
-    <JumpHistory Count="1" HistoryIndex="0">
+    <JumpHistory Count="5" HistoryIndex="4">
       <Position1>
         <Filename Value="reg_main.pas"/>
         <Caret Line="77" Column="26" TopLine="63"/>
       </Position1>
+      <Position2>
+        <Filename Value="frm_readme.pas"/>
+        <Caret Line="6" Column="12"/>
+      </Position2>
+      <Position3>
+        <Filename Value="frm_readme.pas"/>
+        <Caret Line="17" Column="30" TopLine="4"/>
+      </Position3>
+      <Position4>
+        <Filename Value="reg_main.pas"/>
+        <Caret Line="62" Column="42" TopLine="51"/>
+      </Position4>
+      <Position5>
+        <Filename Value="reg_main.pas"/>
+        <Caret Line="61" Column="42" TopLine="50"/>
+      </Position5>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -105,7 +137,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -113,9 +145,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/regdemo/registration.lpr b/components/onguard/examples/regdemo/registration.lpr
index 3d59eed76..f76699122 100644
--- a/components/onguard/examples/regdemo/registration.lpr
+++ b/components/onguard/examples/regdemo/registration.lpr
@@ -11,6 +11,8 @@ uses
 
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TregMain, regMain);
diff --git a/components/onguard/examples/stampexe/stampex1.lfm b/components/onguard/examples/stampexe/stampex1.lfm
index 4b20cdbdc..8c87776f6 100644
--- a/components/onguard/examples/stampexe/stampex1.lfm
+++ b/components/onguard/examples/stampexe/stampex1.lfm
@@ -8,88 +8,122 @@ object frmStamp: TfrmStamp
   VertScrollBar.Page = 159
   VertScrollBar.Range = 130
   ActiveControl = FileEd
+  AutoSize = True
   Caption = 'Stamp EXE'
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
-  Font.Pitch = fpVariable
+  ClientHeight = 160
+  ClientWidth = 428
   OnCreate = FormCreate
   ShowHint = True
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
-    Left = 8
-    Height = 13
-    Top = 8
-    Width = 105
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 12
+    Height = 15
+    Top = 12
+    Width = 88
+    BorderSpacing.Left = 12
+    BorderSpacing.Top = 12
     Caption = '&EXE file to stamp'
     Color = clNone
     FocusControl = FileEd
     ParentColor = False
   end
   object StatusLbl: TLabel
-    Left = 8
-    Height = 13
-    Top = 112
-    Width = 35
+    AnchorSideLeft.Control = Label1
+    AnchorSideTop.Control = CloseBtn
+    AnchorSideTop.Side = asrCenter
+    Left = 12
+    Height = 15
+    Top = 108
+    Width = 32
     Caption = 'Status'
     Color = clNone
     ParentColor = False
   end
   object FileEd: TEdit
-    Left = 8
-    Height = 26
+    AnchorSideLeft.Control = Label1
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 12
+    Height = 23
     Hint = 'Enter EXE file name'
-    Top = 32
+    Top = 31
     Width = 305
+    BorderSpacing.Top = 4
     OnChange = FileEdChange
     TabOrder = 0
   end
   object BrowseBtn: TBitBtn
-    Left = 320
+    AnchorSideLeft.Control = FileEd
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = FileEd
+    AnchorSideTop.Side = asrCenter
+    Left = 317
     Height = 25
     Hint = 'Search for EXE file'
-    Top = 29
-    Width = 89
+    Top = 30
+    Width = 64
+    AutoSize = True
+    BorderSpacing.Right = 12
     Caption = '&Browse'
-    NumGlyphs = 0
     OnClick = BrowseBtnClick
     TabOrder = 1
   end
   object StampBtn: TBitBtn
-    Left = 8
+    AnchorSideLeft.Control = Label1
+    AnchorSideTop.Control = FileEd
+    AnchorSideTop.Side = asrBottom
+    Left = 12
     Height = 25
     Hint = 'Stamp EXE wiht signature record'
-    Top = 72
+    Top = 66
     Width = 89
+    BorderSpacing.Top = 12
     Caption = '&Stamp'
-    NumGlyphs = 0
     OnClick = StampBtnClick
     TabOrder = 2
   end
   object CloseBtn: TBitBtn
-    Left = 320
+    AnchorSideLeft.Control = BrowseBtn
+    AnchorSideTop.Control = StampBtn
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = BrowseBtn
+    AnchorSideRight.Side = asrBottom
+    Left = 317
     Height = 25
-    Top = 104
-    Width = 89
+    Top = 103
+    Width = 64
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 12
+    BorderSpacing.Bottom = 12
     Kind = bkClose
-    NumGlyphs = 0
     TabOrder = 3
   end
   object ClearBtn: TBitBtn
-    Left = 104
+    AnchorSideLeft.Control = StampBtn
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = StampBtn
+    Left = 107
     Height = 25
     Hint = 'Reset EXE''s stamped signature'
-    Top = 72
+    Top = 66
     Width = 89
+    BorderSpacing.Left = 6
     Caption = '&Clear'
-    NumGlyphs = 0
     OnClick = ClearBtnClick
     TabOrder = 4
   end
   object EraseMarkerCb: TCheckBox
-    Left = 184
-    Height = 22
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrCenter
+    Left = 172
+    Height = 19
     Hint = 'Erase marker used to locate signature record'
-    Width = 108
+    Top = 10
+    Width = 85
     Caption = 'Erase &Marker'
     TabOrder = 5
   end
@@ -99,6 +133,7 @@ object frmStamp: TfrmStamp
     Filter = 'EXE files (*.exe)|*.exe|All files (*.*)|*.*|Linux executable|*'
     FilterIndex = 0
     Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist]
-    left = 133
+    Left = 128
+    Top = 8
   end
 end
diff --git a/components/onguard/examples/stampexe/stampex1.lrs b/components/onguard/examples/stampexe/stampex1.lrs
index 4e9bd5380..8486d68df 100644
--- a/components/onguard/examples/stampexe/stampex1.lrs
+++ b/components/onguard/examples/stampexe/stampex1.lrs
@@ -1,33 +1,50 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TfrmStamp','FORMDATA',[
   'TPF0'#9'TfrmStamp'#8'frmStamp'#4'Left'#3#26#1#6'Height'#3#160#0#3'Top'#3#192
   +#0#5'Width'#3#172#1#18'HorzScrollBar.Page'#3#171#1#19'HorzScrollBar.Range'#3
   +#153#1#18'VertScrollBar.Page'#3#159#0#19'VertScrollBar.Range'#3#130#0#13'Act'
-  +'iveControl'#7#6'FileEd'#7'Caption'#6#9'Stamp EXE'#10'Font.Color'#7#6'clText'
-  +#11'Font.Height'#2#11#9'Font.Name'#6#13'MS Sans Serif'#10'Font.Pitch'#7#10'f'
-  +'pVariable'#8'OnCreate'#7#10'FormCreate'#8'ShowHint'#9#0#6'TLabel'#6'Label1'
-  +#4'Left'#2#8#6'Height'#2#13#3'Top'#2#8#5'Width'#2'i'#7'Caption'#6#18'&EXE fi'
-  +'le to stamp'#5'Color'#7#6'clNone'#12'FocusControl'#7#6'FileEd'#11'ParentCol'
-  +'or'#8#0#0#6'TLabel'#9'StatusLbl'#4'Left'#2#8#6'Height'#2#13#3'Top'#2'p'#5'W'
-  +'idth'#2'#'#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0
-  +#5'TEdit'#6'FileEd'#4'Left'#2#8#6'Height'#2#26#4'Hint'#6#19'Enter EXE file n'
-  +'ame'#3'Top'#2' '#5'Width'#3'1'#1#8'OnChange'#7#12'FileEdChange'#8'TabOrder'
-  +#2#0#0#0#7'TBitBtn'#9'BrowseBtn'#4'Left'#3'@'#1#6'Height'#2#25#4'Hint'#6#19
-  +'Search for EXE file'#3'Top'#2#29#5'Width'#2'Y'#7'Caption'#6#7'&Browse'#9'Nu'
-  +'mGlyphs'#2#0#7'OnClick'#7#14'BrowseBtnClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'
-  +#8'StampBtn'#4'Left'#2#8#6'Height'#2#25#4'Hint'#6#31'Stamp EXE wiht signatur'
-  +'e record'#3'Top'#2'H'#5'Width'#2'Y'#7'Caption'#6#6'&Stamp'#9'NumGlyphs'#2#0
-  +#7'OnClick'#7#13'StampBtnClick'#8'TabOrder'#2#2#0#0#7'TBitBtn'#8'CloseBtn'#4
-  +'Left'#3'@'#1#6'Height'#2#25#3'Top'#2'h'#5'Width'#2'Y'#4'Kind'#7#7'bkClose'#9
-  +'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#7'TBitBtn'#8'ClearBtn'#4'Left'#2'h'#6'He'
-  +'ight'#2#25#4'Hint'#6#29'Reset EXE''s stamped signature'#3'Top'#2'H'#5'Width'
-  +#2'Y'#7'Caption'#6#6'&Clear'#9'NumGlyphs'#2#0#7'OnClick'#7#13'ClearBtnClick'
-  +#8'TabOrder'#2#4#0#0#9'TCheckBox'#13'EraseMarkerCb'#4'Left'#3#184#0#6'Height'
-  +#2#22#4'Hint'#6',Erase marker used to locate signature record'#5'Width'#2'l'
-  +#7'Caption'#6#13'Erase &Marker'#8'TabOrder'#2#5#0#0#11'TOpenDialog'#11'OpenD'
-  +'ialog1'#5'Title'#6#24'Select EXE File to Stamp'#10'DefaultExt'#6#4'.exe'#6
-  +'Filter'#6'>EXE files (*.exe)|*.exe|All files (*.*)|*.*|Linux executable|*'
-  +#11'FilterIndex'#2#0#7'Options'#11#14'ofHideReadOnly'#15'ofPathMustExist'#15
-  +'ofFileMustExist'#0#4'left'#3#133#0#0#0#0
+  +'iveControl'#7#6'FileEd'#8'AutoSize'#9#7'Caption'#6#9'Stamp EXE'#12'ClientHe'
+  +'ight'#3#160#0#11'ClientWidth'#3#172#1#8'OnCreate'#7#10'FormCreate'#8'ShowHi'
+  +'nt'#9#10'LCLVersion'#6#7'2.3.0.0'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#12#6'Heig'
+  +'ht'#2#15#3'Top'#2#12#5'Width'#2'X'#18'BorderSpacing.Left'#2#12#17'BorderSpa'
+  +'cing.Top'#2#12#7'Caption'#6#18'&EXE file to stamp'#5'Color'#7#6'clNone'#12
+  +'FocusControl'#7#6'FileEd'#11'ParentColor'#8#0#0#6'TLabel'#9'StatusLbl'#22'A'
+  +'nchorSideLeft.Control'#7#6'Label1'#21'AnchorSideTop.Control'#7#8'CloseBtn'
+  +#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#12#6'Height'#2#15#3'Top'#2
+  +'l'#5'Width'#2' '#7'Caption'#6#6'Status'#5'Color'#7#6'clNone'#11'ParentColor'
+  +#8#0#0#5'TEdit'#6'FileEd'#22'AnchorSideLeft.Control'#7#6'Label1'#21'AnchorSi'
+  +'deTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#12#6'Height'#2#23#4'Hint'#6#19'Enter EXE file name'#3'Top'#2#31#5'Width'#3
+  +'1'#1#17'BorderSpacing.Top'#2#4#8'OnChange'#7#12'FileEdChange'#8'TabOrder'#2
+  +#0#0#0#7'TBitBtn'#9'BrowseBtn'#22'AnchorSideLeft.Control'#7#6'FileEd'#19'Anc'
+  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#6'FileEd'#18'A'
+  +'nchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'='#1#6'Height'#2#25#4'Hint'#6#19
+  +'Search for EXE file'#3'Top'#2#30#5'Width'#2'@'#8'AutoSize'#9#19'BorderSpaci'
+  +'ng.Right'#2#12#7'Caption'#6#7'&Browse'#7'OnClick'#7#14'BrowseBtnClick'#8'Ta'
+  +'bOrder'#2#1#0#0#7'TBitBtn'#8'StampBtn'#22'AnchorSideLeft.Control'#7#6'Label'
+  +'1'#21'AnchorSideTop.Control'#7#6'FileEd'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#12#6'Height'#2#25#4'Hint'#6#31'Stamp EXE wiht signature recor'
+  +'d'#3'Top'#2'B'#5'Width'#2'Y'#17'BorderSpacing.Top'#2#12#7'Caption'#6#6'&Sta'
+  +'mp'#7'OnClick'#7#13'StampBtnClick'#8'TabOrder'#2#2#0#0#7'TBitBtn'#8'CloseBt'
+  +'n'#22'AnchorSideLeft.Control'#7#9'BrowseBtn'#21'AnchorSideTop.Control'#7#8
+  +'StampBtn'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
+  +#7#9'BrowseBtn'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'='#1#6'Hei'
+  +'ght'#2#25#3'Top'#2'g'#5'Width'#2'@'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRi'
+  +'ght'#0#17'BorderSpacing.Top'#2#12#20'BorderSpacing.Bottom'#2#12#4'Kind'#7#7
+  +'bkClose'#8'TabOrder'#2#3#0#0#7'TBitBtn'#8'ClearBtn'#22'AnchorSideLeft.Contr'
+  +'ol'#7#8'StampBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.C'
+  +'ontrol'#7#8'StampBtn'#4'Left'#2'k'#6'Height'#2#25#4'Hint'#6#29'Reset EXE''s'
+  +' stamped signature'#3'Top'#2'B'#5'Width'#2'Y'#18'BorderSpacing.Left'#2#6#7
+  +'Caption'#6#6'&Clear'#7'OnClick'#7#13'ClearBtnClick'#8'TabOrder'#2#4#0#0#9'T'
+  +'CheckBox'#13'EraseMarkerCb'#22'AnchorSideLeft.Control'#7#5'Owner'#19'Anchor'
+  +'SideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#6'Label1'#18'Anch'
+  +'orSideTop.Side'#7#9'asrCenter'#4'Left'#3#172#0#6'Height'#2#19#4'Hint'#6',Er'
+  +'ase marker used to locate signature record'#3'Top'#2#10#5'Width'#2'U'#7'Cap'
+  +'tion'#6#13'Erase &Marker'#8'TabOrder'#2#5#0#0#11'TOpenDialog'#11'OpenDialog'
+  +'1'#5'Title'#6#24'Select EXE File to Stamp'#10'DefaultExt'#6#4'.exe'#6'Filte'
+  +'r'#6'>EXE files (*.exe)|*.exe|All files (*.*)|*.*|Linux executable|*'#11'Fi'
+  +'lterIndex'#2#0#7'Options'#11#14'ofHideReadOnly'#15'ofPathMustExist'#15'ofFi'
+  +'leMustExist'#0#4'Left'#3#128#0#3'Top'#2#8#0#0#0
 ]);
diff --git a/components/onguard/examples/stampexe/stampex1.pas b/components/onguard/examples/stampexe/stampex1.pas
index b82ca083d..a7a9fbd8f 100644
--- a/components/onguard/examples/stampexe/stampex1.pas
+++ b/components/onguard/examples/stampexe/stampex1.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   SysUtils, Classes,
-  Controls, Forms, Dialogs, StdCtrls, Buttons,LResources,
+  Controls, Forms, Dialogs, StdCtrls, Buttons, LResources,
   ogproexe;
 
 type
diff --git a/components/onguard/examples/stampexe/stampexe.lpi b/components/onguard/examples/stampexe/stampexe.lpi
index 259860a05..86ddbc620 100644
--- a/components/onguard/examples/stampexe/stampexe.lpi
+++ b/components/onguard/examples/stampexe/stampexe.lpi
@@ -1,29 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <UseXPManifest Value="True"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -35,72 +43,71 @@
       <Unit0>
         <Filename Value="stampexe.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Stampexe"/>
+        <EditorIndex Value="1"/>
         <CursorPos X="51" Y="7"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
         <UsageCount Value="21"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="stampex1.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="frmStamp"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="STAMPEX1"/>
-        <CursorPos X="7" Y="8"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="11"/>
+        <IsVisibleTab Value="True"/>
+        <CursorPos X="36" Y="27"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="stampex1.lrs"/>
         <CursorPos X="17" Y="3"/>
-        <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\source\ogproexe.pas"/>
-        <UnitName Value="ogproexe"/>
-        <CursorPos X="1" Y="633"/>
         <TopLine Value="696"/>
+        <CursorPos Y="633"/>
         <UsageCount Value="11"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\..\source\ONGUARD.INC"/>
-        <CursorPos X="29" Y="80"/>
         <TopLine Value="53"/>
+        <CursorPos X="29" Y="80"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\source\ogutil.pas"/>
-        <UnitName Value="ogutil"/>
-        <CursorPos X="25" Y="935"/>
         <TopLine Value="914"/>
+        <CursorPos X="25" Y="935"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\..\lazarus\lcl\lclintf.pas"/>
         <UnitName Value="LCLIntf"/>
-        <CursorPos X="10" Y="173"/>
         <TopLine Value="164"/>
+        <CursorPos X="10" Y="173"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="..\..\..\lazarus\lcl\include\lclintf.inc"/>
-        <CursorPos X="1" Y="1"/>
         <TopLine Value="324"/>
         <UsageCount Value="10"/>
       </Unit7>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory HistoryIndex="-1"/>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
@@ -113,7 +120,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
+        <DebugInfoType Value="dsDwarf3"/>
       </Debugging>
       <Options>
         <Win32>
@@ -121,9 +128,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="2">
diff --git a/components/onguard/examples/stampexe/stampexe.lpr b/components/onguard/examples/stampexe/stampexe.lpr
index ed88fe882..94a2fc7a6 100644
--- a/components/onguard/examples/stampexe/stampexe.lpr
+++ b/components/onguard/examples/stampexe/stampexe.lpr
@@ -8,6 +8,8 @@ uses
 
 
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.CreateForm(TfrmStamp, frmStamp);
diff --git a/components/onguard/packages/tponguard.lpk b/components/onguard/packages/tponguard.lpk
index b258e3919..f06e923a8 100644
--- a/components/onguard/packages/tponguard.lpk
+++ b/components/onguard/packages/tponguard.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="tponguard"/>
     <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
@@ -24,7 +24,7 @@ Ports :   Andrew Haines (Kylix version), Bogusław Brandys (FPC/Lazarus)"/>
     <License Value="Mozilla Public License 1.1 (MPL 1.1) 
 
 "/>
-    <Version Major="1"/>
+    <Version Major="1" Release="1"/>
     <Files Count="23">
       <Item1>
         <Filename Value="../source/ogfile.pas"/>
@@ -120,6 +120,7 @@ Ports :   Andrew Haines (Kylix version), Bogusław Brandys (FPC/Lazarus)"/>
         <UnitName Value="ogfirst"/>
       </Item23>
     </Files>
+    <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="2">
       <Item1>
         <PackageName Value="LCL"/>
@@ -134,7 +135,6 @@ Ports :   Andrew Haines (Kylix version), Bogusław Brandys (FPC/Lazarus)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>
 </CONFIG>
diff --git a/components/onguard/source/qonguard2.lfm b/components/onguard/source/qonguard2.lfm
index dd287fcac..e9f25b02a 100644
--- a/components/onguard/source/qonguard2.lfm
+++ b/components/onguard/source/qonguard2.lfm
@@ -1,64 +1,80 @@
 object CodeGenerateFrm: TCodeGenerateFrm
   Left = 228
-  Height = 516
+  Height = 513
   Top = 84
   Width = 556
   ActiveControl = OKBtn
+  AutoSize = True
   BorderIcons = [biSystemMenu, biMinimize]
   Caption = 'Code Generation'
-  ClientHeight = 516
+  ClientHeight = 513
   ClientWidth = 556
   Color = clForm
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object OKBtn: TBitBtn
-    Left = 384
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = CancelBtn
+    Left = 383
     Height = 25
-    Top = 472
+    Top = 470
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Top = 16
+    BorderSpacing.Right = 6
     Caption = 'OK'
     ModalResult = 1
-    NumGlyphs = 0
     TabOrder = 0
   end
   object CancelBtn: TBitBtn
+    AnchorSideTop.Control = GroupBox2
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 464
     Height = 25
-    Top = 472
-    Width = 75
+    Top = 470
+    Width = 76
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 16
+    BorderSpacing.Right = 16
+    BorderSpacing.Bottom = 12
     Caption = 'Cancel'
     ModalResult = 2
-    NumGlyphs = 0
     TabOrder = 1
   end
   object CodesNbk: TPageControl
-    Left = 4
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 6
     Height = 130
-    Top = 4
-    Width = 533
+    Top = 6
+    Width = 540
     ActivePage = TabSheet1
+    BorderSpacing.Around = 6
     TabIndex = 0
     TabOrder = 2
     OnChanging = CodesNbkChanging
     object TabSheet1: TTabSheet
       Caption = 'Date'
-      ClientHeight = 104
-      ClientWidth = 525
+      ClientHeight = 102
+      ClientWidth = 532
       object Label9: TLabel
         Left = 4
-        Height = 14
+        Height = 15
         Top = 12
-        Width = 54
+        Width = 53
         Caption = 'Start date:'
         ParentColor = False
       end
       object Label11: TLabel
         Left = 204
-        Height = 14
+        Height = 15
         Top = 12
-        Width = 48
+        Width = 49
         Caption = 'End date:'
         ParentColor = False
       end
@@ -83,28 +99,28 @@ object CodeGenerateFrm: TCodeGenerateFrm
     end
     object TabSheet2: TTabSheet
       Caption = 'Days'
-      ClientHeight = 104
-      ClientWidth = 525
+      ClientHeight = 102
+      ClientWidth = 532
       ImageIndex = 1
       object Label13: TLabel
         Left = 4
-        Height = 13
+        Height = 15
         Top = 12
-        Width = 52
+        Width = 57
         Caption = 'Day count:'
         ParentColor = False
       end
       object Label2: TLabel
         Left = 228
-        Height = 13
+        Height = 15
         Top = 12
-        Width = 37
+        Width = 40
         Caption = 'Expires:'
         ParentColor = False
       end
       object DaysCountEd: TEdit
         Left = 88
-        Height = 21
+        Height = 23
         Top = 8
         Width = 113
         OnChange = ParametersChanged
@@ -114,7 +130,7 @@ object CodeGenerateFrm: TCodeGenerateFrm
       end
       object DaysExpiresEd: TEdit
         Left = 296
-        Height = 21
+        Height = 23
         Top = 8
         Width = 97
         OnChange = ParametersChanged
@@ -124,8 +140,8 @@ object CodeGenerateFrm: TCodeGenerateFrm
     end
     object TabSheet3: TTabSheet
       Caption = 'Reg'
-      ClientHeight = 104
-      ClientWidth = 525
+      ClientHeight = 102
+      ClientWidth = 532
       ImageIndex = 2
       object RegStrCopySb: TSpeedButton
         Left = 490
@@ -133,7 +149,6 @@ object CodeGenerateFrm: TCodeGenerateFrm
         Hint = 'Copy to clipboard'
         Top = 7
         Width = 23
-        Color = clBtnFace
         Glyph.Data = {
           42010000424D4201000000000000760000002800000011000000110000000100
           040000000000CC00000000000000000000000000000000000000000000000000
@@ -147,20 +162,19 @@ object CodeGenerateFrm: TCodeGenerateFrm
           0000800000088888888880000000888888888888888880000000888888888888
           888880000000
         }
-        NumGlyphs = 0
         OnClick = RegStrCopySbClick
       end
       object Label6: TLabel
         Left = 8
-        Height = 14
+        Height = 15
         Top = 12
-        Width = 33
+        Width = 34
         Caption = 'String:'
         ParentColor = False
       end
       object Label4: TLabel
         Left = 292
-        Height = 14
+        Height = 15
         Top = 48
         Width = 40
         Caption = 'Expires:'
@@ -195,20 +209,20 @@ object CodeGenerateFrm: TCodeGenerateFrm
     end
     object TabSheet4: TTabSheet
       Caption = 'S/N'
-      ClientHeight = 104
-      ClientWidth = 525
+      ClientHeight = 102
+      ClientWidth = 532
       ImageIndex = 3
       object Label7: TLabel
         Left = 8
-        Height = 14
+        Height = 15
         Top = 12
-        Width = 71
+        Width = 78
         Caption = '&Serial Number:'
         ParentColor = False
       end
       object Label15: TLabel
         Left = 268
-        Height = 14
+        Height = 15
         Top = 12
         Width = 40
         Caption = 'Expires:'
@@ -246,28 +260,28 @@ object CodeGenerateFrm: TCodeGenerateFrm
     end
     object TabSheet5: TTabSheet
       Caption = 'Usage'
-      ClientHeight = 104
-      ClientWidth = 525
+      ClientHeight = 102
+      ClientWidth = 532
       ImageIndex = 4
       object Label14: TLabel
         Left = 4
-        Height = 13
+        Height = 15
         Top = 12
-        Width = 64
+        Width = 69
         Caption = 'Usage count:'
         ParentColor = False
       end
       object Label17: TLabel
         Left = 268
-        Height = 13
+        Height = 15
         Top = 12
-        Width = 37
+        Width = 40
         Caption = 'Expires:'
         ParentColor = False
       end
       object UsageCountEd: TEdit
         Left = 108
-        Height = 21
+        Height = 23
         Top = 8
         Width = 113
         OnChange = ParametersChanged
@@ -277,7 +291,7 @@ object CodeGenerateFrm: TCodeGenerateFrm
       end
       object UsageExpiresEd: TEdit
         Left = 336
-        Height = 21
+        Height = 23
         Top = 8
         Width = 97
         OnChange = ParametersChanged
@@ -287,20 +301,20 @@ object CodeGenerateFrm: TCodeGenerateFrm
     end
     object TabSheet6: TTabSheet
       Caption = 'Network'
-      ClientHeight = 104
-      ClientWidth = 525
+      ClientHeight = 102
+      ClientWidth = 532
       ImageIndex = 5
       object Label10: TLabel
         Left = 4
-        Height = 13
+        Height = 15
         Top = 12
-        Width = 64
+        Width = 67
         Caption = 'Access Slots:'
         ParentColor = False
       end
       object NetworkSlotsEd: TEdit
         Left = 116
-        Height = 21
+        Height = 23
         Top = 8
         Width = 113
         OnChange = ParametersChanged
@@ -311,28 +325,28 @@ object CodeGenerateFrm: TCodeGenerateFrm
     end
     object TabSheet7: TTabSheet
       Caption = 'Special'
-      ClientHeight = 104
-      ClientWidth = 525
+      ClientHeight = 102
+      ClientWidth = 532
       ImageIndex = 6
       object Label12: TLabel
         Left = 4
-        Height = 13
+        Height = 15
         Top = 12
-        Width = 62
+        Width = 66
         Caption = 'Special data:'
         ParentColor = False
       end
       object Label19: TLabel
         Left = 252
-        Height = 13
+        Height = 15
         Top = 12
-        Width = 37
+        Width = 40
         Caption = 'Expires:'
         ParentColor = False
       end
       object SpecialDataEd: TEdit
         Left = 104
-        Height = 21
+        Height = 23
         Top = 8
         Width = 129
         OnChange = ParametersChanged
@@ -342,7 +356,7 @@ object CodeGenerateFrm: TCodeGenerateFrm
       end
       object SpecialExpiresEd: TEdit
         Left = 320
-        Height = 21
+        Height = 23
         Top = 8
         Width = 105
         OnChange = ParametersChanged
@@ -352,23 +366,35 @@ object CodeGenerateFrm: TCodeGenerateFrm
     end
   end
   object GroupBox1: TGroupBox
-    Left = 4
-    Height = 248
-    Top = 136
+    AnchorSideLeft.Control = CodesNbk
+    AnchorSideTop.Control = CodesNbk
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = CodesNbk
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 239
+    Top = 142
     Width = 540
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
     Caption = '&Key used to encode'
-    ClientHeight = 230
+    ClientHeight = 219
     ClientWidth = 536
     Color = clBtnFace
+    ParentBackground = False
     ParentColor = False
     TabOrder = 3
     object GenerateKeySb: TSpeedButton
+      AnchorSideTop.Control = BlockKeyEd
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = ModStringEd
+      AnchorSideRight.Side = asrBottom
       Left = 498
       Height = 23
       Hint = 'Generate key'
-      Top = 195
+      Top = 180
       Width = 23
-      Color = clBtnFace
+      Anchors = [akTop, akRight]
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -382,30 +408,42 @@ object CodeGenerateFrm: TCodeGenerateFrm
         0000888888888888888880000000888888888888888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = GenerateKeySbClick
     end
     object Label1: TLabel
-      Left = 8
-      Height = 14
-      Top = 115
-      Width = 43
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = ModStringEd
+      AnchorSideTop.Side = asrBottom
+      Left = 16
+      Height = 15
+      Top = 111
+      Width = 48
+      BorderSpacing.Left = 16
+      BorderSpacing.Top = 16
       Caption = 'Modifier:'
       ParentColor = False
     end
     object Label5: TLabel
-      Left = 12
-      Height = 14
-      Top = 172
-      Width = 23
+      AnchorSideLeft.Control = Label1
+      AnchorSideTop.Control = ModifierEd
+      AnchorSideTop.Side = asrBottom
+      Left = 16
+      Height = 15
+      Top = 163
+      Width = 22
+      BorderSpacing.Top = 12
       Caption = 'Key:'
       ParentColor = False
     end
     object NoModifierCb: TCheckBox
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = GroupBox1
       Left = 16
-      Height = 17
-      Top = 24
-      Width = 72
+      Height = 19
+      Top = 6
+      Width = 82
+      BorderSpacing.Left = 16
+      BorderSpacing.Top = 6
       Caption = 'No modifier'
       Checked = True
       OnClick = ModifierClick
@@ -413,92 +451,145 @@ object CodeGenerateFrm: TCodeGenerateFrm
       TabOrder = 0
     end
     object MachineModifierCb: TCheckBox
-      Left = 176
-      Height = 17
-      Top = 24
-      Width = 98
+      AnchorSideLeft.Control = NoModifierCb
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = NoModifierCb
+      Left = 146
+      Height = 19
+      Top = 6
+      Width = 112
+      BorderSpacing.Left = 48
       Caption = 'Machine modifier'
       OnClick = ModifierClick
       TabOrder = 1
     end
     object UniqueModifierCb: TCheckBox
-      Left = 360
-      Height = 17
-      Top = 24
-      Width = 92
+      AnchorSideLeft.Control = MachineModifierCb
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = NoModifierCb
+      Left = 306
+      Height = 19
+      Top = 6
+      Width = 104
+      BorderSpacing.Left = 48
       Caption = 'Unique modifier'
       OnClick = ModifierClick
       TabOrder = 2
     end
     object DateModifierCb: TCheckBox
+      AnchorSideLeft.Control = NoModifierCb
+      AnchorSideTop.Control = ModDateEd
+      AnchorSideTop.Side = asrCenter
       Left = 16
-      Height = 17
-      Top = 56
-      Width = 82
+      Height = 19
+      Top = 39
+      Width = 90
       Caption = 'Date modifier'
       OnClick = ModifierClick
       TabOrder = 3
     end
     object StringModifierCb: TCheckBox
+      AnchorSideLeft.Control = NoModifierCb
+      AnchorSideTop.Control = ModStringEd
+      AnchorSideTop.Side = asrCenter
       Left = 16
-      Height = 17
-      Top = 88
-      Width = 87
+      Height = 19
+      Top = 74
+      Width = 97
       Caption = 'String Modifier'
       OnClick = ModifierClick
       TabOrder = 4
     end
     object ModDateEd: TEdit
-      Left = 159
+      AnchorSideLeft.Control = MachineModifierCb
+      AnchorSideTop.Control = MachineModifierCb
+      AnchorSideTop.Side = asrBottom
+      Left = 146
       Height = 23
-      Top = 53
+      Top = 37
       Width = 98
+      BorderSpacing.Top = 12
       OnChange = ModifierClick
       OnKeyPress = DateEdKeyPress
       TabOrder = 6
     end
     object ModStringEd: TEdit
-      Left = 160
+      AnchorSideLeft.Control = ModDateEd
+      AnchorSideTop.Control = ModDateEd
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      Left = 146
       Height = 23
-      Top = 85
-      Width = 361
+      Top = 72
+      Width = 375
+      Anchors = [akTop, akLeft, akRight]
+      AutoSize = False
+      BorderSpacing.Top = 12
+      BorderSpacing.Right = 15
       OnChange = ModifierClick
       TabOrder = 8
     end
     object ModifierEd: TEdit
-      Left = 8
+      AnchorSideLeft.Control = Label1
+      AnchorSideTop.Control = Label1
+      AnchorSideTop.Side = asrBottom
+      Left = 16
       Height = 23
-      Top = 140
+      Top = 128
       Width = 169
+      BorderSpacing.Top = 2
       OnChange = ParametersChanged
       OnKeyPress = ModifierEdKeyPress
       TabOrder = 5
     end
     object BlockKeyEd: TEdit
-      Left = 8
+      AnchorSideLeft.Control = Label1
+      AnchorSideTop.Control = Label5
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = GenerateKeySb
+      Left = 16
       Height = 23
-      Top = 196
-      Width = 481
+      Top = 180
+      Width = 478
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 2
+      BorderSpacing.Right = 4
+      BorderSpacing.Bottom = 16
       OnChange = InfoChanged
       TabOrder = 7
     end
   end
   object GroupBox2: TGroupBox
-    Left = 8
-    Height = 69
-    Top = 384
-    Width = 536
+    AnchorSideLeft.Control = GroupBox1
+    AnchorSideTop.Control = GroupBox1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = GroupBox1
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 67
+    Top = 387
+    Width = 540
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Top = 6
     Caption = 'Generate Code'
-    ClientHeight = 51
-    ClientWidth = 532
+    ClientHeight = 47
+    ClientWidth = 536
+    ParentBackground = False
     TabOrder = 4
     object RegCodeCopySb: TSpeedButton
-      Left = 502
+      AnchorSideTop.Control = GenerateBtn
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 497
       Height = 23
       Hint = 'Copy code to clipboard'
-      Top = 25
+      Top = 7
       Width = 23
-      Color = clBtnFace
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 16
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -512,15 +603,19 @@ object CodeGenerateFrm: TCodeGenerateFrm
         0000800000088888888880000000888888888888888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = RegCodeCopySbClick
     end
     object GenerateBtn: TButton
+      AnchorSideLeft.Control = GroupBox2
+      AnchorSideTop.Control = GroupBox2
       Left = 8
       Height = 25
       Hint = 'Generate code'
-      Top = 24
+      Top = 6
       Width = 77
+      BorderSpacing.Left = 8
+      BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 16
       BorderSpacing.InnerBorder = 4
       Caption = '&Generate'
       Default = True
@@ -528,10 +623,19 @@ object CodeGenerateFrm: TCodeGenerateFrm
       TabOrder = 0
     end
     object RegCodeEd: TEdit
-      Left = 96
+      AnchorSideLeft.Control = GenerateBtn
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = GenerateBtn
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = RegCodeCopySb
+      Left = 97
       Height = 23
-      Top = 26
-      Width = 401
+      Top = 7
+      Width = 396
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 12
+      BorderSpacing.Right = 4
+      BorderSpacing.Bottom = 16
       OnChange = InfoChanged
       TabOrder = 1
     end
diff --git a/components/onguard/source/qonguard2.lrs b/components/onguard/source/qonguard2.lrs
index 69e9a51c3..f1ad921c8 100644
--- a/components/onguard/source/qonguard2.lrs
+++ b/components/onguard/source/qonguard2.lrs
@@ -1,148 +1,48 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TCodeGenerateFrm','FORMDATA',[
-  'TPF0'#16'TCodeGenerateFrm'#15'CodeGenerateFrm'#4'Left'#3#228#0#6'Height'#3#4
-  +#2#3'Top'#2'T'#5'Width'#3','#2#13'ActiveControl'#7#5'OKBtn'#11'BorderIcons'
-  +#11#12'biSystemMenu'#10'biMinimize'#0#7'Caption'#6#15'Code Generation'#12'Cl'
-  +'ientHeight'#3#4#2#11'ClientWidth'#3','#2#5'Color'#7#6'clForm'#8'OnCreate'#7
-  +#10'FormCreate'#6'OnShow'#7#8'FormShow'#8'Position'#7#14'poScreenCenter'#10
-  +'LCLVersion'#6#6'0.9.27'#0#7'TBitBtn'#5'OKBtn'#4'Left'#3#128#1#6'Height'#2#25
-  +#3'Top'#3#216#1#5'Width'#2'K'#7'Caption'#6#2'OK'#11'ModalResult'#2#1#9'NumGl'
-  +'yphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#9'CancelBtn'#4'Left'#3#208#1#6'Hei'
-  +'ght'#2#25#3'Top'#3#216#1#5'Width'#2'K'#7'Caption'#6#6'Cancel'#11'ModalResul'
-  +'t'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#12'TPageControl'#8'CodesNbk'#4
-  +'Left'#2#4#6'Height'#3#130#0#3'Top'#2#4#5'Width'#3#21#2#10'ActivePage'#7#9'T'
-  +'abSheet1'#8'TabIndex'#2#0#8'TabOrder'#2#2#10'OnChanging'#7#16'CodesNbkChang'
-  +'ing'#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#4'Date'#12'ClientHeight'#2'h'
-  +#11'ClientWidth'#3#13#2#0#6'TLabel'#6'Label9'#4'Left'#2#4#6'Height'#2#14#3'T'
-  +'op'#2#12#5'Width'#2'6'#7'Caption'#6#11'Start date:'#11'ParentColor'#8#0#0#6
-  +'TLabel'#7'Label11'#4'Left'#3#204#0#6'Height'#2#14#3'Top'#2#12#5'Width'#2'0'
-  +#7'Caption'#6#9'End date:'#11'ParentColor'#8#0#0#5'TEdit'#11'StartDateEd'#4
-  +'Left'#2'\'#6'Height'#2#23#3'Top'#2#8#5'Width'#2'e'#8'OnChange'#7#17'Paramet'
-  +'ersChanged'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#0#0#0#5'TEdit'
-  +#9'EndDateEd'#4'Left'#3#28#1#6'Height'#2#23#3'Top'#2#8#5'Width'#2'e'#8'OnCha'
-  +'nge'#7#17'ParametersChanged'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'
-  +#2#1#0#0#0#9'TTabSheet'#9'TabSheet2'#7'Caption'#6#4'Days'#12'ClientHeight'#2
-  +'h'#11'ClientWidth'#3#13#2#10'ImageIndex'#2#1#0#6'TLabel'#7'Label13'#4'Left'
-  +#2#4#6'Height'#2#13#3'Top'#2#12#5'Width'#2'4'#7'Caption'#6#10'Day count:'#11
-  +'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#3#228#0#6'Height'#2#13#3'Top'
-  +#2#12#5'Width'#2'%'#7'Caption'#6#8'Expires:'#11'ParentColor'#8#0#0#5'TEdit'
-  +#11'DaysCountEd'#4'Left'#2'X'#6'Height'#2#21#3'Top'#2#8#5'Width'#2'q'#8'OnCh'
-  +'ange'#7#17'ParametersChanged'#10'OnKeyPress'#7#16'NumberKeyEdPress'#8'TabOr'
-  +'der'#2#0#4'Text'#6#1'0'#0#0#5'TEdit'#13'DaysExpiresEd'#4'Left'#3'('#1#6'Hei'
-  +'ght'#2#21#3'Top'#2#8#5'Width'#2'a'#8'OnChange'#7#17'ParametersChanged'#10'O'
-  +'nKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#9'TabShe'
-  +'et3'#7'Caption'#6#3'Reg'#12'ClientHeight'#2'h'#11'ClientWidth'#3#13#2#10'Im'
-  +'ageIndex'#2#2#0#12'TSpeedButton'#12'RegStrCopySb'#4'Left'#3#234#1#6'Height'
-  +#2#23#4'Hint'#6#17'Copy to clipboard'#3'Top'#2#7#5'Width'#2#23#5'Color'#7#9
-  +'clBtnFace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0
-  +'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128
-  +#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0
-  +#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128
-  +#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#132'DDDD'#128#0
-  +#0#0#136#136#136#132#255#255#255#244#128#0#0#0#136#136#136#132#240#0#0#244
-  +#128#0#0#0#128#0#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#0#0#244
-  +#128#0#0#0#128#240#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#15'DD'
-  +#128#0#0#0#128#240#0#4#255#255'OH'#128#0#0#0#128#255#255#244#255#255'D'#136
-  +#128#0#0#0#128#240#15#4'DDH'#136#128#0#0#0#128#255#255#15#8#136#136#136#128#0
-  +#0#0#128#255#255#0#136#136#136#136#128#0#0#0#128#0#0#8#136#136#136#136#128#0
-  +#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136
-  +#136#128#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#17'RegStrCopySbClick'#0#0#6'TLa'
-  +'bel'#6'Label6'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#12#5'Width'#2'!'#7'Capti'
-  +'on'#6#7'String:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label4'#4'Left'#3'$'#1#6
-  +'Height'#2#14#3'Top'#2'0'#5'Width'#2'('#7'Caption'#6#8'Expires:'#11'ParentCo'
-  +'lor'#8#0#0#7'TButton'#12'RegRandomBtn'#4'Left'#2'H'#6'Height'#2#25#3'Top'#2
-  +','#5'Width'#3#145#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#14'&Rand'
-  +'om Number'#7'OnClick'#7#17'RegRandomBtnClick'#8'TabOrder'#2#1#0#0#5'TEdit'#8
-  +'RegStrEd'#4'Left'#2'D'#6'Height'#2#23#3'Top'#2#8#5'Width'#3#157#1#8'TabOrde'
-  +'r'#2#0#0#0#5'TEdit'#12'RegExpiresEd'#4'Left'#3'e'#1#6'Height'#2#23#3'Top'#2
-  +','#5'Width'#2'\'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#14'Da'
-  +'teEdKeyPress'#8'TabOrder'#2#2#0#0#0#9'TTabSheet'#9'TabSheet4'#7'Caption'#6#3
-  +'S/N'#12'ClientHeight'#2'h'#11'ClientWidth'#3#13#2#10'ImageIndex'#2#3#0#6'TL'
-  +'abel'#6'Label7'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#12#5'Width'#2'G'#7'Capt'
-  +'ion'#6#15'&Serial Number:'#11'ParentColor'#8#0#0#6'TLabel'#7'Label15'#4'Lef'
-  +'t'#3#12#1#6'Height'#2#14#3'Top'#2#12#5'Width'#2'('#7'Caption'#6#8'Expires:'
-  +#11'ParentColor'#8#0#0#7'TButton'#12'SerRandomBtn'#4'Left'#2#8#6'Height'#2#25
-  +#3'Top'#2','#5'Width'#3#145#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
-  ,#14'&Random Number'#7'OnClick'#7#17'SerRandomBtnClick'#8'TabOrder'#2#2#0#0#5
-  +'TEdit'#14'SerialNumberEd'#4'Left'#2'|'#6'Height'#2#23#3'Top'#2#8#5'Width'#2
-  +'}'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#16'NumberKeyEdPress'
-  +#8'TabOrder'#2#0#4'Text'#6#1'0'#0#0#5'TEdit'#15'SerialExpiresEd'#4'Left'#3'P'
-  +#1#6'Height'#2#23#3'Top'#2#8#5'Width'#2'a'#8'OnChange'#7#17'ParametersChange'
-  +'d'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#9
-  +'TabSheet5'#7'Caption'#6#5'Usage'#12'ClientHeight'#2'h'#11'ClientWidth'#3#13
-  +#2#10'ImageIndex'#2#4#0#6'TLabel'#7'Label14'#4'Left'#2#4#6'Height'#2#13#3'To'
-  +'p'#2#12#5'Width'#2'@'#7'Caption'#6#12'Usage count:'#11'ParentColor'#8#0#0#6
-  +'TLabel'#7'Label17'#4'Left'#3#12#1#6'Height'#2#13#3'Top'#2#12#5'Width'#2'%'#7
-  +'Caption'#6#8'Expires:'#11'ParentColor'#8#0#0#5'TEdit'#12'UsageCountEd'#4'Le'
-  +'ft'#2'l'#6'Height'#2#21#3'Top'#2#8#5'Width'#2'q'#8'OnChange'#7#17'Parameter'
-  +'sChanged'#10'OnKeyPress'#7#16'NumberKeyEdPress'#8'TabOrder'#2#0#4'Text'#6#1
-  +'0'#0#0#5'TEdit'#14'UsageExpiresEd'#4'Left'#3'P'#1#6'Height'#2#21#3'Top'#2#8
-  +#5'Width'#2'a'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#14'DateE'
-  +'dKeyPress'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#9'TabSheet6'#7'Caption'#6#7'N'
-  +'etwork'#12'ClientHeight'#2'h'#11'ClientWidth'#3#13#2#10'ImageIndex'#2#5#0#6
-  +'TLabel'#7'Label10'#4'Left'#2#4#6'Height'#2#13#3'Top'#2#12#5'Width'#2'@'#7'C'
-  +'aption'#6#13'Access Slots:'#11'ParentColor'#8#0#0#5'TEdit'#14'NetworkSlotsE'
-  +'d'#4'Left'#2't'#6'Height'#2#21#3'Top'#2#8#5'Width'#2'q'#8'OnChange'#7#17'Pa'
-  +'rametersChanged'#10'OnKeyPress'#7#16'NumberKeyEdPress'#8'TabOrder'#2#0#4'Te'
-  +'xt'#6#1'2'#0#0#0#9'TTabSheet'#9'TabSheet7'#7'Caption'#6#7'Special'#12'Clien'
-  +'tHeight'#2'h'#11'ClientWidth'#3#13#2#10'ImageIndex'#2#6#0#6'TLabel'#7'Label'
-  +'12'#4'Left'#2#4#6'Height'#2#13#3'Top'#2#12#5'Width'#2'>'#7'Caption'#6#13'Sp'
-  +'ecial data:'#11'ParentColor'#8#0#0#6'TLabel'#7'Label19'#4'Left'#3#252#0#6'H'
-  +'eight'#2#13#3'Top'#2#12#5'Width'#2'%'#7'Caption'#6#8'Expires:'#11'ParentCol'
-  +'or'#8#0#0#5'TEdit'#13'SpecialDataEd'#4'Left'#2'h'#6'Height'#2#21#3'Top'#2#8
-  +#5'Width'#3#129#0#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#16'Nu'
-  +'mberKeyEdPress'#8'TabOrder'#2#0#4'Text'#6#1'0'#0#0#5'TEdit'#16'SpecialExpir'
-  +'esEd'#4'Left'#3'@'#1#6'Height'#2#21#3'Top'#2#8#5'Width'#2'i'#8'OnChange'#7
-  +#17'ParametersChanged'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#1#0
-  +#0#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#4#6'Height'#3#248#0#3'Top'#3#136#0
-  +#5'Width'#3#28#2#7'Caption'#6#19'&Key used to encode'#12'ClientHeight'#3#230
-  +#0#11'ClientWidth'#3#24#2#5'Color'#7#9'clBtnFace'#11'ParentColor'#8#8'TabOrd'
-  +'er'#2#3#0#12'TSpeedButton'#13'GenerateKeySb'#4'Left'#3#242#1#6'Height'#2#23
-  +#4'Hint'#6#12'Generate key'#3'Top'#3#195#0#5'Width'#2#23#5'Color'#7#9'clBtnF'
-  +'ace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0
-  +#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0
-  +#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0
-  +#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128#0#0#0
-  +#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136
-  +#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136
-  +#136#136#128#0#0#0#136#136#0#8#136#136#136#136#128#0#0#0#136#128#0#0#136#8
-  +#136#128#128#0#0#0#136#0#152#144#8#8#0#128#128#0#0#0#136#0#137#128#0#0#0#0
-  +#128#0#0#0#136#0#137#128#0#0#0#0#128#0#0#0#136#0#152#144#8#136#136#136#128#0
-  +#0#0#136#128#0#0#136#136#136#136#128#0#0#0#136#136#0#8#136#136#136#136#128#0
-  +#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136
-  +#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136
-  +#136#136#136#128#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'GenerateKeySbClick'#0
-  +#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14#3'Top'#2's'#5'Width'#2'+'#7
-  +'Caption'#6#9'Modifier:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label5'#4'Left'#2
-  +#12#6'Height'#2#14#3'Top'#3#172#0#5'Width'#2#23#7'Caption'#6#4'Key:'#11'Pare'
-  +'ntColor'#8#0#0#9'TCheckBox'#12'NoModifierCb'#4'Left'#2#16#6'Height'#2#17#3
-  +'Top'#2#24#5'Width'#2'H'#7'Caption'#6#11'No modifier'#7'Checked'#9#7'OnClick'
-  +#7#13'ModifierClick'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#9'TCheckBox'
-  +#17'MachineModifierCb'#4'Left'#3#176#0#6'Height'#2#17#3'Top'#2#24#5'Width'#2
-  +'b'#7'Caption'#6#16'Machine modifier'#7'OnClick'#7#13'ModifierClick'#8'TabOr'
-  +'der'#2#1#0#0#9'TCheckBox'#16'UniqueModifierCb'#4'Left'#3'h'#1#6'Height'#2#17
-  +#3'Top'#2#24#5'Width'#2'\'#7'Caption'#6#15'Unique modifier'#7'OnClick'#7#13
-  +'ModifierClick'#8'TabOrder'#2#2#0#0#9'TCheckBox'#14'DateModifierCb'#4'Left'#2
-  +#16#6'Height'#2#17#3'Top'#2'8'#5'Width'#2'R'#7'Caption'#6#13'Date modifier'#7
-  +'OnClick'#7#13'ModifierClick'#8'TabOrder'#2#3#0#0#9'TCheckBox'#16'StringModi'
-  +'fierCb'#4'Left'#2#16#6'Height'#2#17#3'Top'#2'X'#5'Width'#2'W'#7'Caption'#6
-  ,#15'String Modifier'#7'OnClick'#7#13'ModifierClick'#8'TabOrder'#2#4#0#0#5'TE'
-  +'dit'#9'ModDateEd'#4'Left'#3#159#0#6'Height'#2#23#3'Top'#2'5'#5'Width'#2'b'#8
-  +'OnChange'#7#13'ModifierClick'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrde'
-  +'r'#2#6#0#0#5'TEdit'#11'ModStringEd'#4'Left'#3#160#0#6'Height'#2#23#3'Top'#2
-  +'U'#5'Width'#3'i'#1#8'OnChange'#7#13'ModifierClick'#8'TabOrder'#2#8#0#0#5'TE'
-  +'dit'#10'ModifierEd'#4'Left'#2#8#6'Height'#2#23#3'Top'#3#140#0#5'Width'#3#169
-  +#0#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#18'ModifierEdKeyPres'
-  +'s'#8'TabOrder'#2#5#0#0#5'TEdit'#10'BlockKeyEd'#4'Left'#2#8#6'Height'#2#23#3
-  +'Top'#3#196#0#5'Width'#3#225#1#8'OnChange'#7#11'InfoChanged'#8'TabOrder'#2#7
-  +#0#0#0#9'TGroupBox'#9'GroupBox2'#4'Left'#2#8#6'Height'#2'E'#3'Top'#3#128#1#5
-  +'Width'#3#24#2#7'Caption'#6#13'Generate Code'#12'ClientHeight'#2'3'#11'Clien'
-  +'tWidth'#3#20#2#8'TabOrder'#2#4#0#12'TSpeedButton'#13'RegCodeCopySb'#4'Left'
-  +#3#246#1#6'Height'#2#23#4'Hint'#6#22'Copy code to clipboard'#3'Top'#2#25#5'W'
-  +'idth'#2#23#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'
+  'TPF0'#16'TCodeGenerateFrm'#15'CodeGenerateFrm'#4'Left'#3#228#0#6'Height'#3#1
+  +#2#3'Top'#2'T'#5'Width'#3','#2#13'ActiveControl'#7#5'OKBtn'#8'AutoSize'#9#11
+  +'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#0#7'Caption'#6#15'Code Gene'
+  +'ration'#12'ClientHeight'#3#1#2#11'ClientWidth'#3','#2#5'Color'#7#6'clForm'#8
+  +'OnCreate'#7#10'FormCreate'#6'OnShow'#7#8'FormShow'#8'Position'#7#14'poScree'
+  +'nCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#7'TBitBtn'#5'OKBtn'#21'AnchorSideTop'
+  +'.Control'#7#9'GroupBox2'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSid'
+  +'eRight.Control'#7#9'CancelBtn'#4'Left'#3#127#1#6'Height'#2#25#3'Top'#3#214#1
+  +#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#16
+  +#19'BorderSpacing.Right'#2#6#7'Caption'#6#2'OK'#11'ModalResult'#2#1#8'TabOrd'
+  +'er'#2#0#0#0#7'TBitBtn'#9'CancelBtn'#21'AnchorSideTop.Control'#7#9'GroupBox2'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#208#1#6'Height'#2#25#3'To'
+  +'p'#3#214#1#5'Width'#2'L'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'B'
+  +'orderSpacing.Top'#2#16#19'BorderSpacing.Right'#2#16#20'BorderSpacing.Bottom'
+  +#2#12#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#12'TPag'
+  +'eControl'#8'CodesNbk'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTo'
+  +'p.Control'#7#5'Owner'#4'Left'#2#6#6'Height'#3#130#0#3'Top'#2#6#5'Width'#3#28
+  +#2#10'ActivePage'#7#9'TabSheet1'#20'BorderSpacing.Around'#2#6#8'TabIndex'#2#0
+  +#8'TabOrder'#2#2#10'OnChanging'#7#16'CodesNbkChanging'#0#9'TTabSheet'#9'TabS'
+  +'heet1'#7'Caption'#6#4'Date'#12'ClientHeight'#2'f'#11'ClientWidth'#3#20#2#0#6
+  +'TLabel'#6'Label9'#4'Left'#2#4#6'Height'#2#15#3'Top'#2#12#5'Width'#2'5'#7'Ca'
+  +'ption'#6#11'Start date:'#11'ParentColor'#8#0#0#6'TLabel'#7'Label11'#4'Left'
+  +#3#204#0#6'Height'#2#15#3'Top'#2#12#5'Width'#2'1'#7'Caption'#6#9'End date:'
+  +#11'ParentColor'#8#0#0#5'TEdit'#11'StartDateEd'#4'Left'#2'\'#6'Height'#2#23#3
+  +'Top'#2#8#5'Width'#2'e'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7
+  +#14'DateEdKeyPress'#8'TabOrder'#2#0#0#0#5'TEdit'#9'EndDateEd'#4'Left'#3#28#1
+  +#6'Height'#2#23#3'Top'#2#8#5'Width'#2'e'#8'OnChange'#7#17'ParametersChanged'
+  +#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#9'Ta'
+  +'bSheet2'#7'Caption'#6#4'Days'#12'ClientHeight'#2'f'#11'ClientWidth'#3#20#2
+  +#10'ImageIndex'#2#1#0#6'TLabel'#7'Label13'#4'Left'#2#4#6'Height'#2#15#3'Top'
+  +#2#12#5'Width'#2'9'#7'Caption'#6#10'Day count:'#11'ParentColor'#8#0#0#6'TLab'
+  +'el'#6'Label2'#4'Left'#3#228#0#6'Height'#2#15#3'Top'#2#12#5'Width'#2'('#7'Ca'
+  +'ption'#6#8'Expires:'#11'ParentColor'#8#0#0#5'TEdit'#11'DaysCountEd'#4'Left'
+  +#2'X'#6'Height'#2#23#3'Top'#2#8#5'Width'#2'q'#8'OnChange'#7#17'ParametersCha'
+  +'nged'#10'OnKeyPress'#7#16'NumberKeyEdPress'#8'TabOrder'#2#0#4'Text'#6#1'0'#0
+  +#0#5'TEdit'#13'DaysExpiresEd'#4'Left'#3'('#1#6'Height'#2#23#3'Top'#2#8#5'Wid'
+  +'th'#2'a'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#14'DateEdKeyP'
+  +'ress'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#9'TabSheet3'#7'Caption'#6#3'Reg'#12
+  +'ClientHeight'#2'f'#11'ClientWidth'#3#20#2#10'ImageIndex'#2#2#0#12'TSpeedBut'
+  +'ton'#12'RegStrCopySb'#4'Left'#3#234#1#6'Height'#2#23#4'Hint'#6#17'Copy to c'
+  +'lipboard'#3'Top'#2#7#5'Width'#2#23#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'
   +#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128
   +#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0
@@ -155,11 +55,163 @@ LazarusResources.Add('TCodeGenerateFrm','FORMDATA',[
   +#255#244#255#255'D'#136#128#0#0#0#128#240#15#4'DDH'#136#128#0#0#0#128#255#255
   +#15#8#136#136#136#128#0#0#0#128#255#255#0#136#136#136#136#128#0#0#0#128#0#0#8
   +#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136
-  +#136#136#136#136#136#136#128#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'RegCodeC'
-  +'opySbClick'#0#0#7'TButton'#11'GenerateBtn'#4'Left'#2#8#6'Height'#2#25#4'Hin'
-  +'t'#6#13'Generate code'#3'Top'#2#24#5'Width'#2'M'#25'BorderSpacing.InnerBord'
-  +'er'#2#4#7'Caption'#6#9'&Generate'#7'Default'#9#7'OnClick'#7#16'GenerateBtnC'
-  +'lick'#8'TabOrder'#2#0#0#0#5'TEdit'#9'RegCodeEd'#4'Left'#2'`'#6'Height'#2#23
-  +#3'Top'#2#26#5'Width'#3#145#1#8'OnChange'#7#11'InfoChanged'#8'TabOrder'#2#1#0
-  +#0#0#0
+  +#136#136#136#136#136#136#128#0#0#0#7'OnClick'#7#17'RegStrCopySbClick'#0#0#6
+  +'TLabel'#6'Label6'#4'Left'#2#8#6'Height'#2#15#3'Top'#2#12#5'Width'#2'"'#7'Ca'
+  +'ption'#6#7'String:'#11'ParentColor'#8#0#0#6'TLabel'#6'Label4'#4'Left'#3'$'#1
+  +#6'Height'#2#15#3'Top'#2'0'#5'Width'#2'('#7'Caption'#6#8'Expires:'#11'Parent'
+  +'Color'#8#0#0#7'TButton'#12'RegRandomBtn'#4'Left'#2'H'#6'Height'#2#25#3'Top'
+  +#2','#5'Width'#3#145#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#14'&Ra'
+  +'ndom Number'#7'OnClick'#7#17'RegRandomBtnClick'#8'TabOrder'#2#1#0#0#5'TEdit'
+  +#8'RegStrEd'#4'Left'#2'D'#6'Height'#2#23#3'Top'#2#8#5'Width'#3#157#1#8'TabOr'
+  +'der'#2#0#0#0#5'TEdit'#12'RegExpiresEd'#4'Left'#3'e'#1#6'Height'#2#23#3'Top'
+  +#2','#5'Width'#2'\'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#14
+  ,'DateEdKeyPress'#8'TabOrder'#2#2#0#0#0#9'TTabSheet'#9'TabSheet4'#7'Caption'#6
+  +#3'S/N'#12'ClientHeight'#2'f'#11'ClientWidth'#3#20#2#10'ImageIndex'#2#3#0#6
+  +'TLabel'#6'Label7'#4'Left'#2#8#6'Height'#2#15#3'Top'#2#12#5'Width'#2'N'#7'Ca'
+  +'ption'#6#15'&Serial Number:'#11'ParentColor'#8#0#0#6'TLabel'#7'Label15'#4'L'
+  +'eft'#3#12#1#6'Height'#2#15#3'Top'#2#12#5'Width'#2'('#7'Caption'#6#8'Expires'
+  +':'#11'ParentColor'#8#0#0#7'TButton'#12'SerRandomBtn'#4'Left'#2#8#6'Height'#2
+  +#25#3'Top'#2','#5'Width'#3#145#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
+  +#6#14'&Random Number'#7'OnClick'#7#17'SerRandomBtnClick'#8'TabOrder'#2#2#0#0
+  +#5'TEdit'#14'SerialNumberEd'#4'Left'#2'|'#6'Height'#2#23#3'Top'#2#8#5'Width'
+  +#2'}'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#16'NumberKeyEdPre'
+  +'ss'#8'TabOrder'#2#0#4'Text'#6#1'0'#0#0#5'TEdit'#15'SerialExpiresEd'#4'Left'
+  +#3'P'#1#6'Height'#2#23#3'Top'#2#8#5'Width'#2'a'#8'OnChange'#7#17'ParametersC'
+  +'hanged'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#1#0#0#0#9'TTabShe'
+  +'et'#9'TabSheet5'#7'Caption'#6#5'Usage'#12'ClientHeight'#2'f'#11'ClientWidth'
+  +#3#20#2#10'ImageIndex'#2#4#0#6'TLabel'#7'Label14'#4'Left'#2#4#6'Height'#2#15
+  +#3'Top'#2#12#5'Width'#2'E'#7'Caption'#6#12'Usage count:'#11'ParentColor'#8#0
+  +#0#6'TLabel'#7'Label17'#4'Left'#3#12#1#6'Height'#2#15#3'Top'#2#12#5'Width'#2
+  +'('#7'Caption'#6#8'Expires:'#11'ParentColor'#8#0#0#5'TEdit'#12'UsageCountEd'
+  +#4'Left'#2'l'#6'Height'#2#23#3'Top'#2#8#5'Width'#2'q'#8'OnChange'#7#17'Param'
+  +'etersChanged'#10'OnKeyPress'#7#16'NumberKeyEdPress'#8'TabOrder'#2#0#4'Text'
+  +#6#1'0'#0#0#5'TEdit'#14'UsageExpiresEd'#4'Left'#3'P'#1#6'Height'#2#23#3'Top'
+  +#2#8#5'Width'#2'a'#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#14'D'
+  +'ateEdKeyPress'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#9'TabSheet6'#7'Caption'#6
+  +#7'Network'#12'ClientHeight'#2'f'#11'ClientWidth'#3#20#2#10'ImageIndex'#2#5#0
+  +#6'TLabel'#7'Label10'#4'Left'#2#4#6'Height'#2#15#3'Top'#2#12#5'Width'#2'C'#7
+  +'Caption'#6#13'Access Slots:'#11'ParentColor'#8#0#0#5'TEdit'#14'NetworkSlots'
+  +'Ed'#4'Left'#2't'#6'Height'#2#23#3'Top'#2#8#5'Width'#2'q'#8'OnChange'#7#17'P'
+  +'arametersChanged'#10'OnKeyPress'#7#16'NumberKeyEdPress'#8'TabOrder'#2#0#4'T'
+  +'ext'#6#1'2'#0#0#0#9'TTabSheet'#9'TabSheet7'#7'Caption'#6#7'Special'#12'Clie'
+  +'ntHeight'#2'f'#11'ClientWidth'#3#20#2#10'ImageIndex'#2#6#0#6'TLabel'#7'Labe'
+  +'l12'#4'Left'#2#4#6'Height'#2#15#3'Top'#2#12#5'Width'#2'B'#7'Caption'#6#13'S'
+  +'pecial data:'#11'ParentColor'#8#0#0#6'TLabel'#7'Label19'#4'Left'#3#252#0#6
+  +'Height'#2#15#3'Top'#2#12#5'Width'#2'('#7'Caption'#6#8'Expires:'#11'ParentCo'
+  +'lor'#8#0#0#5'TEdit'#13'SpecialDataEd'#4'Left'#2'h'#6'Height'#2#23#3'Top'#2#8
+  +#5'Width'#3#129#0#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#16'Nu'
+  +'mberKeyEdPress'#8'TabOrder'#2#0#4'Text'#6#1'0'#0#0#5'TEdit'#16'SpecialExpir'
+  +'esEd'#4'Left'#3'@'#1#6'Height'#2#23#3'Top'#2#8#5'Width'#2'i'#8'OnChange'#7
+  +#17'ParametersChanged'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#1#0
+  +#0#0#0#9'TGroupBox'#9'GroupBox1'#22'AnchorSideLeft.Control'#7#8'CodesNbk'#21
+  +'AnchorSideTop.Control'#7#8'CodesNbk'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#8'CodesNbk'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#6#6'Height'#3#239#0#3'Top'#3#142#0#5'Width'#3#28#2#7'Ancho'
+  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#19'&Key u'
+  +'sed to encode'#12'ClientHeight'#3#219#0#11'ClientWidth'#3#24#2#5'Color'#7#9
+  +'clBtnFace'#16'ParentBackground'#8#11'ParentColor'#8#8'TabOrder'#2#3#0#12'TS'
+  +'peedButton'#13'GenerateKeySb'#21'AnchorSideTop.Control'#7#10'BlockKeyEd'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#11'ModStri'
+  +'ngEd'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#242#1#6'Height'#2#23
+  +#4'Hint'#6#12'Generate key'#3'Top'#3#180#0#5'Width'#2#23#7'Anchors'#11#5'akT'
+  +'op'#7'akRight'#0#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0
+  +#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0
+  +#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255
+  +#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136
+  +#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136
+  +#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136
+  +#136#136#136#136#128#0#0#0#136#136#0#8#136#136#136#136#128#0#0#0#136#128#0#0
+  +#136#8#136#128#128#0#0#0#136#0#152#144#8#8#0#128#128#0#0#0#136#0#137#128#0#0
+  +#0#0#128#0#0#0#136#0#137#128#0#0#0#0#128#0#0#0#136#0#152#144#8#136#136#136
+  +#128#0#0#0#136#128#0#0#136#136#136#136#128#0#0#0#136#136#0#8#136#136#136#136
+  +#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136
+  +#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136
+  +#136#136#136#136#128#0#0#0#7'OnClick'#7#18'GenerateKeySbClick'#0#0#6'TLabel'
+  +#6'Label1'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Contro'
+  ,'l'#7#11'ModStringEd'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#16#6'H'
+  +'eight'#2#15#3'Top'#2'o'#5'Width'#2'0'#18'BorderSpacing.Left'#2#16#17'Border'
+  +'Spacing.Top'#2#16#7'Caption'#6#9'Modifier:'#11'ParentColor'#8#0#0#6'TLabel'
+  +#6'Label5'#22'AnchorSideLeft.Control'#7#6'Label1'#21'AnchorSideTop.Control'#7
+  +#10'ModifierEd'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#16#6'Height'
+  +#2#15#3'Top'#3#163#0#5'Width'#2#22#17'BorderSpacing.Top'#2#12#7'Caption'#6#4
+  +'Key:'#11'ParentColor'#8#0#0#9'TCheckBox'#12'NoModifierCb'#22'AnchorSideLeft'
+  +'.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7#9'GroupBox1'#4'Left'#2
+  +#16#6'Height'#2#19#3'Top'#2#6#5'Width'#2'R'#18'BorderSpacing.Left'#2#16#17'B'
+  +'orderSpacing.Top'#2#6#7'Caption'#6#11'No modifier'#7'Checked'#9#7'OnClick'#7
+  +#13'ModifierClick'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#9'TCheckBox'
+  +#17'MachineModifierCb'#22'AnchorSideLeft.Control'#7#12'NoModifierCb'#19'Anch'
+  +'orSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#12'NoModifierCb'
+  +#4'Left'#3#146#0#6'Height'#2#19#3'Top'#2#6#5'Width'#2'p'#18'BorderSpacing.Le'
+  +'ft'#2'0'#7'Caption'#6#16'Machine modifier'#7'OnClick'#7#13'ModifierClick'#8
+  +'TabOrder'#2#1#0#0#9'TCheckBox'#16'UniqueModifierCb'#22'AnchorSideLeft.Contr'
+  +'ol'#7#17'MachineModifierCb'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Ancho'
+  +'rSideTop.Control'#7#12'NoModifierCb'#4'Left'#3'2'#1#6'Height'#2#19#3'Top'#2
+  +#6#5'Width'#2'h'#18'BorderSpacing.Left'#2'0'#7'Caption'#6#15'Unique modifier'
+  +#7'OnClick'#7#13'ModifierClick'#8'TabOrder'#2#2#0#0#9'TCheckBox'#14'DateModi'
+  +'fierCb'#22'AnchorSideLeft.Control'#7#12'NoModifierCb'#21'AnchorSideTop.Cont'
+  +'rol'#7#9'ModDateEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'He'
+  +'ight'#2#19#3'Top'#2''''#5'Width'#2'Z'#7'Caption'#6#13'Date modifier'#7'OnCl'
+  +'ick'#7#13'ModifierClick'#8'TabOrder'#2#3#0#0#9'TCheckBox'#16'StringModifier'
+  +'Cb'#22'AnchorSideLeft.Control'#7#12'NoModifierCb'#21'AnchorSideTop.Control'
+  +#7#11'ModStringEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#16#6'Heig'
+  +'ht'#2#19#3'Top'#2'J'#5'Width'#2'a'#7'Caption'#6#15'String Modifier'#7'OnCli'
+  +'ck'#7#13'ModifierClick'#8'TabOrder'#2#4#0#0#5'TEdit'#9'ModDateEd'#22'Anchor'
+  +'SideLeft.Control'#7#17'MachineModifierCb'#21'AnchorSideTop.Control'#7#17'Ma'
+  +'chineModifierCb'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#146#0#6'He'
+  +'ight'#2#23#3'Top'#2'%'#5'Width'#2'b'#17'BorderSpacing.Top'#2#12#8'OnChange'
+  +#7#13'ModifierClick'#10'OnKeyPress'#7#14'DateEdKeyPress'#8'TabOrder'#2#6#0#0
+  +#5'TEdit'#11'ModStringEd'#22'AnchorSideLeft.Control'#7#9'ModDateEd'#21'Ancho'
+  +'rSideTop.Control'#7#9'ModDateEd'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'A'
+  +'nchorSideRight.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#3#146#0#6'Height'#2#23#3'Top'#2'H'#5'Width'#3'w'#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#8#17'BorderSpacing.Top'#2#12#19
+  +'BorderSpacing.Right'#2#15#8'OnChange'#7#13'ModifierClick'#8'TabOrder'#2#8#0
+  +#0#5'TEdit'#10'ModifierEd'#22'AnchorSideLeft.Control'#7#6'Label1'#21'AnchorS'
+  +'ideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#16#6'Height'#2#23#3'Top'#3#128#0#5'Width'#3#169#0#17'BorderSpacing.Top'#2#2
+  +#8'OnChange'#7#17'ParametersChanged'#10'OnKeyPress'#7#18'ModifierEdKeyPress'
+  +#8'TabOrder'#2#5#0#0#5'TEdit'#10'BlockKeyEd'#22'AnchorSideLeft.Control'#7#6
+  +'Label1'#21'AnchorSideTop.Control'#7#6'Label5'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#23'AnchorSideRight.Control'#7#13'GenerateKeySb'#4'Left'#2#16#6'Hei'
+  +'ght'#2#23#3'Top'#3#180#0#5'Width'#3#222#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#4#20'BorderS'
+  +'pacing.Bottom'#2#16#8'OnChange'#7#11'InfoChanged'#8'TabOrder'#2#7#0#0#0#9'T'
+  +'GroupBox'#9'GroupBox2'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorS'
+  +'ideTop.Control'#7#9'GroupBox1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc'
+  +'horSideRight.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#2'C'#3'Top'#3#131#1#5'Width'#3#28#2#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Capt'
+  +'ion'#6#13'Generate Code'#12'ClientHeight'#2'/'#11'ClientWidth'#3#24#2#16'Pa'
+  +'rentBackground'#8#8'TabOrder'#2#4#0#12'TSpeedButton'#13'RegCodeCopySb'#21'A'
+  +'nchorSideTop.Control'#7#11'GenerateBtn'#18'AnchorSideTop.Side'#7#9'asrCente'
+  +'r'#23'AnchorSideRight.Control'#7#9'GroupBox2'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#3#241#1#6'Height'#2#23#4'Hint'#6#22'Copy code to clipboa'
+  +'rd'#3'Top'#2#7#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderS'
+  +'pacing.Right'#2#16#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'
+  +#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0
+  +#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255
+  +#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136
+  ,#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#132'DDDD'
+  +#128#0#0#0#136#136#136#132#255#255#255#244#128#0#0#0#136#136#136#132#240#0#0
+  +#244#128#0#0#0#128#0#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#0#0
+  +#244#128#0#0#0#128#240#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#15
+  +'DD'#128#0#0#0#128#240#0#4#255#255'OH'#128#0#0#0#128#255#255#244#255#255'D'
+  +#136#128#0#0#0#128#240#15#4'DDH'#136#128#0#0#0#128#255#255#15#8#136#136#136
+  +#128#0#0#0#128#255#255#0#136#136#136#136#128#0#0#0#128#0#0#8#136#136#136#136
+  +#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136
+  +#136#136#128#0#0#0#7'OnClick'#7#18'RegCodeCopySbClick'#0#0#7'TButton'#11'Gen'
+  +'erateBtn'#22'AnchorSideLeft.Control'#7#9'GroupBox2'#21'AnchorSideTop.Contro'
+  +'l'#7#9'GroupBox2'#4'Left'#2#8#6'Height'#2#25#4'Hint'#6#13'Generate code'#3
+  +'Top'#2#6#5'Width'#2'M'#18'BorderSpacing.Left'#2#8#17'BorderSpacing.Top'#2#6
+  +#20'BorderSpacing.Bottom'#2#16#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
+  +#9'&Generate'#7'Default'#9#7'OnClick'#7#16'GenerateBtnClick'#8'TabOrder'#2#0
+  +#0#0#5'TEdit'#9'RegCodeEd'#22'AnchorSideLeft.Control'#7#11'GenerateBtn'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'GenerateB'
+  +'tn'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#13
+  +'RegCodeCopySb'#4'Left'#2'a'#6'Height'#2#23#3'Top'#2#7#5'Width'#3#140#1#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12#19'Bo'
+  +'rderSpacing.Right'#2#4#20'BorderSpacing.Bottom'#2#16#8'OnChange'#7#11'InfoC'
+  +'hanged'#8'TabOrder'#2#1#0#0#0#0
 ]);
diff --git a/components/onguard/source/qonguard3.lfm b/components/onguard/source/qonguard3.lfm
index ae45e190e..e1a0bf310 100644
--- a/components/onguard/source/qonguard3.lfm
+++ b/components/onguard/source/qonguard3.lfm
@@ -1,50 +1,77 @@
 object KeyMaintFrm: TKeyMaintFrm
   Left = 240
-  Height = 414
+  Height = 403
   Top = 219
-  Width = 489
+  Width = 483
   HorzScrollBar.Page = 488
   VertScrollBar.Page = 413
   ActiveControl = OKBtn
+  AutoSize = True
   BorderIcons = [biSystemMenu, biMinimize]
   Caption = 'Key Maintenance'
+  ClientHeight = 403
+  ClientWidth = 483
   OnCreate = FormCreate
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object OKBtn: TBitBtn
-    Left = 304
+    AnchorSideTop.Control = CancelBtn
+    AnchorSideRight.Control = CancelBtn
+    Left = 310
     Height = 25
-    Top = 376
+    Top = 363
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Bottom = 8
     Caption = 'OK'
     Default = True
     ModalResult = 1
-    NumGlyphs = 0
     TabOrder = 0
   end
   object CancelBtn: TBitBtn
-    Left = 386
+    AnchorSideTop.Control = GroupBox1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = FileNameGb
+    AnchorSideRight.Side = asrBottom
+    Left = 389
     Height = 25
-    Top = 376
+    Top = 363
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Left = 4
+    BorderSpacing.Top = 8
+    BorderSpacing.Bottom = 8
     Caption = 'Cancel'
     ModalResult = 2
-    NumGlyphs = 0
     TabOrder = 1
   end
   object FileNameGb: TGroupBox
-    Left = 7
-    Height = 63
-    Top = 2
-    Width = 454
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = ProductsGb
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 59
+    Top = 6
+    Width = 458
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    BorderSpacing.Bottom = 6
     Caption = '&File name'
+    ClientHeight = 39
+    ClientWidth = 454
+    Constraints.MinWidth = 450
     TabOrder = 2
     object OpenFileSb: TSpeedButton
-      Left = 328
+      AnchorSideRight.Control = OpenBtn
+      Left = 329
       Height = 23
       Hint = 'Find key maintenance file'
       Top = 6
       Width = 23
-      Color = clBtnFace
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 4
       Glyph.Data = {
         26050000424D26050000000000003604000028000000100000000F0000000100
         0800000000000000000000000000000000000000000000000000000000000000
@@ -89,92 +116,141 @@ object KeyMaintFrm: TKeyMaintFrm
         0707000707070007000707070707070707070700000007070707070707070707
         07070707070707070707
       }
-      NumGlyphs = 0
       OnClick = OpenFileClick
     end
     object OpenBtn: TBitBtn
-      Left = 357
+      AnchorSideRight.Control = FileNameGb
+      AnchorSideRight.Side = asrBottom
+      Left = 356
       Height = 25
       Top = 6
       Width = 90
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 8
+      BorderSpacing.Bottom = 8
       Caption = '&Open'
-      NumGlyphs = 0
       OnClick = OpenBtnClick
       TabOrder = 0
     end
     object FileNameEd: TEdit
+      AnchorSideLeft.Control = FileNameGb
+      AnchorSideTop.Control = FileNameGb
+      AnchorSideRight.Control = OpenFileSb
       Left = 8
-      Height = 25
-      Top = 6
-      Width = 315
+      Height = 23
+      Top = 8
+      Width = 313
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 8
       TabOrder = 1
       Text = 'onguard.ini'
     end
   end
   object ProductsGb: TGroupBox
-    Left = 7
-    Height = 181
-    Top = 64
-    Width = 454
+    AnchorSideLeft.Control = FileNameGb
+    AnchorSideTop.Control = FileNameGb
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = FileNameGb
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 184
+    Top = 71
+    Width = 458
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
     Caption = 'A&pplications'
+    ClientHeight = 164
+    ClientWidth = 454
     TabOrder = 3
     object AddBtn: TButton
-      Left = 357
+      AnchorSideLeft.Control = ProductsLb
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = ProductsLb
+      Left = 359
       Height = 25
       Hint = 'Add a new product and key'
       Top = 8
       Width = 90
+      BorderSpacing.Left = 8
+      BorderSpacing.Right = 8
       BorderSpacing.InnerBorder = 4
       Caption = '&Add...'
       OnClick = AddBtnClick
       TabOrder = 0
     end
     object EditBtn: TButton
-      Left = 357
+      AnchorSideLeft.Control = AddBtn
+      AnchorSideTop.Control = AddBtn
+      AnchorSideTop.Side = asrBottom
+      Left = 359
       Height = 25
       Hint = 'Edit the selected product'
-      Top = 48
+      Top = 49
       Width = 90
+      BorderSpacing.Top = 16
+      BorderSpacing.Right = 8
       BorderSpacing.InnerBorder = 4
       Caption = '&Edit...'
       OnClick = EditBtnClick
       TabOrder = 1
     end
     object DeleteBtn: TButton
-      Left = 357
+      AnchorSideLeft.Control = AddBtn
+      AnchorSideTop.Control = EditBtn
+      AnchorSideTop.Side = asrBottom
+      Left = 359
       Height = 25
       Hint = 'Remove the selected product'
-      Top = 88
+      Top = 90
       Width = 90
+      BorderSpacing.Top = 16
+      BorderSpacing.Right = 8
       BorderSpacing.InnerBorder = 4
       Caption = '&Delete'
       OnClick = DeleteBtnClick
       TabOrder = 2
     end
     object ProductsLb: TListBox
+      AnchorSideLeft.Control = ProductsGb
+      AnchorSideTop.Control = ProductsGb
       Left = 8
       Height = 148
       Top = 8
       Width = 343
+      BorderSpacing.Around = 8
+      ItemHeight = 0
       OnClick = ProductsLbClick
       TabOrder = 3
-      TopIndex = -1
     end
   end
   object GroupBox1: TGroupBox
+    AnchorSideLeft.Control = ProductsGb
+    AnchorSideTop.Control = ProductsGb
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = ProductsGb
+    AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 121
-    Top = 248
-    Width = 457
+    Height = 94
+    Top = 261
+    Width = 458
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Top = 6
     Caption = '&Key'
+    ClientHeight = 74
+    ClientWidth = 454
     TabOrder = 4
     object CopyBlockKeySb: TSpeedButton
-      Left = 398
+      AnchorSideTop.Control = BlockKeyEd
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = KeyPasteSb
+      Left = 396
       Height = 23
       Hint = 'Copy key to clipboard'
-      Top = 24
+      Top = 8
       Width = 23
-      Color = clBtnFace
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 4
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -188,16 +264,20 @@ object KeyMaintFrm: TKeyMaintFrm
         0000800000088888888880000000888888888888888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = CopyBlockKeySbClick
     end
     object KeyPasteSb: TSpeedButton
-      Left = 425
+      AnchorSideTop.Control = BlockKeyEd
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Side = asrBottom
+      Left = 423
       Height = 23
       Hint = 'Paste from clipboard'
-      Top = 26
+      Top = 8
       Width = 23
-      Color = clBtnFace
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 8
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -211,16 +291,16 @@ object KeyMaintFrm: TKeyMaintFrm
         0000200000BB0000022220000000222220000222222220000000222222222222
         222220000000
       }
-      NumGlyphs = 0
       OnClick = KeyPasteSbClick
     end
     object CopyByteKeySb: TSpeedButton
-      Left = 398
+      AnchorSideLeft.Control = CopyBlockKeySb
+      AnchorSideTop.Control = BytesKeyEd
+      Left = 396
       Height = 23
       Hint = 'Copy key to clipboard'
-      Top = 57
+      Top = 43
       Width = 23
-      Color = clBtnFace
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -234,16 +314,16 @@ object KeyMaintFrm: TKeyMaintFrm
         0000800000088888888880000000888888888888888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = CopyByteKeySbClick
     end
     object SpeedButton1: TSpeedButton
-      Left = 425
+      AnchorSideLeft.Control = KeyPasteSb
+      AnchorSideTop.Control = BytesKeyEd
+      Left = 423
       Height = 23
       Hint = 'Paste from clipboard'
-      Top = 57
+      Top = 43
       Width = 23
-      Color = clBtnFace
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -257,21 +337,35 @@ object KeyMaintFrm: TKeyMaintFrm
         0000200000BB0000022220000000222220000222222220000000222222222222
         222220000000
       }
-      NumGlyphs = 0
       OnClick = SpeedButton1Click
     end
     object BlockKeyEd: TEdit
+      AnchorSideLeft.Control = GroupBox1
+      AnchorSideTop.Control = GroupBox1
+      AnchorSideRight.Control = CopyByteKeySb
       Left = 8
-      Height = 25
-      Top = 24
-      Width = 388
+      Height = 23
+      Top = 8
+      Width = 384
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 8
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 4
       TabOrder = 0
     end
     object BytesKeyEd: TEdit
+      AnchorSideLeft.Control = BlockKeyEd
+      AnchorSideTop.Control = BlockKeyEd
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = BlockKeyEd
+      AnchorSideRight.Side = asrBottom
       Left = 8
-      Height = 25
-      Top = 57
-      Width = 388
+      Height = 23
+      Top = 43
+      Width = 384
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 12
+      BorderSpacing.Bottom = 8
       TabOrder = 1
     end
   end
@@ -281,7 +375,7 @@ object KeyMaintFrm: TKeyMaintFrm
     Filter = 'INI Files (*.ini)|*.ini|All Files (*.*)|*.*'
     FilterIndex = 0
     Options = [ofPathMustExist]
-    left = 368
-    top = 144
+    Left = 296
+    Top = 128
   end
 end
diff --git a/components/onguard/source/qonguard3.lrs b/components/onguard/source/qonguard3.lrs
index e4f80c912..f1de08905 100644
--- a/components/onguard/source/qonguard3.lrs
+++ b/components/onguard/source/qonguard3.lrs
@@ -1,23 +1,35 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TKeyMaintFrm','FORMDATA',[
-  'TPF0'#12'TKeyMaintFrm'#11'KeyMaintFrm'#4'Left'#3#240#0#6'Height'#3#158#1#3'T'
-  +'op'#3#219#0#5'Width'#3#233#1#18'HorzScrollBar.Page'#3#232#1#18'VertScrollBa'
-  +'r.Page'#3#157#1#13'ActiveControl'#7#5'OKBtn'#11'BorderIcons'#11#12'biSystem'
-  +'Menu'#10'biMinimize'#0#7'Caption'#6#15'Key Maintenance'#8'OnCreate'#7#10'Fo'
-  +'rmCreate'#8'Position'#7#14'poScreenCenter'#0#7'TBitBtn'#5'OKBtn'#4'Left'#3
-  +'0'#1#6'Height'#2#25#3'Top'#3'x'#1#5'Width'#2'K'#7'Caption'#6#2'OK'#7'Defaul'
-  +'t'#9#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#9
-  +'CancelBtn'#4'Left'#3#130#1#6'Height'#2#25#3'Top'#3'x'#1#5'Width'#2'K'#7'Cap'
-  +'tion'#6#6'Cancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#9
-  +'TGroupBox'#10'FileNameGb'#4'Left'#2#7#6'Height'#2'?'#3'Top'#2#2#5'Width'#3
-  +#198#1#7'Caption'#6#10'&File name'#8'TabOrder'#2#2#0#12'TSpeedButton'#10'Ope'
-  +'nFileSb'#4'Left'#3'H'#1#6'Height'#2#23#4'Hint'#6#25'Find key maintenance fi'
-  +'le'#3'Top'#2#6#5'Width'#2#23#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10'*'#5
-  +#0#0'&'#5#0#0'BM&'#5#0#0#0#0#0#0'6'#4#0#0'('#0#0#0#16#0#0#0#15#0#0#0#1#0#8#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0
-  +#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#192#192#192#0#192#220#192#0
-  +#240#200#164#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  'TPF0'#12'TKeyMaintFrm'#11'KeyMaintFrm'#4'Left'#3#240#0#6'Height'#3#147#1#3'T'
+  +'op'#3#219#0#5'Width'#3#227#1#18'HorzScrollBar.Page'#3#232#1#18'VertScrollBa'
+  +'r.Page'#3#157#1#13'ActiveControl'#7#5'OKBtn'#8'AutoSize'#9#11'BorderIcons'
+  +#11#12'biSystemMenu'#10'biMinimize'#0#7'Caption'#6#15'Key Maintenance'#12'Cl'
+  +'ientHeight'#3#147#1#11'ClientWidth'#3#227#1#8'OnCreate'#7#10'FormCreate'#8
+  +'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#7'TBitBtn'#5'O'
+  +'KBtn'#21'AnchorSideTop.Control'#7#9'CancelBtn'#23'AnchorSideRight.Control'#7
+  +#9'CancelBtn'#4'Left'#3'6'#1#6'Height'#2#25#3'Top'#3'k'#1#5'Width'#2'K'#7'An'
+  +'chors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Bottom'#2#8#7'Caption'#6#2
+  +'OK'#7'Default'#9#11'ModalResult'#2#1#8'TabOrder'#2#0#0#0#7'TBitBtn'#9'Cance'
+  +'lBtn'#21'AnchorSideTop.Control'#7#9'GroupBox1'#18'AnchorSideTop.Side'#7#9'a'
+  +'srBottom'#23'AnchorSideRight.Control'#7#10'FileNameGb'#20'AnchorSideRight.S'
+  +'ide'#7#9'asrBottom'#4'Left'#3#133#1#6'Height'#2#25#3'Top'#3'k'#1#5'Width'#2
+  +'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#18'BorderSpacing.Left'#2#4#17'Border'
+  +'Spacing.Top'#2#8#20'BorderSpacing.Bottom'#2#8#7'Caption'#6#6'Cancel'#11'Mod'
+  +'alResult'#2#2#8'TabOrder'#2#1#0#0#9'TGroupBox'#10'FileNameGb'#22'AnchorSide'
+  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSide'
+  +'Right.Control'#7#10'ProductsGb'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+  +'eft'#2#6#6'Height'#2';'#3'Top'#2#6#5'Width'#3#202#1#18'BorderSpacing.Left'#2
+  +#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bo'
+  +'ttom'#2#6#7'Caption'#6#10'&File name'#12'ClientHeight'#2''''#11'ClientWidth'
+  +#3#198#1#20'Constraints.MinWidth'#3#194#1#8'TabOrder'#2#2#0#12'TSpeedButton'
+  +#10'OpenFileSb'#23'AnchorSideRight.Control'#7#7'OpenBtn'#4'Left'#3'I'#1#6'He'
+  +'ight'#2#23#4'Hint'#6#25'Find key maintenance file'#3'Top'#2#6#5'Width'#2#23
+  +#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#4#10'Glyph.Da'
+  +'ta'#10'*'#5#0#0'&'#5#0#0'BM&'#5#0#0#0#0#0#0'6'#4#0#0'('#0#0#0#16#0#0#0#15#0
+  +#0#0#1#0#8#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128
+  +#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#192#192#192#0#192
+  +#220#192#0#240#200#164#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
@@ -42,95 +54,130 @@ LazarusResources.Add('TKeyMaintFrm','FORMDATA',[
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#240#251#255#0#164#160#160#0#128#128#128#0#0#0#255#0#0#255#0#0#0#255#255#0
-  +#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#7#7#7#7#7#7#7#7#7#7#7#7#7#7
-  +#7#7#0#0#0#0#0#0#0#0#0#0#0#7#7#7#7#7#0#0#3#3#3#3#3#3#3#3#3#0#7#7#7#7#0#251#0
-  +#3#3#3#3#3#3#3#3#3#0#7#7#7#0#255#251#0#3#3#3#3#3#3#3#3#3#0#7#7#0#251#255#251
-  +#0#3#3#3#3#3#3#3#3#3#0#7#0#255#251#255#251#0#0#0#0#0#0#0#0#0#0#0#0#251#255
-  +#251#255#251#255#251#255#251#0#7#7#7#7#7#0#255#251#255#251#255#251#255#251
-  +#255#0#7#7#7#7#7#0#251#255#251#0#0#0#0#0#0#0#7#7#7#7#7#7#0#0#0#7#7#7#7#7#7#7
-  +#7#0#0#0#7#7#7#7#7#7#7#7#7#7#7#7#7#7#0#0#7#7#7#7#7#7#7#7#7#0#7#7#7#0#7#0#7#7
-  +#7#7#7#7#7#7#7#7#0#0#0#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#9'NumGlyphs'#2
-  +#0#7'OnClick'#7#13'OpenFileClick'#0#0#7'TBitBtn'#7'OpenBtn'#4'Left'#3'e'#1#6
-  +'Height'#2#25#3'Top'#2#6#5'Width'#2'Z'#7'Caption'#6#5'&Open'#9'NumGlyphs'#2#0
-  +#7'OnClick'#7#12'OpenBtnClick'#8'TabOrder'#2#0#0#0#5'TEdit'#10'FileNameEd'#4
-  +'Left'#2#8#6'Height'#2#25#3'Top'#2#6#5'Width'#3';'#1#8'TabOrder'#2#1#4'Text'
-  +#6#11'onguard.ini'#0#0#0#9'TGroupBox'#10'ProductsGb'#4'Left'#2#7#6'Height'#3
-  +#181#0#3'Top'#2'@'#5'Width'#3#198#1#7'Caption'#6#13'A&pplications'#8'TabOrde'
-  +'r'#2#3#0#7'TButton'#6'AddBtn'#4'Left'#3'e'#1#6'Height'#2#25#4'Hint'#6#25'Ad'
-  +'d a new product and key'#3'Top'#2#8#5'Width'#2'Z'#25'BorderSpacing.InnerBor'
-  +'der'#2#4#7'Caption'#6#7'&Add...'#7'OnClick'#7#11'AddBtnClick'#8'TabOrder'#2
-  +#0#0#0#7'TButton'#7'EditBtn'#4'Left'#3'e'#1#6'Height'#2#25#4'Hint'#6#25'Edit'
-  +' the selected product'#3'Top'#2'0'#5'Width'#2'Z'#25'BorderSpacing.InnerBord'
-  +'er'#2#4#7'Caption'#6#8'&Edit...'#7'OnClick'#7#12'EditBtnClick'#8'TabOrder'#2
-  +#1#0#0#7'TButton'#9'DeleteBtn'#4'Left'#3'e'#1#6'Height'#2#25#4'Hint'#6#27'Re'
-  +'move the selected product'#3'Top'#2'X'#5'Width'#2'Z'#25'BorderSpacing.Inner'
-  ,'Border'#2#4#7'Caption'#6#7'&Delete'#7'OnClick'#7#14'DeleteBtnClick'#8'TabOr'
-  +'der'#2#2#0#0#8'TListBox'#10'ProductsLb'#4'Left'#2#8#6'Height'#3#148#0#3'Top'
-  +#2#8#5'Width'#3'W'#1#7'OnClick'#7#15'ProductsLbClick'#8'TabOrder'#2#3#8'TopI'
-  +'ndex'#2#255#0#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#6#6'Height'#2'y'#3'To'
-  +'p'#3#248#0#5'Width'#3#201#1#7'Caption'#6#4'&Key'#8'TabOrder'#2#4#0#12'TSpee'
-  +'dButton'#14'CopyBlockKeySb'#4'Left'#3#142#1#6'Height'#2#23#4'Hint'#6#21'Cop'
-  +'y key to clipboard'#3'Top'#2#24#5'Width'#2#23#5'Color'#7#9'clBtnFace'#10'Gl'
-  +'yph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0
-  +#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128
-  +#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255
-  +#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136
-  +#136#136#136#136#136#128#0#0#0#136#136#136#132'DDDD'#128#0#0#0#136#136#136
-  +#132#255#255#255#244#128#0#0#0#136#136#136#132#240#0#0#244#128#0#0#0#128#0#0
-  +#4#255#255#255#244#128#0#0#0#128#255#255#244#240#0#0#244#128#0#0#0#128#240#0
-  +#4#255#255#255#244#128#0#0#0#128#255#255#244#240#15'DD'#128#0#0#0#128#240#0#4
-  +#255#255'OH'#128#0#0#0#128#255#255#244#255#255'D'#136#128#0#0#0#128#240#15#4
-  +'DDH'#136#128#0#0#0#128#255#255#15#8#136#136#136#128#0#0#0#128#255#255#0#136
-  +#136#136#136#128#0#0#0#128#0#0#8#136#136#136#136#128#0#0#0#136#136#136#136
-  +#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#9'NumGl'
-  +'yphs'#2#0#7'OnClick'#7#19'CopyBlockKeySbClick'#0#0#12'TSpeedButton'#10'KeyP'
-  +'asteSb'#4'Left'#3#169#1#6'Height'#2#23#4'Hint'#6#20'Paste from clipboard'#3
-  +'Top'#2#26#5'Width'#2#23#5'Color'#7#9'clBtnFace'#10'Glyph.Data'#10'F'#1#0#0
-  +'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0
-  +#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0
-  +#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#192#192#192#0#128#128#128#0#0#0
-  +#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0
-  +'"""""""" '#0#0#0'"""""""" '#0#0#0'"""DDDDD '#0#0#0' '#0#0'O'#255#255#255#244
-  +' '#0#0#0#8'88O'#0#0#0#244' '#0#0#0#3#131#131'O'#255#255#255#244' '#0#0#0#8
-  +'88O'#0#15'DD '#0#0#0#3#131#131'O'#255#255'OB '#0#0#0#8'88O'#255#255'D" '#0#0
-  +#0#3#131#131'DDD@" '#0#0#0#8'888880" '#0#0#0#3#128#0#0#0#3#128'" '#0#0#0#8'0'
-  +'www'#8'0" '#0#0#0#3#131#11#0#176#131#128'" '#0#0#0' '#0#0#187#0#0#2'" '#0#0
-  +#0'"" '#0#2'""" '#0#0#0'"""""""" '#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#15'Ke'
-  +'yPasteSbClick'#0#0#12'TSpeedButton'#13'CopyByteKeySb'#4'Left'#3#142#1#6'Hei'
-  +'ght'#2#23#4'Hint'#6#21'Copy key to clipboard'#3'Top'#2'9'#5'Width'#2#23#5'C'
-  +'olor'#7#9'clBtnFace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0
-  +'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0
-  +#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255
-  +#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136
-  +#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#132
-  +'DDDD'#128#0#0#0#136#136#136#132#255#255#255#244#128#0#0#0#136#136#136#132
-  +#240#0#0#244#128#0#0#0#128#0#0#4#255#255#255#244#128#0#0#0#128#255#255#244
-  +#240#0#0#244#128#0#0#0#128#240#0#4#255#255#255#244#128#0#0#0#128#255#255#244
-  +#240#15'DD'#128#0#0#0#128#240#0#4#255#255'OH'#128#0#0#0#128#255#255#244#255
-  +#255'D'#136#128#0#0#0#128#240#15#4'DDH'#136#128#0#0#0#128#255#255#15#8#136
-  +#136#136#128#0#0#0#128#255#255#0#136#136#136#136#128#0#0#0#128#0#0#8#136#136
-  +#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136
-  +#136#136#136#136#128#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'CopyByteKeySbCli'
-  +'ck'#0#0#12'TSpeedButton'#12'SpeedButton1'#4'Left'#3#169#1#6'Height'#2#23#4
-  +'Hint'#6#20'Paste from clipboard'#3'Top'#2'9'#5'Width'#2#23#5'Color'#7#9'clB'
-  +'tnFace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0
-  +#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0
-  +#0#192#192#192#0#128#128#128#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255
-  +#0#255#0#255#255#0#0#255#255#255#0'"""""""" '#0#0#0'"""""""" '#0#0#0'"""DDDD'
-  +'D '#0#0#0' '#0#0'O'#255#255#255#244' '#0#0#0#8'88O'#0#0#0#244' '#0#0#0#3#131
-  +#131'O'#255#255#255#244' '#0#0#0#8'88O'#0#15'DD '#0#0#0#3#131#131'O'#255#255
-  +'OB '#0#0#0#8'88O'#255#255'D" '#0#0#0#3#131#131'DDD@" '#0#0#0#8'888880" '#0#0
-  +#0#3#128#0#0#0#3#128'" '#0#0#0#8'0www'#8'0" '#0#0#0#3#131#11#0#176#131#128'"'
-  +' '#0#0#0' '#0#0#187#0#0#2'" '#0#0#0'"" '#0#2'""" '#0#0#0'"""""""" '#0#0#0#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#17'SpeedButton1Click'#0#0#5'TEdit'#10'BlockKeyE'
-  +'d'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#24#5'Width'#3#132#1#8'TabOrder'#2#0#0
-  +#0#5'TEdit'#10'BytesKeyEd'#4'Left'#2#8#6'Height'#2#25#3'Top'#2'9'#5'Width'#3
-  ,#132#1#8'TabOrder'#2#1#0#0#0#11'TOpenDialog'#11'OpenDialog1'#5'Title'#6#27'S'
-  +'elect Key Maintenance File'#10'DefaultExt'#6#4'.ini'#6'Filter'#6'+INI Files'
-  +' (*.ini)|*.ini|All Files (*.*)|*.*'#11'FilterIndex'#2#0#7'Options'#11#15'of'
-  +'PathMustExist'#0#4'left'#3'p'#1#3'top'#3#144#0#0#0#0
+  +#0#0#0#0#0#0#240#251#255#0#164#160#160#0#128#128#128#0#0#0#255#0#0#255#0#0#0
+  +#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#7#7#7#7#7#7#7#7#7
+  +#7#7#7#7#7#7#7#0#0#0#0#0#0#0#0#0#0#0#7#7#7#7#7#0#0#3#3#3#3#3#3#3#3#3#0#7#7#7
+  +#7#0#251#0#3#3#3#3#3#3#3#3#3#0#7#7#7#0#255#251#0#3#3#3#3#3#3#3#3#3#0#7#7#0
+  +#251#255#251#0#3#3#3#3#3#3#3#3#3#0#7#0#255#251#255#251#0#0#0#0#0#0#0#0#0#0#0
+  +#0#251#255#251#255#251#255#251#255#251#0#7#7#7#7#7#0#255#251#255#251#255#251
+  +#255#251#255#0#7#7#7#7#7#0#251#255#251#0#0#0#0#0#0#0#7#7#7#7#7#7#0#0#0#7#7#7
+  +#7#7#7#7#7#0#0#0#7#7#7#7#7#7#7#7#7#7#7#7#7#7#0#0#7#7#7#7#7#7#7#7#7#0#7#7#7#0
+  +#7#0#7#7#7#7#7#7#7#7#7#7#0#0#0#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7#7'OnC'
+  +'lick'#7#13'OpenFileClick'#0#0#7'TBitBtn'#7'OpenBtn'#23'AnchorSideRight.Cont'
+  +'rol'#7#10'FileNameGb'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'd'#1
+  ,#6'Height'#2#25#3'Top'#2#6#5'Width'#2'Z'#7'Anchors'#11#5'akTop'#7'akRight'#0
+  +#19'BorderSpacing.Right'#2#8#20'BorderSpacing.Bottom'#2#8#7'Caption'#6#5'&Op'
+  +'en'#7'OnClick'#7#12'OpenBtnClick'#8'TabOrder'#2#0#0#0#5'TEdit'#10'FileNameE'
+  +'d'#22'AnchorSideLeft.Control'#7#10'FileNameGb'#21'AnchorSideTop.Control'#7
+  +#10'FileNameGb'#23'AnchorSideRight.Control'#7#10'OpenFileSb'#4'Left'#2#8#6'H'
+  +'eight'#2#23#3'Top'#2#8#5'Width'#3'9'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
+  +'kRight'#0#20'BorderSpacing.Around'#2#8#8'TabOrder'#2#1#4'Text'#6#11'onguard'
+  +'.ini'#0#0#0#9'TGroupBox'#10'ProductsGb'#22'AnchorSideLeft.Control'#7#10'Fil'
+  +'eNameGb'#21'AnchorSideTop.Control'#7#10'FileNameGb'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#23'AnchorSideRight.Control'#7#10'FileNameGb'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#184#0#3'Top'#2'G'#5'Width'#3
+  +#202#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#7'Caption'
+  +#6#13'A&pplications'#12'ClientHeight'#3#164#0#11'ClientWidth'#3#198#1#8'TabO'
+  +'rder'#2#3#0#7'TButton'#6'AddBtn'#22'AnchorSideLeft.Control'#7#10'ProductsLb'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'Produ'
+  +'ctsLb'#4'Left'#3'g'#1#6'Height'#2#25#4'Hint'#6#25'Add a new product and key'
+  +#3'Top'#2#8#5'Width'#2'Z'#18'BorderSpacing.Left'#2#8#19'BorderSpacing.Right'
+  +#2#8#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'&Add...'#7'OnClick'#7
+  +#11'AddBtnClick'#8'TabOrder'#2#0#0#0#7'TButton'#7'EditBtn'#22'AnchorSideLeft'
+  +'.Control'#7#6'AddBtn'#21'AnchorSideTop.Control'#7#6'AddBtn'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrBottom'#4'Left'#3'g'#1#6'Height'#2#25#4'Hint'#6#25'Edit the '
+  +'selected product'#3'Top'#2'1'#5'Width'#2'Z'#17'BorderSpacing.Top'#2#16#19'B'
+  +'orderSpacing.Right'#2#8#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#8'&E'
+  +'dit...'#7'OnClick'#7#12'EditBtnClick'#8'TabOrder'#2#1#0#0#7'TButton'#9'Dele'
+  +'teBtn'#22'AnchorSideLeft.Control'#7#6'AddBtn'#21'AnchorSideTop.Control'#7#7
+  +'EditBtn'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3'g'#1#6'Height'#2#25
+  +#4'Hint'#6#27'Remove the selected product'#3'Top'#2'Z'#5'Width'#2'Z'#17'Bord'
+  +'erSpacing.Top'#2#16#19'BorderSpacing.Right'#2#8#25'BorderSpacing.InnerBorde'
+  +'r'#2#4#7'Caption'#6#7'&Delete'#7'OnClick'#7#14'DeleteBtnClick'#8'TabOrder'#2
+  +#2#0#0#8'TListBox'#10'ProductsLb'#22'AnchorSideLeft.Control'#7#10'ProductsGb'
+  +#21'AnchorSideTop.Control'#7#10'ProductsGb'#4'Left'#2#8#6'Height'#3#148#0#3
+  +'Top'#2#8#5'Width'#3'W'#1#20'BorderSpacing.Around'#2#8#10'ItemHeight'#2#0#7
+  +'OnClick'#7#15'ProductsLbClick'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#9'GroupBo'
+  +'x1'#22'AnchorSideLeft.Control'#7#10'ProductsGb'#21'AnchorSideTop.Control'#7
+  +#10'ProductsGb'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Con'
+  +'trol'#7#10'ProductsGb'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6
+  +'Height'#2'^'#3'Top'#3#5#1#5'Width'#3#202#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#4'&Key'#12
+  +'ClientHeight'#2'J'#11'ClientWidth'#3#198#1#8'TabOrder'#2#4#0#12'TSpeedButto'
+  +'n'#14'CopyBlockKeySb'#21'AnchorSideTop.Control'#7#10'BlockKeyEd'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#10'KeyPasteSb'#4
+  +'Left'#3#140#1#6'Height'#2#23#4'Hint'#6#21'Copy key to clipboard'#3'Top'#2#8
+  +#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2
+  +#4#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0
+  +#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0
+  +#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0
+  +#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128#0#0#0
+  +#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#132'DDDD'#128#0#0#0
+  +#136#136#136#132#255#255#255#244#128#0#0#0#136#136#136#132#240#0#0#244#128#0
+  +#0#0#128#0#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#0#0#244#128#0#0
+  +#0#128#240#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#15'DD'#128#0#0#0
+  +#128#240#0#4#255#255'OH'#128#0#0#0#128#255#255#244#255#255'D'#136#128#0#0#0
+  +#128#240#15#4'DDH'#136#128#0#0#0#128#255#255#15#8#136#136#136#128#0#0#0#128
+  +#255#255#0#136#136#136#136#128#0#0#0#128#0#0#8#136#136#136#136#128#0#0#0#136
+  +#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0
+  +#0#0#7'OnClick'#7#19'CopyBlockKeySbClick'#0#0#12'TSpeedButton'#10'KeyPasteSb'
+  +#21'AnchorSideTop.Control'#7#10'BlockKeyEd'#18'AnchorSideTop.Side'#7#9'asrCe'
+  +'nter'#23'AnchorSideRight.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#3#167#1#6'Height'#2#23#4'Hint'#6#20'Paste from clipboa'
+  +'rd'#3'Top'#2#8#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderS'
+  +'pacing.Right'#2#8#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'
+  +#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0
+  ,#128#128#0#0#192#192#192#0#128#128#128#0#0#0#255#0#0#255#0#0#0#255#255#0#255
+  +#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0'"""""""" '#0#0#0'"""""""" '#0#0
+  +#0'"""DDDDD '#0#0#0' '#0#0'O'#255#255#255#244' '#0#0#0#8'88O'#0#0#0#244' '#0
+  +#0#0#3#131#131'O'#255#255#255#244' '#0#0#0#8'88O'#0#15'DD '#0#0#0#3#131#131
+  +'O'#255#255'OB '#0#0#0#8'88O'#255#255'D" '#0#0#0#3#131#131'DDD@" '#0#0#0#8'8'
+  +'88880" '#0#0#0#3#128#0#0#0#3#128'" '#0#0#0#8'0www'#8'0" '#0#0#0#3#131#11#0
+  +#176#131#128'" '#0#0#0' '#0#0#187#0#0#2'" '#0#0#0'"" '#0#2'""" '#0#0#0'"""""'
+  +'""" '#0#0#0#7'OnClick'#7#15'KeyPasteSbClick'#0#0#12'TSpeedButton'#13'CopyBy'
+  +'teKeySb'#22'AnchorSideLeft.Control'#7#14'CopyBlockKeySb'#21'AnchorSideTop.C'
+  +'ontrol'#7#10'BytesKeyEd'#4'Left'#3#140#1#6'Height'#2#23#4'Hint'#6#21'Copy k'
+  +'ey to clipboard'#3'Top'#2'+'#5'Width'#2#23#10'Glyph.Data'#10'F'#1#0#0'B'#1#0
+  +#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136
+  +#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0
+  +#136#136#136#132'DDDD'#128#0#0#0#136#136#136#132#255#255#255#244#128#0#0#0
+  +#136#136#136#132#240#0#0#244#128#0#0#0#128#0#0#4#255#255#255#244#128#0#0#0
+  +#128#255#255#244#240#0#0#244#128#0#0#0#128#240#0#4#255#255#255#244#128#0#0#0
+  +#128#255#255#244#240#15'DD'#128#0#0#0#128#240#0#4#255#255'OH'#128#0#0#0#128
+  +#255#255#244#255#255'D'#136#128#0#0#0#128#240#15#4'DDH'#136#128#0#0#0#128#255
+  +#255#15#8#136#136#136#128#0#0#0#128#255#255#0#136#136#136#136#128#0#0#0#128#0
+  +#0#8#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136
+  +#136#136#136#136#136#136#136#128#0#0#0#7'OnClick'#7#18'CopyByteKeySbClick'#0
+  +#0#12'TSpeedButton'#12'SpeedButton1'#22'AnchorSideLeft.Control'#7#10'KeyPast'
+  +'eSb'#21'AnchorSideTop.Control'#7#10'BytesKeyEd'#4'Left'#3#167#1#6'Height'#2
+  +#23#4'Hint'#6#20'Paste from clipboard'#3'Top'#2'+'#5'Width'#2#23#10'Glyph.Da'
+  +'ta'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0
+  +#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#192#192#192#0
+  +#128#128#128#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255
+  +#0#0#255#255#255#0'"""""""" '#0#0#0'"""""""" '#0#0#0'"""DDDDD '#0#0#0' '#0#0
+  +'O'#255#255#255#244' '#0#0#0#8'88O'#0#0#0#244' '#0#0#0#3#131#131'O'#255#255
+  +#255#244' '#0#0#0#8'88O'#0#15'DD '#0#0#0#3#131#131'O'#255#255'OB '#0#0#0#8'8'
+  +'8O'#255#255'D" '#0#0#0#3#131#131'DDD@" '#0#0#0#8'888880" '#0#0#0#3#128#0#0#0
+  +#3#128'" '#0#0#0#8'0www'#8'0" '#0#0#0#3#131#11#0#176#131#128'" '#0#0#0' '#0#0
+  +#187#0#0#2'" '#0#0#0'"" '#0#2'""" '#0#0#0'"""""""" '#0#0#0#7'OnClick'#7#17'S'
+  +'peedButton1Click'#0#0#5'TEdit'#10'BlockKeyEd'#22'AnchorSideLeft.Control'#7#9
+  +'GroupBox1'#21'AnchorSideTop.Control'#7#9'GroupBox1'#23'AnchorSideRight.Cont'
+  +'rol'#7#13'CopyByteKeySb'#4'Left'#2#8#6'Height'#2#23#3'Top'#2#8#5'Width'#3
+  +#128#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2
+  +#8#17'BorderSpacing.Top'#2#8#19'BorderSpacing.Right'#2#4#8'TabOrder'#2#0#0#0
+  +#5'TEdit'#10'BytesKeyEd'#22'AnchorSideLeft.Control'#7#10'BlockKeyEd'#21'Anch'
+  +'orSideTop.Control'#7#10'BlockKeyEd'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
+  +'AnchorSideRight.Control'#7#10'BlockKeyEd'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#8#6'Height'#2#23#3'Top'#2'+'#5'Width'#3#128#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#12#20'BorderSpacing'
+  +'.Bottom'#2#8#8'TabOrder'#2#1#0#0#0#11'TOpenDialog'#11'OpenDialog1'#5'Title'
+  +#6#27'Select Key Maintenance File'#10'DefaultExt'#6#4'.ini'#6'Filter'#6'+INI'
+  +' Files (*.ini)|*.ini|All Files (*.*)|*.*'#11'FilterIndex'#2#0#7'Options'#11
+  +#15'ofPathMustExist'#0#4'Left'#3'('#1#3'Top'#3#128#0#0#0#0
 ]);