diff --git a/projects/ce3.dsp b/projects/ce3.dsp
index 48567f31b..87f9e90a9 100755
--- a/projects/ce3.dsp
+++ b/projects/ce3.dsp
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "XI_R4" /FR /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "__LONGDOUBLE__" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -367,6 +367,54 @@ InputName=ce3700a
 # Begin Group "Headers"
 
 # PROP Default_Filter "h"
+# Begin Source File
+
+SOURCE=..\ce\ce3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3100.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3100a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3200.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3200a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3300.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3300a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3400.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3400a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3500a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3600a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ce\ce3700a.h
+# End Source File
 # End Group
 # Begin Group "Forms"
 
diff --git a/projects/cg3.dsp b/projects/cg3.dsp
index 440359ed1..8bab1ac59 100755
--- a/projects/cg3.dsp
+++ b/projects/cg3.dsp
@@ -132,6 +132,10 @@ SOURCE=..\cg\cg3700.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\cg\cg3800.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\cg\cglib01.cpp
 # End Source File
 # Begin Source File
@@ -517,11 +521,98 @@ InputName=cg3700a
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3800a.uml
+
+!IF  "$(CFG)" == "cg3 - Win32 Release"
+
+# Begin Custom Build - Compiling mask $(InputPath)...
+TargetDir=D:\Release\Campo32
+InputPath=..\cg\cg3800a.uml
+InputName=cg3800a
+
+"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	msk32 $(InputPath) $(TargetDir)\$(InputName).msk
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "cg3 - Win32 Debug"
+
+# Begin Custom Build - Compiling mask $(InputPath)...
+TargetDir=\U\Luca\r030200\exed
+InputPath=..\cg\cg3800a.uml
+InputName=cg3800a
+
+"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	msk32 $(InputPath) $(TargetDir)\$(InputName).msk
+
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Headers"
 
 # PROP Default_Filter "h"
+# Begin Source File
+
+SOURCE=..\cg\cg3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3100.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3200.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3300.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3300a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3300b.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3400a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3400b.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3401.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3500.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3600.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3700a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3800.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3800a.h
+# End Source File
 # End Group
 # Begin Group "Forms"
 
@@ -544,13 +635,44 @@ InputName=cg3300
 
 !ELSEIF  "$(CFG)" == "cg3 - Win32 Debug"
 
-# Begin Custom Build - Copying form $(InputPath) to $(TargetDir)...
+# Begin Custom Build - Compiling form $(InputPath)...
 TargetDir=\U\Luca\r030200\exed
 InputPath=..\cg\cg3300.frm
 InputName=cg3300
 
 "$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) $(TargetDir)
+	frm32 $(InputPath) $(TargetDir)\$(InputName).frm
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg3800a.frm
+
+!IF  "$(CFG)" == "cg3 - Win32 Release"
+
+# Begin Custom Build - Compiling form $(InputPath)...
+TargetDir=D:\Release\Campo32
+InputPath=..\cg\cg3800a.frm
+InputName=cg3800a
+
+"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	frm32 $(InputPath) $(TargetDir)\$(InputName).frm
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "cg3 - Win32 Debug"
+
+# Begin Custom Build - Compiling form $(InputPath)...
+TargetDir=\U\Luca\r030200\exed
+InputPath=..\cg\cg3800a.frm
+InputName=cg3800a
+
+"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	frm32 $(InputPath) $(TargetDir)\$(InputName).frm
 
 # End Custom Build
 
diff --git a/projects/cg5.dsp b/projects/cg5.dsp
index c8672d055..f62a879de 100755
--- a/projects/cg5.dsp
+++ b/projects/cg5.dsp
@@ -567,7 +567,7 @@ SOURCE=..\cg\cg5700a.frm
 
 !IF  "$(CFG)" == "cg5 - Win32 Release"
 
-# Begin Custom Build - Compiling mask $(InputPath)...
+# Begin Custom Build - Compiling form $(InputPath)...
 TargetDir=D:\Release\Campo32
 InputPath=..\cg\cg5700a.frm
 InputName=cg5700a
