diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET
index 157220d2..4a620334 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: Battle.net Launcher
+# image: battle_net
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup.exe"
 export PW_WINE_USE="WINE_LG"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BDO b/data_from_portwine/scripts/pw_autoinstall/PW_BDO
index 1119a44d..1e695872 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_BDO
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_BDO
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: Black Desert Online (RU)
+# image: bdo
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="BLACK_DESERT_ONLINE"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/BlackDesert_Installer_RU.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL
index 8109fcda..10531861 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: games
+# name: Blood and Soul
+# image: bloodandsoul
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="BLOOD_AND_SOUL"
 export LAUNCH_PARAMETERS=("/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-")
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BSR b/data_from_portwine/scripts/pw_autoinstall/PW_BSR
index c63a8f17..5a3dbb31 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_BSR
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_BSR
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Boria138
+# type: games
+# name: Battle Of Space Raiders
+# image: bsr
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT /SUPPRESSMSGBOXES")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/bsr_setup.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER
index ab952a75..2886c091 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: CALIBER
+# image: caliber
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="CALIBER"
 export LAUNCH_PARAMETERS=("/VERYSILENT" "/CLOSEAPPLICATIONS")
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
index 3cf5b52a..04e019ad 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: CatsLauncher (Front Edge)
+# image: catslauncher
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/q" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CatsLauncher.msi"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU
index 29440e76..51919ca7 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: linux-gaming.ru
+# type: emulators
+# name: Cemu
+# image: cemu
+# info_en:
+# info_ru:
 ########################################################################
 export PW_URL_CEMU=$(curl -s "https://api.github.com/repos/cemu-project/Cemu/releases" | grep -iEo 'https.*download.*' | grep "windows" | head -n1)
 export PW_CEMU_NAME=Cemu_$(echo "$PW_URL_CEMU" | awk -F"-" '{print $3}')
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT
index 226e8b1d..12d4a6cf 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro Fidel
+# type: games
+# name: Crossout
+# image: crossout
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/crossout.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CWC b/data_from_portwine/scripts/pw_autoinstall/PW_CWC
index ba1ec793..476f932d 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_CWC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_CWC
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: CONTRACT WARS
+# image: cwc
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CWClient_Install.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL b/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL
index bfcd0fdd..0ad2cc59 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: Demul
+# image: demul
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/demul07_280418.7z"
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN
index a8dca38c..32bfaf45 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: Dolphin 5.0
+# image: dolphin
+# info_en:
+# info_ru:
 ########################################################################## 
 export LAUNCH_PARAMETERS=("/S")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/dolphin-x64-5.0.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP
index 9e570f25..b45adf77 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: EA App (TEST)
+# image: eaapp
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/silent" "/repair" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
index 66d40cf0..7191a7fa 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: Epic Games Launcher
+# image: epicgames
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/q" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EpicGamesLauncherInstaller.msi"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE
index 9f1f805e..a0fc6543 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: ePSXe
+# image: epsxe
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/ePSXe205.zip"
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE
index 319ed55c..25a11fd2 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: cefeiko
+# type: games
+# name: EVE Online Launcher
+# image: eve
+# info_en:
+# info_ru:
 ########################################################################
 export PW_WINDOWS_VER="10"
 export PW_WINE_USE="WINE_LG"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84 b/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84
index 5e6edd6c..84c21eed 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Farlight 84
+# image: farlight84
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Farlight84_setup_1.3.0.1_238.exe"
 export PORTWINE_CREATE_SHORTCUT_NAME="Farlight 84"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX
