diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index a8f6a8adde..d4f72c5c44 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -286,7 +286,7 @@ if build_type == "rus" then tup.append_table(extra_files, {
  {"kolibrios/games/Dungeons/Resources/Textures/HUD/", PROGS .. "/games/Dungeons/Resources/Textures/HUD/*"},
  {"kolibrios/games/Dungeons/Resources/Textures/", PROGS .. "/games/Dungeons/Resources/Textures/Licenses.txt"},
  {"kolibrios/games/Dungeons/", PROGS .. "/games/Dungeons/readme_ru.txt"},
- {"kolibrios/games/sstartrek/", "common/games/sstartrek/SStarTrek_ru"},
+ {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_ru"},
  {"kolibrios/games/WHOWTBAM/", build_type .. "/games/whowtbam"},
  {"kolibrios/games/WHOWTBAM/", build_type .. "/games/appdata.dat"},
  {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"},
@@ -302,7 +302,7 @@ if build_type == "rus" then tup.append_table(extra_files, {
  {"HD_Load/mtldr/install.txt", PROGS .. "/hd_load/mtldr/install_eng.txt"},
  {"HD_Load/USB_Boot/readme.txt", PROGS .. "/hd_load/usb_boot/readme_eng.txt"},
  {"kolibrios/games/ataka", "common/games/ataka/ataka_en"},
- {"kolibrios/games/sstartrek/", "common/games/sstartrek/SStarTrek_en"},
+ {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_en"},
  {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"},
 }) end
 --[[
diff --git a/data/rus/settings/games.ini b/data/rus/settings/games.ini
index bb76143948..fc19158c11 100644
--- a/data/rus/settings/games.ini
+++ b/data/rus/settings/games.ini
@@ -32,7 +32,7 @@ Sea War=games/SW,66
 Almaz=/k/games/almaz,81
 Tanks=games/tanks,67
 RocketForces=games/rforces,110
-Pig=/k/games/pig/pigex
+Pig=/k/games/pig/pigex,120
 Ataka=/k/games/ataka,35
 Donkey=/k/games/donkey
 Loderunner=/k/games/LRL/LRL,41
diff --git a/programs/cmm/barscfg/barscfg.c b/programs/cmm/barscfg/barscfg.c
index da0a616bbd..da10a2505c 100644
--- a/programs/cmm/barscfg/barscfg.c
+++ b/programs/cmm/barscfg/barscfg.c
@@ -287,7 +287,7 @@ void EventDockyProcessButton(dword id)
 {
 	if (BTN_DOCKY_ATTACHEMENT == id) {
 		dkLocation++; 
-		if (dkLocation>3) dkLocation=1; 
+		if (dkLocation>4) dkLocation=1; 
 		DrawWindowContent(); 
 		SaveSettingsAndRestartProcess(DOCKY);
 	}
diff --git a/programs/cmm/barscfg/panels_cfg.png b/programs/cmm/barscfg/panels_cfg.png
index 45bf07d3a7..76f7e903ce 100644
Binary files a/programs/cmm/barscfg/panels_cfg.png and b/programs/cmm/barscfg/panels_cfg.png differ
diff --git a/programs/cmm/barscfg/panels_image.raw b/programs/cmm/barscfg/panels_image.raw
index 085d531182..c1f57802ef 100644
Binary files a/programs/cmm/barscfg/panels_image.raw and b/programs/cmm/barscfg/panels_image.raw differ
diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h
index 82d88fc34a..1e0072fa49 100644
--- a/programs/cmm/eolite/include/settings.h
+++ b/programs/cmm/eolite/include/settings.h
@@ -229,6 +229,7 @@ void SetAppColors()
 	dword old_list_bg_color = col.list_bg;
 	sc.get();
 	sc.work_dark = MixColors(0, sc.work, 35);
+	if (sc.work == 0) sc.work = 1;
 	if (bg_col == sc.work) return;
 	bg_col = sc.work;
 	if (skin_is_dark()) 
diff --git a/programs/cmm/lib/patterns/libimg_load_skin.h b/programs/cmm/lib/patterns/libimg_load_skin.h
index ce85dd9c2b..4ecc8814ac 100644
--- a/programs/cmm/lib/patterns/libimg_load_skin.h
+++ b/programs/cmm/lib/patterns/libimg_load_skin.h
@@ -30,7 +30,7 @@
 
 :void Libimg_FillTransparent(dword struct_pointer, w, h, new_color)
 {
-	Libimg_ReplaceColor(struct_pointer, w, h, 0, new_color);
+	if (new_color!=0) Libimg_ReplaceColor(struct_pointer, w, h, 0, new_color);
 }
 
 :libimg_image icons32draw;
diff --git a/programs/cmm/misc/build.bat b/programs/cmm/misc/build.bat
index a33d9ad595..e9866fd95d 100644
--- a/programs/cmm/misc/build.bat
+++ b/programs/cmm/misc/build.bat
@@ -10,6 +10,7 @@ move *.com bin
 
 cd bin
 forfiles /S /M *.com /C "cmd /c rename @file @fname"
+rename software_widget syspanel
 cd ..
 
 del warning.txt
diff --git a/programs/cmm/misc/software_widget.c b/programs/cmm/misc/software_widget.c
index ea35977407..b05b93864a 100644
--- a/programs/cmm/misc/software_widget.c
+++ b/programs/cmm/misc/software_widget.c
@@ -145,11 +145,14 @@ void SetAppColors()
 	 	swc.light = 0xFCFCFC;
 	}
 
-	if (swc.list_bg != old_list_bg_color)
-	{	
-		Libimg_LoadImage(#skin, "/sys/icons32.png");
-		Libimg_FillTransparent(skin.image, skin.w, skin.h, swc.list_bg);
-	}
+	if (!skin.image) LoadImages();
+	else if (swc.list_bg != old_list_bg_color) LoadImages();
+}
+
+void LoadImages()
+{
+	Libimg_LoadImage(#skin, "/sys/icons32.png");
+	Libimg_FillTransparent(skin.image, skin.w, skin.h, swc.list_bg);	
 }