diff --git a/components/onguard/images/BuildRC.bat b/components/onguard/images/BuildRC.bat
index 852a1a361..574cc4634 100644
--- a/components/onguard/images/BuildRC.bat
+++ b/components/onguard/images/BuildRC.bat
@@ -1,2 +1,5 @@
 @echo OFF
-lazres controls.lrs TOGUSAGECODE.xpm TOGSPECIALCODE.xpm TOGSERIALNUMBERCODE.xpm TOGREGISTRATIONCODE.xpm TOGPROTECTEXE.xpm TOGNETCODE.xpm TOGMAKEKEYS.xpm TOGMAKECODES.xpm TOGDAYSCODE.xpm TOGDATECODE.xpm
\ No newline at end of file
+dir /b *.png > files.txt
+lazres ../source/ogreg.res @files.txt
+del files.txt
+::lazres controls.lrs TOGUSAGECODE.xpm TOGSPECIALCODE.xpm TOGSERIALNUMBERCODE.xpm TOGREGISTRATIONCODE.xpm TOGPROTECTEXE.xpm TOGNETCODE.xpm TOGMAKEKEYS.xpm TOGMAKECODES.xpm TOGDAYSCODE.xpm TOGDATECODE.xpm
\ No newline at end of file
diff --git a/components/onguard/images/TOgDateCode.png b/components/onguard/images/TOgDateCode.png
new file mode 100644
index 000000000..7c24a4438
Binary files /dev/null and b/components/onguard/images/TOgDateCode.png differ
diff --git a/components/onguard/images/TOgDateCode_150.png b/components/onguard/images/TOgDateCode_150.png
new file mode 100644
index 000000000..b5f9874c2
Binary files /dev/null and b/components/onguard/images/TOgDateCode_150.png differ
diff --git a/components/onguard/images/TOgDateCode_200.png b/components/onguard/images/TOgDateCode_200.png
new file mode 100644
index 000000000..fba61a1d6
Binary files /dev/null and b/components/onguard/images/TOgDateCode_200.png differ
diff --git a/components/onguard/images/TOgDaysCode.png b/components/onguard/images/TOgDaysCode.png
new file mode 100644
index 000000000..fd2c20ba5
Binary files /dev/null and b/components/onguard/images/TOgDaysCode.png differ
diff --git a/components/onguard/images/TOgDaysCode_150.png b/components/onguard/images/TOgDaysCode_150.png
new file mode 100644
index 000000000..fed8d0876
Binary files /dev/null and b/components/onguard/images/TOgDaysCode_150.png differ
diff --git a/components/onguard/images/TOgDaysCode_200.png b/components/onguard/images/TOgDaysCode_200.png
new file mode 100644
index 000000000..d98d39e80
Binary files /dev/null and b/components/onguard/images/TOgDaysCode_200.png differ
diff --git a/components/onguard/images/TOgMakeCodes.png b/components/onguard/images/TOgMakeCodes.png
new file mode 100644
index 000000000..59a0217c8
Binary files /dev/null and b/components/onguard/images/TOgMakeCodes.png differ
diff --git a/components/onguard/images/TOgMakeCodes_150.png b/components/onguard/images/TOgMakeCodes_150.png
new file mode 100644
index 000000000..633055ec2
Binary files /dev/null and b/components/onguard/images/TOgMakeCodes_150.png differ
diff --git a/components/onguard/images/TOgMakeCodes_200.png b/components/onguard/images/TOgMakeCodes_200.png
new file mode 100644
index 000000000..77ecf5612
Binary files /dev/null and b/components/onguard/images/TOgMakeCodes_200.png differ
diff --git a/components/onguard/images/TOgMakeKeys.png b/components/onguard/images/TOgMakeKeys.png
new file mode 100644
index 000000000..99d77ae5d
Binary files /dev/null and b/components/onguard/images/TOgMakeKeys.png differ
diff --git a/components/onguard/images/TOgMakeKeys_150.png b/components/onguard/images/TOgMakeKeys_150.png
new file mode 100644
index 000000000..9efa89182
Binary files /dev/null and b/components/onguard/images/TOgMakeKeys_150.png differ
diff --git a/components/onguard/images/TOgMakeKeys_200.png b/components/onguard/images/TOgMakeKeys_200.png
new file mode 100644
index 000000000..c4c9bf058
Binary files /dev/null and b/components/onguard/images/TOgMakeKeys_200.png differ
diff --git a/components/onguard/images/TOgNetCode.png b/components/onguard/images/TOgNetCode.png
new file mode 100644
index 000000000..fc778524d
Binary files /dev/null and b/components/onguard/images/TOgNetCode.png differ
diff --git a/components/onguard/images/TOgNetCode_150.png b/components/onguard/images/TOgNetCode_150.png
new file mode 100644
index 000000000..a4eea72e7
Binary files /dev/null and b/components/onguard/images/TOgNetCode_150.png differ
diff --git a/components/onguard/images/TOgNetCode_200.png b/components/onguard/images/TOgNetCode_200.png
new file mode 100644
index 000000000..6bc4fe1dc
Binary files /dev/null and b/components/onguard/images/TOgNetCode_200.png differ
diff --git a/components/onguard/images/TOgProtectExe.png b/components/onguard/images/TOgProtectExe.png
new file mode 100644
index 000000000..144a61e86
Binary files /dev/null and b/components/onguard/images/TOgProtectExe.png differ
diff --git a/components/onguard/images/TOgProtectExe_150.png b/components/onguard/images/TOgProtectExe_150.png
new file mode 100644
index 000000000..2f012a092
Binary files /dev/null and b/components/onguard/images/TOgProtectExe_150.png differ
diff --git a/components/onguard/images/TOgProtectExe_200.png b/components/onguard/images/TOgProtectExe_200.png
new file mode 100644
index 000000000..f2ffb240b
Binary files /dev/null and b/components/onguard/images/TOgProtectExe_200.png differ
diff --git a/components/onguard/images/TOgRegistrationCode.png b/components/onguard/images/TOgRegistrationCode.png
new file mode 100644
index 000000000..3e1a40806
Binary files /dev/null and b/components/onguard/images/TOgRegistrationCode.png differ
diff --git a/components/onguard/images/TOgRegistrationCode_150.png b/components/onguard/images/TOgRegistrationCode_150.png
new file mode 100644
index 000000000..9b05cbafd
Binary files /dev/null and b/components/onguard/images/TOgRegistrationCode_150.png differ
diff --git a/components/onguard/images/TOgRegistrationCode_200.png b/components/onguard/images/TOgRegistrationCode_200.png
new file mode 100644
index 000000000..8cd3d40a1
Binary files /dev/null and b/components/onguard/images/TOgRegistrationCode_200.png differ
diff --git a/components/onguard/images/TOgSerialNumberCode.png b/components/onguard/images/TOgSerialNumberCode.png
new file mode 100644
index 000000000..443f20b4c
Binary files /dev/null and b/components/onguard/images/TOgSerialNumberCode.png differ
diff --git a/components/onguard/images/TOgSerialNumberCode_150.png b/components/onguard/images/TOgSerialNumberCode_150.png
new file mode 100644
index 000000000..7bd8fd96f
Binary files /dev/null and b/components/onguard/images/TOgSerialNumberCode_150.png differ
diff --git a/components/onguard/images/TOgSerialNumberCode_200.png b/components/onguard/images/TOgSerialNumberCode_200.png
new file mode 100644
index 000000000..4068c5a65
Binary files /dev/null and b/components/onguard/images/TOgSerialNumberCode_200.png differ
diff --git a/components/onguard/images/TOgSpecialCode.png b/components/onguard/images/TOgSpecialCode.png
new file mode 100644
index 000000000..21515fee5
Binary files /dev/null and b/components/onguard/images/TOgSpecialCode.png differ
diff --git a/components/onguard/images/TOgSpecialCode_150.png b/components/onguard/images/TOgSpecialCode_150.png
new file mode 100644
index 000000000..cf4c532b9
Binary files /dev/null and b/components/onguard/images/TOgSpecialCode_150.png differ
diff --git a/components/onguard/images/TOgSpecialCode_200.png b/components/onguard/images/TOgSpecialCode_200.png
new file mode 100644
index 000000000..7e6e3dd83
Binary files /dev/null and b/components/onguard/images/TOgSpecialCode_200.png differ
diff --git a/components/onguard/images/TOgUsageCode.png b/components/onguard/images/TOgUsageCode.png
new file mode 100644
index 000000000..b458e9b44
Binary files /dev/null and b/components/onguard/images/TOgUsageCode.png differ
diff --git a/components/onguard/images/TOgUsageCode_150.png b/components/onguard/images/TOgUsageCode_150.png
new file mode 100644
index 000000000..4a1984711
Binary files /dev/null and b/components/onguard/images/TOgUsageCode_150.png differ
diff --git a/components/onguard/images/TOgUsageCode_200.png b/components/onguard/images/TOgUsageCode_200.png
new file mode 100644
index 000000000..26fa40e2a
Binary files /dev/null and b/components/onguard/images/TOgUsageCode_200.png differ
diff --git a/components/onguard/source/ogreg.pas b/components/onguard/source/ogreg.pas
index ea70d7a13..466585e5e 100644
--- a/components/onguard/source/ogreg.pas
+++ b/components/onguard/source/ogreg.pas
@@ -43,6 +43,8 @@ procedure Register;
 
 implementation
 
+{$R ogreg.res}
+
 uses
   Classes, Controls, Forms,
   qogabout0, ogconst,ognetwrk, ogproexe,                  {AH.01}
@@ -54,9 +56,9 @@ uses
   qonguard7,                                                       {AH.01}
   ogutil,                                                            {!!.12}
   ComponentEditors,
-  PropEdits,
-  LazarusPackageIntf,
-  LResources;
+  PropEdits;
+//  LazarusPackageIntf;
+  //LResources;
 
 {-------------------------------------------------------------------------------
                              TOgCodeGenEditor
@@ -225,10 +227,4 @@ begin
     TOgProtectExe]);
 end;
 
-
-{$IFDEF FPC}
-initialization
-{$I ogreg.lrs}
-{$ENDIF}
-
 end.
diff --git a/components/onguard/source/ogreg.res b/components/onguard/source/ogreg.res
new file mode 100644
index 000000000..9bce147dc
Binary files /dev/null and b/components/onguard/source/ogreg.res differ