index 543dcef1..ff7d72db 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: FCEUX
+# image: fceux
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fceux-2.6.5-win64.zip"
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE
index ed2c30de..b6eb195f 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.), cefeiko, Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: Gameforge Client
+# image: gameforge
+# info_en:
+# info_ru:
 ##########################################################################
 pw_shutdown_please () {
     if [[ "$PW_USE_RUNTIME" != 1 ]]
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GAME_XP b/data_from_portwine/scripts/pw_autoinstall/PW_GAME_XP
index 4b5b6ac3..b2c0b254 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_GAME_XP
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAME_XP
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: GameXP
+# image: gamexp
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="GAMEXP"
 export LAUNCH_PARAMETERS=("/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-")
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH
index 2f05a4c9..4a4d58ad 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: games
+# name: Glyph
+# image:
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GlyphInstall.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG
index da900d4e..119416cb 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: GoG Galaxy Launcher
+# image: gog
+# info_en:
+# info_ru:
 ########################################################################
 GOG_VER="$(curl "https://remote-config.gog.com/components/webinstaller?component_version=2.0.0" \
 | awk -F'setup_galaxy_' '{print $2}' \
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 b/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2
index 19df14db..0c2e05bd 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro Fidel
+# type: games
+# name: Guild Wars 2
+# image: gw2
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_PREFIX_NAME="GW2"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY
index cb998dfb..53cef2f5 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: HoYoPlay
+# image: hoyoplay
+# info_en:
+# info_ru:
 ########################################################################
 export PW_VULKAN_USE=2
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Hoyolauncher_installer.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT b/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT
index 849e52cb..6f6c0543 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro Fidel
+# type: games
+# name: Indiegala Client
+# image: igclient
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/igclient_setup.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH
index fb0a209a..6fa20a40 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: games
+# name: ITCH.IO
+# image: itch
+# info_en:
+# info_ru:
 ########################################################################## 
 export LAUNCH_PARAMETERS=("--silent")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/itch-setup.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LGC b/data_from_portwine/scripts/pw_autoinstall/PW_LGC
index d99c8a9e..69078978 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_LGC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Lesta Game Center
+# image: lgc
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Lesta_Game_Center_Install_RU.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT b/data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT
index 5fc98d17..eed0d8e4 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Lost Light
+# image: lostlight
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="LOST_LIGHT"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/LostLight_installer.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MAME b/data_from_portwine/scripts/pw_autoinstall/PW_MAME
index 16ec4b93..5e452185 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_MAME
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_MAME
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: MAME
+# image: mame
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/mame0259b_64bit.exe"
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MW b/data_from_portwine/scripts/pw_autoinstall/PW_MW
index 78e1a2de..7505514b 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_MW
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_MW
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: ValoKarDin
+# type: games
+# name: Modern Warships
+# image: mw
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/modern_warships.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MWO b/data_from_portwine/scripts/pw_autoinstall/PW_MWO
index e6b61abd..6f6887c5 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_MWO
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_MWO
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Metal War Online
+# image: mwo
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/s" "/nr" "/l=Russian")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MWO_Launcher_Setup.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_OSU b/data_from_portwine/scripts/pw_autoinstall/PW_OSU
index 512815d5..851c3f9d 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: cefeiko
+# type: games
+# name: OSU
+# image: osu
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="OSU"
 export PORTWINE_CREATE_SHORTCUT_NAME="OSU"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR b/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR
index 6d5eaaeb..1d427407 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Panzar
+# image: panzar
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_WINDOWS_VER="7"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY
index 0681081d..fb99098d 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: games
+# name: Plarium Play
+# image: plariumplay
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/s" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_POE b/data_from_portwine/scripts/pw_autoinstall/PW_POE
index b2d0fe4e..19392f1b 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_POE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_POE
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro Fidel (linux-gaming.ru)
+# type: games
+# name: Path of Exile
+# image: poe
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PathOfExileInstaller.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP
index 93a05cda..3cbde487 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: PPSSPP Window
+# image: ppsspp
+# info_en:
+# info_ru:
 ##########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PPSSPPSetup.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64
index db1df70c..8ca9a777 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: Project64
+# image: project64
+# info_en:
+# info_ru:
 ########################################################################
 PR64_VER="$(curl https://www.pj64-emu.com/public-releases | grep 'installer' | head -n 1 \
 | awk -F'/project64' '{print $2}' \
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE
index 74362461..85d3cfe8 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: cefeiko
+# type: games
+# name: Pulse Online
+# image: pulseonline
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="DOTNET"
 export PORTWINE_CREATE_SHORTCUT_NAME="Pulse Online"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH
index 55a623f1..6d7bea28 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: games
+# name: RetroArch
+# image: retroarch
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/RetroArch.7z"
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RISE_OF_FLIGHT b/data_from_portwine/scripts/pw_autoinstall/PW_RISE_OF_FLIGHT
index dd0364f2..247c9440 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_RISE_OF_FLIGHT
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_RISE_OF_FLIGHT
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Rise of Flight
+# image: riseofflight
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="RISE_OF_FLIGHT"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/ROF_UE.zip"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR
index 4ee2e042..ce1c1456 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: games
+# name: Rockstar Games Launcher
+# image: Rockstar
+# info_en:
+# info_ru:
 ########################################################################
 export PW_VULKAN_USE="1"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RUSSIAN_FISHING b/data_from_portwine/scripts/pw_autoinstall/PW_RUSSIAN_FISHING
index 920afcce..78de5f6b 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_RUSSIAN_FISHING
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_RUSSIAN_FISHING
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Boria138
+# type: games
+# name: Russian Fishing 4
+# image: rf4launcher
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/q" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/RF4SetupRU.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SO b/data_from_portwine/scripts/pw_autoinstall/PW_SO
index 79fc06c4..294dbdba 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_SO
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_SO
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Stalker Online
+# image: so
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SO_installer.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT b/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT
index 2e2f4ce7..155b3682 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: Star Conflict
+# image: starconflict
+# info_en:
+# info_ru:
 ########################################################################
 # export LAUNCH_PARAMETERS=("/S" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EXBO_Setup_ru.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM
index f2fa116e..9c709268 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: Steam (unstable)
+# image: steam
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Steam")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SWL b/data_from_portwine/scripts/pw_autoinstall/PW_SWL
index 3c2a5528..19125d2a 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_SWL
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_SWL
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus
+# type: games
+# name: Secret World Legends (ENG)
+# image: swl
+# info_en:
+# info_ru:
 ########################################################################
 export WINEDLLOVERRIDES="d3d9=b"
 export LAUNCH_PARAMETERS=("/VERYSILENT")
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_UBISOFT b/data_from_portwine/scripts/pw_autoinstall/PW_UBISOFT
index 6535c562..a6fadc8f 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_UBISOFT
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_UBISOFT
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
+# type: games
+# name: Ubisoft Game Launcher
+# image: ubc
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Ubisoft Game Launcher")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M
index cb7707b9..0e0a13da 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: VBA-M
+# image: vba-m
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-x86_64.zip"
 
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY
index 1ef7e71f..042da8cd 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: games
+# name: vkPlay Games Center
+# image: mygames
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("")
 export PW_PREFIX_NAME="VK_PLAY"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_W3D_HUB b/data_from_portwine/scripts/pw_autoinstall/PW_W3D_HUB
index 76d5a525..76b6ef50 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_W3D_HUB
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_W3D_HUB
@@ -1,5 +1,10 @@
 #!/bin/bash
 # Author: chal55rus and Boria138
+# type: games
+# name: W3D Hub Launcher
+# image: w3dhub
+# info_en:
+# info_ru:
 ########################################################################
 export PW_PREFIX_NAME="DOTNET"
 export LAUNCH_PARAMETERS=("/S")
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME b/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME
index 753c46c5..49ba23a0 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Castro Fidel
+# type: games
+# name: Warframe
+# image: warframe
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/q")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Warframe.msi"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC
index f9211ede..43020e4b 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: cefeiko
+# type: games
+# name: Wargaming Game Center
+# image: wgc
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 [[ "$LANGUAGE" == "ru" ]] && export WGC_LOC=RU || export WGC_LOC=EU
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE
index 8a74b842..1ad22003 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: Cefeiko
+# type: games
+# name: World of Sea Battle
+# image: wosb
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S")
 export PW_PREFIX_NAME="WORLD_OF_SEA_BATTLE"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_XEMU b/data_from_portwine/scripts/pw_autoinstall/PW_XEMU
index dbb9504f..856eb07e 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_XEMU
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_XEMU
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emualators
+# name: xemu
+# image: xemu
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/xemu-win-release.zip"
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_XENIA b/data_from_portwine/scripts/pw_autoinstall/PW_XENIA
index 1c6fb272..7efaaa04 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_XENIA
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_XENIA
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: Xenia
+# image: xenia
+# info_en:
+# info_ru:
 ########################################################################
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/xenia_master.zip"
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE
index b5a479b6..28750960 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Author: chal55rus (Sergey P.)
+# type: emulators
+# name: Yabause
+# image: yabause
+# info_en:
+# info_ru:
 ########################################################################
 export LAUNCH_PARAMETERS=("/S")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/yabause-0.9.15-win64.exe"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index e343aa73..3fba502c 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -615,7 +615,8 @@ else
     export KEY_MENU="$RANDOM"
 
     IFS=$'\n'
-    PW_GENERATE_BUTTONS="--field=   ${translations[Create shortcut...]}!${PW_GUI_ICON_PATH}/find_48.svg!:FBTN%@bash -c \"button_click --normal pw_find_exe\"%"
+    AMOUNT_GENERATE_BUTTONS="1"
+    PW_GENERATE_BUTTONS="--field=   ${translations[Create shortcut...]}!${PW_GUI_ICON_PATH}/find_48.svg!:FBTNR%@bash -c \"button_click --normal pw_find_exe\"%"
     for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do
         if check_flatpak ; then
             PW_NAME_D_ICON="$(grep Exec "${PORT_WINE_PATH}/${PW_DESKTOP_FILES}" | awk -F'=' '{print $2}' |
@@ -656,11 +657,13 @@ else
         else
             PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES}"
         fi
