diff --git a/data/eng/@notify b/data/eng/@notify
deleted file mode 100644
index cb2a8b4811..0000000000
Binary files a/data/eng/@notify and /dev/null differ
diff --git a/data/eng/Makefile b/data/eng/Makefile
index 4136c4200c..a752f787cf 100644
--- a/data/eng/Makefile
+++ b/data/eng/Makefile
@@ -41,6 +41,7 @@ export DOCDIR
 FASM_PROGRAMS:=\
  @clip:@CLIP:$(PROGS)/system/clip/trunk/@clip.ASM \
  @menu:@MENU:$(PROGS)/system/menu/trunk/menu.asm \
+ @notify:@NOTIFY:$(PROGS)/system/notify/trunk/@notify.asm \
  @panel:@PANEL:$(PROGS)/system/panel/trunk/@PANEL.ASM \
  @rb:@RB:$(PROGS)/system/rb/trunk/@RB.ASM \
  @ss:@SS:$(PROGS)/system/ss/trunk/@ss.asm\
@@ -63,6 +64,7 @@ FASM_PROGRAMS:=\
  magnify:MAGNIFY:$(PROGS)/demos/magnify/trunk/magnify.asm \
  mgb:MGB:$(PROGS)/system/mgb/trunk/mgb.asm \
  mousemul:MOUSEMUL:$(PROGS)/system/mousemul/trunk/mousemul.asm \
+ mykey:MYKEY:$(PROGS)/system/MyKey/trunk/MyKey.asm \
  pcidev:PCIDEV:$(PROGS)/system/pcidev/trunk/PCIDEV.ASM \
  period:PERIOD:$(PROGS)/other/period/trunk/period.asm \
  pic4:PIC4:$(PROGS)/media/pic4/trunk/pic4.asm \
@@ -71,6 +73,8 @@ FASM_PROGRAMS:=\
  run:RUN:$(PROGS)/system/run/trunk/run.asm \
  scrshoot:SCRSHOOT:$(PROGS)/media/scrshoot/scrshoot.asm \
  setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \
+ spanel:SPANEL:$(PROGS)/system/spanel/trunk/spanel.asm \
+ test:TEST:$(PROGS)/system/test/trunk/test.asm \
  tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \
  vrr:VRR:$(PROGS)/system/vrr/trunk/vrr.asm \
  vrr_m:VRR_M:$(PROGS)/system/vrr_m/trunk/vrr_m.asm \
@@ -223,9 +227,9 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \
  icons.dat:ICONS.DAT iconstrp.gif:ICONSTRP.GIF index_htm:INDEX.HTM \
  kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY kpack:KPACK \
  kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \
- menu.dat:MENU.DAT mykey:MYKEY @notify:@NOTIFY \
+ menu.dat:MENU.DAT \
  panel.dat:PANEL.DAT setup.dat:SETUP.DAT \
- shell:SHELL spanel:SPANEL table:TABLE test:TEST \
+ shell:SHELL table:TABLE \
  vmode:VMODE 3d/3dsheart:3D/3DSHEART \
  3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \
  demos/ak47.lif:DEMOS/AK47.LIF \
diff --git a/data/eng/mykey b/data/eng/mykey
deleted file mode 100644
index 95e9153bf4..0000000000
Binary files a/data/eng/mykey and /dev/null differ
diff --git a/data/eng/spanel b/data/eng/spanel
deleted file mode 100644
index b2e75e6358..0000000000
Binary files a/data/eng/spanel and /dev/null differ
diff --git a/data/eng/test b/data/eng/test
deleted file mode 100644
index c2890faf65..0000000000
Binary files a/data/eng/test and /dev/null differ
diff --git a/data/rus/@notify b/data/rus/@notify
deleted file mode 100644
index cb2a8b4811..0000000000
Binary files a/data/rus/@notify and /dev/null differ
diff --git a/data/rus/Makefile b/data/rus/Makefile
index 37c78d6013..785c9dbd37 100644
--- a/data/rus/Makefile
+++ b/data/rus/Makefile
@@ -41,6 +41,7 @@ export DOCDIR
 FASM_PROGRAMS:=\
  @clip:@CLIP:$(PROGS)/system/clip/trunk/@clip.ASM \
  @menu:@MENU:$(PROGS)/system/menu/trunk/menu.asm \
