diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 30dfc5aa15..2d0014e885 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -138,7 +138,8 @@ extra_files = {
  {"kolibrios/3D/info3ds/TL_SYS_16.PNG", PROGS .. "/develop/info3ds/tl_sys_16.png"},
  {"kolibrios/3D/info3ds/TOOLBAR.PNG", PROGS .. "/develop/info3ds/toolbar.png"},
  {"kolibrios/3D/info3ds/FONT8X9.BMP", PROGS .. "/fs/kfar/trunk/font8x9.bmp"},
- {"kolibrios/3D/m2view/", "common/3d/md2view/*"},
+ {"kolibrios/3D/md2view/", "common/3d/md2view/*"},
+ {"kolibrios/3D/md2view/md2_model", "common/3d/md2view/md2_model/*"},
  {"kolibrios/3D/voxel_editor/VOXEL_EDITOR", PROGS .. "/media/voxel_editor/trunk/voxel_editor"},
  {"kolibrios/3D/voxel_editor/CURSORS.PNG", PROGS .. "/media/voxel_editor/trunk/cursors.png"},
  {"kolibrios/3D/voxel_editor/CURSORS_GR.PNG", PROGS .. "/media/voxel_editor/trunk/cursors_gr.png"},
@@ -195,7 +196,11 @@ extra_files = {
  {"kolibrios/games/phenix", PROGS .. "/games/phenix/trunk/phenix"},
  {"kolibrios/games/soko/soko", PROGS .. "/games/soko/trunk/SOKO"},
  {"kolibrios/games/soko/", "common/games/soko/*"},
- {"kolibrios/ggrafx2/", "common/media/grafx2/*"},
+ {"kolibrios/grafx2/fonts/", "common/media/grafx2/fonts/*"},
+ {"kolibrios/grafx2/scripts/", "common/media/grafx2/scripts/libs/*"},
+ {"kolibrios/grafx2/scripts/libs/", "common/media/grafx2/scripts/*"},
+ {"kolibrios/grafx2/skins/", "common/media/grafx2/skins/*"},
+ {"kolibrios/grafx2/", "common/media/grafx2/*"},
  {"kolibrios/drivers/ahci/", "common/drivers/ahci/*"},
  {"kolibrios/drivers/atikms/", "common/drivers/atikms/*"},
  {"kolibrios/drivers/i915/", "common/drivers/i915/*"},
diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini
index 8bf4130b98..58b565053f 100644
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -16,9 +16,9 @@ VoxelEditor=/kolibrios/3d/voxel_editor/voxel_editor,30
 
 [3D Demos]
 3dsHeart=/kolibrios/3d/3dsheart,78
-M2View=/kolibrios/3d/m2view/m2view,78
+M2View=/kolibrios/3d/md2view/md2view,78
 
 [Other]
 Calc+=/kolibrios/utils/calcplus,4
 Life=/kolibrios/demos/life2,13
-fNav=/kolibrios/utils/fNav.kex,45
+fNav=/kolibrios/utils/fNav/fNav.kex,45
diff --git a/programs/cmm/eolite/include/icons.h b/programs/cmm/eolite/include/icons.h
index ac8b170d23..8836760fa2 100644
--- a/programs/cmm/eolite/include/icons.h
+++ b/programs/cmm/eolite/include/icons.h
@@ -16,7 +16,7 @@ char *ext[]={
 "skn", 13,
 "avi", 14, "flv", 14, "mpg", 14, "wmv", 14, "mov", 14, "mkv", 14, "mp4", 14, "vob", 14, "webm", 14,
 "djvu",15, "pdf", 15, "fb2", 15,
-"nes", 18, "smc", 18,
+"nes", 18, "smc", 18, "min", 18,
 "gif", 19, "bmp", 19, "tga", 19, "pcx", 19, "png", 19, "pnm", 19, "jpg", 19, "xcf", 19, "ai",  19,
 "jpeg",19, "raw", 11, "psd", 19, "wbmp",19, "tiff",19, "tif", 19, 
 "3ds", 20, "asc", 20, "ico", 20, "cur", 20, "ani", 20, "vox", 20,
diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h
index b3335abe81..ba68c6a856 100644
--- a/programs/cmm/eolite/include/left_panel.h
+++ b/programs/cmm/eolite/include/left_panel.h
@@ -113,7 +113,7 @@ void _SystemDiscs::Get()
 		}
 		if (!strcmp(#sys_discs, "/rd/1/")) 
 		{
-			GetDir(#tempbuf, #temp_file_count, "/kolibrios/", DIRS_ONLYREAL);
+			GetDir(#tempbuf, #temp_file_count, "/kolibrios", DIRS_ONLYREAL);
 			if (temp_file_count) list.add("/kolibrios/");
 			free(tempbuf);
 		}
@@ -239,7 +239,7 @@ void DrawLeftPanelBg()
 	}
 	else
 	{
-		DrawBar(2,start_y,190, onTop1-268, col_lpanel);
+		DrawBar(2,start_y,190, onTop1-268+status_bar_h, col_lpanel);
 		PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270, 8, #blue_hl_pal);
 	}
 	PutShadow(17,start_y,160,1,1,3);