diff --git a/projects/cm1.dsp b/projects/cm1.dsp
new file mode 100755
index 000000000..46cdaab7f
--- /dev/null
+++ b/projects/cm1.dsp
@@ -0,0 +1,226 @@
+# Microsoft Developer Studio Project File - Name="cm1" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=cm1 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "cm1.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "cm1.mak" CFG="cm1 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "cm1 - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "cm1 - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "cm1 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\release"
+# PROP Intermediate_Dir "..\release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x410 /d "NDEBUG"
+# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\AGA32\cm1.exe"
+# SUBTRACT LINK32 /map /debug /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "cm1 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\debug"
+# PROP Intermediate_Dir "..\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "__LONGDOUBLE__" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x410 /d "_DEBUG"
+# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\cm1.exe" /pdbtype:sept
+# SUBTRACT LINK32 /incremental:no /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "cm1 - Win32 Release"
+# Name "cm1 - Win32 Debug"
+# Begin Group "Sources"
+
+# PROP Default_Filter "cpp"
+# Begin Source File
+
+SOURCE=..\cg\cg2101.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cg2103.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cglib01.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\cg\cgsaldac.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\cm\cm1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\cm\cm1100.cpp
+# End Source File
+# End Group
+# Begin Group "Masks"
+
+# PROP Default_Filter "uml"
+# Begin Source File
+
+SOURCE=..\cm\cm1100a.uml
+
+!IF  "$(CFG)" == "cm1 - Win32 Release"
+
+# Begin Custom Build - Compiling mask $(InputPath)...
+TargetDir=D:\Release\AGA32
+InputPath=..\cm\cm1100a.uml
+InputName=cm1100a
+
+"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	msk32 $(InputPath) $(TargetDir)\$(InputName).msk
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "cm1 - Win32 Debug"
+
+# Begin Custom Build - Compiling mask $(InputPath)...
+TargetDir=\U\Luca\r030200\exed
+InputPath=..\cm\cm1100a.uml
+InputName=cm1100a
+
+"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	msk32 $(InputPath) $(TargetDir)\$(InputName).msk
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Headers"
+
+# PROP Default_Filter "h"
+# Begin Source File
+
+SOURCE=..\cm\cm1.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cm\cm1100.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cm\cm1100a.h
+# End Source File
+# End Group
+# Begin Group "Forms"
+
+# PROP Default_Filter "frm"
+# Begin Source File
+
+SOURCE=..\cm\cm1100a.frm
+
+!IF  "$(CFG)" == "cm1 - Win32 Release"
+
+# Begin Custom Build - Compiling form $(InputPath)...
+TargetDir=D:\Release\AGA32
+InputPath=..\cm\cm1100a.frm
+InputName=cm1100a
+
+"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	frm32 $(InputPath) $(TargetDir)\$(InputName).frm
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "cm1 - Win32 Debug"
+
+# Begin Custom Build - Compiling form $(InputPath)...
+TargetDir=\U\Luca\r030200\exed
+InputPath=..\cm\cm1100a.frm
+InputName=cm1100a
+
+"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	frm32 $(InputPath) $(TargetDir)\$(InputName).frm
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\cm1.rc
+
+!IF  "$(CFG)" == "cm1 - Win32 Release"
+
+# ADD BASE RSC /l 0x410
+# ADD RSC /l 0x410
+
+!ELSEIF  "$(CFG)" == "cm1 - Win32 Debug"
+
+# ADD BASE RSC /l 0x410
+# ADD RSC /l 0x410 /fo"..\Debug/cm1.res"
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
diff --git a/projects/cm1.rc b/projects/cm1.rc
new file mode 100755
index 000000000..898d4e0c0
--- /dev/null
+++ b/projects/cm1.rc
@@ -0,0 +1,4 @@
+"9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
+
+rcinclude ../../wx240/include/wx/msw/wx.rc
+
diff --git a/projects/omnia0.rc b/projects/omnia0.rc
new file mode 100755
index 000000000..898d4e0c0
--- /dev/null
+++ b/projects/omnia0.rc
@@ -0,0 +1,4 @@
+"9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
+
+rcinclude ../../wx240/include/wx/msw/wx.rc
+