-        PW_GENERATE_BUTTONS+="--field=   $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_NAME_D_ICON_48}.png!:FBTN%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%"
+        PW_GENERATE_BUTTONS+="--field=   $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_NAME_D_ICON_48}.png!:FBTNR%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%"
+        (( AMOUNT_GENERATE_BUTTONS++ ))
     done
+    MAIN_GUI_ROWS="$(( AMOUNT_GENERATE_BUTTONS / MAIN_GUI_COLUMNS + 1 ))"
 
     IFS="%"
-    "${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_COLUMNS" --homogeneous-column \
+    "${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_ROWS" --homogeneous-column \
     --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" \
     --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null &
     IFS="$orig_IFS"
@@ -700,38 +703,39 @@ else
         AI_FILE="${ai_file//"$PORT_SCRIPTS_PATH/pw_autoinstall/"/}"
         while IFS= read -r line ; do
             [[ $line =~ "##########" ]] && break
-            [[ $line =~ "# type: " ]] && AI_TYPE="${line//"# type: "/}"
-            [[ $line =~ "# name: " ]] && AI_NAME="${line//"# name: "/}"
-            [[ $line =~ "# image: " ]] && AI_IMAGE="${line//"# image: "/}"
+            [[ $line =~ "# type: " ]] && AI_TYPE="${line//# type: /}"
+            [[ $line =~ "# name: " ]] && AI_NAME="${line//# name: /}"
+            [[ $line =~ "# image: " ]] && AI_IMAGE="${line//# image: /}"
             if [[ "$LANGUAGE" == ru ]] ; then