+ @notify:@NOTIFY:$(PROGS)/system/notify/trunk/@notify.asm \
  @panel:@PANEL:$(PROGS)/system/panel/trunk/@PANEL.ASM \
  @rb:@RB:$(PROGS)/system/rb/trunk/@RB.ASM \
  @ss:@SS:$(PROGS)/system/ss/trunk/@ss.asm \
@@ -63,6 +64,7 @@ FASM_PROGRAMS:=\
  magnify:MAGNIFY:$(PROGS)/demos/magnify/trunk/magnify.asm \
  mgb:MGB:$(PROGS)/system/mgb/trunk/mgb.asm \
  mousemul:MOUSEMUL:$(PROGS)/system/mousemul/trunk/mousemul.asm \
+ mykey:MYKEY:$(PROGS)/system/MyKey/trunk/MyKey.asm \
  pcidev:PCIDEV:$(PROGS)/system/pcidev/trunk/PCIDEV.ASM \
  period:PERIOD:$(PROGS)/other/period/trunk/period.asm \
  pic4:PIC4:$(PROGS)/media/pic4/trunk/pic4.asm \
@@ -71,6 +73,8 @@ FASM_PROGRAMS:=\
  run:RUN:$(PROGS)/system/run/trunk/run.asm \
  scrshoot:SCRSHOOT:$(PROGS)/media/scrshoot/scrshoot.asm \
  setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \
+ spanel:SPANEL:$(PROGS)/system/spanel/trunk/spanel.asm \
+ test:TEST:$(PROGS)/system/test/trunk/test.asm \
  tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \
  vrr:VRR:$(PROGS)/system/vrr/trunk/vrr.asm \
  vrr_m:VRR_M:$(PROGS)/system/vrr_m/trunk/vrr_m.asm \
@@ -223,9 +227,9 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \
  icons.dat:ICONS.DAT iconstrp.gif:ICONSTRP.GIF index_htm:INDEX.HTM \
  kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY kpack:KPACK \
  kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \
- menu.dat:MENU.DAT mykey:MYKEY @notify:@NOTIFY \
+ menu.dat:MENU.DAT \
  panel.dat:PANEL.DAT pipetka:PIPETKA setup.dat:SETUP.DAT \
- shell:SHELL spanel:SPANEL table:TABLE test:TEST \
+ shell:SHELL table:TABLE \
  vmode:VMODE 3d/3dsheart:3D/3DSHEART \
  3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \
  demos/ak47.lif:DEMOS/AK47.LIF \
diff --git a/data/rus/mykey b/data/rus/mykey
deleted file mode 100644
index 95e9153bf4..0000000000
Binary files a/data/rus/mykey and /dev/null differ
diff --git a/data/rus/spanel b/data/rus/spanel
deleted file mode 100644
index b2e75e6358..0000000000
Binary files a/data/rus/spanel and /dev/null differ
diff --git a/data/rus/test b/data/rus/test
deleted file mode 100644
index c2890faf65..0000000000
Binary files a/data/rus/test and /dev/null differ
diff --git a/programs/system/MyKey/trunk/MyKey.asm b/programs/system/MyKey/trunk/MyKey.asm
index f0d079ecc2..5704f1811c 100644
--- a/programs/system/MyKey/trunk/MyKey.asm
+++ b/programs/system/MyKey/trunk/MyKey.asm
@@ -19,7 +19,7 @@ use32
 	dd	0x0
 	dd	app_path
 
-include 'aspAPI.inc'
+include 'ASPAPI.INC'
 include 'string.inc'
 include 'macros.inc'
 include 'editbox_ex.mac'
diff --git a/programs/system/spanel/trunk/spanel.asm b/programs/system/spanel/trunk/spanel.asm
index 84485b04c1..043c347ed5 100644
--- a/programs/system/spanel/trunk/spanel.asm
+++ b/programs/system/spanel/trunk/spanel.asm
@@ -16,7 +16,7 @@ use32
                dd     0x8000                  ; esp
                dd     0x0 , 0x0               ; I_Param , I_Icon
 
-include '..\..\macros.inc'
+include '../../../macros.inc'
 
 START:                          ; start of execution
 
diff --git a/programs/system/test/trunk/test.asm b/programs/system/test/trunk/test.asm
index 6554d17db0..abc82ea1a7 100644
--- a/programs/system/test/trunk/test.asm
+++ b/programs/system/test/trunk/test.asm
@@ -14,7 +14,7 @@ use32
                dd     0xfff0                  ; esp
                dd     0x0 , 0x0               ; I_Param , I_Icon
 
-include '..\..\macros.inc'
+include '../../../macros.inc'
 
 START:                          ; start of execution