-                [[ $line =~ "# info_ru: " ]] && AI_INFO="${line//"# info_ru: "/}"
+                [[ $line =~ "# info_ru: " ]] && AI_INFO="${line//# info_ru: /}"
             else
-                [[ $line =~ "# info_en: " ]] && AI_INFO="${line//"# info_en: "/}"
+                [[ $line =~ "# info_en: " ]] && AI_INFO="${line//# info_en: /}"
             fi
         done < "$ai_file"
 
         IFS=$'\n'
-        case "$AI_TYPE" in
+        case $AI_TYPE in
             games) 
-                PW_GENERATE_BUTTONS_GAMES+="--field=   $AI_NAME!${PW_GUI_ICON_PATH}/${AI_IMAGE}.png!$AI_INFO:FBTNR%@bash -c \"button_click --normal ${AI_FILE}\"%"
+                PW_GENERATE_BUTTONS_GAMES+="--field=   $AI_NAME!$PW_GUI_ICON_PATH/$AI_IMAGE.png!$AI_INFO:FBTNR%@bash -c \"button_click --normal $AI_FILE\"%"
                 (( AI_AMOUNT_GAMES++ ))
                 ;;
             emulators) 
-                PW_GENERATE_BUTTONS_EMUL+="--field=   $AI_NAME!${PW_GUI_ICON_PATH}/${AI_IMAGE}.png!$AI_INFO:FBTNR%@bash -c \"button_click --normal ${AI_FILE}\"%"
+                PW_GENERATE_BUTTONS_EMULS+="--field=   $AI_NAME!$PW_GUI_ICON_PATH/$AI_IMAGE.png!$AI_INFO:FBTNR%@bash -c \"button_click --normal $AI_FILE\"%"
                 (( AI_AMOUNT_EMULS++ ))
                 ;;
         esac
-        unset AI_FILE AI_TYPE AI_NAME AI_IMAGE AI_INFO
+        [[ -z $PW_DEBUG ]] && unset AI_FILE AI_TYPE AI_NAME AI_IMAGE AI_INFO
     done
-    export MAIN_GUI_COLUMNS_ROWS="$(( $AI_AMOUNT_GAMES / $MAIN_GUI_COLUMNS ))"
-    
+    MAIN_GUI_ROWS_GAMES="$(( AI_AMOUNT_GAMES / MAIN_GUI_COLUMNS + 1 ))"
+    MAIN_GUI_ROWS_EMULS="$(( AI_AMOUNT_EMULS / MAIN_GUI_COLUMNS + 1 ))"
+
     IFS="%"
-    "${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[1]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
-    --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" --separator=" " ${PW_GENERATE_BUTTONS_EMUL} 2>/dev/null &
-    "${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[0]}" --form --columns="$MAIN_GUI_COLUMNS_ROWS" --align-buttons --scroll --homogeneous-column \
+    "${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[1]}" --form --columns="$MAIN_GUI_ROWS_EMULS" --align-buttons --scroll --homogeneous-column \
+    --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" --separator=" " ${PW_GENERATE_BUTTONS_EMULS} 2>/dev/null &
+    "${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[0]}" --form --columns="$MAIN_GUI_ROWS_GAMES" --align-buttons --scroll --homogeneous-column \
     --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" --separator=" " ${PW_GENERATE_BUTTONS_GAMES} 2>/dev/null &
+    unset PW_GENERATE_BUTTONS_GAMES PW_GENERATE_BUTTONS_EMULS
     IFS="$orig_IFS"
-    unset PW_GENERATE_BUTTONS_GAMES PW_GENERATE_BUTTONS_EMUL
 
     export START_FROM_PP_GUI="1"
     if [[ -z ${TAB_MAIN_MENU} ]] ; then
diff --git a/data_from_portwine/themes/gui/yad_gui_pp b/data_from_portwine/themes/gui/yad_gui_pp
index ff0e573d..fe3f7af8 100755
Binary files a/data_from_portwine/themes/gui/yad_gui_pp and b/data_from_portwine/themes/gui/yad_gui_pp differ