version update

reworked built-in function for getting yt links
minor corrections for EPG dialog
2026-05-08 19:27:11 +02:00 · 2022-01-25 18:16:00 +03:00 · 2022-01-25 18:07:34 +03:00 · 2022-01-24 19:17:11 +03:00 · 2022-01-24 16:39:59 +03:00 · 2022-01-23 14:52:34 +03:00
71 changed files with 8240 additions and 5389 deletions
--- a/DemonEditor.desktop
+++ b/DemonEditor.desktop
@@ -5,6 +5,7 @@ Comment=Channel and satellite list editor for Enigma2
 Comment[ru]=Редактор списка каналов и спутников для Enigma2
 Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
 Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
+Comment[tr]=Enigma2 için kanal ve uydu listesi editörü
 Icon=demon-editor
 Exec=bash -c 'cd $(dirname %k) && ./start.py'
 Terminal=false
--- a/README.md
+++ b/README.md
@@ -1,33 +1,32 @@
 # <img src="app/ui/icons/hicolor/96x96/apps/demon-editor.png" width="32" /> DemonEditor
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) ![platform](https://img.shields.io/badge/platform-linux%20|%20macos-lightgrey)  
-### Enigma2 channel and satellite list editor for GNU/Linux. 
-[<img src="https://user-images.githubusercontent.com/7511379/118884719-8277e980-b8ff-11eb-8621-c8c4afd6181b.png" width="560"/>](https://user-images.githubusercontent.com/7511379/118884719-8277e980-b8ff-11eb-8621-c8c4afd6181b.png)  
-
-Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).                                                   
-Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc).
+### Enigma2 channel and satellite list editor for GNU/Linux.
+Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).

 ## Main features of the program
 * Editing bouquets, channels, satellites.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118884747-8ad02480-b8ff-11eb-9104-8cf8fb6e785d.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118884747-8ad02480-b8ff-11eb-9104-8cf8fb6e785d.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/141680963-9b8eb6cc-c712-46b2-aefe-19769e21a7d5.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141680963-9b8eb6cc-c712-46b2-aefe-19769e21a7d5.png)
 * Import function.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118526825-4dc23180-b749-11eb-8197-e9bbccbc3bdf.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118526825-4dc23180-b749-11eb-8197-e9bbccbc3bdf.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/141681059-68bc1b55-6fab-436c-aa73-ef24e2e5113b.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141681059-68bc1b55-6fab-436c-aa73-ef24e2e5113b.png)
 * Backup function.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118528402-f58c2f00-b74a-11eb-9b84-edf220526e6e.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118528402-f58c2f00-b74a-11eb-9b84-edf220526e6e.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/141681104-ed9b5d35-25de-426f-b9bb-2a6e4db022bb.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141681104-ed9b5d35-25de-426f-b9bb-2a6e4db022bb.png)
 * Support of picons.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118526864-5c104d80-b749-11eb-8497-6e8c78542ab1.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118526864-5c104d80-b749-11eb-8497-6e8c78542ab1.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/141681115-957c63a3-4113-422d-bb27-2d96b1463cd1.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141681115-957c63a3-4113-422d-bb27-2d96b1463cd1.png)
 * Importing services, downloading picons and updating satellites from the Web.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118530243-1a81a180-b74d-11eb-8e01-aea904d954af.png" width="250"/>](https://user-images.githubusercontent.com/7511379/118530243-1a81a180-b74d-11eb-8e01-aea904d954af.png)
-  [<img src="https://user-images.githubusercontent.com/7511379/118526706-31be9000-b749-11eb-9956-c4bf2e13f968.png" width="292"/>](https://user-images.githubusercontent.com/7511379/118526706-31be9000-b749-11eb-9956-c4bf2e13f968.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/141681075-28f18ea5-e456-4e84-bf64-1b7d9a95324d.png" width="262"/>](https://user-images.githubusercontent.com/7511379/141681075-28f18ea5-e456-4e84-bf64-1b7d9a95324d.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/141681040-b1ad190a-6bc2-4741-bb42-1fb219a0fcab.png" width="250"/>](https://user-images.githubusercontent.com/7511379/141681040-b1ad190a-6bc2-4741-bb42-1fb219a0fcab.png)
 * Extended support of IPTV.
 * Import to bouquet(Neutrino WEBTV) from m3u.
 * Export of bouquets with IPTV services in m3u.
-* Assignment of EPG from DVB or XML for IPTV services (only Enigma2, experimental).
-* Preview (playback) of IPTV or other streams directly from the bouquet list.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118884891-b3f0b500-b8ff-11eb-8717-3588d6e089de.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118884891-b3f0b500-b8ff-11eb-8717-3588d6e089de.png)
-* Control panel with the ability to view EPG and manage timers (via HTTP API, experimental).  
-  [<img src="https://user-images.githubusercontent.com/7511379/118886284-66754780-b901-11eb-9068-29b5a607ccaf.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118886284-66754780-b901-11eb-9068-29b5a607ccaf.png)
+* Assignment of EPG from DVB or XML for IPTV services (Enigma2 only).  
+  [<img src="https://user-images.githubusercontent.com/7511379/141681187-fae4e784-c9e0-43df-b499-4d38e83d6560.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141681187-fae4e784-c9e0-43df-b499-4d38e83d6560.png)
+* Playback of IPTV or other streams directly from the bouquet list.  
+  [<img src="https://user-images.githubusercontent.com/7511379/141681129-98f78cdc-9a98-46ef-b738-618a327634d4.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141681129-98f78cdc-9a98-46ef-b738-618a327634d4.png)
+* Control panel (via HTTP API).  
+  [<img src="https://user-images.githubusercontent.com/7511379/141684475-4511ea4f-b152-42d5-b9c8-f3e1e9a160d0.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141684475-4511ea4f-b152-42d5-b9c8-f3e1e9a160d0.png)
+* Ability to view EPG and manage timers (via HTTP API).  
 * Simple FTP client (experimental).   
-  [<img src="https://user-images.githubusercontent.com/7511379/118527372-e8bb0b80-b749-11eb-9653-4ad64c99a05a.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118527372-e8bb0b80-b749-11eb-9653-4ad64c99a05a.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/141681165-5679c331-72e7-4044-b365-dcdb30b1433c.png" width="480"/>](https://user-images.githubusercontent.com/7511379/141681165-5679c331-72e7-4044-b365-dcdb30b1433c.png)
  
 #### Keyboard shortcuts
 * **Ctrl + X** - only in bouquet list.
@@ -51,8 +50,10 @@ Clipboard is **"rubber"**. There is an accumulation before the insertion!
 * **Ctrl + D** - load data from receiver.                                                                                                                                                         
 * **Ctrl + U/B** - upload data/bouquets to receiver.
 * **Ctrl + I** - extra info, details.
-* **Ctrl + F** - show/hide search bar.
+* **Ctrl + F** - show search bar.
 * **Ctrl + Shift + F** - show/hide filter bar.
+* **Ctrl + T** - show/hide built-in Telnet client.
+* **Ctrl + Shift + L** - show/hide logging panel.
                                                                          
 For **multiple** selection with the mouse, press and hold the **Ctrl** key!

@@ -71,13 +72,32 @@ To create a simple **debian package**, you can use the *build-deb.sh.* You can a
 Users of **LTS** versions of [Ubuntu](https://ubuntu.com/) or distributions based on them can use [PPA](https://launchpad.net/~dmitriy-yefremov/+archive/ubuntu/demon-editor) repository.  
 A ready-made [package](https://aur.archlinux.org/packages/demoneditor-bin) is also available for [Arch Linux](https://archlinux.org/) users in the [AUR](https://aur.archlinux.org/) repository. 
 * ### macOS
-**This program can be run on macOS.** To work in this OS, you must use a [separate branch](https://github.com/DYefremov/DemonEditor/tree/experimental-mac). A ready-made package can be downloaded from the [releases](https://github.com/DYefremov/DemonEditor/releases) page.  
-**The functionality and performance of this version may be different from the Linux version!**
+**This program can be run on macOS.**  
+To run the program on macOS, you need to install [brew](https://brew.sh/).  
+Then install the required components via terminal:  
+```brew install python3 gtk+3 pygobject3 adwaita-icon-theme```                                                                  
+```pip3 install requests, pillow```
+
+Launch is similar to Linux.
+
+You can also download the ready-made package as a ***.dmg** file from the [releases](https://github.com/DYefremov/DemonEditor/releases) page.  
+Recommended copy the package to the **Application** directory.  
+Perhaps in the security settings it will be necessary to allow the launch of this application!  
+
+* ### MS Windows  
+**Windows users can also run this program.** One way is to use the [MSYS2](https://www.msys2.org/) platform.  
+In addition, you can download a ready-made build (**64-bit**) from the [releases](https://github.com/DYefremov/DemonEditor/releases) page.  
+
+**All builds may contain components distributed under the GPL [v3](http://www.gnu.org/licenses/gpl-3.0.html) or lower license.  
+By downloading and using this packages you agree to the terms of this [license](http://www.gnu.org/licenses/gpl-3.0.html) and the possible inconvenience associated with this!** 
+
+THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY.                                                                        
+AUTHOR IS NOT LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY CONNECTION WITH THIS SOFTWARE.

 ## Important
-The program is tested only with [openATV](https://www.opena.tv/) image and **Formuler F1** receiver in [Linux Mint](https://linuxmint.com/) (MATE 64-bit) distribution!
+The program is tested only with [openATV](https://www.opena.tv/) image and **Formuler F1** receiver in [Linux Mint](https://linuxmint.com/) (MATE 64-bit) distribution!  
+Support for DVB-T/T2 and DVB-C channels for Neutrino is not fully implemented and has an experimental status.  

-Terrestrial(DVB-T/T2) and cable(DVB-C) channels are only supported for Enigma2.                                                                                                
 Main supported *lamedb* format is version **4**. Versions **3** and **5** has only **experimental** support! For version **3** is only read mode available. When saving, version **4** format is used instead.   

 When using the multiple import feature, from *lamedb* will be taken data **only for channels that are in the selected bouquets!**
@@ -85,6 +105,8 @@ If you need full set of the data, including *[satellites, terrestrial, cables].x
 just load your data via *"File/Open"* and press *"Save"*. When importing separate bouquet files, only those services 
 (excluding IPTV) that are in the **current open lamedb** (main list of services) will be imported.

+**The built-in Telnet client does not support ANSI escape sequences!**
+
 For streams playback, this app supports [VLC](https://www.videolan.org/vlc/), [MPV](https://mpv.io/) and [GStreamer](https://gstreamer.freedesktop.org/). Depending on your distro, you may need to install additional packages and libraries. 
 #### Command line arguments:
 * **-l** - write logs to file.
--- a/app/commons.py
+++ b/app/commons.py
@@ -7,13 +7,12 @@ from gi.repository import GLib

 _LOG_FILE = "demon-editor.log"
 _DATE_FORMAT = "%d-%m-%y %H:%M:%S"
-_LOGGER_NAME = None
+
+LOGGER_NAME = "main_logger"


 def init_logger():
-    global _LOGGER_NAME
-    _LOGGER_NAME = "main_logger"
-    logging.Logger(_LOGGER_NAME)
+    logging.Logger(LOGGER_NAME)
    logging.basicConfig(level=logging.INFO,
                        format="%(asctime)s %(message)s",
                        datefmt=_DATE_FORMAT,
@@ -23,7 +22,7 @@ def init_logger():

 def log(message, level=logging.ERROR, debug=False, fmt_message="{}"):
    """ The main logging function. """
-    logger = logging.getLogger(_LOGGER_NAME)
+    logger = logging.getLogger(LOGGER_NAME)
    if debug:
        from traceback import format_exc
        logger.log(level, fmt_message.format(format_exc()))
--- a/app/connections.py
+++ b/app/connections.py
@@ -1,3 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2021 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
 import os
 import re
 import socket
@@ -181,7 +209,7 @@ class UtfFTP(FTP):
            self.send_file(file_name, src, callback)

    def remove_unused_bouquets(self, callback):
-        bq_files = ("userbouquet.", "bouquets.xml", "ubouquets.xml")
+        bq_files = ("userbouquet.", "subbouquet.", "bouquets.xml", "ubouquets.xml")

        for file in filter(lambda f: f.startswith(bq_files), self.nlst()):
            self.delete_file(file, callback)
--- a/app/eparser/init.py
+++ b/app/eparser/init.py
@@ -62,7 +62,7 @@ def get_bouquets(path, s_type):
 def write_bouquet(path, bq, s_type):
    if s_type is SettingsType.ENIGMA_2:
        writer = BouquetsWriter(path, None)
-        writer.write_bouquet(path + "userbouquet.{}.{}".format(bq.name, bq.type), bq.name, bq.services)
+        writer.write_bouquet(f"{path}userbouquet.{bq.name}.{bq.type}", bq.name, bq.services)
    elif s_type is SettingsType.NEUTRINO_MP:
        from .neutrino.bouquets import write_bouquet
        write_bouquet(path, bq)
--- a/app/eparser/ecommons.py
+++ b/app/eparser/ecommons.py
@@ -1,7 +1,37 @@
-""" Common elements module """
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2021 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
+""" Common elements module. """
 from collections import namedtuple
 from enum import Enum

+from app.commons import log
+
 Service = namedtuple("Service", ["flags_cas", "transponder_type", "coded", "service", "locked", "hide", "package",
                                 "service_type", "picon", "picon_id", "ssid", "freq", "rate", "pol", "fec",
                                 "system", "pos", "data_id", "fav_id", "transponder"])
@@ -17,6 +47,10 @@ class BqServiceType(Enum):
    ALT = "ALT"  # Service with alternatives
    BOUQUET = "BOUQUET"  # Sub bouquet.

+    @classmethod
+    def _missing_(cls, value):
+        return cls.DEFAULT
+

 Bouquet = namedtuple("Bouquet", ["name", "type", "services", "locked", "hidden", "file"])
 Bouquet.__new__.__defaults__ = (None, BqServiceType.DEFAULT, [], None, None, None)  # For Python3 < 3.7
@@ -82,6 +116,21 @@ class Flag(Enum):
    def is_new(value: int):
        return value & 1 << 5

+    @staticmethod
+    def parse(value: str) -> int:
+        """ Returns an int representation of the flag value.
+
+            The flag value is usually represented by the number [int],
+            but can also be appear in hex format.
+         """
+        if len(value) < 3:
+            return 0
+
+        value = value[2:]
+        if value.isdigit():
+            return int(value)
+        return int(value, 16)
+

 class Pids(Enum):
    VIDEO = "c:00"
@@ -191,14 +240,15 @@ def get_value_by_name(en, name):


 def is_transponder_valid(tr: Transponder):
-    """ Checks  transponder validity """
+    """ Checks transponder validity. """
    try:
        int(tr.frequency)
        int(tr.symbol_rate)
        tr.pls_mode is None or int(tr.pls_mode)
        tr.pls_code is None or int(tr.pls_code)
        tr.is_id is None or int(tr.is_id)
-    except TypeError:
+    except (TypeError, ValueError) as e:
+        log(f"Transponder validation error: {e}\n{tr}")
        return False

    if tr.polarization not in POLARIZATION.values():
--- a/app/eparser/enigma/bouquets.py
+++ b/app/eparser/enigma/bouquets.py
@@ -60,14 +60,14 @@ class BouquetsWriter:
        self._marker_index = 1
        self._space_index = 0
        self._alt_names = set()
+        self._NAME_PATTERN = re.compile("[^\\w_()]+")

    def write(self):
        line = []
-        pattern = re.compile("[^\\w_()]+")

        for bqs in self._bouquets:
            line.clear()
-            line.append("#NAME {}\n".format(bqs.name))
+            line.append(f"#NAME {bqs.name}\n")
            bq_file_names = {b.file for b in bqs.bouquets}
            count = 1
            m_count = 0
@@ -76,24 +76,29 @@ class BouquetsWriter:
                bq_name = bq.file
                if not bq_name:
                    if self._force_bq_names:
-                        bq_name = re.sub(pattern, "_", bq.name)
+                        bq_name = re.sub(self._NAME_PATTERN, "_", bq.name)
                    else:
-                        bq_name = "de{0:02d}".format(count)
+                        bq_name = f"de{count:02d}"
                        while bq_name in bq_file_names:
                            count += 1
-                            bq_name = "de{0:02d}".format(count)
+                            bq_name = f"de{count:02d}"
                        bq_file_names.add(bq_name)

-                if BqType(bq.type) is BqType.MARKER:
+                bq_type = BqType(bq.type)
+                if bq_type is BqType.MARKER:
                    m_data = bq.file.split(":") if bq.file else None
                    b_name = m_data[-1].strip() if m_data else bq.name.lstrip(_MARKER_PREFIX)
                    line.append(self._MARKER.format(m_count, b_name))
                    m_count += 1
                else:
-                    line.append(self._SERVICE.format(2 if bq.type == BqType.RADIO.value else 1, bq_name, bq.type))
-                    self.write_bouquet(f"{self._path}userbouquet.{bq_name}.{bq.type}", bq.name, bq.services)
+                    if bq_type is BqType.BOUQUET:
+                        bq_name = re.sub(self._NAME_PATTERN, "_", bq.name)
+                        self.write_sub_bouquet(self._path, bq_name, bq, bqs.type)
+                    else:
+                        self.write_bouquet(f"{self._path}userbouquet.{bq_name}.{bqs.type}", bq.name, bq.services)
+                    line.append(self._SERVICE.format(2 if bqs.type == BqType.RADIO.value else 1, bq_name, bqs.type))

-            with open(self._path + "bouquets.{}".format(bqs.type), "w", encoding="utf-8") as file:
+            with open(f"{self._path}bouquets.{bqs.type}", "w", encoding="utf-8") as file:
                file.writelines(line)

    def write_bouquet(self, path, name, services):
@@ -134,6 +139,18 @@ class BouquetsWriter:
        with open(path, "w", encoding="utf-8") as file:
            file.writelines(bouquet)

+    def write_sub_bouquet(self, path, file_name, bq, bq_type):
+        bouquet = [f"#NAME {bq.name}\n"]
+        sb_type = 2 if bq_type == BqType.RADIO.value else 1
+
+        for sb in bq.services:
+            bq_name = f"subbouquet.{re.sub(self._NAME_PATTERN, '_', sb.name)}.{sb.type}"
+            self.write_bouquet(f"{path}{bq_name}", sb.name, sb.services)
+            bouquet.append(f"#SERVICE 1:7:{sb_type}:0:0:0:0:0:0:0:FROM BOUQUET \"{bq_name}\" ORDER BY bouquet\n")
+
+        with open(f"{self._path}userbouquet.{file_name}.{bq_type}", "w", encoding="utf-8") as file:
+            file.writelines(bouquet)
+

 class ServiceType(Enum):
    SERVICE = "0"
@@ -141,6 +158,7 @@ class ServiceType(Enum):
    MARKER = "64"
    SPACE = "832"  # Hidden marker.
    ALT = "134"  # Alternatives.
+    UDP = "256"

    @classmethod
    def _missing_(cls, value):
@@ -198,7 +216,7 @@ class BouquetsReader:
                    else:
                        s_data = line.split(":")
                        if len(s_data) == 12 and s_data[1] == ServiceType.MARKER.value:
-                            b_name = "{}{}".format(_MARKER_PREFIX, s_data[-1].strip())
+                            b_name = f"{_MARKER_PREFIX}{s_data[-1].strip()}"
                            bouquets[2].append(Bouquet(b_name, BqType.MARKER.value, [], None, None, line.strip()))
                        else:
                            log(f"Unsupported or invalid data format: [{line}].")
@@ -210,14 +228,14 @@ class BouquetsReader:
    @staticmethod
    def get_bouquet(path, bq_name, bq_type, prefix="userbouquet"):
        """ Parsing services ids from bouquet file. """
-        with open(path + "{}.{}.{}".format(prefix, bq_name, bq_type), encoding="utf-8", errors="replace") as file:
+        with open(f"{path}{prefix}.{bq_name}.{bq_type}", encoding="utf-8", errors="replace") as file:
            chs_list = file.read()
            services = []
            srvs = list(filter(None, chs_list.split("\n#SERVICE")))  # filtering ['']
            # May come across empty[wrong] files!
            if not srvs:
-                log("Bouquet file 'userbouquet.{}.{}' is empty or wrong!".format(bq_name, bq_type))
-                return "{} [empty]".format(bq_name), services
+                log(f"Bouquet file 'userbouquet.{bq_name}.{bq_type}' is empty or wrong!")
+                return f"{bq_name} [empty]", services

            bq_name = srvs.pop(0)

@@ -225,7 +243,7 @@ class BouquetsReader:
                srv_data = srv.strip().split(":")
                data_len = len(srv_data)
                if data_len < 10:
-                    log("The bouquet [{}] service [{}] has the wrong data format: [{}]".format(bq_name, num, srv))
+                    log(f"The bouquet [{bq_name}] service [{num}] has the wrong data format: [{srv}]")
                    continue

                s_type = ServiceType(srv_data[1])
@@ -253,7 +271,7 @@ class BouquetsReader:
                    desc = desc.lstrip(":").strip() if desc else srv_data[-1].strip()
                    services.append(BouquetService(desc, BqServiceType.IPTV, srv, num))
                else:
-                    fav_id = "{}:{}:{}:{}".format(srv_data[3], srv_data[4], srv_data[5], srv_data[6])
+                    fav_id = f"{srv_data[3]}:{srv_data[4]}:{srv_data[5]}:{srv_data[6]}"
                    name = None
                    if data_len == 12:
                        name, sep, desc = str(srv_data[-1]).partition("\n#DESCRIPTION")
--- a/app/eparser/enigma/lamedb.py
+++ b/app/eparser/enigma/lamedb.py
@@ -52,7 +52,7 @@ class LameDbReader:
    """ Lamedb parser class.

        Reads and parses the Enigma2 lamedb[5] file.
-        Supports versions 3, 4 and 5..
+        Supports versions 3, 4 and 5.
    """
    __slots__ = ["_path", "_fmt"]

@@ -99,7 +99,7 @@ class LameDbReader:
            try:
                data = str(file.read())
            except UnicodeDecodeError as e:
-                log("lamedb parse error: " + str(e))
+                log(f"lamedb parse error: {e}")
            else:
                return self.get_services_list(data)

@@ -115,7 +115,7 @@ class LameDbReader:
            for line in lns:
                if line.startswith("s:"):
                    srv_data = line.strip("s:").split(",", 2)
-                    srv_data[1] = srv_data[1].strip("\"")
+                    srv_data[1] = srv_data[1].strip("\"\n")
                    data_len = len(srv_data)
                    if data_len == 3:
                        srv_data[2] = srv_data[2].strip()
@@ -129,7 +129,7 @@ class LameDbReader:
                        tr, srv = data[0].strip("t:"), data[1].strip().replace(":", " ", 1)
                        trs[tr] = srv
                    else:
-                        log("Error while parsing transponder data [ver. 5] for line: {}".format(line))
+                        log(f"Error while parsing transponder data [ver. 5] for line: {line}")

            return self.parse_services(srvs, trs)

@@ -151,33 +151,33 @@ class LameDbReader:
            is_v3 = False
            if len(tid) < 4:
                is_v3 = True
-                tid = "{:0>4}".format(tid)
+                tid = f"{tid:0>4}"
                data[2] = tid
            if len(nid) < 4:
                is_v3 = True
-                nid = "{:0>4}".format(nid)
+                nid = f"{nid:0>4}"
                data[3] = nid
            if is_v3:
-                data[0] = "{:0>4}".format(data[0])
+                data[0] = f"{data[0]:0>4}"
                data_id = _SEP.join(data)

            srv_type = int(data[4])
-            transponder_id = "{}:{}:{}".format(data[1], tid, nid)
+            transponder_id = f"{data[1]}:{tid}:{nid}"
            transponder = transponders.get(transponder_id, None)
-
-            tid = tid.lstrip(sp).upper()
-            nid = nid.lstrip(sp).upper()
+            # The tid and nid values can be 0.
+            tid = tid.lstrip(sp).upper() or "0"
+            nid = nid.lstrip(sp).upper() or "0"
            ssid = str(data[0]).lstrip(sp).upper()
            onid = str(data[1]).lstrip(sp).upper()
            # For comparison in bouquets. Needed in upper case!!!
-            fav_id = "{}:{}:{}:{}".format(ssid, tid, nid, onid)
-            picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(srv_type, ssid, tid, nid, onid)
-            s_id = "1:0:{:X}:{}:{}:{}:{}:0:0:0:".format(srv_type, ssid, tid, nid, onid)
+            fav_id = f"{ssid}:{tid}:{nid}:{onid}"
+            picon_id = f"1_0_{srv_type:X}_{ssid}_{tid}_{nid}_{onid}_0_0_0.png"
+            s_id = f"1:0:{srv_type:X}:{ssid}:{tid}:{nid}:{onid}:0:0:0:"

            all_flags = srv[2].split(",")
            coded = CODED_ICON if list(filter(lambda x: x.startswith("C:"), all_flags)) else None
            flags = list(filter(lambda x: x.startswith("f:"), all_flags))
-            hide = HIDE_ICON if flags and Flag.is_hide(int(flags[0][2:])) else None
+            hide = HIDE_ICON if flags and Flag.is_hide(Flag.parse(flags[0])) else None
            locked = LOCKED_ICON if s_id in blacklist else None

            package = list(filter(lambda x: x.startswith("p:"), all_flags))
@@ -188,7 +188,7 @@ class LameDbReader:
                tr_type = TrType(tr_type)
                tr = tr.split(_SEP)
                service_type = SERVICE_TYPE.get(data[4], SERVICE_TYPE["-2"])
-                # Removing all non printable symbols!
+                # Removing all non-printable symbols!
                srv_name = "".join(c for c in srv[1] if c.isprintable())
                freq = tr[0]
                rate = tr[1]
@@ -203,7 +203,7 @@ class LameDbReader:
                    system = "DVB-S2" if len(tr) > 7 else "DVB-S"
                    pos = tr[4]
                if tr_type is TrType.Terrestrial:
-                    system = T_SYSTEM.get(tr[9], None)
+                    system = T_SYSTEM.get(tr[10] if len(tr) > 10 else "0", None)
                    pos = "T"
                    fec = T_FEC.get(tr[3], None)
                elif tr_type is TrType.Cable:
@@ -217,13 +217,13 @@ class LameDbReader:

                # Formatting displayed values.
                try:
-                    freq = "{}".format(int(freq) // 1000)
-                    rate = "{}".format(int(rate) // 1000)
+                    freq = f"{int(freq) // 1000}"
+                    rate = f"{int(rate) // 1000}"
                    if tr_type is TrType.Satellite:
                        pos = int(pos)
-                        pos = "{:0.1f}{}".format(abs(pos / 10), "W" if pos < 0 else "E")
+                        pos = f"{abs(pos / 10):0.1f}{'W' if pos < 0 else 'E'}"
                except ValueError as e:
-                    log("Parse error [parse_services]: {}".format(e))
+                    log(f"Parse error [parse_services]: {e}")

                s = Service(srv[2], tr_type.value, coded, srv_name, locked, hide, package, service_type, None,
                            picon_id, data[0], freq, rate, pol, fec, system, pos, data_id, fav_id, transponder)
@@ -258,18 +258,17 @@ class LameDbReader:
        tr_set = set()
        for srv in services:
            data_id = str(srv.data_id).split(_SEP)
-            tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3])
+            tr_id = f"{data_id[1]}:{data_id[2]}:{data_id[3]}"
            if tr_id not in tr_set:
-                transponder = "{}\n\t{}\n/\n".format(tr_id, srv.transponder)
-                tr_lines.append(transponder)
+                tr_lines.append(f"{tr_id}\n\t{srv.transponder}\n/\n")
                tr_set.add(tr_id)
            # Services
-            services_lines.append("{}\n{}\n{}\n".format(srv.data_id, srv.service, srv.flags_cas))
+            services_lines.append(f"{srv.data_id}\n{srv.service}\n{srv.flags_cas}\n")

        tr_lines.sort()
        lines.extend(tr_lines)
        lines.extend(services_lines)
-        lines.append("end\n" + _END_LINE)
+        lines.append(f"end\n{_END_LINE}")

        return lines

@@ -324,13 +323,13 @@ class LameDbWriter:

        for srv in self._services:
            data_id = str(srv.data_id).split(_SEP)
-            tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3])
-            tr_set.add("t:{},{}\n".format(tr_id, srv.transponder.replace(" ", ":", 1)))
+            tr_id = f"{data_id[1]}:{data_id[2]}:{data_id[3]}"
+            tr_set.add(f"t:{tr_id},{srv.transponder.replace(' ', ':', 1)}\n")
            # Removing empty packages
            flags = list(filter(lambda x: x != "p:", srv.flags_cas.split(",")))
            flags = ",".join(flags)
            flags = "," + flags if flags else ""
-            services_lines.append("s:{},\"{}\"{}\n".format(srv.data_id, srv.service, flags))
+            services_lines.append(f"s:{srv.data_id},\"{srv.service}\"{flags}\n")

        lines.extend(sorted(tr_set))
        lines.extend(services_lines)
--- a/app/eparser/iptv.py
+++ b/app/eparser/iptv.py
@@ -1,3 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2021 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
 """ Module for IPTV and streams support """
 import re
 from enum import Enum
@@ -10,7 +38,7 @@ from app.ui.uicommons import IPTV_ICON

 # url, description, urlkey, account, usrname, psw, s_type, iconsrc, iconsrc_b, group
 NEUTRINO_FAV_ID_FORMAT = "{}::{}::{}::{}::{}::{}::{}::{}::{}::{}"
-ENIGMA2_FAV_ID_FORMAT = " {}:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0:{}:{}\n#DESCRIPTION: {}\n"
+ENIGMA2_FAV_ID_FORMAT = " {}:{}:{}:{:X}:{:X}:{:X}:{:X}:0:0:0:{}:{}\n#DESCRIPTION: {}\n"
 MARKER_FORMAT = " 1:64:{}:0:0:0:0:0:0:0::{}\n#DESCRIPTION {}\n"


@@ -51,9 +79,6 @@ def parse_m3u(path, s_type, detect_encoding=True, params=None):

        for line in str(data, encoding=encoding, errors="ignore").splitlines():
            if line.startswith("#EXTINF"):
-                inf, sep, line = line.partition(" ")
-                if not line:
-                    line = inf
                line, sep, name = line.rpartition(",")

                data = re.split('"', line)
@@ -87,12 +112,12 @@ def parse_m3u(path, s_type, detect_encoding=True, params=None):
                    srv = Service(None, None, IPTV_ICON, name, *aggr[0:3], st, picon, p_id, *s_aggr, url, fav_id, None)
                    services.append(srv)
                else:
-                    log("*.m3u* parse error ['{}']: name[{}], url[{}], fav id[{}]".format(path, name, url, fav_id))
+                    log(f"*.m3u* parse error ['{path}']: name[{name}], url[{url}], fav id[{fav_id}]")

    return services


-def export_to_m3u(path, bouquet, s_type):
+def export_to_m3u(path, bouquet, s_type, url=None):
    pattern = re.compile(".*:(http.*):.*") if s_type is SettingsType.ENIGMA_2 else re.compile("(http.*?)::::.*")
    lines = ["#EXTM3U\n"]
    current_grp = None
@@ -103,24 +128,26 @@ def export_to_m3u(path, bouquet, s_type):
            res = re.match(pattern, s.data)
            if not res:
                continue
-            data = res.group(1)
-            lines.append("#EXTINF:-1,{}\n".format(s.name))
-            if current_grp:
-                lines.append(current_grp)
-            lines.append("{}\n".format(unquote(data.strip())))
+            lines.append(f"#EXTINF:-1,{s.name}\n")
+            lines.append(current_grp) if current_grp else None
+            lines.append(f"{unquote(res.group(1).strip())}\n")
        elif s_type is BqServiceType.MARKER:
-            current_grp = "#EXTGRP:{}\n".format(s.name)
+            current_grp = f"#EXTGRP:{s.name}\n"
+        elif s_type is BqServiceType.DEFAULT and url:
+            lines.append(f"#EXTINF:-1,{s.name}\n")
+            lines.append(current_grp) if current_grp else None
+            lines.append(f"{url}{s.data}\n")

-    with open(path + "{}.m3u".format(bouquet.name), "w", encoding="utf-8") as file:
+    with open(f"{path}{bouquet.name}.m3u", "w", encoding="utf-8") as file:
        file.writelines(lines)


-def get_fav_id(url, service_name, settings_type, params=None, stream_type=None, s_type=1):
+def get_fav_id(url, name, settings_type, params=None, st_type=None, s_id=0, srv_type=1):
    """ Returns fav id depending on the profile. """
    if settings_type is SettingsType.ENIGMA_2:
-        stream_type = stream_type or StreamType.NONE_TS.value
+        st_type = st_type or StreamType.NONE_TS.value
        params = params or (0, 0, 0, 0)
-        return ENIGMA2_FAV_ID_FORMAT.format(stream_type, s_type, *params, quote(url), service_name, service_name, None)
+        return ENIGMA2_FAV_ID_FORMAT.format(st_type, s_id, srv_type, *params, quote(url), name, name, None)
    elif settings_type is SettingsType.NEUTRINO_MP:
        return NEUTRINO_FAV_ID_FORMAT.format(url, "", 0, None, None, None, None, "", "", 1)

--- a/app/settings.py
+++ b/app/settings.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -676,6 +676,14 @@ class Settings:
    def dark_mode(self, value):
        self._settings["dark_mode"] = value

+    @property
+    def display_picons(self):
+        return self._settings.get("display_picons", True)
+
+    @display_picons.setter
+    def display_picons(self, value):
+        self._settings["display_picons"] = value
+
    @property
    def alternate_layout(self):
        return self._settings.get("alternate_layout", IS_DARWIN)
@@ -711,7 +719,7 @@ class Settings:
    @property
    @lru_cache(1)
    def themes_path(self):
-        return "{}{}.themes{}".format(HOME_PATH, SEP, SEP)
+        return f"{HOME_PATH}{SEP}.themes{SEP}"

    @property
    def icon_theme(self):
@@ -724,7 +732,7 @@ class Settings:
    @property
    @lru_cache(1)
    def icon_themes_path(self):
-        return "{}{}.icons{}".format(HOME_PATH, SEP, SEP)
+        return f"{HOME_PATH}{SEP}.icons{SEP}"

    @property
    def is_darwin(self):
--- a/app/tools/epg.py
+++ b/app/tools/epg.py
@@ -1,4 +1,32 @@
-"""  Module for working with epg.dat file """
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2022 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
+"""  Module for working with epg.dat file. """
 import struct
 from datetime import datetime
 from xml.dom.minidom import parse, Node, Document
@@ -11,7 +39,7 @@ class EPG:
    @staticmethod
    def get_epg_refs(path):
        """ The read algorithm was taken from the eEPGCache::load() function from this source:
-            https://github.com/OpenPLi/enigma2/blob/44d9b92f5260c7de1b3b3a1b9a9cbe0f70ca4bf0/lib/dvb/epgcache.cpp#L1300
+            https://github.com/OpenPLi/enigma2/blob/develop/lib/dvb/epgcache.cpp#L955
        """
        refs = set()

@@ -21,17 +49,23 @@ class EPG:
                raise ValueError("Epg file has incorrect byte order!")

            header = f.read(13).decode()
-            if header != "ENIGMA_EPG_V7":
+            if header == "ENIGMA_EPG_V7":
+                epg_ver = 7
+            elif header == "ENIGMA_EPG_V8":
+                epg_ver = 8
+            else:
                raise ValueError("Unsupported format of epd.dat file!")

            channels_count = struct.unpack("<I", f.read(4))[0]
+            _len_read_size = 3 if epg_ver == 8 else 2
+            _type_read_str = f"<{'H' if epg_ver == 8 else 'B'}B"

            for i in range(channels_count):
                sid, nid, tsid, events_size = struct.unpack("<IIII", f.read(16))
-                service_id = "{:X}:{:X}:{:X}".format(sid, tsid, nid)
+                service_id = f"{sid:X}:{tsid:X}:{nid:X}"

                for j in range(events_size):
-                    _type, _len = struct.unpack("<BB", f.read(2))
+                    _type, _len = struct.unpack(_type_read_str, f.read(_len_read_size))
                    f.read(10)
                    n_crc = (_len - 10) // 4
                    if n_crc > 0:
@@ -90,14 +124,14 @@ class ChannelsParser:
            srv_type = srv.type
            if srv_type is BqServiceType.IPTV:
                channel_child = doc.createElement("channel")
-                channel_child.setAttribute("id", str(srv.num))
+                channel_child.setAttribute("id", srv.name)
                data = srv.data.strip().split(":")
                channel_child.appendChild(doc.createTextNode(":".join(data[:10])))
                comment = doc.createComment(srv.name)
-                lines.append("{} {}\n".format(str(channel_child.toxml()), str(comment.toxml())))
+                lines.append(f"{channel_child.toxml()} {comment.toxml()}\n")
            elif srv_type is BqServiceType.MARKER:
                comment = doc.createComment(srv.name)
-                lines.append("{}\n".format(str(comment.toxml())))
+                lines.append(f"{comment.toxml()}\n")

        lines.append("</channels>")
        doc.unlink()
--- a/app/tools/picons.py
+++ b/app/tools/picons.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -57,7 +57,7 @@ class PiconsCzDownloader:
    _PERM_URL = "https://picon.cz/download/7337"
    _BASE_URL = "https://picon.cz/download/"
    _BASE_LOGO_URL = "https://picon.cz/picon/0/"
-    _HEADER = {"User-Agent": "DemonEditor/2.0.0", "Referer": ""}
+    _HEADER = {"User-Agent": "DemonEditor/2.1.0", "Referer": ""}
    _LINK_PATTERN = re.compile(r"((.*)-\d+x\d+)-(.*)_by_chocholousek.7z$")
    _FILE_PATTERN = re.compile(b"\\s+(1_.*\\.png).*")

@@ -130,7 +130,7 @@ class PiconsCzDownloader:
        # TODO: think about https://github.com/miurahr/py7zr
        exe = "7z"
        if IS_DARWIN and GTK_PATH:
-            exe = "./7z"
+            exe = "./7zr"

        if IS_LINUX and not os.path.isfile(f"/usr/bin/{exe}"):
            raise PiconsError("7-zip [7z] archiver not found!")
@@ -219,7 +219,8 @@ class PiconsCzDownloader:
                "picontransparentdark": "td220",
                "piconoled": "o96",
                "piconblack80": "b50",
-                "piconblack3d": "b50"
+                "piconblack3d": "b50",
+                "piconwin11": "win11220"
                }

    def get_name_map(self):
--- a/app/tools/satellites.py
+++ b/app/tools/satellites.py
@@ -1,6 +1,34 @@
-""" Module for downloading satellites, transponders ans services from the web.
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2022 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#

-    Sources: www.flysat.com, www.lyngsat.com.
+
+""" Module for downloading satellites, transponders and services from the Web.
+
+    Sources: www.flysat.com, www.lyngsat.com, www.kingofsat.net.
    Replaces or updates the current satellites.xml file.
 """
 import re
@@ -15,10 +43,11 @@ from app.eparser.ecommons import (PLS_MODE, get_key_by_value, FEC, SYSTEM, POLAR
                                  Service, CAS)

 _HEADERS = {"User-Agent": "Mozilla/5.0 (Linux x86_64; rv:92.0) Gecko/20100101 Firefox/92.0"}
+_TIMEOUT = 10


 class SatelliteSource(Enum):
-    FLYSAT = ("https://www.flysat.com/satlist.php",)
+    FLYSAT = ("https://www.flysat.com/en/satellitelist",)
    LYNGSAT = ("https://www.lyngsat.com/asia.html", "https://www.lyngsat.com/europe.html",
               "https://www.lyngsat.com/atlantic.html", "https://www.lyngsat.com/america.html")
    KINGOFSAT = ("https://en.kingofsat.net/satellites.php",)
@@ -38,10 +67,10 @@ class Cell:
        self._img = img

    def __repr__(self):
-        return "Cell({}, {}, {})".format(self._text, self._url, self._img)
+        return f"Cell({self._text}, {self._url}, {self._img})"

    def __str__(self):
-        return "<Cell(text={}, link={}, img={})>".format(self._text, self._url, self._img)
+        return f"<Cell(text={self._text}, link={self._url}, img={self._img})>"

    def __iter__(self):
        return (x for x in (self._text, self._url, self._img))
@@ -92,6 +121,7 @@ class SatellitesParser(HTMLParser):
        self._current_cell = []
        self._rows = []
        self._source = source
+        self.pls_modes = {v: k for k, v in PLS_MODE.items()}

    def handle_starttag(self, tag, attrs):
        if tag == "td":
@@ -134,9 +164,9 @@ class SatellitesParser(HTMLParser):

        for src in SatelliteSource.get_sources(self._source):
            try:
-                request = requests.get(url=src, headers=_HEADERS)
-            except requests.exceptions.ConnectionError as e:
-                log(repr(e))
+                request = requests.get(url=src, headers=_HEADERS, timeout=_TIMEOUT)
+            except requests.exceptions.RequestException as e:
+                log(f"Getting satellite list error: {repr(e)}")
                return []
            else:
                reason = request.reason
@@ -147,63 +177,99 @@ class SatellitesParser(HTMLParser):

        if self._rows:
            if self._source is SatelliteSource.FLYSAT:
-                def get_sat(r):
-                    return r[1], self.parse_position(r[2]), r[3], r[0], False
-
-                return list(map(get_sat, filter(lambda x: all(x) and len(x) == 5, self._rows)))
+                return self.get_satellites_for_fly_sat()
            elif self._source is SatelliteSource.LYNGSAT:
-                base_url = "https://www.lyngsat.com/"
-                sats = []
-                cur_pos = "0"
-                for row in filter(lambda x: 3 < len(x) < 8, self._rows):
-                    if not row[0]:
-                        row = row[1:]
-
-                    pos = self.parse_position(row[1])
-                    if not self.POS_PAT.match(pos):
-                        if len(row) == 4 and row[0].endswith(".html"):
-                            sats.append((row[1], cur_pos, row[-2], base_url + row[0], False))
-                        continue
-
-                    sats.append((row[-3], pos, row[-2], base_url + row[0], False))
-                    cur_pos = pos
-                return sats
+                return self.get_satellites_for_lyng_sat()
            elif source is SatelliteSource.KINGOFSAT:
-                def get_sat(r):
-                    return r[3], self.parse_position(r[1]), None, r[2], False
-
-                return list(map(get_sat, filter(lambda x: len(x) == 17, self._rows)))
+                return self.get_satellites_for_king_of_sat()

    def get_satellite(self, sat):
        pos = sat[1]
-        return Satellite(name="{} {}".format(pos, sat[0]),
-                         flags="0",
+        return Satellite(name=f"{pos} {sat[0]}", flags="0",
                         position=self.get_position(pos.replace(".", "")),
                         transponders=self.get_transponders(sat[3]))

+    def get_satellites_for_fly_sat(self):
+        sat_pat = re.compile(r"https://.*/satellite/.+")
+        pos_pat = re.compile(r"https://.*/satellite/position/.+")
+        names = []
+        pos = ""
+        pos_url = ""
+
+        def normalize_pos(p):
+            return f"{float(p[:-1])}{p[-1]}" if "." not in p else p
+
+        def get_sat(r):
+            nonlocal pos
+            nonlocal pos_url
+            # Uniting satellites in position.
+            if re.match(pos_pat, r[2]):
+                pos_url = r[2]
+                name = r[1]
+                pos = normalize_pos(self.parse_position(r[3]))
+
+                names.append(name)
+                return name, pos, r[5], r[0], False
+
+            r_size = len(r)
+            if r_size == 5:
+                name = r[1]
+                names.append(name)
+                return name, pos, r[3], r[0], False
+            if r_size == 6:
+                if names:
+                    name = "/".join(names)
+                    names.clear()
+                    return name, pos, None, pos_url, False
+
+                return r[1], normalize_pos(self.parse_position(r[2])), r[4], r[0], False
+
+        return list(filter(None, map(get_sat, filter(lambda row: row and re.match(sat_pat, row[0]), self._rows))))
+
+    def get_satellites_for_lyng_sat(self):
+        base_url = "https://www.lyngsat.com/"
+        sats = []
+        cur_pos = "0"
+        for row in filter(lambda x: 3 < len(x) < 8, self._rows):
+            if not row[0]:
+                row = row[1:]
+
+            pos = self.parse_position(row[1])
+            if not self.POS_PAT.match(pos):
+                if len(row) == 4 and row[0].endswith(".html"):
+                    sats.append((row[1], cur_pos, row[-2], base_url + row[0], False))
+                continue
+
+            sats.append((row[-3], pos, row[-2], base_url + row[0], False))
+            cur_pos = pos
+        return sats
+
+    def get_satellites_for_king_of_sat(self):
+        def get_sat(r):
+            return r[3], self.parse_position(r[1]), None, r[2], False
+
+        return list(map(get_sat, filter(lambda x: len(x) == 17, self._rows)))
+
    @staticmethod
    def parse_position(pos_str):
        return "".join(c for c in pos_str if c.isdigit() or c.isalpha() or c == ".")

    @staticmethod
    def get_position(pos):
-        return "{}{}".format("-" if pos[-1] == "W" else "", pos[:-1])
+        return f"{'-' if pos[-1] == 'W' else ''}{pos[:-1]}"

    def get_transponders(self, sat_url):
        """ Getting transponders(sorted by frequency). """
        self._rows.clear()
        trs = []

-        url = sat_url
-        if self._source is SatelliteSource.FLYSAT:
-            url = "https://www.flysat.com/" + sat_url
-        elif self._source is SatelliteSource.KINGOFSAT:
-            url = "https://en.kingofsat.net/" + sat_url
+        if self._source is SatelliteSource.KINGOFSAT:
+            sat_url = "https://en.kingofsat.net/" + sat_url

        try:
-            request = requests.get(url=url, headers=_HEADERS)
-        except requests.exceptions.ConnectionError as e:
-            log("Getting transponders error: {}".format(e))
+            request = requests.get(url=sat_url, headers=_HEADERS, timeout=_TIMEOUT)
+        except requests.exceptions.RequestException as e:
+            log(f"Getting transponders error: {e}")
        else:
            if request.status_code == 200:
                self.feed(request.text)
@@ -214,87 +280,89 @@ class SatellitesParser(HTMLParser):
                elif self._source is SatelliteSource.KINGOFSAT:
                    self.get_transponders_for_king_of_sat(trs)
            else:
-                log("SatellitesParser [get transponders] error: {}  {}".format(url, request.reason))
+                log(f"SatellitesParser [get transponders] error: {sat_url}  {request.reason}")

        return sorted(trs, key=lambda x: int(x.frequency))

    def get_transponders_for_fly_sat(self, trs):
-        """ Parsing transponders for FlySat """
-        pls_pattern = re.compile("(PLS:)+ (Root|Gold|Combo)+ (\\d+)?")
-        is_id_pattern = re.compile("(Stream) (\\d+)")
-        pls_modes = {v: k for k, v in PLS_MODE.items()}
+        """ Parsing transponders for FlySat. """
+        frq_pol_pattern = re.compile(r"(\d{4,5})+\s+([RLHV]).*(DVB-S[2]?)/(.+PSK)?.*")
+        pls_pattern = re.compile(r".*PLS\s+(Root|Gold|Combo)+\s(\d+)?")
+        is_id_pattern = re.compile(r"Stream\s(\d+)")
+        sr_fec_pattern = re.compile(r"(\d{4,5})+\s+(\d+/\d+).*")
        n_trs = []

        if self._rows:
-            zeros = "000"
            is_ids = []
            for r in self._rows:
-                if len(r) == 1:
+                row_len = len(r)
+                if row_len == 1:
                    is_ids.extend(re.findall(is_id_pattern, r[0]))
                    continue
-                if len(r) < 3:
+                if row_len < 12:
                    continue
-                data = r[2].split(" ")
-                if len(data) != 2:
-                    continue
-                sr, fec = data
-                data = r[1].split(" ")
-                if len(data) < 3:
-                    continue
-                freq, pol, sys = data[0], data[1], data[2]
-                sys = sys.split("/")
-                if len(sys) != 2:
-                    continue
-                sys, mod = sys
-                mod = "QPSK" if sys == "DVB-S" else mod

-                pls = re.findall(pls_pattern, r[1])
+                freq = re.findall(frq_pol_pattern, r[2])
+                if not freq:
+                    continue
+                freq, pol, sys, mod = freq[0]
+
+                sr_fec = re.match(sr_fec_pattern, r[3])
+                if not sr_fec:
+                    continue
+                sr, fec = sr_fec.group(1), sr_fec.group(2)
+
+                pls = re.match(pls_pattern, r[2])
                pls_code = None
                pls_mode = None
-
                if pls:
-                    pls_code = pls[0][2]
-                    pls_mode = pls_modes.get(pls[0][1], None)
+                    pls_mode = self.pls_modes.get(pls.group(1), None)
+                    pls_code = pls.group(2)

                if is_ids:
                    tr = trs.pop()
                    for index, is_id in enumerate(is_ids):
-                        tr = tr._replace(is_id=is_id[1])
+                        tr = tr._replace(is_id=is_id)
                        if is_transponder_valid(tr):
                            n_trs.append(tr)
-                else:
-                    tr = Transponder(freq + zeros, sr + zeros, pol, fec, sys, mod, pls_mode, pls_code, None)
-                    if is_transponder_valid(tr):
-                        trs.append(tr)
+
+                tr = Transponder(f"{freq}000", f"{sr}000", pol, fec, sys, mod, pls_mode, pls_code, None)
+                if is_transponder_valid(tr):
+                    trs.append(tr)
+
                is_ids.clear()
            trs.extend(n_trs)

    def get_transponders_for_lyng_sat(self, trs):
        """ Parsing transponders for LyngSat. """
-        frq_pol_pattern = re.compile("(\\d{4,5})\\s+([RLHV]).*")
-        sr_fec_pattern = re.compile(r"(DVB-S[2]?)\s+(.+PSK)?.*?(\d+)\s+(\d/\d)\s*(?:T2-MI\s+PLP\s+(\d+))?.*")
-        zeros = "000"
-        pls_mode, pls_code, pls_id = None, None, None
+        frq_pol_pattern = re.compile(r"(\d{4,5})\s+([RLHV]).*")
+        sr_fec_pattern = re.compile((r"(DVB-S[2]?)\s+(.+PSK)?.*?(\d+)\s+(\d/\d)\s?"
+                                     r"(?:T2-MI\s+PLP\s+(\d+))?.*"
+                                     r"?(?:PLS\s+(Root|Gold|Combo)\s+(\d+))?"
+                                     r"(?:.*Stream\s+(\d+))?.*"))

        for row in filter(lambda x: len(x) > 8, self._rows):
-            for frq in row[1], row[2], row[3]:
-                freq = re.match(frq_pol_pattern, frq)
-                if freq:
+            for freq in row[1], row[2], row[3]:
+                res = re.match(frq_pol_pattern, freq)
+                if res:
                    break
-            if not freq:
+            if not res:
                continue

-            frq, pol = freq.group(1), freq.group(2)
-            srf = " ".join(row[3:5])
-            sr_fec = re.search(sr_fec_pattern, srf)
-            if not sr_fec:
+            freq, pol = res.group(1), res.group(2)
+            res = re.search(sr_fec_pattern, row[3])
+            if not res:
                continue

-            sys, mod, sr, fec = sr_fec.group(1), sr_fec.group(2), sr_fec.group(3), sr_fec.group(4)
+            sys, mod, sr, fec = res.group(1), res.group(2), res.group(3), res.group(4)
            mod = mod.strip() if mod else "Auto"
-            pls_id = sr_fec.group(5)
+            plp, pls_mode, pls_code, is_id = res.group(5), res.group(6), res.group(7), res.group(8)
+            pls_mode = self.pls_modes.get(pls_mode, None)

-            tr = Transponder(frq + zeros, sr + zeros, pol, fec, sys, mod, pls_mode, pls_code, pls_id)
+            if plp is not None:
+                log(f"Detected T2-MI transponder! [{freq} {sr} {pol}] ")
+
+            tr = Transponder(f"{freq}000", f"{sr}000", pol, fec, sys, mod, pls_mode, pls_code, is_id)
            if is_transponder_valid(tr):
                trs.append(tr)

@@ -303,19 +371,37 @@ class SatellitesParser(HTMLParser):

            Since the *.ini file contains incomplete information, it is not used.
        """
-        zeros = "000"
-        pat = re.compile(
-            r"(\d+).00\s+([RLHV])\s+(DVB-S[2]?)\s+(?:T2-MI, PLP (\d+)\s+)?(.*PSK).*?(?:Stream\s+(\d+))?\s+(\d+)\s+(\d+/\d+)$")
+        sys_pat = re.compile(r"(DVB-S[2]?)\s?(?:T2-MI,\s+PLP\s+(\d+))?.*?(?:PLS:\s+(Root|Gold|Combo)\+(\d+))?")
+        mod_pat = re.compile(r"(.*PSK).*?(?:.*Stream\s+(\d+))?.*")
+        sr_fec_pattern = re.compile(r"(\d{4,5})+\s+(\d+/\d+).*")

        for row in filter(lambda r: len(r) == 16 and self.POS_PAT.match(r[0]), self._rows):
-            res = pat.search(" ".join((row[0], row[2], row[3], row[8], row[9], row[10])))
-            if res:
-                freq, sr, pol, fec, sys = res.group(1), res.group(7), res.group(2), res.group(8), res.group(3)
-                mod, pls_id, pls_code = res.group(5), res.group(4), res.group(6)
+            freq, pol = row[2].replace(".", "0"), row[3]
+            if not freq.isdigit() or pol not in "VHLR":
+                continue

-                tr = Transponder(freq + zeros, sr + zeros, pol, fec, sys, mod, None, pls_code, pls_id)
-                if is_transponder_valid(tr):
-                    trs.append(tr)
+            res = re.match(sys_pat, row[8])
+            if not res:
+                continue
+            sys, t2_mi, pls_id, pls_code = res.group(1), res.group(2), res.group(3), res.group(4)
+            pls_id = self.pls_modes.get(pls_id, None)
+
+            res = re.match(mod_pat, row[9])
+            if not res:
+                continue
+            mod, is_id = res.group(1), res.group(2)
+
+            res = re.match(sr_fec_pattern, row[10])
+            if not res:
+                continue
+            sr, fec = res.group(1), res.group(2)
+
+            if t2_mi:
+                log(f"Detected T2-MI transponder! [{freq} {sr} {pol}] ")
+
+            tr = Transponder(freq, f"{sr}000", pol, fec, sys, mod, pls_id, pls_code, is_id)
+            if is_transponder_valid(tr):
+                trs.append(tr)


 class ServicesParser(HTMLParser):
@@ -329,16 +415,27 @@ class ServicesParser(HTMLParser):
                         "MPEG-4": "22", "HEVC SD": "22", "MPEG-4/HD": "25", "MPEG-4 HD": "25", "MPEG-4 HD 1080": "25",
                         "MPEG-4 HD 720": "25", "HEVC HD": "25", "HEVC/HD": "25", "HEVC": "31", "HEVC/UHD": "31",
                         "HEVC UHD": "31", "HEVC UHD 4K": "31", "3": "Data"}
-        self._TR_PAT = re.compile(
-            r".*?(\d+)\s+([RLHV]).*(DVB-S[2]?)/?(.*PSK)?\s(T2-MI)?\s?SR-FEC:\s(\d+)-(\d/\d)\s+.*ONID-TID:\s+(\d+)-(\d+).*")
-        self._POS_PAT = re.compile(r".*?(\d+\.\d°[EW]).*")
+
        self._TR = "s {}000:{}000:{}:{}:{}:{}:{}:{}"
        self._S2_TR = "{}:{}:{}:{}"

+        self._POS_PAT = re.compile(r".*?(\d+\.\d°[EW]).*")
+        # LyngSat.
+        self._TR_PAT = re.compile((r".*?(\d+)\.?\d?\s+([RLHV]).*(DVB-S[2]?)/?(.*PSK)?\s"
+                                   r"?(T2-MI)?\s?(PLS\s+Multistream)?\s?"
+                                   r"SR-FEC:\s(\d+)-(\d/\d)\s+.*ONID-TID:\s+(\d+)-(\d+).*"))
+
+        self._MULTI_PAT = re.compile(r"PLS\s+(Root|Gold|Combo)+\s(\d+)?\s+(?:Stream\s(\d+))")
+        # KingOfSat.
+        self._KING_TR_PAT = re.compile((r"(DVB-S[2]?)\s?(?:T2-MI,\s+PLP\s+(\d+))?.*"
+                                        r"?(?:PLS:\s+(Root|Gold|Combo)\+(\d+))?"
+                                        r"\s+(.*PSK).*?(?:.*Stream\s+(\d+))?.*"))
+
        self._parse_html_entities = entities
        self._separator = separator
        self._is_td = False
        self._is_th = False
+        self._is_mux_div = False
        self._current_row = []
        self._current_cell_text = []
        self._current_cell = Cell()
@@ -346,6 +443,7 @@ class ServicesParser(HTMLParser):
        self._source = source
        self._t_url = ""
        self._use_short_names = True
+        self._pls_modes = {v: k for k, v in PLS_MODE.items()}

    @property
    def source(self):
@@ -389,12 +487,18 @@ class ServicesParser(HTMLParser):
                    self._current_cell.img = img_link
            elif self._source is SatelliteSource.KINGOFSAT:
                self._current_cell.img = img_link
+        elif tag == "div" and self._source is SatelliteSource.LYNGSAT:
+            self._is_mux_div = bool(list(filter(lambda at: at[-1] == "mux-header", attrs)))

    def handle_data(self, data):
        """ Save content to a cell """
        if self._is_td or self._is_th:
            self._current_cell_text.append(data.strip())

+        if self._is_mux_div:
+            self._current_cell.url = data.strip()
+            self._is_mux_div = False
+
    def handle_endtag(self, tag):
        if tag == "td":
            self._is_td = False
@@ -414,21 +518,24 @@ class ServicesParser(HTMLParser):
            self._current_row = []

    def error(self, message):
-        log("ServicesParser error: {}".format(message))
+        log(f"ServicesParser error: {message}")

    def init_data(self, url):
        """ Initializes data for the given URL. """
        if self._source not in (SatelliteSource.LYNGSAT, SatelliteSource.KINGOFSAT):
-            raise ValueError("Unsupported source: {}!".format(self._source.name))
+            raise ValueError(f"Unsupported source: {self._source.name}!")

        self._rows.clear()
-        request = requests.get(url=url, headers=_HEADERS)
-        reason = request.reason
-
-        if reason == "OK":
-            self.feed(request.text)
+        try:
+            request = requests.get(url=url, headers=_HEADERS, timeout=_TIMEOUT)
+        except requests.exceptions.RequestException as e:
+            raise ValueError(e)
        else:
-            raise ValueError(reason)
+            reason = request.reason
+            if reason == "OK":
+                self.feed(request.text)
+            else:
+                raise ValueError(reason)

    def get_transponders_links(self, sat_url):
        """ Returns transponder links. """
@@ -467,13 +574,13 @@ class ServicesParser(HTMLParser):
            self.init_data(tr_url)
        except ValueError as e:
            log(e)
+            return []
        else:
            if self._source is SatelliteSource.LYNGSAT:
                return self.get_lyngsat_services(sat_position, use_pids)
            elif self._source is SatelliteSource.KINGOFSAT:
                return self.get_kingofsat_services(sat_position, use_pids)
-            else:
-                return []
+            return []

    def get_lyngsat_services(self, sat_position=None, use_pids=False):
        services = []
@@ -481,7 +588,10 @@ class ServicesParser(HTMLParser):
        sys = "DVB-S"
        pos_found = False
        tr = None
-        # Transponder
+        # Multi-stream.
+        multi_tr = None
+        multi = False
+        # Transponder.
        for r in filter(lambda x: x and 6 < len(x) < 9, self._rows):
            if not pos_found:
                pos_tr = re.match(self._POS_PAT, r[0].text)
@@ -490,7 +600,6 @@ class ServicesParser(HTMLParser):

                if not sat_position:
                    pos = self.get_position(pos_tr.group(1))
-
                pos_found = True

            if pos_found:
@@ -498,34 +607,46 @@ class ServicesParser(HTMLParser):
                td = re.match(self._TR_PAT, text)
                if td:
                    freq, pol = int(td.group(1)), get_key_by_value(POLARIZATION, td.group(2))
-                    if td.group(5):
-                        log("Detected T2-MI transponder!")
-                        continue
-
-                    sys, mod, sr, _fec, = td.group(3), td.group(4), td.group(6), td.group(7)
-                    nid, tid = td.group(8), td.group(9)
+                    sys, mod, sr, _fec, = td.group(3), td.group(4), td.group(7), td.group(8)
+                    nid, tid = td.group(9), td.group(10)
                    sys, mod, fec, nsp, s2_flags, roll_off, pilot, inv = self.get_transponder_data(pos, _fec, sys, mod)
                    nid, tid = int(nid), int(tid)
+
+                    if td.group(5):
+                        log(f"Detected T2-MI transponder! [{freq} {sr} {pol}]")
+
+                    if td.group(6):
+                        log(f"Detected multi-stream transponder! [{freq} {sr} {pol}]")
+                        multi = True
+
                    tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)

        if not tr:
-            er = f"Transponder [{freq}] not found or its type [T2-MI, etc] not supported yet."
+            er = f"Transponder [{self._t_url}] not found or its type [T2-MI, etc] not supported yet."
            log(f"ServicesParser error [get transponder services]: {er}")
            return services

-        # Services
-        for r in filter(lambda x: x and len(x) == 12 and (x[0].text.isdigit()), self._rows):
-            sid, name, s_type, v_pid, a_pid, cas, pkg = r[0].text, r[2].text, r[4].text, r[
-                5].text.strip(), r[6].text.split(), r[9].text, r[10].text.strip()
-            try:
-                s_type = self._S_TYPES.get(s_type, "3")  # 3 = Data
-                _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))  # str repr
-                flags, sid, fav_id, picon_id, data_id = self.get_service_data(s_type, pkg, sid, tid, nid, nsp,
-                                                                              v_pid, a_pid, cas, use_pids)
-                services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, r[1].img, picon_id,
-                                        sid, freq, sr, pol, fec, sys, pos, data_id, fav_id, tr))
-            except ValueError as e:
-                log(f"ServicesParser error [get transponder services]: {e}")
+        # Services.
+        for r in filter(None, self._rows):
+            if multi and r[0].url:
+                res = re.match(self._MULTI_PAT, r[0].url)
+                if res:
+                    pls_mode, is_code, is_id = self._pls_modes.get(res.group(1), None), res.group(2), res.group(3)
+                    multi_tr = f"{tr}:{is_id}:{is_code}:{pls_mode}" if all((pls_mode, is_code, is_id)) else None
+                    tid = int(is_id) if multi_tr else tid
+
+            if len(r) == 12 and r[0].text.isdigit():
+                sid, name, s_type, v_pid, a_pid, cas, pkg = r[0].text, r[2].text, r[4].text, r[
+                    5].text.strip(), r[6].text.split(), r[9].text, r[10].text.strip()
+                try:
+                    s_type = self._S_TYPES.get(s_type, "3")  # 3 = Data
+                    _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))  # str repr
+                    flags, sid, fav_id, picon_id, data_id = self.get_service_data(s_type, pkg, sid, tid, nid, nsp,
+                                                                                  v_pid, a_pid, cas, use_pids)
+                    services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, r[1].img, picon_id,
+                                            sid, freq, sr, pol, fec, sys, pos, data_id, fav_id, multi_tr or tr))
+                except ValueError as e:
+                    log(f"ServicesParser error [get transponder services]: {e}")

        return services

@@ -537,40 +658,60 @@ class ServicesParser(HTMLParser):
            log(f"ServicesParser error [get transponder services]: Transponder [{self._t_url}] not found!")
            return services

-        tr = tr[0]
-        s_pos, freq, pol, sys, mod, sr_fec = tr[0].text, tr[2].text, tr[3].text, tr[6].text, tr[7].text, tr[8].text
-        tid, nid = tr[10].text, tr[11].text
+        tr, multi_tr, tid, nid, nsp = None, None, None, None, None
+        freq, sr, pol, fec, sys, pos = None, None, None, None, None, None

-        pos = sat_position
-        if not sat_position:
-            pos_tr = re.match(self._POS_PAT, s_pos)
-            if pos_tr:
-                pos = self.get_position(pos_tr.group(1))
+        for r in filter(lambda x: len(x) > 12, self._rows):
+            r_size = len(r)
+            if r_size == 13 and r[4].url and r[4].url.startswith("tp.php?tp="):
+                res = re.match(self._KING_TR_PAT, f"{r[6].text} {r[7].text}")
+                if not res:
+                    continue

-        sr, fec = sr_fec.split()
-        pol = get_key_by_value(POLARIZATION, pol)
-        sys, mod, fec, nsp, s2_flags, roll_off, pilot, inv = self.get_transponder_data(pos, fec, sys, mod)
-        freq, nid, tid = int(float(freq)), int(nid), int(tid)
-        tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)
+                sys, mod = res.group(1), res.group(5)
+                s_pos, freq, pol, sr_fec = r[0].text, r[2].text, r[3].text, r[8].text
+                nid, tid = r[10].text, r[11].text

-        for r in filter(lambda x: len(x) == 14 and not x[1].text and x[7].text and x[7].text.isdigit(), self._rows):
-            if r[1].img == "/radio.gif":
-                s_type = ""
-            elif r[8].img == "/hd.gif":
-                s_type = "HEVC HD"
-            elif r[1].img == "/data.gif":
-                s_type = "Data"
-            else:
-                s_type = "SD"
+                pos = sat_position
+                if not sat_position:
+                    pos_tr = re.match(self._POS_PAT, s_pos)
+                    if pos_tr:
+                        pos = self.get_position(pos_tr.group(1))

-            s_type = self._S_TYPES.get(s_type, "3")
-            _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))
+                sr, fec = sr_fec.split()
+                pol = get_key_by_value(POLARIZATION, pol)
+                sys, mod, fec, nsp, s2_flags, roll_off, pilot, inv = self.get_transponder_data(pos, fec, sys, mod)
+                freq, nid, tid = int(float(freq)), int(nid), int(tid)
+                tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)

-            name, pkg, cas, sid, v_pid, a_pid = r[2].text, r[5].text, r[6].text, r[7].text, None, None
-            flags, sid, fav_id, picon_id, data_id = self.get_service_data(s_type, pkg, sid, tid, nid, nsp,
-                                                                          v_pid, a_pid, cas, use_pids)
-            services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, None, picon_id,
-                                    sid, str(freq), sr, pol, fec, sys, pos, data_id, fav_id, tr))
+                pls_mode, is_code, is_id = self._pls_modes.get(res.group(3), None), res.group(4), res.group(6)
+                multi_tr = f"{tr}:{is_id}:{is_code}:{pls_mode}" if all((pls_mode, is_code, is_id)) else None
+                tid = int(is_id) if multi_tr else tid
+
+                if res.group(2):
+                    log(f"Detected T2-MI transponder! [{freq} {sr}]")
+
+                if multi_tr:
+                    log(f"Detected multi-stream transponder! [{freq} {sr}]")
+
+            if tr and r_size == 14 and not r[1].text and r[7].text and r[7].text.isdigit():
+                if r[1].img == "/radio.gif":
+                    s_type = ""
+                elif r[8].img == "/hd.gif":
+                    s_type = "HEVC HD"
+                elif r[1].img == "/data.gif":
+                    s_type = "Data"
+                else:
+                    s_type = "SD"
+
+                s_type = self._S_TYPES.get(s_type, "3")
+                _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))
+
+                name, pkg, cas, sid, v_pid, a_pid = r[2].text, r[5].text, r[6].text, r[7].text, None, None
+                flags, sid, fav_id, picon_id, data_id = self.get_service_data(s_type, pkg, sid, tid, nid, nsp,
+                                                                              v_pid, a_pid, cas, use_pids)
+                services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, None, picon_id,
+                                        sid, str(freq), sr, pol, fec, sys, pos, data_id, fav_id, multi_tr or tr))

        return services

@@ -580,7 +721,7 @@ class ServicesParser(HTMLParser):
        mod = get_key_by_value(MODULATION, mod)
        fec = get_key_by_value(FEC, fec)
        # For negative (West) positions: 3600 - numeric position value!!!
-        namespace = "{:04x}0000".format(3600 - pos if pos < 0 else pos)
+        namespace = f"{3600 - pos if pos < 0 else pos:04x}0000"
        tr_flag = 1
        roll_off = 0  # 35% DVB-S2/DVB-S (default)
        pilot = 2  # Auto
@@ -592,15 +733,15 @@ class ServicesParser(HTMLParser):
    @staticmethod
    def get_service_data(s_type, pkg, sid, tid, nid, namespace, v_pid, a_pid, cas, use_pids=False):
        sid = int(sid)
-        data_id = "{:04x}:{}:{:04x}:{:04x}:{}:0:0".format(sid, namespace, tid, nid, s_type)
-        fav_id = "{}:{}:{}:{}".format(sid, tid, nid, namespace)
-        picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(int(s_type), sid, tid, nid, namespace)
+        data_id = f"{sid:04x}:{namespace}:{tid:04x}:{nid:04x}:{s_type}:0:0"
+        fav_id = f"{sid}:{tid}:{nid}:{namespace}"
+        picon_id = f"1_0_{int(s_type):X}_{sid}_{tid}_{nid}_{namespace}_0_0_0.png"
        # Flags.
-        flags = "p:{}".format(pkg)
+        flags = f"p:{pkg}"
        cas = ",".join(get_key_by_value(CAS, c) or "C:0000" for c in cas.split()) if cas else None
        if use_pids:
-            v_pid = "c:00{:04x}".format(int(v_pid)) if v_pid else None
-            a_pid = ",".join(["c:01{:04x}".format(int(p)) for p in a_pid]) if a_pid else None
+            v_pid = f"c:00{int(v_pid):04x}" if v_pid else None
+            a_pid = ",".join([f"c:01{int(p):04x}" for p in a_pid]) if a_pid else None
            flags = ",".join(filter(None, (flags, v_pid, a_pid, cas)))
        else:
            flags = ",".join(filter(None, (flags, cas)))
--- a/app/tools/yt.py
+++ b/app/tools/yt.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
 #


-""" Module for working with YouTube service """
+""" Module for working with YouTube service. """
 import gzip
 import json
 import os
@@ -35,20 +35,21 @@ import shutil
 import sys
 from html.parser import HTMLParser
 from json import JSONDecodeError
+from urllib import parse
 from urllib.error import URLError
-from urllib.parse import unquote
 from urllib.request import Request, urlopen, urlretrieve

 from app.commons import log
 from app.settings import SEP
 from app.ui.uicommons import show_notification

+_TIMEOUT = 5
+_HEADERS = {"User-Agent": "Mozilla/5.0 (Linux x86_64; rv:92.0) Gecko/20100101 Firefox/92.0",
+            "DNT": "1",
+            "Accept-Encoding": "gzip, deflate"}
 _YT_PATTERN = re.compile(r"https://www.youtube.com/.+(?:v=)([\w-]{11}).*")
 _YT_LIST_PATTERN = re.compile(r"https://www.youtube.com/.+?(?:list=)([\w-]{18,})?.*")
 _YT_VIDEO_PATTERN = re.compile(r"https://r\d+---sn-[\w]{10}-[\w]{3,5}.googlevideo.com/videoplayback?.*")
-_HEADERS = {"User-Agent": "Mozilla/5.0 (X11; Linux i586; rv:31.0) Gecko/20100101 Firefox/69.0",
-            "DNT": "1",
-            "Accept-Encoding": "gzip, deflate"}

 Quality = {137: "1080p", 136: "720p", 135: "480p", 134: "360p",
           133: "240p", 160: "144p", 0: "0p", 18: "360p", 22: "720p"}
@@ -109,6 +110,8 @@ class YouTube:
        if self._settings.enable_yt_dl and url:
            if not self._yt_dl:
                self._yt_dl = YouTubeDL.get_instance(self._settings, self._callback)
+                if not self._yt_dl:
+                    raise YouTubeException("youtube-dl initialization error.")
            return self._yt_dl.get_yt_link(url, skip_errors)

        return self.get_yt_link_by_id(video_id)
@@ -119,61 +122,117 @@ class YouTube:

            Returns tuple from the video links dict and title.
        """
-        req = Request(YouTube._VIDEO_INFO_LINK.format(video_id), headers=_HEADERS)
+        info = InnerTube().player(video_id)
+        det = info.get("videoDetails", None)
+        title = det.get("title", None) if det else None
+        streaming_data = info.get("streamingData", None)
+        fmts = streaming_data.get("formats", None) if streaming_data else None

-        with urlopen(req, timeout=2) as resp:
-            data = unquote(gzip.decompress(resp.read()).decode("utf-8")).split("&")
-            out = {k: v for k, sep, v in (str(d).partition("=") for d in map(unquote, data))}
-            player_resp = out.get("player_response", None)
+        if fmts:
+            links = {Quality[i["itag"]]: i["url"] for i in filter(
+                lambda i: i.get("itag", -1) in Quality, fmts) if "url" in i}

-            if player_resp:
-                try:
-                    resp = json.loads(player_resp)
-                except JSONDecodeError as e:
-                    log("{}: Parsing player response error: {}".format(__class__.__name__, e))
-                else:
-                    det = resp.get("videoDetails", None)
-                    title = det.get("title", None) if det else None
-                    streaming_data = resp.get("streamingData", None)
-                    fmts = streaming_data.get("formats", None) if streaming_data else None
+            if links and title:
+                return links, title.replace("+", " ")

-                    if fmts:
-                        urls = {Quality[i["itag"]]: i["url"] for i in
-                                filter(lambda i: i.get("itag", -1) in Quality, fmts) if "url" in i}
+        cause = None
+        status = info.get("playabilityStatus", None)
+        if status:
+            cause = f"[{status.get('status', '')}] {status.get('reason', '')}"

-                        if urls and title:
-                            return urls, title.replace("+", " ")
+        log(f"{__class__.__name__}: Getting link to video with id '{video_id}' filed! Cause: {cause}")

-            stream_map = out.get("url_encoded_fmt_stream_map", None)
-            if stream_map:
-                s_map = {k: v for k, sep, v in (str(d).partition("=") for d in stream_map.split("&"))}
-                url, title = s_map.get("url", None), out.get("title", None)
-                url, title = unquote(url) if url else "", title.replace("+", " ") if title else ""
-                if url and title:
-                    return {Quality[0]: url}, title.replace("+", " ")
-
-            rsn = out.get("reason", None)
-            rsn = rsn.replace("+", " ") if rsn else ""
-            log("{}: Getting link to video with id {} filed! Cause: {}".format(__class__.__name__, video_id, rsn))
-
-            return None, rsn
+        return None, cause

    def get_yt_playlist(self, list_id, url=None):
        """ Returns tuple from the playlist header and list of tuples (title, video id). """
        if self._settings.enable_yt_dl and url:
            try:
+                if not self._yt_dl:
+                    raise YouTubeException("youtube-dl is not initialized!")
+
                self._yt_dl.update_options({"noplaylist": False, "extract_flat": True})
                info = self._yt_dl.get_info(url, skip_errors=False)
                if "url" in info:
                    info = self._yt_dl.get_info(info.get("url"), skip_errors=False)
+
                return info.get("title", ""), [(e.get("title", ""), e.get("id", "")) for e in info.get("entries", [])]
            finally:
                # Restoring default options
-                self._yt_dl.update_options({"noplaylist": True, "extract_flat": False})
+                if self._yt_dl:
+                    self._yt_dl.update_options({"noplaylist": True, "extract_flat": False})

        return PlayListParser.get_yt_playlist(list_id)


+class InnerTube:
+    """ Object for interacting with the innertube API.
+
+        Based on InnerTube class from pytube [https://github.com/pytube/pytube] project!
+    """
+    _BASE_URI = "https://www.youtube.com/youtubei/v1"
+
+    _DEFAULT_CLIENTS = {
+        "ANDROID": {
+            "context": {"client": {"clientName": "ANDROID", "clientVersion": "16.20"}},
+            "api_key": "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8"
+        },
+        "ANDROID_EMBED": {
+            "context": {"client": {"clientName": "ANDROID", "clientVersion": "16.20", "clientScreen": "EMBED"}},
+            "api_key": "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8"
+        }
+    }
+
+    def __init__(self, client="ANDROID"):
+        """ Initialize an InnerTube object.
+
+            @param client: Client to use for the object. Default to web because it returns the most playback types.
+        """
+        self.context = self._DEFAULT_CLIENTS[client]["context"]
+        self.api_key = self._DEFAULT_CLIENTS[client]["api_key"]
+
+    @property
+    def base_data(self):
+        """Return the base json data to transmit to the innertube API."""
+        return {"context": self.context}
+
+    @property
+    def base_params(self):
+        """Return the base query parameters to transmit to the innertube API."""
+        return {"key": self.api_key, "contentCheckOk": True, "racyCheckOk": True}
+
+    def player(self, video_id):
+        """ Make a request to the player endpoint. Returns raw player info results. """
+        endpoint = f"{self._BASE_URI}/player"
+        query = {"videoId": video_id}
+        query.update(self.base_params)
+        return self._call_api(endpoint, query, self.base_data) or {}
+
+    @staticmethod
+    def _call_api(endpoint, query, data):
+        """ Make a request to a given endpoint with the provided query parameters and data."""
+        headers = {"Content-Type": "application/json", }
+        response = InnerTube._execute(f"{endpoint}?{parse.urlencode(query)}", "POST", headers=headers, data=data)
+
+        try:
+            resp = json.loads(response.read())
+        except JSONDecodeError as e:
+            log(f"{__class__.__name__}: Parsing response error: {e}")
+        else:
+            return resp
+
+    @staticmethod
+    def _execute(url, method=None, headers=None, data=None, timeout=_TIMEOUT):
+        base_headers = {"User-Agent": "Mozilla/5.0", "accept-language": "en-US,en"}
+        if headers:
+            base_headers.update(headers)
+        if data:
+            # Encoding data for request.
+            if not isinstance(data, bytes):
+                data = bytes(json.dumps(data), encoding="utf-8")
+        return urlopen(Request(url, headers=base_headers, method=method, data=data), timeout=timeout)
+
+
 class PlayListParser(HTMLParser):
    """ Very simple parser to handle YouTube playlist pages. """

@@ -200,7 +259,7 @@ class PlayListParser(HTMLParser):
                try:
                    resp = json.loads(data)
                except JSONDecodeError as e:
-                    log("{}: Parsing data error: {}".format(__class__.__name__, e))
+                    log(f"{__class__.__name__}: Parsing data error: {e}")
                else:
                    sb = resp.get("sidebar", None)
                    if sb:
@@ -218,7 +277,7 @@ class PlayListParser(HTMLParser):
            self._is_script = False

    def error(self, message):
-        log("{} Parsing error: {}".format(__class__.__name__, message))
+        log(f"{__class__.__name__} Parsing error: {message}")

    @property
    def header(self):
@@ -234,9 +293,9 @@ class PlayListParser(HTMLParser):

           returns tuple from the playlist header and list of tuples (title, video id)
        """
-        request = Request("https://www.youtube.com/playlist?list={}&hl=en".format(play_list_id), headers=_HEADERS)
+        request = Request(f"https://www.youtube.com/playlist?list={play_list_id}&hl=en", headers=_HEADERS)

-        with urlopen(request, timeout=2) as resp:
+        with urlopen(request, timeout=_TIMEOUT) as resp:
            data = gzip.decompress(resp.read()).decode("utf-8")
            parser = PlayListParser()
            parser.feed(data)
@@ -259,7 +318,7 @@ class YouTubeDL:
                "cookiefile": "cookies.txt"}  # File name where cookies should be read from and dumped to.

    def __init__(self, settings, callback):
-        self._path = "{}tools{}".format(settings.default_data_path, SEP)
+        self._path = f"{settings.default_data_path}tools{SEP}"
        self._update = settings.enable_yt_dl_update
        self._supported = {"22", "18"}
        self._dl = None
@@ -276,7 +335,7 @@ class YouTubeDL:
        return cls._DL_INSTANCE

    def init(self):
-        if not os.path.isfile("{}youtube_dl{}version.py".format(self._path, SEP)):
+        if not os.path.isfile(f"{self._path}youtube_dl{SEP}version.py"):
            self.get_latest_release()

        if self._path not in sys.path:
@@ -288,17 +347,22 @@ class YouTubeDL:
        try:
            import youtube_dl
        except ModuleNotFoundError as e:
-            log("YouTubeDLHelper error: {}".format(str(e)))
+            log(f"YouTubeDLHelper error: {e}")
            raise YouTubeException(e)
        except ImportError as e:
-            log("YouTubeDLHelper error: {}".format(str(e)))
+            log(f"YouTubeDLHelper error: {e}")
        else:
+            if self._path not in youtube_dl.__file__:
+                msg = "Another version of youtube-dl was found on your system!"
+                log(msg)
+                raise YouTubeException(msg)
+
            if self._update:
                if hasattr(youtube_dl.version, "__version__"):
                    l_ver = self.get_last_release_id()
                    cur_ver = youtube_dl.version.__version__
                    if l_ver and youtube_dl.version.__version__ < l_ver:
-                        msg = "youtube-dl has new release!\nCurrent: {}. Last: {}.".format(cur_ver, l_ver)
+                        msg = f"youtube-dl has new release!\nCurrent: {cur_ver}. Last: {l_ver}."
                        show_notification(msg)
                        log(msg)
                        self._callback(msg, False)
@@ -318,7 +382,7 @@ class YouTubeDL:
            with urlopen(url, timeout=10) as resp:
                return json.loads(resp.read().decode("utf-8")).get("tag_name", "0")
        except URLError as e:
-            log("YouTubeDLHelper error [get last release id]: {}".format(e))
+            log(f"YouTubeDLHelper error [get last release id]: {e}")

    def get_latest_release(self):
        try:
@@ -329,6 +393,9 @@ class YouTubeDL:
                r = json.loads(resp.read().decode("utf-8"))
                zip_url = r.get("zipball_url", None)
                if zip_url:
+                    if os.path.isdir(self._path):
+                        shutil.rmtree(self._path)
+
                    zip_file = self._path + "yt.zip"
                    os.makedirs(os.path.dirname(self._path), exist_ok=True)
                    f_name, headers = urlretrieve(zip_url, filename=zip_file)
@@ -336,25 +403,22 @@ class YouTubeDL:
                    import zipfile

                    with zipfile.ZipFile(f_name) as arch:
-
-                        if os.path.isdir(self._path):
-                            shutil.rmtree(self._path)
-                        else:
-                            os.makedirs(os.path.dirname(self._path), exist_ok=True)
-
                        for info in arch.infolist():
                            pref, sep, f = info.filename.partition("/youtube_dl/")
                            if sep:
                                arch.extract(info.filename)
-                                shutil.move(info.filename, "{}{}{}".format(self._path, sep, f))
+                                shutil.move(info.filename, f"{self._path}{sep}{f}")
                        shutil.rmtree(pref)
                        msg = "Getting the last youtube-dl release is done!"
                        show_notification(msg)
                        log(msg)
                        self._callback(msg, False)
-                        return True
+
+                    if os.path.isfile(zip_file):
+                        os.remove(zip_file)
+                    return True
        except URLError as e:
-            log("YouTubeDLHelper error: {}".format(e))
+            log(f"YouTubeDLHelper error: {e}")
            raise YouTubeException(e)
        finally:
            self._is_update_process = False
@@ -377,10 +441,10 @@ class YouTubeDL:
        try:
            return self._dl.extract_info(url, download=False)
        except URLError as e:
-            log(str(e))
+            log(f"YouTubeDLHelper error [get info]: {e}")
            raise YouTubeException(e)
        except self._DownloadError as e:
-            log(str(e))
+            log(f"YouTubeDLHelper error [get info]: {e}")
            if not skip_errors:
                raise YouTubeException(e)

--- a/app/ui/app_menu.ui
+++ b/app/ui/app_menu.ui
@@ -133,8 +133,18 @@
          <attribute name="hidden-when">action-disabled</attribute>
        </item>
      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Display picons</attribute>
+          <attribute name="action">app.display_picons</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Alternate layout</attribute>
+          <attribute name="action">app.set_alternate_layout</attribute>
+        </item>
+      </section>
    </submenu>
-    <submenu>
+    <submenu id="tools_menu">
      <attribute name="label" translatable="yes">Tools</attribute>
      <attribute name="action">app.hide_menu_bar</attribute>
      <attribute name="hidden-when">action-disabled</attribute>
@@ -147,6 +157,10 @@
          <attribute name="label" translatable="yes">Telnet</attribute>
          <attribute name="action">app.on_telnet_show</attribute>
        </item>
+        <item>
+          <attribute name="label" translatable="yes">Logs</attribute>
+          <attribute name="action">app.on_logs_show</attribute>
+        </item>
      </section>
    </submenu>
    <submenu>
@@ -319,6 +333,16 @@
          <attribute name="hidden-when">action-disabled</attribute>
        </item>
      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Display picons</attribute>
+          <attribute name="action">app.display_picons</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Alternate layout</attribute>
+          <attribute name="action">app.set_alternate_layout</attribute>
+        </item>
+      </section>
    </submenu>
    <submenu>
      <attribute name="label" translatable="yes">Tools</attribute>
@@ -333,6 +357,10 @@
          <attribute name="label" translatable="yes">Telnet</attribute>
          <attribute name="action">app.on_telnet_show</attribute>
        </item>
+        <item>
+          <attribute name="label" translatable="yes">Logs</attribute>
+          <attribute name="action">app.on_logs_show</attribute>
+        </item>
      </section>
    </submenu>
    <submenu>
@@ -360,7 +388,7 @@
    </item>
    <item>
      <attribute name="label" translatable="yes">Export to m3u</attribute>
-      <attribute name="action">app.on_export_to_m3u</attribute>
+      <attribute name="action">app.on_export_iptv_to_m3u</attribute>
    </item>
    <section>
      <item>
--- a/app/ui/backup.py
+++ b/app/ui/backup.py
@@ -38,7 +38,7 @@ from app.commons import run_idle
 from app.settings import SettingsType, SEP
 from app.ui.dialogs import show_dialog, DialogType, get_builder
 from app.ui.main_helper import append_text_to_tview
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK, IS_GNOME_SESSION


 class RestoreType(Enum):
@@ -74,6 +74,24 @@ class BackupDialog:
        self._info_check_button = builder.get_object("info_check_button")
        self._info_bar = builder.get_object("info_bar")
        self._message_label = builder.get_object("message_label")
+
+        if IS_GNOME_SESSION:
+            header_bar = Gtk.HeaderBar(visible=True, show_close_button=True)
+            self._dialog_window.set_titlebar(header_bar)
+
+            button_box = builder.get_object("main_button_box")
+            button_box.set_margin_top(0)
+            button_box.set_margin_bottom(0)
+            button_box.set_margin_left(0)
+            button_box.reparent(header_bar)
+
+            ch_button = builder.get_object("info_check_button")
+            ch_button.set_margin_right(0)
+            h_bar = builder.get_object("header_bar")
+            h_bar.remove(ch_button)
+            h_bar.set_visible(False)
+            header_bar.pack_end(ch_button)
+
        # Setting the last size of the dialog window if it was saved
        window_size = self._settings.get("backup_tool_window_size")
        if window_size:
--- a/app/ui/backup_dialog.glade
+++ b/app/ui/backup_dialog.glade
@@ -124,7 +124,6 @@ Author: Dmitriy Yefremov
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
        <child>
          <object class="GtkBox" id="header_bar">
            <property name="visible">True</property>
@@ -232,6 +231,7 @@ Author: Dmitriy Yefremov
          <object class="GtkPaned" id="main_paned">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
+            <property name="margin_top">5</property>
            <property name="margin_left">5</property>
            <property name="margin_right">5</property>
            <property name="margin_bottom">5</property>
--- a/app/ui/control.glade
+++ b/app/ui/control.glade
@@ -598,18 +598,6 @@ Author: Dmitriy Yefremov
        <property name="margin_bottom">5</property>
        <property name="row_spacing">5</property>
        <property name="column_spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="timer_service_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Service:</property>
-            <property name="xalign">0</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
        <child>
          <object class="GtkLabel" id="timer_description_label">
            <property name="visible">True</property>
@@ -634,17 +622,6 @@ Author: Dmitriy Yefremov
            <property name="top_attach">1</property>
          </packing>
        </child>
-        <child>
-          <object class="GtkEntry" id="timer_service_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="primary_icon_name">document-edit-symbolic</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
        <child>
          <object class="GtkEntry" id="timer_desc_entry">
            <property name="visible">True</property>
@@ -690,6 +667,115 @@ Author: Dmitriy Yefremov
            <property name="top_attach">0</property>
          </packing>
        </child>
+        <child>
+          <object class="GtkLabel" id="timer_service_ref_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Service reference:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">9</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="timer_service_ref_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="editable">False</property>
+            <property name="width_chars">25</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">9</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="timer_event_id_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Event ID:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">10</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="timer_event_id_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="editable">False</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">10</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="timer_location_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Location:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">12</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="timer_location_entry">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="primary_icon_name">document-edit-symbolic</property>
+            <property name="placeholder_text" translatable="yes">Default</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">12</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="timer_dialog_location_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="margin_top">10</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkImage" id="timer_location_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">document-edit-symbolic</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="timer_location_switch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">11</property>
+          </packing>
+        </child>
        <child>
          <object class="GtkLabel" id="timer_begins_label">
            <property name="visible">True</property>
@@ -699,7 +785,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
+            <property name="top_attach">3</property>
          </packing>
        </child>
        <child>
@@ -724,7 +810,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
+            <property name="top_attach">3</property>
          </packing>
        </child>
        <child>
@@ -736,7 +822,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
+            <property name="top_attach">4</property>
          </packing>
        </child>
        <child>
@@ -761,7 +847,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
+            <property name="top_attach">4</property>
          </packing>
        </child>
        <child>
@@ -773,7 +859,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">5</property>
          </packing>
        </child>
        <child>
@@ -954,7 +1040,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">5</property>
          </packing>
        </child>
        <child>
@@ -966,7 +1052,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">6</property>
          </packing>
        </child>
        <child>
@@ -981,7 +1067,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">6</property>
          </packing>
        </child>
        <child>
@@ -993,7 +1079,7 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">7</property>
          </packing>
        </child>
        <child>
@@ -1010,115 +1096,30 @@ Author: Dmitriy Yefremov
          </object>
          <packing>
            <property name="left_attach">1</property>
+            <property name="top_attach">7</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="timer_service_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Service:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
            <property name="top_attach">8</property>
          </packing>
        </child>
        <child>
-          <object class="GtkLabel" id="timer_service_ref_label">
+          <object class="GtkEntry" id="timer_service_entry">
            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Service reference:</property>
-            <property name="xalign">0</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="timer_service_ref_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="editable">False</property>
-            <property name="width_chars">25</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="timer_event_id_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Event ID:</property>
-            <property name="xalign">0</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="timer_event_id_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="editable">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">10</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="timer_location_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Location:</property>
-            <property name="xalign">0</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="timer_location_entry">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
            <property name="can_focus">True</property>
            <property name="primary_icon_name">document-edit-symbolic</property>
-            <property name="placeholder_text" translatable="yes">Default</property>
          </object>
          <packing>
            <property name="left_attach">1</property>
-            <property name="top_attach">12</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="timer_dialog_location_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkImage" id="timer_location_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">document-edit-symbolic</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSwitch" id="timer_location_switch">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">11</property>
+            <property name="top_attach">8</property>
          </packing>
        </child>
        <child>
@@ -1157,81 +1158,66 @@ Author: Dmitriy Yefremov
      <!-- column-name data -->
      <column type="PyObject"/>
    </columns>
+    <signal name="row-deleted" handler="on_recordings_model_changed" swapped="no"/>
+    <signal name="row-inserted" handler="on_recordings_model_changed" swapped="no"/>
  </object>
-  <object class="GtkFrame" id="recordings_frame">
+  <object class="GtkBox" id="recordings_box">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
-    <property name="label_xalign">0.49000000953674316</property>
-    <property name="shadow_type">in</property>
+    <property name="orientation">vertical</property>
    <child>
-      <object class="GtkBox" id="recordings_box">
+      <object class="GtkPaned" id="recordings_paned">
        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">5</property>
-        <property name="margin_right">5</property>
-        <property name="margin_top">2</property>
-        <property name="margin_bottom">5</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">True</property>
+        <property name="wide_handle">True</property>
        <child>
-          <object class="GtkBox" id="recordings_header_box">
+          <object class="GtkFrame" id="recordings_frame">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="spacing">5</property>
+            <property name="label_xalign">0.49000000953674316</property>
+            <property name="shadow_type">in</property>
            <child>
-              <object class="GtkButton" id="recordings_remove_button">
+              <object class="GtkBox" id="recordings_main_box">
                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Remove</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_recording_remove" swapped="no"/>
+                <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_top">5</property>
+                <property name="orientation">vertical</property>
                <child>
-                  <object class="GtkImage" id="remove_recording_image">
+                  <object class="GtkBox" id="recordings_header_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="icon_name">user-trash-symbolic</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="recordings_fs_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkBox" id="recordings_search_box">
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <child>
-                  <object class="GtkSearchEntry" id="fav_search_entry1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="primary_icon_name">edit-find-symbolic</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="primary_icon_sensitive">False</property>
+                    <property name="margin_left">5</property>
+                    <property name="margin_right">5</property>
+                    <property name="margin_top">5</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkButton" id="recordings_remove_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Remove</property>
+                        <property name="always_show_image">True</property>
+                        <signal name="clicked" handler="on_recording_remove" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="remove_recording_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">user-trash-symbolic</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                  </object>
                  <packing>
                    <property name="expand">False</property>
@@ -1240,196 +1226,198 @@ Author: Dmitriy Yefremov
                  </packing>
                </child>
                <child>
-                  <object class="GtkButton" id="fav_search_down_button1">
+                  <object class="GtkScrolledWindow" id="recordings_view_scrolled_window">
                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="shadow_type">in</property>
                    <child>
-                      <object class="GtkArrow" id="fav_down_arrow1">
+                      <object class="GtkTreeView" id="recordings_view">
                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="arrow_type">down</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">recordings_model</property>
+                        <property name="enable_grid_lines">both</property>
+                        <property name="tooltip_column">5</property>
+                        <signal name="row-activated" handler="on_recordings_activated" swapped="no"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="recordings_view_selection">
+                            <property name="mode">multiple</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="rec_service_column">
+                            <property name="min_width">100</property>
+                            <property name="title" translatable="yes">Service</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="rec_service_renderer">
+                                <property name="xalign">0.49000000953674316</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="rec_title_column">
+                            <property name="sizing">autosize</property>
+                            <property name="min_width">150</property>
+                            <property name="title" translatable="yes">Title</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="rec_title_renderer">
+                                <property name="xpad">5</property>
+                                <property name="ellipsize">end</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="rec_time_column">
+                            <property name="min_width">100</property>
+                            <property name="title" translatable="yes">Time</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="rec_time_renderer">
+                                <property name="xpad">5</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="rec_len_column">
+                            <property name="min_width">100</property>
+                            <property name="title" translatable="yes">Length</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="rec_len_renderer">
+                                <property name="xalign">0.49000000953674316</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="rec_file_column">
+                            <property name="resizable">True</property>
+                            <property name="min_width">100</property>
+                            <property name="title" translatable="yes">File</property>
+                            <property name="expand">True</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="rec_file_renderer">
+                                <property name="ellipsize">end</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">4</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="rec_desc_column">
+                            <property name="resizable">True</property>
+                            <property name="title" translatable="yes">Description</property>
+                            <property name="expand">True</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="rec_desc_renderer">
+                                <property name="ellipsize">end</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">5</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
                      </object>
                    </child>
                  </object>
                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                    <property name="position">1</property>
                  </packing>
                </child>
                <child>
-                  <object class="GtkButton" id="fav_search_up_button1">
+                  <object class="GtkBox" id="recordings_status_box">
+                    <property name="height_request">24</property>
                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
+                    <property name="spacing">5</property>
                    <child>
-                      <object class="GtkArrow" id="fav_up_arrow1">
+                      <object class="GtkImage" id="recordings_count_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="arrow_type">up</property>
+                        <property name="icon_name">document-properties</property>
                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="recordings_count_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
                    </child>
                  </object>
                  <packing>
                    <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="fill">True</property>
                    <property name="position">2</property>
                  </packing>
                </child>
-                <style>
-                  <class name="group"/>
-                </style>
              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
            </child>
-            <child>
-              <placeholder/>
+            <child type="label">
+              <object class="GtkLabel" id="recordings_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Recordings</property>
+              </object>
            </child>
          </object>
          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
          </packing>
        </child>
        <child>
-          <object class="GtkPaned" id="recordings_paned">
+          <object class="GtkFrame" id="recordings_paths_frame">
            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="wide_handle">True</property>
-            <child>
-              <object class="GtkScrolledWindow" id="recordings_view_scrolled_window">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkTreeView" id="recordings_view">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="model">recordings_model</property>
-                    <property name="enable_grid_lines">both</property>
-                    <property name="tooltip_column">5</property>
-                    <signal name="row-activated" handler="on_recordings_activated" swapped="no"/>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="recordings_view_selection">
-                        <property name="mode">multiple</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="rec_service_column">
-                        <property name="min_width">100</property>
-                        <property name="title" translatable="yes">Service</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="rec_service_renderer">
-                            <property name="xalign">0.49000000953674316</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="rec_title_column">
-                        <property name="sizing">autosize</property>
-                        <property name="min_width">150</property>
-                        <property name="title" translatable="yes">Title</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="rec_title_renderer">
-                            <property name="xpad">5</property>
-                            <property name="ellipsize">end</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="rec_time_column">
-                        <property name="min_width">100</property>
-                        <property name="title" translatable="yes">Time</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="rec_time_renderer">
-                            <property name="xpad">5</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">2</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="rec_len_column">
-                        <property name="min_width">100</property>
-                        <property name="title" translatable="yes">Length</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="rec_len_renderer">
-                            <property name="xalign">0.49000000953674316</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">3</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="rec_file_column">
-                        <property name="resizable">True</property>
-                        <property name="min_width">100</property>
-                        <property name="title" translatable="yes">File</property>
-                        <property name="expand">True</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="rec_file_renderer">
-                            <property name="ellipsize">end</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">4</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="rec_desc_column">
-                        <property name="resizable">True</property>
-                        <property name="title" translatable="yes">Description</property>
-                        <property name="expand">True</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="rec_desc_renderer">
-                            <property name="ellipsize">end</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">5</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0.49000000953674316</property>
+            <property name="shadow_type">in</property>
            <child>
              <object class="GtkScrolledWindow" id="paths_view_scrolled_window">
                <property name="width_request">250</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_bottom">5</property>
                <property name="shadow_type">in</property>
                <property name="min_content_height">100</property>
                <child>
@@ -1437,6 +1425,7 @@ Author: Dmitriy Yefremov
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="model">rec_paths_model</property>
+                    <property name="headers_visible">False</property>
                    <property name="search_column">1</property>
                    <property name="rubber_banding">True</property>
                    <property name="activate_on_single_click">True</property>
@@ -1478,26 +1467,26 @@ Author: Dmitriy Yefremov
                  </object>
                </child>
              </object>
-              <packing>
-                <property name="resize">False</property>
-                <property name="shrink">True</property>
-              </packing>
+            </child>
+            <child type="label">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Paths</property>
+              </object>
            </child>
          </object>
          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="resize">False</property>
+            <property name="shrink">True</property>
          </packing>
        </child>
      </object>
-    </child>
-    <child type="label">
-      <object class="GtkLabel" id="recordings_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Recordings</property>
-      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
    </child>
  </object>
  <object class="GtkListStore" id="timer_model">
--- a/app/ui/control.py
+++ b/app/ui/control.py
@@ -36,7 +36,7 @@ from urllib.parse import quote
 from gi.repository import GLib

 from .dialogs import get_builder, show_dialog, DialogType, get_message
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Page, Column, KeyboardKey
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Page, Column, KeyboardKey, IS_GNOME_SESSION
 from ..commons import run_task, run_with_delay, log, run_idle
 from ..connections import HttpAPI, UtfFTP
 from ..eparser.ecommons import BqServiceType
@@ -126,7 +126,7 @@ class EpgTool(Gtk.Box):
        start = int(event.get("e2eventstart", "0"))
        start_time = datetime.fromtimestamp(start)
        end_time = datetime.fromtimestamp(start + int(event.get("e2eventduration", "0")))
-        time = "{} - {}".format(start_time.strftime("%A, %H:%M"), end_time.strftime("%H:%M"))
+        time = f"{start_time.strftime('%A, %H:%M')} - {end_time.strftime('%H:%M')}"

        return title, time, desc, event

@@ -159,7 +159,7 @@ class TimerTool(Gtk.Box):

    class TimerDialog(Gtk.Dialog):
        def __init__(self, parent, action=None, timer_data=None, *args, **kwargs):
-            super().__init__(*args, **kwargs)
+            super().__init__(use_header_bar=IS_GNOME_SESSION, *args, **kwargs)

            self._action = action or TimerTool.TimerAction.ADD
            self._timer_data = timer_data or {}
@@ -213,7 +213,7 @@ class TimerTool(Gtk.Box):
            self._timer_desc_entry.drag_dest_unset()
            self._timer_service_entry.drag_dest_unset()

-            self.add_buttons(get_message("Cancel"), Gtk.ResponseType.CLOSE, get_message("Save"), Gtk.ResponseType.OK)
+            self.add_buttons(get_message("Cancel"), Gtk.ResponseType.CANCEL, get_message("Save"), Gtk.ResponseType.OK)
            self.get_content_area().pack_start(builder.get_object("timer_dialog_frame"), True, True, 5)

            if self._action is TimerTool.TimerAction.ADD:
@@ -223,7 +223,7 @@ class TimerTool(Gtk.Box):
            elif self._action is TimerTool.TimerAction.EVENT:
                self.set_timer_from_event_data()
            else:
-                log("{} error: No action set for timer!".format(__class__.__name__))
+                log(f"{__class__.__name__} error: No action set for timer!")

        @property
        def request(self):
@@ -242,34 +242,34 @@ class TimerTool(Gtk.Box):
            s_ref = quote(t_data.get("sRef", ""))

            if self._action is TimerTool.TimerAction.EVENT:
-                args.append("timeraddbyeventid?sRef={}".format(s_ref))
-                args.append("eventid={}".format(t_data.get("eit", "0")))
-                args.append("justplay={}".format(t_data.get("justplay", "")))
-                args.append("tags={}".format(""))
+                args.append(f"timeraddbyeventid?sRef={s_ref}")
+                args.append(f"eventid={t_data.get('eit', '0')}")
+                args.append(f"justplay={t_data.get('justplay', '')}")
+                args.append(f"tags={''}")
            else:
                if self._action is TimerTool.TimerAction.ADD:
-                    args.append("timeradd?sRef={}".format(s_ref))
-                    args.append("deleteOldOnSave={}".format(0))
+                    args.append(f"timeradd?sRef={s_ref}")
+                    args.append(f"deleteOldOnSave={0}")
                elif self._action is TimerTool.TimerAction.CHANGE:
-                    args.append("timerchange?sRef={}".format(s_ref))
-                    args.append("channelOld={}".format(s_ref))
-                    args.append("beginOld={}".format(self._timer_data.get("e2timebegin", "0")))
-                    args.append("endOld={}".format(self._timer_data.get("e2timeend", "0")))
-                    args.append("deleteOldOnSave={}".format(1))
+                    args.append(f"timerchange?sRef={s_ref}")
+                    args.append(f"channelOld={s_ref}")
+                    args.append(f"beginOld={self._timer_data.get('e2timebegin', '0')}")
+                    args.append(f"endOld={self._timer_data.get('e2timeend', '0')}")
+                    args.append(f"deleteOldOnSave={1}")

-                args.append("begin={}".format(t_data.get("begin", "")))
-                args.append("end={}".format(t_data.get("end", "")))
-                args.append("name={}".format(quote(t_data.get("name", ""))))
-                args.append("description={}".format(quote(t_data.get("description", ""))))
-                args.append("tags={}".format(""))
-                args.append("eit={}".format("0"))
-                args.append("disabled={}".format(t_data.get("disabled", "1")))
-                args.append("justplay={}".format(t_data.get("justplay", "1")))
-                args.append("afterevent={}".format(t_data.get("afterevent", "0")))
-                args.append("repeated={}".format(TimerTool.get_repetition_flags(self._days_buttons)))
+                args.append(f"begin={t_data.get('begin', '')}")
+                args.append(f"end={t_data.get('end', '')}")
+                args.append(f"name={quote(t_data.get('name', ''))}")
+                args.append(f"description={quote(t_data.get('description', ''))}")
+                args.append(f"tags={''}")
+                args.append(f"eit={'0'}")
+                args.append(f"disabled={t_data.get('disabled', '1')}")
+                args.append(f"justplay={t_data.get('justplay', '1')}")
+                args.append(f"afterevent={t_data.get('afterevent', '0')}")
+                args.append(f"repeated={TimerTool.get_repetition_flags(self._days_buttons)}")

                if self._timer_location_switch.get_active():
-                    args.append("dirname={}".format(self._timer_location_entry.get_text()))
+                    args.append(f"dirname={self._timer_location_entry.get_text()}")

            return "&".join(args)

@@ -292,8 +292,7 @@ class TimerTool(Gtk.Box):
            self._timer_begins_min_button.set_value(minute)
            self._timer_begins_calendar.select_day(date.day)
            self._timer_begins_calendar.select_month(date.month - 1, date.year)
-            self._timer_begins_entry.set_text(
-                "{}-{}-{} {}:{:02d}".format(date.year, date.month, date.day, hour, minute))
+            self._timer_begins_entry.set_text(f"{date.year}-{date.month}-{date.day} {hour}:{minute:02d}")

        def get_ends_date(self):
            date = self._timer_ends_calendar.get_date()
@@ -308,7 +307,7 @@ class TimerTool(Gtk.Box):
            self._timer_ends_min_button.set_value(minute)
            self._timer_ends_calendar.select_day(date.day)
            self._timer_ends_calendar.select_month(date.month - 1, date.year)
-            self._timer_ends_entry.set_text("{}-{}-{} {}:{:02d}".format(date.year, date.month, date.day, hour, minute))
+            self._timer_ends_entry.set_text(f"{date.year}-{date.month}-{date.day} {hour}:{minute:02d}")

        def set_timer_for_add(self):
            self._timer_service_entry.set_text(self._timer_data.get("e2servicename", ""))
@@ -446,7 +445,7 @@ class TimerTool(Gtk.Box):
        service = timer.get("e2servicename", "") or ""
        start_time = datetime.fromtimestamp(int(timer.get("e2timebegin", "0")))
        end_time = datetime.fromtimestamp(int(timer.get("e2timeend", "0")))
-        time = "{} - {}".format(start_time.strftime("%A, %H:%M"), end_time.strftime("%H:%M"))
+        time = f"{start_time.strftime('%A, %H:%M')} - {end_time.strftime('%H:%M')}"

        return disabled, name, service, time, description, timer

@@ -486,7 +485,7 @@ class TimerTool(Gtk.Box):
    @run_idle
    def timer_add_edit_callback(self, resp):
        if "error_code" in resp:
-            msg = "Error getting timer status.\n{}".format(resp.get("error_code"))
+            msg = f"Error getting timer status.\n{resp.get('error_code')}"
            self._app.show_error_message(msg)
            log(msg)
            return
@@ -628,7 +627,7 @@ class TimerTool(Gtk.Box):
            service = self._app.current_services.get(fav_id, None)
            if service:
                if service.service_type == BqServiceType.ALT.name:
-                    msg = "Alternative service.\n\n {}".format(get_message("Not implemented yet!"))
+                    msg = "Alternative service.\n\n {get_message('Not implemented yet!')}"
                    show_dialog(DialogType.ERROR, transient=self._app._main_window, text=msg)
                    context.finish(False, False, time)
                    return
@@ -647,6 +646,7 @@ class RecordingsTool(Gtk.Box):
        super().__init__(*args, **kwargs)

        self._app = app
+        self._app.connect("layout-changed", self.on_layout_changed)
        self._app.connect("profile-changed", self.init)
        self._settings = settings
        self._ftp = None
@@ -658,14 +658,18 @@ class RecordingsTool(Gtk.Box):
        handlers = {"on_path_press": self.on_path_press,
                    "on_path_activated": self.on_path_activated,
                    "on_recordings_activated": self.on_recordings_activated,
-                    "on_recording_remove": self.on_recording_remove}
+                    "on_recording_remove": self.on_recording_remove,
+                    "on_recordings_model_changed": self.on_recordings_model_changed}

        builder = get_builder(UI_RESOURCES_PATH + "control.glade", handlers,
-                              objects=("recordings_frame", "recordings_model", "rec_paths_model"))
+                              objects=("recordings_box", "recordings_model", "rec_paths_model"))
        self._rec_view = builder.get_object("recordings_view")
        self._paths_view = builder.get_object("recordings_paths_view")
        self._paned = builder.get_object("recordings_paned")
-        self.pack_start(builder.get_object("recordings_frame"), True, True, 0)
+        self._recordings_count_label = builder.get_object("recordings_count_label")
+        self.pack_start(builder.get_object("recordings_box"), True, True, 0)
+        if settings.alternate_layout:
+            self.on_layout_changed(app, True)

        self.init()
        self.show()
@@ -674,6 +678,14 @@ class RecordingsTool(Gtk.Box):
        self._rec_view.get_model().clear()
        self._paths_view.get_model().clear()

+    def on_layout_changed(self, app, alt_layout):
+        ch1 = self._paned.get_child1()
+        ch2 = self._paned.get_child2()
+        self._paned.remove(ch1)
+        self._paned.remove(ch2)
+        self._paned.add1(ch2)
+        self._paned.add(ch1)
+
    @run_task
    def init(self, app=None, arg=None):
        GLib.idle_add(self.clear_data)
@@ -716,10 +728,14 @@ class RecordingsTool(Gtk.Box):

        for f in files:
            f_data = f.split()
+            if len(f_data) < 9:
+                log(f"{__class__.__name__}. Folder data parsing error. [{f}]")
+                continue
+
            f_type = f_data[0][0]

            if f_type == "d":
-                model.append((self._icon, f_data[-1], self._ftp.pwd()))
+                model.append((self._icon, " ".join(f_data[8:]), self._ftp.pwd()))

    def on_path_activated(self, view, path, column):
        row = view.get_model()[path][:]
@@ -774,6 +790,9 @@ class RecordingsTool(Gtk.Box):
                    self._app.show_error_message(resp)
                    break

+    def on_recordings_model_changed(self, model, path, itr=None):
+        self._recordings_count_label.set_text(str(len(model)))
+
    def on_playback(self, box, state):
        """ Updates state of the UI elements for playback mode. """
        if self._settings.play_streams_mode is PlayStreamsMode.BUILT_IN:
@@ -797,6 +816,7 @@ class ControlTool(Gtk.Box):

        self._settings = settings
        self._app = app
+        self._app.connect("layout-changed", self.on_layout_changed)
        self._pix = None

        handlers = {"on_volume_changed": self.on_volume_changed,
@@ -806,7 +826,7 @@ class ControlTool(Gtk.Box):
                              objects=("control_box", "volume_adjustment"))

        self.pack_start(builder.get_object("control_box"), True, True, 0)
-        self._stack = builder.get_object("stack")
+        self._remote_box = builder.get_object("remote_box")
        self._screenshot_area = builder.get_object("screenshot_area")
        self._screenshot_button_box = builder.get_object("screenshot_button_box")
        self._screenshot_check_button = builder.get_object("screenshot_check_button")
@@ -819,6 +839,9 @@ class ControlTool(Gtk.Box):
        self._agc_level_bar = builder.get_object("agc_level_bar")
        self._volume_button = builder.get_object("volume_button")
        self.init_actions(app)
+        if settings.alternate_layout:
+            self.on_layout_changed(app, True)
+
        self.show()

    def init_actions(self, app):
@@ -852,6 +875,9 @@ class ControlTool(Gtk.Box):
        app.set_action("on_screenshot_video", self.on_screenshot_video)
        app.set_action("on_screenshot_osd", self.on_screenshot_osd)

+    def on_layout_changed(self, app, alt_layout):
+        self._remote_box.reorder_child(self._remote_box.get_children()[0], 1)
+
    # ***************** Remote controller ********************* #

    def on_remote(self, action, state=False):
@@ -871,7 +897,7 @@ class ControlTool(Gtk.Box):

    @run_with_delay(0.5)
    def on_volume_changed(self, button, value):
-        self._app.send_http_request(HttpAPI.Request.VOL, "{:.0f}".format(value), self.on_response)
+        self._app.send_http_request(HttpAPI.Request.VOL, f"{value:.0f}", self.on_response)

    def update_volume(self, vol):
        if "error_code" in vol:
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -3,7 +3,7 @@

 The MIT License (MIT)

-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2022 Dmitriy Yefremov

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,7 @@ Author: Dmitriy Yefremov
    <property name="icon_name">system-help</property>
    <property name="type_hint">normal</property>
    <property name="program_name">DemonEditor</property>
-    <property name="version">2.0.0 Alpha</property>
+    <property name="version">2.1.0 Beta</property>
    <property name="copyright">2018-2021 Dmitriy Yefremov
 </property>
    <property name="comments" translatable="yes">Enigma2 channel and satellite list editor.</property>
@@ -91,51 +91,36 @@ Author: Dmitriy Yefremov
    <property name="type_hint">utility</property>
    <property name="skip_taskbar_hint">True</property>
    <property name="skip_pager_hint">True</property>
-    <child type="titlebar">
-      <placeholder/>
+    <child type="action">
+      <object class="GtkButton" id="input_dialog_cancel_button">
+        <property name="label" translatable="yes">Cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="valign">center</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="input_dialog_ok_button">
+        <property name="label" translatable="yes">OK</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="valign">center</property>
+        <accelerator key="Return" signal="activate"/>
+      </object>
    </child>
    <child internal-child="vbox">
      <object class="GtkBox">
        <property name="can_focus">False</property>
        <property name="margin_left">5</property>
        <property name="margin_right">5</property>
-        <property name="margin_top">4</property>
        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
        <child internal-child="action_area">
          <object class="GtkButtonBox">
            <property name="can_focus">False</property>
            <property name="valign">center</property>
            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="input_dialog_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="input_dialog_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-                <accelerator key="Return" signal="activate"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
          </object>
          <packing>
            <property name="expand">False</property>
@@ -147,10 +132,10 @@ Author: Dmitriy Yefremov
          <object class="GtkEntry" id="input_entry">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
-            <property name="margin_left">2</property>
-            <property name="margin_right">2</property>
-            <property name="margin_top">2</property>
-            <property name="margin_bottom">2</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
            <property name="primary_icon_name">document-edit-symbolic</property>
            <property name="primary_icon_activatable">False</property>
            <property name="secondary_icon_activatable">False</property>
--- a/app/ui/download_dialog.glade
+++ b/app/ui/download_dialog.glade
@@ -225,8 +225,8 @@ Author: Dmitriy Yefremov
          <object class="GtkFrame" id="main_settings_box_frame">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
            <property name="margin_top">5</property>
            <property name="label_xalign">0.019999999552965164</property>
            <property name="shadow_type">in</property>
@@ -239,12 +239,13 @@ Author: Dmitriy Yefremov
                <property name="margin_top">10</property>
                <property name="margin_bottom">10</property>
                <property name="orientation">vertical</property>
+                <property name="spacing">10</property>
                <child>
                  <object class="GtkGrid" id="main_settings_bo">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="row_spacing">2</property>
-                    <property name="column_spacing">2</property>
+                    <property name="row_spacing">5</property>
+                    <property name="column_spacing">10</property>
                    <property name="column_homogeneous">True</property>
                    <child>
                      <object class="GtkLabel" id="ip_label">
@@ -310,9 +311,8 @@ Author: Dmitriy Yefremov
                  <object class="GtkBox" id="extra_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_top">5</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
                    <child>
                      <object class="GtkCheckButton" id="remove_unused_check_button">
                        <property name="label" translatable="yes">Remove unused bouquets</property>
@@ -384,7 +384,7 @@ Author: Dmitriy Yefremov
          <packing>
            <property name="expand">False</property>
            <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
          </packing>
        </child>
        <child>
@@ -438,54 +438,85 @@ Author: Dmitriy Yefremov
          <packing>
            <property name="expand">False</property>
            <property name="fill">False</property>
-            <property name="position">6</property>
+            <property name="position">2</property>
          </packing>
        </child>
        <child>
-          <object class="GtkExpander" id="expander">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_left">1</property>
-            <property name="margin_right">1</property>
-            <property name="margin_bottom">1</property>
-            <property name="resize_toplevel">True</property>
+          <object class="GtkFrame" id="log_bar_frame">
+            <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">in</property>
            <child>
-              <object class="GtkScrolledWindow" id="scrolled_window">
-                <property name="height_request">120</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkTextView" id="text_view">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="left_margin">5</property>
-                    <property name="right_margin">5</property>
+              <object class="GtkInfoBar" id="log_bar">
+                <property name="can_focus">False</property>
+                <property name="baseline_position">bottom</property>
+                <property name="message_type">other</property>
+                <property name="show_close_button">True</property>
+                <child internal-child="action_area">
+                  <object class="GtkButtonBox" id="log_bar_button_box">
+                    <property name="can_focus">False</property>
+                    <property name="layout_style">end</property>
                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child internal-child="content_area">
+                  <object class="GtkBox" id="log_bar_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolled_window">
+                        <property name="height_request">100</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTextView" id="text_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="editable">False</property>
+                            <property name="left_margin">5</property>
+                            <property name="right_margin">5</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
                </child>
              </object>
            </child>
-            <child type="label">
-              <object class="GtkLabel" id="expander_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Extra:</property>
-              </object>
+            <child type="label_item">
+              <placeholder/>
            </child>
          </object>
          <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
            <property name="fill">True</property>
-            <property name="position">7</property>
+            <property name="position">3</property>
          </packing>
        </child>
        <child>
          <object class="GtkInfoBar" id="info_bar">
            <property name="can_focus">False</property>
-            <property name="margin_left">1</property>
-            <property name="margin_right">1</property>
-            <property name="margin_bottom">1</property>
            <property name="show_close_button">True</property>
            <signal name="response" handler="on_info_bar_close" swapped="no"/>
            <child internal-child="action_area">
--- a/app/ui/download_dialog.py
+++ b/app/ui/download_dialog.py
@@ -35,7 +35,7 @@ from app.connections import download_data, DownloadType, upload_data
 from app.settings import SettingsType
 from app.ui.backup import backup_data, restore_data
 from app.ui.main_helper import append_text_to_tview
-from app.ui.settings_dialog import show_settings_dialog
+from app.ui.settings_dialog import SettingsDialog
 from .dialogs import show_dialog, DialogType, get_message, get_builder
 from .uicommons import Gtk, UI_RESOURCES_PATH

@@ -59,10 +59,6 @@ class DownloadDialog:

        self._dialog_window = builder.get_object("download_dialog_window")
        self._dialog_window.set_transient_for(transient)
-        self._info_bar = builder.get_object("info_bar")
-        self._message_label = builder.get_object("info_bar_message_label")
-        self._text_view = builder.get_object("text_view")
-        self._expander = builder.get_object("expander")
        self._host_entry = builder.get_object("host_entry")
        self._data_path_entry = builder.get_object("data_path_entry")
        self._remove_unused_check_button = builder.get_object("remove_unused_check_button")
@@ -73,6 +69,13 @@ class DownloadDialog:
        self._use_http_switch = builder.get_object("use_http_switch")
        self._http_radio_button = builder.get_object("http_radio_button")
        self._profile_combo_box = builder.get_object("profile_combo_box")
+        # Info.
+        self._info_bar = builder.get_object("info_bar")
+        self._message_label = builder.get_object("info_bar_message_label")
+        self._text_view = builder.get_object("text_view")
+        self._log_bar = builder.get_object("log_bar")
+        self._log_bar.bind_property("visible", builder.get_object("log_bar_frame"), "visible")
+        self._log_bar.connect("response", lambda b, r: b.set_visible(False))

        self.init_settings()

@@ -120,8 +123,9 @@ class DownloadDialog:
        self._dialog_window.destroy()

    def on_settings(self, item):
-        response = show_settings_dialog(self._dialog_window, self._settings)
-        if response != Gtk.ResponseType.CANCEL:
+        dialog = SettingsDialog(self._dialog_window, self._settings)
+        dialog.show()
+        if dialog.is_updated():
            self._s_type = self._settings.setting_type
            self.update_profiles()
            gen = self._update_settings_callback()
@@ -147,7 +151,7 @@ class DownloadDialog:
    @run_task
    def download(self, download, d_type):
        """ Download/upload data from/to receiver """
-        GLib.idle_add(self._expander.set_expanded, True)
+        GLib.idle_add(self._log_bar.set_visible, True)
        self.clear_output()
        backup, backup_src, data_path = self._settings.backup_before_downloading, None, None

--- a/app/ui/epg.glade
+++ b/app/ui/epg.glade
@@ -3,7 +3,7 @@

 The MIT License (MIT)

-Copyright (c)  2018-2020 Dmitriy Yefremov
+Copyright (c)  2018-2022 Dmitriy Yefremov

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -158,6 +158,8 @@ Author: Dmitriy Yefremov
    <columns>
      <!-- column-name service -->
      <column type="gchararray"/>
+      <!-- column-name pos -->
+      <column type="gchararray"/>
      <!-- column-name service_id -->
      <column type="gchararray"/>
    </columns>
@@ -671,7 +673,7 @@ Author: Dmitriy Yefremov
                        <property name="image">filter_image</property>
                        <property name="always_show_image">True</property>
                        <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
-                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | Primary"/>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -810,17 +812,61 @@ Author: Dmitriy Yefremov
          </packing>
        </child>
        <child>
-          <object class="GtkSearchBar" id="filter_bar">
+          <object class="GtkBox" id="filter_bar">
            <property name="can_focus">False</property>
+            <property name="margin_top">2</property>
+            <property name="margin_bottom">2</property>
+            <property name="spacing">5</property>
            <child>
+              <object class="GtkSwitch" id="filter_auto_switch">
+                <property name="name">filter_switch</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">Automatically set the name selected in the bouquet list.</property>
+                <property name="valign">center</property>
+                <property name="margin_right">15</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="filter_auto_label">
+                <property name="name">filter_auto_label</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="label" translatable="yes">Auto</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="center">
              <object class="GtkSearchEntry" id="filter_entry">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                <property name="primary_icon_name">edit-find-replace-symbolic</property>
                <property name="primary_icon_activatable">False</property>
                <property name="primary_icon_sensitive">False</property>
                <signal name="search-changed" handler="on_filter_changed" swapped="no"/>
              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
            </child>
          </object>
          <packing>
@@ -851,7 +897,6 @@ Author: Dmitriy Yefremov
                    <property name="can_focus">False</property>
                    <property name="margin_left">5</property>
                    <property name="margin_right">5</property>
-                    <property name="margin_bottom">5</property>
                    <property name="orientation">vertical</property>
                    <child>
                      <object class="GtkScrolledWindow">
@@ -864,26 +909,28 @@ Author: Dmitriy Yefremov
                            <property name="can_focus">True</property>
                            <property name="model">service_sort_model</property>
                            <property name="search_column">0</property>
+                            <property name="fixed_height_mode">True</property>
                            <property name="enable_grid_lines">both</property>
                            <signal name="button-press-event" handler="on_popup_menu" object="source_popup_menu" swapped="no"/>
                            <signal name="drag-begin" handler="on_drag_begin" swapped="no"/>
                            <signal name="drag-data-get" handler="on_drag_data_get" swapped="no"/>
-                            <signal name="key-release-event" handler="on_key_release" swapped="no"/>
+                            <signal name="key-press-event" handler="on_key_press" swapped="no"/>
                            <child internal-child="selection">
                              <object class="GtkTreeSelection"/>
                            </child>
                            <child>
                              <object class="GtkTreeViewColumn" id="service_column">
                                <property name="resizable">True</property>
-                                <property name="sizing">autosize</property>
+                                <property name="sizing">fixed</property>
                                <property name="min_width">50</property>
                                <property name="title" translatable="yes">Service</property>
                                <property name="expand">True</property>
                                <property name="alignment">0.5</property>
                                <property name="sort_column_id">0</property>
                                <child>
-                                  <object class="GtkCellRendererText" id="source_service_cellrenderertext">
+                                  <object class="GtkCellRendererText" id="source_service_renderertext">
                                    <property name="xpad">5</property>
+                                    <property name="ellipsize">end</property>
                                  </object>
                                  <attributes>
                                    <attribute name="text">0</attribute>
@@ -892,15 +939,15 @@ Author: Dmitriy Yefremov
                              </object>
                            </child>
                            <child>
-                              <object class="GtkTreeViewColumn" id="ref_column">
-                                <property name="resizable">True</property>
-                                <property name="sizing">autosize</property>
-                                <property name="min_width">50</property>
-                                <property name="title" translatable="yes">Reference</property>
-                                <property name="expand">True</property>
+                              <object class="GtkTreeViewColumn" id="pos_column">
+                                <property name="sizing">fixed</property>
+                                <property name="min_width">70</property>
+                                <property name="title" translatable="yes">Pos</property>
                                <property name="alignment">0.5</property>
+                                <property name="sort_column_id">1</property>
                                <child>
-                                  <object class="GtkCellRendererText" id="source_reference_cellrenderertext">
+                                  <object class="GtkCellRendererText" id="source_pos_renderertext">
+                                    <property name="xpad">5</property>
                                    <property name="xalign">0.50999999046325684</property>
                                  </object>
                                  <attributes>
@@ -909,6 +956,24 @@ Author: Dmitriy Yefremov
                                </child>
                              </object>
                            </child>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="ref_column">
+                                <property name="resizable">True</property>
+                                <property name="sizing">fixed</property>
+                                <property name="min_width">50</property>
+                                <property name="title" translatable="yes">Reference</property>
+                                <property name="alignment">0.5</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="source_reference_renderertext">
+                                    <property name="xpad">10</property>
+                                    <property name="xalign">0.50999999046325684</property>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="text">2</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
                          </object>
                        </child>
                      </object>
@@ -1039,7 +1104,6 @@ Author: Dmitriy Yefremov
                    <property name="can_focus">False</property>
                    <property name="margin_left">5</property>
                    <property name="margin_right">5</property>
-                    <property name="margin_bottom">5</property>
                    <property name="orientation">vertical</property>
                    <child>
                      <object class="GtkScrolledWindow" id="fav_scrolled_window">
@@ -1055,8 +1119,9 @@ Author: Dmitriy Yefremov
                            <property name="enable_grid_lines">both</property>
                            <property name="tooltip_column">9</property>
                            <signal name="button-press-event" handler="on_bouquet_popup_menu" object="bouquet_popup_menu" swapped="no"/>
+                            <signal name="cursor-changed" handler="on_bq_cursor_changed" swapped="no"/>
                            <signal name="drag-data-received" handler="on_drag_data_received" swapped="no"/>
-                            <signal name="key-release-event" handler="on_key_release" swapped="no"/>
+                            <signal name="key-release-event" handler="on_key_press" swapped="no"/>
                            <child internal-child="selection">
                              <object class="GtkTreeSelection">
                                <property name="mode">multiple</property>
@@ -1065,6 +1130,7 @@ Author: Dmitriy Yefremov
                            <child>
                              <object class="GtkTreeViewColumn" id="num_column">
                                <property name="resizable">True</property>
+                                <property name="sizing">fixed</property>
                                <property name="min_width">30</property>
                                <property name="title" translatable="yes">Num</property>
                                <property name="alignment">0.5</property>
@@ -1085,6 +1151,7 @@ Author: Dmitriy Yefremov
                            <child>
                              <object class="GtkTreeViewColumn" id="fav_service_column">
                                <property name="resizable">True</property>
+                                <property name="sizing">fixed</property>
                                <property name="min_width">50</property>
                                <property name="title" translatable="yes">Service</property>
                                <property name="expand">True</property>
@@ -1141,7 +1208,7 @@ Author: Dmitriy Yefremov
                            <child>
                              <object class="GtkTreeViewColumn" id="fav_type_column">
                                <property name="resizable">True</property>
-                                <property name="sizing">autosize</property>
+                                <property name="sizing">fixed</property>
                                <property name="min_width">40</property>
                                <property name="title" translatable="yes">Type</property>
                                <property name="expand">True</property>
@@ -1161,7 +1228,7 @@ Author: Dmitriy Yefremov
                              <object class="GtkTreeViewColumn" id="fav_pos_column">
                                <property name="visible">False</property>
                                <property name="resizable">True</property>
-                                <property name="sizing">autosize</property>
+                                <property name="sizing">fixed</property>
                                <property name="min_width">10</property>
                                <property name="title" translatable="yes">Pos</property>
                                <child>
@@ -1178,7 +1245,7 @@ Author: Dmitriy Yefremov
                            <child>
                              <object class="GtkTreeViewColumn" id="fav_id_column">
                                <property name="visible">False</property>
-                                <property name="sizing">autosize</property>
+                                <property name="sizing">fixed</property>
                                <property name="title">fav_id</property>
                                <child>
                                  <object class="GtkCellRendererText" id="fav_id_cellrenderertext4"/>
@@ -1191,7 +1258,7 @@ Author: Dmitriy Yefremov
                            <child>
                              <object class="GtkTreeViewColumn" id="fav_extra_column">
                                <property name="visible">False</property>
-                                <property name="sizing">autosize</property>
+                                <property name="sizing">fixed</property>
                                <property name="title" translatable="yes">extra</property>
                                <child>
                                  <object class="GtkCellRendererText" id="fav_tooltip_cellrenderertext"/>
--- a/app/ui/epg.py
+++ b/app/ui/epg.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -37,14 +37,14 @@ from urllib.error import HTTPError, URLError

 from gi.repository import GLib

-from app.commons import run_idle, run_task
+from app.commons import run_idle, run_task, run_with_delay
 from app.connections import download_data, DownloadType
 from app.eparser.ecommons import BouquetService, BqServiceType
 from app.settings import SEP
 from app.tools.epg import EPG, ChannelsParser
 from app.ui.dialogs import get_message, show_dialog, DialogType, get_builder
 from .main_helper import on_popup_menu, update_entry_data
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column, EPG_ICON, KeyboardKey
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column, EPG_ICON, KeyboardKey, IS_GNOME_SESSION


 class RefsSource(Enum):
@@ -54,7 +54,7 @@ class RefsSource(Enum):

 class EpgDialog:

-    def __init__(self, transient, settings, services, bouquet, fav_model, bouquet_name):
+    def __init__(self, app, bouquet, bouquet_name):

        handlers = {"on_close_dialog": self.on_close_dialog,
                    "on_apply": self.on_apply,
@@ -80,12 +80,14 @@ class EpgDialog:
                    "on_enable_filtering_switch": self.on_enable_filtering_switch,
                    "on_update_on_start_switch": self.on_update_on_start_switch,
                    "on_field_icon_press": self.on_field_icon_press,
-                    "on_key_release": self.on_key_release}
+                    "on_key_press": self.on_key_press,
+                    "on_bq_cursor_changed": self.on_bq_cursor_changed}

+        self._app = app
        self._services = {}
-        self._ex_services = services
-        self._ex_fav_model = fav_model
-        self._settings = settings
+        self._ex_services = self._app.current_services
+        self._ex_fav_model = self._app.fav_view.get_model()
+        self._settings = self._app.app_settings
        self._bouquet = bouquet
        self._bouquet_name = bouquet_name
        self._current_ref = []
@@ -93,13 +95,12 @@ class EpgDialog:
        self._use_web_source = False
        self._update_epg_data_on_start = False
        self._refs_source = RefsSource.SERVICES
-        self._show_tooltips = True
        self._download_xml_is_active = False

        builder = get_builder(UI_RESOURCES_PATH + "epg.glade", handlers)

        self._dialog = builder.get_object("epg_dialog_window")
-        self._dialog.set_transient_for(transient)
+        self._dialog.set_transient_for(self._app.app_window)
        self._source_view = builder.get_object("source_view")
        self._bouquet_view = builder.get_object("bouquet_view")
        self._bouquet_model = builder.get_object("bouquet_list_store")
@@ -111,8 +112,8 @@ class EpgDialog:
        self._xml_download_progress_bar = builder.get_object("xml_download_progress_bar")
        # Filter
        self._filter_bar = builder.get_object("filter_bar")
-        self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
        self._filter_entry = builder.get_object("filter_entry")
+        self._filter_auto_switch = builder.get_object("filter_auto_switch")
        self._services_filter_model = builder.get_object("services_filter_model")
        self._services_filter_model.set_visible_func(self.services_filter_function)
        # Info
@@ -132,6 +133,19 @@ class EpgDialog:
        self._epg_dat_stb_path_entry = builder.get_object("epg_dat_stb_path_entry")
        self._update_on_start_switch = builder.get_object("update_on_start_switch")
        self._epg_dat_source_box = builder.get_object("epg_dat_source_box")
+
+        if IS_GNOME_SESSION:
+            header_bar = Gtk.HeaderBar(visible=True, show_close_button=True, title="EPG",
+                                       subtitle=get_message("List configuration"))
+            self._dialog.set_titlebar(header_bar)
+            builder.get_object("left_action_box").reparent(header_bar)
+            right_box = builder.get_object("right_action_box")
+            builder.get_object("main_actions_box").remove(right_box)
+            header_bar.pack_end(right_box)
+            builder.get_object("toolbar_box").set_visible(False)
+
+        self._app.connect("epg-dat-downloaded", self.on_epg_dat_downloaded)
+
        # Setting the last size of the dialog window
        window_size = self._settings.get("epg_tool_window_size")
        if window_size:
@@ -167,8 +181,11 @@ class EpgDialog:
    def on_update(self, item=None):
        self.clear_data()
        self.init_options()
-        gen = self.init_data()
-        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
+        if self._update_epg_data_on_start:
+            self.download_epg_from_stb()
+        else:
+            gen = self.init_data()
+            GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)

    def clear_data(self):
        self._services_model.clear()
@@ -184,23 +201,15 @@ class EpgDialog:

        refs = None
        if self._enable_dat_filter:
-            if self._update_epg_data_on_start:
-                try:
-                    self.download_epg_from_stb()
-                except OSError as e:
-                    self.show_info_message("Download epg.dat file error: {}".format(e), Gtk.MessageType.ERROR)
-                    return
-            yield True
-
            try:
                refs = EPG.get_epg_refs(self._epg_dat_path_entry.get_text() + "epg.dat")
-            except FileNotFoundError as e:
-                self.show_info_message("Read data error: {}".format(e), Gtk.MessageType.ERROR)
+            except (OSError, ValueError) as e:
+                self.show_info_message(f"Read data error: {e}", Gtk.MessageType.ERROR)
                return
            yield True

        if self._refs_source is RefsSource.SERVICES:
-            self.init_lamedb_source(refs)
+            yield from self.init_lamedb_source(refs)
        elif self._refs_source is RefsSource.XML:
            xml_gen = self.init_xml_source(refs)
            try:
@@ -225,8 +234,15 @@ class EpgDialog:
        s_types = (BqServiceType.MARKER.value, BqServiceType.IPTV.value)
        filtered = filter(None, [srvs.get(ref) for ref in refs]) if refs else filter(
            lambda s: s.service_type not in s_types, self._ex_services.values())
-        list(map(self._services_model.append, map(lambda s: (s.service, s.fav_id), filtered)))
+
+        factor = self._app.DEL_FACTOR / 4
+        for index, srv in enumerate(filtered):
+            self._services_model.append((srv.service, srv.pos, srv.fav_id))
+            if index % factor == 0:
+                yield True
+
        self.update_source_count_info()
+        yield True

    def init_xml_source(self, refs):
        path = self._epg_dat_path_entry.get_text() if self._use_web_source else self._xml_chooser_button.get_filename()
@@ -274,7 +290,7 @@ class EpgDialog:

                        path = tfp.name.rstrip(".gz")
            except (HTTPError, URLError) as e:
-                raise ValueError("{} {}".format(get_message("Download XML file error."), e))
+                raise ValueError(f"{get_message('Download XML file error.')} {e}")
            else:
                try:
                    with open(path, "wb") as f_out:
@@ -282,7 +298,7 @@ class EpgDialog:
                            shutil.copyfileobj(f, f_out)
                    os.remove(tfp.name)
                except Exception as e:
-                    raise ValueError("{} {}".format(get_message("Unpacking data error."), e))
+                    raise ValueError(f"{get_message('Unpacking data error.')} {e}")
            finally:
                self._download_xml_is_active = False
                self.update_active_header_elements(True)
@@ -291,16 +307,22 @@ class EpgDialog:
            s_refs, info = ChannelsParser.get_refs_from_xml(path)
            yield True
        except Exception as e:
-            raise ValueError("{} {}".format(get_message("XML parsing error:"), e))
+            raise ValueError(f"{get_message('XML parsing error:')} {e}")
        else:
            if refs:
                s_refs = filter(lambda x: x.num in refs, s_refs)
-            list(map(lambda s: self._services_model.append((s.name, s.data)), s_refs))
+
+            factor = self._app.DEL_FACTOR / 4
+            for index, srv in enumerate(s_refs):
+                self._services_model.append((srv.name, " ", srv.data))
+                if index % factor == 0:
+                    yield True
+
            self.update_source_info(info)
            self.update_source_count_info()
            yield True

-    def on_key_release(self, view, event):
+    def on_key_press(self, view, event):
        """  Handling  keystrokes  """
        key_code = event.hardware_keycode
        if not KeyboardKey.value_exist(key_code):
@@ -313,6 +335,13 @@ class EpgDialog:
        elif ctrl and key is KeyboardKey.V:
            self.on_assign_ref()

+    def on_bq_cursor_changed(self, view):
+        if self._filter_bar.get_visible() and self._filter_auto_switch.get_active():
+            path, column = view.get_cursor()
+            model = view.get_model()
+            if path:
+                self._filter_entry.set_text(model[path][Column.FAV_SERVICE] or "")
+
    @run_idle
    def on_save_to_xml(self, item):
        response = show_dialog(DialogType.CHOOSER, self._dialog, settings=self._settings)
@@ -348,7 +377,7 @@ class EpgDialog:
        for row in self._services_model:
            name = re.sub("\\W+", "", str(row[0])).upper()
            name = name.translate(tr) if use_cyrillic else name
-            source[name] = row[1]
+            source[name] = row

        success_count = 0
        not_founded = {}
@@ -378,7 +407,7 @@ class EpgDialog:
                                                 get_message("Count of successfully configured services:"),
                                                 success_count), Gtk.MessageType.INFO)

-    def assign_data(self, row, ref, show_error=False):
+    def assign_data(self, row, data, show_error=False):
        if row[Column.FAV_TYPE] != BqServiceType.IPTV.value:
            if not show_error:
                self.show_info_message(get_message("Not allowed in this context!"), Gtk.MessageType.ERROR)
@@ -386,18 +415,23 @@ class EpgDialog:

        fav_id = row[Column.FAV_ID]
        fav_id_data = fav_id.split(":")
-        fav_id_data[3:7] = ref.split(":")
+        fav_id_data[3:7] = data[-1].split(":")
        new_fav_id = ":".join(fav_id_data)
        service = self._services.pop(fav_id, None)
        if service:
            self._services[new_fav_id] = service
            row[Column.FAV_ID] = new_fav_id
            row[Column.FAV_LOCKED] = EPG_ICON
-            row[Column.FAV_TOOLTIP] = ":".join(fav_id_data[:10]) if self._show_tooltips else None
+            pos = f"({data[1] if self._refs_source is RefsSource.SERVICES else 'XML'})"
+            src = f"{get_message('EPG source')}: {(GLib.markup_escape_text(data[0] or ''))} {pos}"
+            row[Column.FAV_TOOLTIP] = f"{get_message('Service reference')}: {':'.join(fav_id_data[:10])}\n{src}"

-    def on_filter_toggled(self, button: Gtk.ToggleButton):
-        self._filter_bar.set_search_mode(button.get_active())
+    def on_filter_toggled(self, button):
+        self._filter_bar.set_visible(button.get_active())
+        if not button.get_active():
+            self._filter_entry.set_text("")

+    @run_with_delay(1)
    def on_filter_changed(self, entry):
        self._services_filter_model.refilter()

@@ -412,7 +446,7 @@ class EpgDialog:
        model, paths = self._source_view.get_selection().get_selected_rows()
        self._current_ref.clear()
        if paths:
-            self._current_ref.append(model[paths][1])
+            self._current_ref.append(model[paths][:])

    def on_assign_ref(self, item=None):
        if self._current_ref:
@@ -481,7 +515,7 @@ class EpgDialog:
    # ***************** Drag-and-drop *********************#

    def init_drag_and_drop(self):
-        """ Enable drag-and-drop """
+        """ Enable drag-and-drop. """
        target = []
        self._source_view.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, target, Gdk.DragAction.COPY)
        self._source_view.drag_source_add_text_targets()
@@ -494,17 +528,22 @@ class EpgDialog:
        if selection.count_selected_rows() > 1:
            view.do_toggle_cursor_row(view)

-    def on_drag_data_get(self, view: Gtk.TreeView, drag_context, data, info, time):
+    def on_drag_data_get(self, view, drag_context, data, info, time):
        model, paths = view.get_selection().get_selected_rows()
        if paths:
-            val = model.get_value(model.get_iter(paths), 1)
-            data.set_text(val, -1)
+            s_data = model[paths][:]
+            if all(s_data):
+                data.set_text("::::".join(s_data), -1)
+            else:
+                self.show_info_message(get_message("Source error!"), Gtk.MessageType.ERROR)

-    def on_drag_data_received(self, view: Gtk.TreeView, drag_context, x, y, data, info, time):
+    def on_drag_data_received(self, view, drag_context, x, y, data, info, time):
        path, pos = view.get_dest_row_at_pos(x, y)
        model = view.get_model()
-        self.assign_data(model[path], data.get_text())
-        self.update_epg_count()
+        data = data.get_text()
+        if data:
+            self.assign_data(model[path], data.split("::::"))
+            self.update_epg_count()
        return False

    # ***************** Options *********************#
@@ -566,10 +605,19 @@ class EpgDialog:

    # ***************** Downloads *********************#

+    def on_epg_dat_downloaded(self, app, value):
+        gen = self.init_data()
+        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
+
    @run_task
    def download_epg_from_stb(self):
        """ Download the epg.dat file via ftp from the receiver. """
-        download_data(settings=self._settings, download_type=DownloadType.EPG, callback=print)
+        try:
+            download_data(settings=self._settings, download_type=DownloadType.EPG, callback=print)
+        except Exception as e:
+            GLib.idle_add(self.show_info_message, f"Download epg.dat file error: {e}", Gtk.MessageType.ERROR)
+        else:
+            GLib.idle_add(self._app.emit, "epg-dat-downloaded", None)


 if __name__ == "__main__":
--- a/app/ui/ftp.glade
+++ b/app/ui/ftp.glade
@@ -84,116 +84,59 @@ Author: Dmitriy Yefremov
      <column type="gchararray"/>
    </columns>
  </object>
-  <object class="GtkFrame" id="main_frame">
+  <object class="GtkBox" id="main_ftp_box">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
-    <property name="label_xalign">0.49000000953674316</property>
-    <property name="shadow_type">in</property>
+    <property name="margin_top">2</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">2</property>
    <child>
-      <object class="GtkBox" id="main_ftp_box">
+      <object class="GtkPaned" id="paned">
+        <property name="width_request">320</property>
+        <property name="height_request">240</property>
        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="can_focus">True</property>
+        <property name="position_set">True</property>
+        <property name="wide_handle">True</property>
+        <signal name="size-allocate" handler="on_paned_size_allocate" swapped="no"/>
        <child>
-          <object class="GtkBox" id="ftp_button_box">
+          <object class="GtkFrame" id="ftp_frame">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="spacing">2</property>
-            <child>
-              <object class="GtkButton" id="connect_button">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Connect</property>
-                <signal name="clicked" handler="on_connect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="connect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-connect</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="disconnect_button">
-                <property name="can_focus">False</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Disconnect</property>
-                <signal name="clicked" handler="on_disconnect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="disconnect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-disconnect</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="bookmark_button">
-                <property name="can_focus">False</property>
-                <property name="model">bookmarks_list_store</property>
-                <property name="id_column">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkPaned" id="paned">
-            <property name="width_request">320</property>
-            <property name="height_request">240</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="wide_handle">True</property>
+            <property name="label_xalign">0.49000000953674316</property>
+            <property name="shadow_type">in</property>
            <child>
              <object class="GtkBox" id="ftp_bpx">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_top">5</property>
                <property name="orientation">vertical</property>
-                <property name="spacing">2</property>
+                <property name="spacing">5</property>
                <child>
-                  <object class="GtkBox" id="ftp_info_box">
+                  <object class="GtkBox" id="ftp_button_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="spacing">5</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
+                    <property name="margin_top">5</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="spacing">10</property>
                    <child>
-                      <object class="GtkLabel" id="ftp_label">
+                      <object class="GtkButton" id="connect_button">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="label">FTP:</property>
-                        <attributes>
-                          <attribute name="weight" value="semibold"/>
-                        </attributes>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Connect</property>
+                        <signal name="clicked" handler="on_connect" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="connect_button_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-connect</property>
+                          </object>
+                        </child>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -202,12 +145,93 @@ Author: Dmitriy Yefremov
                      </packing>
                    </child>
                    <child>
-                      <object class="GtkLabel" id="ftp_info_label">
+                      <object class="GtkButton" id="disconnect_button">
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Disconnect</property>
+                        <signal name="clicked" handler="on_disconnect" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="disconnect_button_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-disconnect</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="ftp_actions_box">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="ellipsize">end</property>
-                        <property name="max_width_chars">75</property>
-                        <property name="yalign">1</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkButton" id="ftp_add_folder_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Add folder</property>
+                            <signal name="clicked" handler="on_ftp_create_folder" object="ftp_name_column_renderer" swapped="no"/>
+                            <child>
+                              <object class="GtkImage" id="ftp_add_folder_button_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">folder-new-symbolic</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="ftp_edit_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Edit</property>
+                            <property name="always_show_image">True</property>
+                            <signal name="clicked" handler="on_ftp_edit" swapped="no"/>
+                            <child>
+                              <object class="GtkImage" id="ftp_edit_button_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">document-edit-symbolic</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="ftp_remove_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">True</property>
+                            <signal name="clicked" handler="on_ftp_remove" swapped="no"/>
+                            <child>
+                              <object class="GtkImage" id="ftp_remove_button_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">user-trash-symbolic</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -215,6 +239,19 @@ Author: Dmitriy Yefremov
                        <property name="position">2</property>
                      </packing>
                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="bookmark_button">
+                        <property name="can_focus">False</property>
+                        <property name="model">bookmarks_list_store</property>
+                        <property name="id_column">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
                  </object>
                  <packing>
                    <property name="expand">False</property>
@@ -269,7 +306,7 @@ Author: Dmitriy Yefremov
                              <object class="GtkCellRendererText" id="ftp_name_column_renderer">
                                <property name="xalign">0.019999999552965164</property>
                                <property name="ellipsize">end</property>
-                                <signal name="edited" handler="on_ftp_edited" swapped="no"/>
+                                <signal name="edited" handler="on_ftp_renamed" swapped="no"/>
                              </object>
                              <attributes>
                                <attribute name="text">1</attribute>
@@ -344,37 +381,22 @@ Author: Dmitriy Yefremov
                  <packing>
                    <property name="expand">True</property>
                    <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                  </packing>
                </child>
-              </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="file_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">2</property>
                <child>
-                  <object class="GtkBox" id="pc_info_box">
+                  <object class="GtkBox">
+                    <property name="height_request">24</property>
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
                    <property name="spacing">5</property>
                    <child>
-                      <object class="GtkLabel" id="pc_label">
+                      <object class="GtkImage" id="ftp_info_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_left">10</property>
-                        <property name="label" translatable="yes">PC:</property>
-                        <attributes>
-                          <attribute name="weight" value="semibold"/>
-                        </attributes>
+                        <property name="icon_name">document-properties</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -383,11 +405,104 @@ Author: Dmitriy Yefremov
                      </packing>
                    </child>
                    <child>
-                      <object class="GtkLabel" id="pc_info_label">
+                      <object class="GtkLabel" id="ftp_info_label">
+                        <property name="height_request">16</property>
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="ellipsize">end</property>
-                        <property name="max_width_chars">75</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="ftp_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">FTP</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="resize">True</property>
+            <property name="shrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="pc_frame">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0.49000000953674316</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkBox" id="file_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_top">5</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkBox" id="pc_header_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
+                    <property name="margin_top">5</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkButton" id="pc_add_folder_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Add folder</property>
+                        <signal name="clicked" handler="on_file_create_folder" object="file_name_column_renderer" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="pc_add_folder_button_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">folder-new-symbolic</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="pc_remove_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">True</property>
+                        <signal name="clicked" handler="on_file_remove" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="pc_remove_button_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">user-trash-symbolic</property>
+                          </object>
+                        </child>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -448,7 +563,7 @@ Author: Dmitriy Yefremov
                            <child>
                              <object class="GtkCellRendererText" id="file_name_column_renderer">
                                <property name="ellipsize">end</property>
-                                <signal name="edited" handler="on_file_edited" swapped="no"/>
+                                <signal name="edited" handler="on_file_renamed" swapped="no"/>
                              </object>
                              <attributes>
                                <attribute name="text">1</attribute>
@@ -523,27 +638,64 @@ Author: Dmitriy Yefremov
                    <property name="position">1</property>
                  </packing>
                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="height_request">24</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkLabel" id="pc_info_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="pc_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="label" translatable="yes">PC</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
              </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
            </child>
          </object>
          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="resize">True</property>
+            <property name="shrink">False</property>
          </packing>
        </child>
      </object>
-    </child>
-    <child type="label">
-      <object class="GtkLabel" id="main_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">FTP client</property>
-      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
    </child>
  </object>
  <object class="GtkImage" id="remove_image">
@@ -559,7 +711,7 @@ Author: Dmitriy Yefremov
  <object class="GtkImage" id="rename_image">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
-    <property name="icon_name">gtk-edit</property>
+    <property name="icon_name">edit-find-replace</property>
  </object>
  <object class="GtkMenu" id="ftp_popup_menu">
    <property name="visible">True</property>
@@ -577,13 +729,24 @@ Author: Dmitriy Yefremov
    </child>
    <child>
      <object class="GtkImageMenuItem" id="ftp_edit_menu_item">
-        <property name="label" translatable="yes">Edit</property>
+        <property name="label">gtk-edit</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="on_ftp_edit" swapped="no"/>
+        <accelerator key="F4" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="ftp_rename_menu_item">
+        <property name="label" translatable="yes">Rename</property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="image">rename_image</property>
        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_ftp_edit" object="ftp_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
+        <signal name="activate" handler="on_ftp_rename" object="ftp_name_column_renderer" swapped="no"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
        <accelerator key="F2" signal="activate"/>
      </object>
    </child>
@@ -608,7 +771,7 @@ Author: Dmitriy Yefremov
  <object class="GtkImage" id="rename_image_2">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
-    <property name="icon_name">gtk-edit</property>
+    <property name="icon_name">edit-find-replace</property>
  </object>
  <object class="GtkMenu" id="file_popup_menu">
    <property name="visible">True</property>
@@ -625,13 +788,13 @@ Author: Dmitriy Yefremov
      </object>
    </child>
    <child>
-      <object class="GtkImageMenuItem" id="file_edit_menu_item">
-        <property name="label" translatable="yes">Edit</property>
+      <object class="GtkImageMenuItem" id="file_rename_menu_item">
+        <property name="label" translatable="yes">Rename</property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="image">rename_image_2</property>
        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_file_edit" object="file_name_column_renderer" swapped="no"/>
+        <signal name="activate" handler="on_file_rename" object="file_name_column_renderer" swapped="no"/>
        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
        <accelerator key="F2" signal="activate"/>
      </object>
--- a/app/ui/ftp.py
+++ b/app/ui/ftp.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -32,6 +32,7 @@ from collections import namedtuple
 from datetime import datetime
 from enum import IntEnum
 from ftplib import all_errors
+from io import TextIOWrapper, BytesIO
 from pathlib import Path
 from shutil import rmtree
 from urllib.parse import urlparse, unquote
@@ -40,9 +41,10 @@ from gi.repository import GLib

 from app.commons import log, run_task, run_idle
 from app.connections import UtfFTP
+from app.settings import IS_LINUX, IS_DARWIN, IS_WIN
 from app.ui.dialogs import show_dialog, DialogType, get_builder
 from app.ui.main_helper import on_popup_menu
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK, IS_GNOME_SESSION

 File = namedtuple("File", ["icon", "name", "size", "date", "attr", "extra"])

@@ -63,6 +65,86 @@ class FtpClientBox(Gtk.HBox):
        ATTR = 4
        EXTRA = 5

+    class TextEditDialog(Gtk.Dialog):
+        """ Simple text edit dialog. """
+
+        def __init__(self, path, use_header_bar=0, *args, **kwargs):
+            super().__init__(title=f"DemonEditor [{path}]", use_header_bar=use_header_bar, *args, **kwargs)
+
+            self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE, Gtk.ResponseType.OK, )
+
+            content_box = self.get_content_area()
+            self._search_entry = Gtk.SearchEntry(visible=True, primary_icon_name="system-search-symbolic")
+            self._search_entry.connect("search-changed", self.on_search_changed)
+
+            if use_header_bar:
+                bar = self.get_header_bar()
+                bar.pack_start(self._search_entry)
+                bar.set_title("DemonEditor")
+                bar.set_subtitle(path)
+            else:
+                search_bar = Gtk.SearchBar(visible=True)
+                search_bar.add(self._search_entry)
+                search_bar.set_search_mode(True)
+                content_box.pack_start(search_bar, False, False, 0)
+
+            scrolled_window = Gtk.ScrolledWindow(hexpand=True, vexpand=True,
+                                                 min_content_width=720,
+                                                 min_content_height=320)
+            content_box.pack_start(scrolled_window, True, True, 0)
+
+            try:
+                import gi
+
+                gi.require_version("GtkSource", "3.0")
+                from gi.repository import GtkSource
+            except (ImportError, ValueError) as e:
+                self._text_view = Gtk.TextView()
+                self._buf = self._text_view.get_buffer()
+                log(e)
+            else:
+                self._text_view = GtkSource.View(show_line_numbers=True, show_line_marks=True)
+                self._buf = self._text_view.get_buffer()
+                self._buf.set_highlight_syntax(True)
+                self._buf.set_highlight_matching_brackets(True)
+                lang_manager = GtkSource.LanguageManager.new()
+                self._buf.set_language(lang_manager.guess_language(path))
+                # Style
+                self._buf.set_style_scheme(GtkSource.StyleSchemeManager().get_default().get_scheme("tango"))
+
+            self._tag_found = self._buf.create_tag("found", background="yellow")
+            scrolled_window.add(self._text_view)
+
+            self.show_all()
+
+        @property
+        def text(self):
+            return self._buf.get_text(self._buf.get_start_iter(), self._buf.get_end_iter(), include_hidden_chars=True)
+
+        @text.setter
+        def text(self, value):
+            self._buf.set_text(value)
+
+        def on_search_changed(self, entry):
+            self._buf.remove_tag(self._tag_found, self._buf.get_start_iter(), self._buf.get_end_iter())
+            cursor_mark = self._buf.get_insert()
+            start = self._buf.get_iter_at_mark(cursor_mark)
+            if start.get_offset() == self._buf.get_char_count():
+                start = self._buf.get_start_iter()
+
+            self.search_and_mark(entry.get_text(), start)
+
+        def search_and_mark(self, text, start, first=True):
+            end = self._buf.get_end_iter()
+            match = start.forward_search(text, 0, end)
+
+            if match is not None:
+                match_start, match_end = match
+                self._buf.apply_tag(self._tag_found, match_start, match_end)
+                if first:
+                    self._text_view.scroll_to_iter(match_start, 0.0, False, 0.0, 0.0)
+                GLib.idle_add(self.search_and_mark, text, match_end, False)
+
    def __init__(self, app, settings, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.set_spacing(2)
@@ -78,9 +160,10 @@ class FtpClientBox(Gtk.HBox):
                    "on_ftp_row_activated": self.on_ftp_row_activated,
                    "on_file_row_activated": self.on_file_row_activated,
                    "on_ftp_edit": self.on_ftp_edit,
-                    "on_ftp_edited": self.on_ftp_edited,
-                    "on_file_edit": self.on_file_edit,
-                    "on_file_edited": self.on_file_edited,
+                    "on_ftp_rename": self.on_ftp_rename,
+                    "on_ftp_renamed": self.on_ftp_renamed,
+                    "on_file_rename": self.on_file_rename,
+                    "on_file_renamed": self.on_file_renamed,
                    "on_file_remove": self.on_file_remove,
                    "on_ftp_remove": self.on_ftp_file_remove,
                    "on_file_create_folder": self.on_file_create_folder,
@@ -94,11 +177,12 @@ class FtpClientBox(Gtk.HBox):
                    "on_view_popup_menu": on_popup_menu,
                    "on_view_key_press": self.on_view_key_press,
                    "on_view_press": self.on_view_press,
-                    "on_view_release": self.on_view_release}
+                    "on_view_release": self.on_view_release,
+                    "on_paned_size_allocate": self.on_paned_size_allocate}

        builder = get_builder(UI_RESOURCES_PATH + "ftp.glade", handlers)

-        self.add(builder.get_object("main_frame"))
+        self.add(builder.get_object("main_ftp_box"))
        self._ftp_info_label = builder.get_object("ftp_info_label")
        self._ftp_view = builder.get_object("ftp_view")
        self._ftp_model = builder.get_object("ftp_list_store")
@@ -109,8 +193,10 @@ class FtpClientBox(Gtk.HBox):
        # Buttons
        self._connect_button = builder.get_object("connect_button")
        disconnect_button = builder.get_object("disconnect_button")
+        disconnect_button.bind_property("visible", builder.get_object("ftp_actions_box"), "sensitive")
        disconnect_button.bind_property("visible", builder.get_object("ftp_create_folder_menu_item"), "sensitive")
        disconnect_button.bind_property("visible", builder.get_object("ftp_edit_menu_item"), "sensitive")
+        disconnect_button.bind_property("visible", builder.get_object("ftp_rename_menu_item"), "sensitive")
        disconnect_button.bind_property("visible", builder.get_object("ftp_remove_menu_item"), "sensitive")
        self._connect_button.bind_property("visible", builder.get_object("disconnect_button"), "visible", 4)
        # Force Ctrl
@@ -219,7 +305,7 @@ class FtpClientBox(Gtk.HBox):
            else:
                r_size = self.get_size_from_bytes(size)

-            date = "{}, {}  {}".format(f_data[5], f_data[6], f_data[7])
+            date = f"{f_data[5]}, {f_data[6]}  {f_data[7]}"
            self._ftp_model.append(File(icon, " ".join(f_data[8:]), r_size, date, f_data[0], size))

    def on_connect(self, item=None):
@@ -259,23 +345,22 @@ class FtpClientBox(Gtk.HBox):
    def open_file(self, path):
        GLib.idle_add(self._file_view.set_sensitive, False)
        try:
-            cmd = ["open" if self._settings.is_darwin else "xdg-open", path]
-            subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+            cmd = [self.get_open_file_cmd(), path]
+            subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=IS_WIN).communicate()
        finally:
            GLib.idle_add(self._file_view.set_sensitive, True)

    @run_task
    def open_ftp_file(self, f_path):
-        is_darwin = self._settings.is_darwin
        GLib.idle_add(self._ftp_view.set_sensitive, False)

        try:
            import tempfile
            import os
-            path = os.path.expanduser("~/Desktop") if is_darwin else None
+            path = os.path.expanduser("~/Desktop") if not IS_LINUX else None

-            with tempfile.NamedTemporaryFile(mode="wb", dir=path, delete=not is_darwin) as tf:
-                msg = "Downloading file: {}.   Status: {}"
+            with tempfile.NamedTemporaryFile(mode="wb", dir=path, delete=IS_LINUX) as tf:
+                msg = "Downloading file: {}.  Status: {}"
                try:
                    status = self._ftp.retrbinary("RETR " + f_path, tf.write)
                    self.update_ftp_info(msg.format(f_path, status))
@@ -283,12 +368,74 @@ class FtpClientBox(Gtk.HBox):
                    self.update_ftp_info(msg.format(f_path, e))

                tf.flush()
-                cmd = ["open" if is_darwin else "xdg-open", tf.name]
-                subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+
+                cmd = [self.get_open_file_cmd(), tf.name]
+                subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=IS_WIN).communicate()
        finally:
            GLib.idle_add(self._ftp_view.set_sensitive, True)

-    def on_ftp_edit(self, renderer):
+    @staticmethod
+    def get_open_file_cmd():
+        if IS_DARWIN:
+            return "open"
+        elif IS_WIN:
+            return "start"
+        return "xdg-open"
+
+    @run_task
+    def on_ftp_edit(self, item=None):
+        path = self.get_ftp_edit_path()
+        if path:
+            row = self._ftp_model[path]
+            f_path = row[self.Column.NAME]
+            size = row[self.Column.SIZE]
+
+            if size == self.FOLDER or f_path == self.ROOT:
+                self._app.show_error_message("Not allowed in this context!")
+            else:
+                b_size = row[self.Column.EXTRA]
+                if b_size.isdigit() and int(b_size) > self.MAX_SIZE / 5:
+                    self._app.show_error_message("The file size is too large!")
+                else:
+                    msg = "Retrieving file: {}.  Status: {}"
+                    io = BytesIO()
+                    try:
+                        status = self._ftp.retrbinary("RETR " + f_path, io.write)
+                        self.update_ftp_info(msg.format(f_path, status))
+                    except all_errors as e:
+                        self.update_ftp_info(msg.format(f_path, e))
+                    else:
+                        io.seek(0)
+                        self.show_edit_dialog(f_path, TextIOWrapper(io, errors="ignore").read())
+
+    def on_ftp_edited(self, f_path, txt_data):
+        buf = BytesIO()
+        buf.write(txt_data.encode())
+        buf.seek(0)
+
+        msg = "Uploading file: {}.  Status: {}"
+        try:
+            status = self._ftp.storbinary(f"STOR {f_path}", buf)
+            self.update_ftp_info(msg.format(f_path, status))
+        except all_errors as e:
+            self.update_ftp_info(msg.format(f_path, e))
+
+    @run_idle
+    def show_edit_dialog(self, f_path, data):
+        dialog = self.TextEditDialog(f_path, IS_GNOME_SESSION)
+        dialog.text = data
+        ok = Gtk.ResponseType.OK
+        if dialog.run() == ok and show_dialog(DialogType.QUESTION, self._app.app_window) == ok:
+            self.on_ftp_edited(f_path, dialog.text)
+        dialog.destroy()
+
+    def on_ftp_rename(self, renderer):
+        path = self.get_ftp_edit_path()
+        if path:
+            renderer.set_property("editable", True)
+            self._ftp_view.set_cursor(path, self._ftp_view.get_column(0), True)
+
+    def get_ftp_edit_path(self):
        model, paths = self._ftp_view.get_selection().get_selected_rows()
        if not paths:
            return
@@ -296,11 +443,9 @@ class FtpClientBox(Gtk.HBox):
        if len(paths) > 1:
            self._app.show_error_message("Please, select only one item!")
            return
+        return paths

-        renderer.set_property("editable", True)
-        self._ftp_view.set_cursor(paths, self._ftp_view.get_column(0), True)
-
-    def on_ftp_edited(self, renderer, path, new_value):
+    def on_ftp_renamed(self, renderer, path, new_value):
        renderer.set_property("editable", False)
        row = self._ftp_model[path]
        old_name = row[self.Column.NAME]
@@ -308,11 +453,11 @@ class FtpClientBox(Gtk.HBox):
            return

        resp = self._ftp.rename_file(old_name, new_value)
-        self.update_ftp_info("{}   Status: {}".format(old_name, resp))
+        self.update_ftp_info(f"{old_name}   Status: {resp}")
        if resp[0] == "2":
            row[self.Column.NAME] = new_value

-    def on_file_edit(self, renderer):
+    def on_file_rename(self, renderer):
        model, paths = self._file_view.get_selection().get_selected_rows()
        if len(paths) > 1:
            self._app.show_error_message("Please, select only one item!")
@@ -321,7 +466,7 @@ class FtpClientBox(Gtk.HBox):
        renderer.set_property("editable", True)
        self._file_view.set_cursor(paths, self._file_view.get_column(0), True)

-    def on_file_edited(self, renderer, path, new_value):
+    def on_file_renamed(self, renderer, path, new_value):
        renderer.set_property("editable", False)
        row = self._file_model[path]
        old_name = row[self.Column.NAME]
@@ -331,7 +476,7 @@ class FtpClientBox(Gtk.HBox):
        path = Path(row[self.Column.ATTR])
        if path.exists():
            try:
-                new_path = path.rename("{}/{}".format(path.parent, new_value))
+                new_path = path.rename(f"{path.parent}/{new_value}")
            except ValueError as e:
                log(e)
                self._app.show_error_message(str(e))
@@ -341,7 +486,7 @@ class FtpClientBox(Gtk.HBox):
                    row[self.Column.ATTR] = str(new_path.resolve())

    def on_file_remove(self, item=None):
-        if show_dialog(DialogType.QUESTION, self._app._main_window) != Gtk.ResponseType.OK:
+        if show_dialog(DialogType.QUESTION, self._app.app_window) != Gtk.ResponseType.OK:
            return

        model, paths = self._file_view.get_selection().get_selected_rows()
@@ -359,7 +504,7 @@ class FtpClientBox(Gtk.HBox):
        list(map(model.remove, to_delete))

    def on_ftp_file_remove(self, item=None):
-        if show_dialog(DialogType.QUESTION, self._app._main_window) != Gtk.ResponseType.OK:
+        if show_dialog(DialogType.QUESTION, self._app.app_window) != Gtk.ResponseType.OK:
            return

        model, paths = self._ftp_view.get_selection().get_selected_rows()
@@ -385,7 +530,7 @@ class FtpClientBox(Gtk.HBox):

        name = self.get_new_folder_name(self._file_model)
        cur_path = self._file_model.get_value(itr, self.Column.ATTR)
-        path = Path("{}/{}".format(cur_path, name))
+        path = Path(f"{cur_path}/{name}")

        try:
            path.mkdir()
@@ -406,13 +551,13 @@ class FtpClientBox(Gtk.HBox):
        name = self.get_new_folder_name(self._ftp_model)

        try:
-            folder = "{}/{}".format(cur_path, name)
+            folder = f"{cur_path}/{name}"
            resp = self._ftp.mkd(folder)
        except all_errors as e:
            self.update_ftp_info(str(e))
            log(e)
        else:
-            if resp == "{}/{}".format(cur_path, name):
+            if resp == f"{cur_path}/{name}":
                itr = self._ftp_model.append(File(self._folder_icon, name, self.FOLDER, "", "drwxr-xr-x", "0"))
                renderer.set_property("editable", True)
                self._ftp_view.set_cursor(self._ftp_model.get_path(itr), self._ftp_view.get_column(0), True)
@@ -424,7 +569,7 @@ class FtpClientBox(Gtk.HBox):
        count = 0
        while name in names:
            count += 1
-            name = "{}{}".format(name, count)
+            name = f"{name}{count}"
        return name

    # ***************** Drag-and-drop ********************* #
@@ -459,7 +604,7 @@ class FtpClientBox(Gtk.HBox):
            uris = []
            for r in [model[p][:] for p in paths]:
                if r[self.Column.SIZE] != self.LINK and r[self.Column.NAME] != self.ROOT:
-                    uris.append(Path("/{}:{}".format(r[self.Column.NAME], r[self.Column.ATTR])).as_uri())
+                    uris.append(Path(f"/{r[self.Column.NAME]}:{r[self.Column.ATTR]}").as_uri())
            data.set_uris([sep.join(uris)])

    @run_task
@@ -469,7 +614,7 @@ class FtpClientBox(Gtk.HBox):

        resp = "2"
        try:
-            GLib.idle_add(self._app._wait_dialog.show)
+            GLib.idle_add(self._app.wait_dialog.show)

            uris = data.get_uris()
            if self._settings.is_darwin and len(uris) == 1:
@@ -488,7 +633,7 @@ class FtpClientBox(Gtk.HBox):
                else:
                    resp = self._ftp.send_file(path.name, str(path.parent) + "/", callback=self.update_ftp_info)
        finally:
-            GLib.idle_add(self._app._wait_dialog.hide)
+            GLib.idle_add(self._app.wait_dialog.hide)
            if resp and resp[0] == "2":
                itr = self._ftp_model.get_iter_first()
                if itr:
@@ -507,7 +652,7 @@ class FtpClientBox(Gtk.HBox):
    def on_file_drag_data_received(self, view, context, x, y, data, info, time):
        cur_path = self._file_model.get_value(self._file_model.get_iter_first(), self.Column.ATTR) + "/"
        try:
-            GLib.idle_add(self._app._wait_dialog.show)
+            GLib.idle_add(self._app.wait_dialog.show)

            uris = data.get_uris()
            if self._settings.is_darwin and len(uris) == 1:
@@ -525,7 +670,7 @@ class FtpClientBox(Gtk.HBox):
        except OSError as e:
            log(e)
        finally:
-            GLib.idle_add(self._app._wait_dialog.hide)
+            GLib.idle_add(self._app.wait_dialog.hide)
            self.init_file_data(cur_path)

        Gtk.drag_finish(context, True, False, time)
@@ -556,14 +701,21 @@ class FtpClientBox(Gtk.HBox):
                self.on_file_create_folder(self._file_name_renderer)
        elif key is KeyboardKey.F2 or ctrl and KeyboardKey.R:
            if self._ftp_view.is_focus():
-                self.on_ftp_edit(self._ftp_name_renderer)
+                self.on_ftp_rename(self._ftp_name_renderer)
            elif self._file_view.is_focus():
-                self.on_file_edit(self._file_name_renderer)
+                self.on_file_rename(self._file_name_renderer)
+        elif key is KeyboardKey.F4:
+            if self._ftp_view.is_focus():
+                self.on_ftp_edit()
        elif key is KeyboardKey.DELETE:
            if self._ftp_view.is_focus():
                self.on_ftp_file_remove()
            elif self._file_view.is_focus():
                self.on_file_remove()
+        elif key is KeyboardKey.RETURN:
+            path, column = view.get_cursor()
+            if path:
+                view.emit("row-activated", path, column)

    def on_view_press(self, view, event):
        if event.get_event_type() == Gdk.EventType.BUTTON_PRESS and event.button == Gdk.BUTTON_PRIMARY:
@@ -577,6 +729,10 @@ class FtpClientBox(Gtk.HBox):
        # Enable selection.
        self._select_enabled = True

+    def on_paned_size_allocate(self, paned, allocation):
+        """ Sets default homogeneous sizes. """
+        paned.set_position(0.5 * allocation.width)
+
    def get_size_from_bytes(self, size):
        """ Simple convert function from bytes to other units like K, M or G. """
        try:
@@ -589,11 +745,11 @@ class FtpClientBox(Gtk.HBox):
            if b < kb:
                return str(b)
            elif kb <= b < mb:
-                return "{0:.1f} K".format(b / kb)
+                return f"{b / kb:.1f} K"
            elif mb <= b < gb:
-                return "{0:.1f} M".format(b / mb)
+                return f"{b / mb:.1f} M"
            elif gb <= b:
-                return "{0:.1f} G".format(b / gb)
+                return f"{b / gb:.1f} G"


 if __name__ == '__main__':
--- a/app/ui/iptv.glade
+++ b/app/ui/iptv.glade
--- a/app/ui/iptv.py
+++ b/app/ui/iptv.py
@@ -48,7 +48,7 @@ from app.ui.main_helper import get_base_model, get_iptv_url, on_popup_menu, get_
 from app.ui.uicommons import (Gtk, Gdk, UI_RESOURCES_PATH, IPTV_ICON, Column, KeyboardKey, get_yt_icon)

 _DIGIT_ENTRY_NAME = "digit-entry"
-_ENIGMA2_REFERENCE = "{}:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0"
+_ENIGMA2_REFERENCE = "{}:{}:{}:{:X}:{:X}:{:X}:{:X}:0:0:0"
 _PATTERN = re.compile("(?:^[\\s]*$|\\D)")
 _UI_PATH = UI_RESOURCES_PATH + "iptv.glade"

@@ -104,6 +104,7 @@ class IptvDialog:
        self._url_entry = builder.get_object("url_entry")
        self._reference_entry = builder.get_object("reference_entry")
        self._srv_type_entry = builder.get_object("srv_type_entry")
+        self._srv_id_entry = builder.get_object("srv_id_entry")
        self._sid_entry = builder.get_object("sid_entry")
        self._tr_id_entry = builder.get_object("tr_id_entry")
        self._net_id_entry = builder.get_object("net_id_entry")
@@ -119,8 +120,8 @@ class IptvDialog:
        # style
        self._style_provider = Gtk.CssProvider()
        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        self._digit_elems = (self._srv_type_entry, self._sid_entry, self._tr_id_entry, self._net_id_entry,
-                             self._namespace_entry)
+        self._digit_elems = (self._srv_id_entry, self._srv_type_entry, self._sid_entry, self._tr_id_entry,
+                             self._net_id_entry, self._namespace_entry)
        for el in self._digit_elems:
            el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
                                                           Gtk.STYLE_PROVIDER_PRIORITY_USER)
@@ -195,6 +196,7 @@ class IptvDialog:
        except ValueError:
            self.show_info_message("Unknown stream type {}".format(s_type), Gtk.MessageType.ERROR)

+        self._srv_id_entry.set_text(data[1])
        self._srv_type_entry.set_text(data[2])
        self._sid_entry.set_text(str(int(data[3], 16)))
        self._tr_id_entry.set_text(str(int(data[4], 16)))
@@ -212,6 +214,7 @@ class IptvDialog:
        if self._s_type is SettingsType.ENIGMA_2 and is_data_correct(self._digit_elems):
            self.on_url_changed(self._url_entry)
            self._reference_entry.set_text(_ENIGMA2_REFERENCE.format(self.get_type(),
+                                                                     self._srv_id_entry.get_text(),
                                                                     self._srv_type_entry.get_text(),
                                                                     int(self._sid_entry.get_text()),
                                                                     int(self._tr_id_entry.get_text()),
@@ -296,6 +299,7 @@ class IptvDialog:
    def save_enigma2_data(self):
        name = self._name_entry.get_text().strip()
        fav_id = ENIGMA2_FAV_ID_FORMAT.format(self.get_type(),
+                                              self._srv_id_entry.get_text(),
                                              self._srv_type_entry.get_text(),
                                              int(self._sid_entry.get_text()),
                                              int(self._tr_id_entry.get_text()),
@@ -432,6 +436,7 @@ class IptvListDialog:
                    "on_response": self.on_response,
                    "on_stream_type_default_togged": self.on_stream_type_default_togged,
                    "on_stream_type_changed": self.on_stream_type_changed,
+                    "on_default_id_toggled": self.on_default_id_toggled,
                    "on_default_type_toggled": self.on_default_type_toggled,
                    "on_auto_sid_toggled": self.on_auto_sid_toggled,
                    "on_default_tid_toggled": self.on_default_tid_toggled,
@@ -453,12 +458,14 @@ class IptvListDialog:
        self._info_bar = builder.get_object("list_configuration_info_bar")
        self._reference_label = builder.get_object("reference_label")
        self._stream_type_check_button = builder.get_object("stream_type_default_check_button")
+        self._id_default_check_button = builder.get_object("id_default_check_button")
        self._type_check_button = builder.get_object("type_default_check_button")
        self._sid_auto_check_button = builder.get_object("sid_auto_check_button")
        self._tid_check_button = builder.get_object("tid_default_check_button")
        self._nid_check_button = builder.get_object("nid_default_check_button")
        self._namespace_check_button = builder.get_object("namespace_default_check_button")
        self._stream_type_combobox = builder.get_object("stream_type_list_combobox")
+        self._list_srv_id_entry = builder.get_object("list_srv_id_entry")
        self._list_srv_type_entry = builder.get_object("list_srv_type_entry")
        self._list_sid_entry = builder.get_object("list_sid_entry")
        self._list_tid_entry = builder.get_object("list_tid_entry")
@@ -467,13 +474,16 @@ class IptvListDialog:
        self._apply_button = builder.get_object("list_configuration_apply_button")
        self._cancel_button = builder.get_object("cancel_config_list_button")
        self._ok_button = builder.get_object("list_configuration_ok_button")
+        self._ok_button.bind_property("visible", self._apply_button, "visible", 4)
+        self._ok_button.bind_property("visible", self._cancel_button, "visible", 4)
        # Style
        style_provider = Gtk.CssProvider()
        style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        self._default_elems = (self._stream_type_check_button, self._type_check_button, self._sid_auto_check_button,
-                               self._tid_check_button, self._nid_check_button, self._namespace_check_button)
-        self._digit_elems = (self._list_srv_type_entry, self._list_sid_entry, self._list_tid_entry,
-                             self._list_nid_entry, self._list_namespace_entry)
+        self._default_elems = (self._stream_type_check_button, self._id_default_check_button, self._type_check_button,
+                               self._sid_auto_check_button, self._tid_check_button, self._nid_check_button,
+                               self._namespace_check_button)
+        self._digit_elems = (self._list_srv_id_entry, self._list_srv_type_entry, self._list_sid_entry,
+                             self._list_tid_entry, self._list_nid_entry, self._list_namespace_entry)
        for el in self._digit_elems:
            el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), style_provider,
                                                           Gtk.STYLE_PROVIDER_PRIORITY_USER)
@@ -495,30 +505,28 @@ class IptvListDialog:
            self._stream_type_combobox.set_active(1)
        self._stream_type_combobox.set_sensitive(not button.get_active())

+    def on_default_id_toggled(self, button):
+        self.set_default(button, self._list_srv_id_entry, "0")
+
    def on_default_type_toggled(self, button):
-        if button.get_active():
-            self._list_srv_type_entry.set_text("1")
-        self._list_srv_type_entry.set_sensitive(not button.get_active())
+        self.set_default(button, self._list_srv_type_entry, "1")

    def on_auto_sid_toggled(self, button):
-        if button.get_active():
-            self._list_sid_entry.set_text("0")
-        self._list_sid_entry.set_sensitive(not button.get_active())
+        self.set_default(button, self._list_sid_entry, "0")

    def on_default_tid_toggled(self, button):
-        if button.get_active():
-            self._list_tid_entry.set_text("0")
-        self._list_tid_entry.set_sensitive(not button.get_active())
+        self.set_default(button, self._list_tid_entry, "0")

    def on_default_nid_toggled(self, button):
-        if button.get_active():
-            self._list_nid_entry.set_text("0")
-        self._list_nid_entry.set_sensitive(not button.get_active())
+        self.set_default(button, self._list_nid_entry, "0")

    def on_default_namespace_toggled(self, button):
+        self.set_default(button, self._list_namespace_entry, "0")
+
+    def set_default(self, button, entry, value):
        if button.get_active():
-            self._list_namespace_entry.set_text("0")
-        self._list_namespace_entry.set_sensitive(not button.get_active())
+            entry.set_text(value)
+        entry.set_sensitive(not button.get_active())

    @run_idle
    def on_reset_to_default(self, item):
@@ -550,7 +558,7 @@ class IptvListDialog:
            self.update_reference()

    def is_default_values(self):
-        return any(el.get_text() == "0" for el in self._digit_elems[2:])
+        return any(el.get_text() == "0" for el in self._digit_elems[3:])

    def is_all_data_default(self):
        return all(el.get_active() for el in self._default_elems)
@@ -573,31 +581,35 @@ class IptvListConfigurationDialog(IptvListDialog):
            return

        if self._s_type is SettingsType.ENIGMA_2:
+            id_default = self._id_default_check_button.get_active()
            type_default = self._type_check_button.get_active()
            tid_default = self._tid_check_button.get_active()
            sid_auto = self._sid_auto_check_button.get_active()
            nid_default = self._nid_check_button.get_active()
            namespace_default = self._namespace_check_button.get_active()
+            all_default = self.is_all_data_default()

-            stream_type = get_stream_type(self._stream_type_combobox)
+            st_type = get_stream_type(self._stream_type_combobox)
+            s_id = "0" if id_default else self._list_srv_id_entry.get_text()
            srv_type = "1" if type_default else self._list_srv_type_entry.get_text()
-            tid = "0" if tid_default else "{:X}".format(int(self._list_tid_entry.get_text()))
-            nid = "0" if nid_default else "{:X}".format(int(self._list_nid_entry.get_text()))
-            namespace = "0" if namespace_default else "{:X}".format(int(self._list_namespace_entry.get_text()))
+            sid = "0" if sid_auto else self._list_sid_entry.get_text()
+            tid = "0" if tid_default else f"{int(self._list_tid_entry.get_text()):X}"
+            nid = "0" if nid_default else f"{int(self._list_nid_entry.get_text()):X}"
+            namespace = "0" if namespace_default else f"{int(self._list_namespace_entry.get_text()):X}"

            for index, row in enumerate(self._rows):
                fav_id = row[Column.FAV_ID]
                data, sep, desc = fav_id.partition("http")
                data = data.split(":")

-                if self.is_all_data_default():
-                    data[2], data[3], data[4], data[5], data[6] = "10000"
+                if all_default:
+                    data[1], data[2], data[3], data[4], data[5], data[6] = "010000"
                else:
-                    data[0], data[2], data[4], data[5], data[6] = stream_type, srv_type, tid, nid, namespace
-                    data[3] = "{:X}".format(index) if sid_auto else "0"
+                    data[0], data[1], data[2], data[4], data[5], data[6] = st_type, s_id, srv_type, tid, nid, namespace

+                data[3] = f"{index:X}" if sid_auto else sid
                data = ":".join(data)
-                new_fav_id = "{}{}{}".format(data, sep, desc)
+                new_fav_id = f"{data}{sep}{desc}"
                row[Column.FAV_ID] = new_fav_id
                srv = self._services.pop(fav_id, None)

@@ -608,6 +620,7 @@ class IptvListConfigurationDialog(IptvListDialog):
            list(map(lambda r: self._bouquet.append(r[Column.FAV_ID]), self._fav_model))

            self._info_bar.set_visible(True)
+            self._ok_button.set_visible(True)


 class M3uImportDialog(IptvListDialog):
@@ -628,8 +641,6 @@ class M3uImportDialog(IptvListDialog):
        self._dialog.set_title(get_message("Playlist import"))
        self._dialog.connect("delete-event", self.on_close)
        self._apply_button.set_label(get_message("Import"))
-        self._ok_button.bind_property("visible", self._apply_button, "visible", 4)
-        self._ok_button.bind_property("visible", self._cancel_button, "visible", 4)
        # Progress
        self._progress_bar = Gtk.ProgressBar(visible=False, valign="center")
        self._spinner = Gtk.Spinner(active=False)
@@ -654,7 +665,7 @@ class M3uImportDialog(IptvListDialog):
        extra_box.pack_start(self._info_label, False, False, 5)
        extra_box.pack_end(self._picon_box, True, True, 5)

-        frame = Gtk.Frame(visible=True)
+        frame = Gtk.Frame(visible=True, margin_bottom=5)
        frame.add(extra_box)
        self._data_box.add(frame)

@@ -670,7 +681,7 @@ class M3uImportDialog(IptvListDialog):
                    GLib.idle_add(self._picon_box.set_sensitive, True)
                    break
        finally:
-            msg = "{} {}.".format(get_message("Streams detected:"), len(self._services) if self._services else 0)
+            msg = f"{get_message('Streams detected:')} {len(self._services) if self._services else 0}."
            GLib.idle_add(self._info_label.set_text, msg)
            GLib.idle_add(self._spinner.set_property, "active", False)

@@ -685,9 +696,12 @@ class M3uImportDialog(IptvListDialog):
        if not self.is_all_data_default():
            services = []
            params = [int(el.get_text()) for el in self._digit_elems]
-            s_type = params[0]
-            params = params[1:]
-            stream_type = get_stream_type(self._stream_type_combobox)
+            s_id = params[0]
+            s_type = params[1]
+            params = params[2:]
+            st_type = get_stream_type(self._stream_type_combobox)
+            sid_auto = self._sid_auto_check_button.get_active()
+            sid = 0 if sid_auto else int(self._list_sid_entry.get_text())

            for i, s in enumerate(self._services, start=params[0]):
                # Skipping markers.
@@ -695,9 +709,9 @@ class M3uImportDialog(IptvListDialog):
                    services.append(s)
                    continue

-                params[0] = i
-                picon_id = "{}_0_{:X}_{:X}_{:X}_{:X}_{:X}_0_0_0.png".format(stream_type, s_type, *params)
-                fav_id = get_fav_id(s.data_id, s.service, self._s_type, params, stream_type, s_type)
+                params[0] = i if sid_auto else sid
+                picon_id = "{}_{}_{:X}_{:X}_{:X}_{:X}_{:X}_0_0_0.png".format(st_type, s_id, s_type, *params)
+                fav_id = get_fav_id(s.data_id, s.service, self._s_type, params, st_type, s_id, s_type)
                if s.picon:
                    picons[s.picon] = picon_id

@@ -755,16 +769,16 @@ class M3uImportDialog(IptvListDialog):
    @run_idle
    def on_picon_load_done(self, data, user_data):
        try:
-            self._info_label.set_text("Processing: {}".format(user_data))
+            self._info_label.set_text(f"Processing: {user_data}")
            f = Gio.MemoryInputStream.new_from_data(data)
            pixbuf = GdkPixbuf.Pixbuf.new_from_stream_at_scale(f, 220, 132, False, self._cancellable)
-            path = "{}{}".format(self._pic_path, user_data)
+            path = f"{self._pic_path}{user_data}"
            pixbuf.savev(path, "png", [], [])
            self._picons[user_data] = get_picon_pixbuf(path)
        except GLib.GError as e:
            self.update_progress(1)
            if e.code != Gio.IOErrorEnum.CANCELLED:
-                log("Loading picon [{}] data error: {}".format(user_data, e))
+                log(f"Loading picon [{user_data}] data error: {e}")
        else:
            self.update_progress()

@@ -780,14 +794,14 @@ class M3uImportDialog(IptvListDialog):
        self._progress_bar.set_visible(False)
        self._progress_bar.set_fraction(0.0)
        self._apply_button.set_sensitive(True)
-        self._info_label.set_text("Errors: {}.".format(self._errors_count))
+        self._info_label.set_text(f"Errors: {self._errors_count}.")
        self._is_download = False

        gen = self.update_fav_model()
        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)

    def update_fav_model(self):
-        services = self._app._services
+        services = self._app.current_services
        picons = self._app._picons
        model = self._app.fav_view.get_model()
        for r in model:
--- a/app/ui/lang/be/LC_MESSAGES/demon-editor.mo
+++ b/app/ui/lang/be/LC_MESSAGES/demon-editor.mo
--- a/app/ui/lang/de/LC_MESSAGES/demon-editor.mo
+++ b/app/ui/lang/de/LC_MESSAGES/demon-editor.mo
--- a/app/ui/lang/it/LC_MESSAGES/demon-editor.mo
+++ b/app/ui/lang/it/LC_MESSAGES/demon-editor.mo
--- a/app/ui/lang/pl/LC_MESSAGES/demon-editor.mo
+++ b/app/ui/lang/pl/LC_MESSAGES/demon-editor.mo
--- a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo
+++ b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo
--- a/app/ui/lang/tr/LC_MESSAGES/demon-editor.mo
+++ b/app/ui/lang/tr/LC_MESSAGES/demon-editor.mo
--- a/app/ui/logs.glade
+++ b/app/ui/logs.glade
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.2 
+
+The MIT License (MIT)
+
+Copyright (c) 2018-2021 Dmitriy Yefremov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Author: Dmitriy Yefremov
+
+-->
+<interface domain="demon-editor">
+  <requires lib="gtk+" version="3.18"/>
+  <!-- interface-css-provider-path style.css -->
+  <!-- interface-license-type mit -->
+  <!-- interface-name DemonEditor -->
+  <!-- interface-description Enigma2 channel and satellite list editor. -->
+  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
+  <!-- interface-authors Dmitriy Yefremov -->
+  <object class="GtkFrame" id="log_frame">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="label_xalign">0.49000000953674316</property>
+    <property name="shadow_type">in</property>
+    <child>
+      <object class="GtkBox" id="main_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">5</property>
+        <property name="margin_right">5</property>
+        <property name="margin_bottom">5</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkBox" id="header_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_bottom">2</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkButton" id="clear_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Clear</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <signal name="clicked" handler="on_clear" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="clear_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-clear</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolled_window">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTextView" id="log_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="left_margin">5</property>
+                <property name="right_margin">5</property>
+                <property name="top_margin">5</property>
+                <property name="bottom_margin">5</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="label">
+      <object class="GtkLabel" id="log_label">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Logs</property>
+      </object>
+    </child>
+  </object>
+</interface>
--- a/app/ui/logs.py
+++ b/app/ui/logs.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2021 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
+import logging
+
+from gi.repository import GLib
+
+from app.commons import LOGGER_NAME
+from app.ui.dialogs import get_builder
+from app.ui.main_helper import append_text_to_tview
+from app.ui.uicommons import Gtk, UI_RESOURCES_PATH
+
+
+class LogsClient(Gtk.Box):
+    """ Logger GUI client. """
+
+    class LogHandler(logging.Handler):
+        def __init__(self, view):
+            logging.Handler.__init__(self)
+            self._view = view
+
+        def handle(self, rec):
+            GLib.idle_add(append_text_to_tview, f"{rec.msg}\n", self._view)
+
+    def __init__(self, app, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._app = app
+
+        handlers = {"on_clear": self.on_clear}
+        builder = get_builder(UI_RESOURCES_PATH + "logs.glade", handlers)
+
+        self._log_view = builder.get_object("log_view")
+        self.pack_start(builder.get_object("log_frame"), True, True, 0)
+
+        logger = logging.getLogger(LOGGER_NAME)
+        logger.addHandler(LogsClient.LogHandler(self._log_view))
+
+        self.show()
+
+    def on_clear(self, button):
+        GLib.idle_add(self._log_view.get_buffer().set_text, "")
--- a/app/ui/mac_style.css
+++ b/app/ui/mac_style.css
@@ -1,5 +1,6 @@
 * {
-  -GtkDialog-action-area-border: 5em;
+  -GtkDialog-action-area-border: 6em;
+  -GtkDialog-button-spacing: 12;
 }

 entry {
@@ -36,3 +37,7 @@ switch slider {
  min-height: 1.5em;
  min-width: 1.5em;
 }
+
+.dialog-action-area button {
+  margin-bottom: 0.6em;
+}
--- a/app/ui/main.glade
+++ b/app/ui/main.glade
--- a/app/ui/main.py
+++ b/app/ui/main.py
--- a/app/ui/main_helper.py
+++ b/app/ui/main_helper.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,14 @@
 #


-""" Helper module for the ui. """
+""" Helper module for the GUI. """
+
+__all__ = ("insert_marker", "move_items", "rename", "ViewTarget", "set_flags", "locate_in_services",
+           "scroll_to", "get_base_model", "copy_picon_reference", "assign_picons", "remove_picon",
+           "is_only_one_item_selected", "gen_bouquets", "BqGenType", "get_selection",
+           "get_model_data", "remove_all_unused_picons", "get_picon_pixbuf", "get_base_itrs", "get_iptv_url",
+           "update_entry_data", "append_text_to_tview", "on_popup_menu")
+
 import os
 import shutil
 from collections import defaultdict
@@ -37,8 +44,8 @@ from gi.repository import GdkPixbuf, GLib
 from app.eparser import Service
 from app.eparser.ecommons import Flag, BouquetService, Bouquet, BqType
 from app.eparser.enigma.bouquets import BqServiceType, to_bouquet_id
-from app.settings import SettingsType, SEP, IS_WIN
-from .dialogs import show_dialog, DialogType, get_chooser_dialog
+from app.settings import SettingsType, SEP, IS_WIN, IS_DARWIN, IS_LINUX
+from .dialogs import show_dialog, DialogType, get_message
 from .uicommons import ViewTarget, BqGenType, Gtk, Gdk, HIDE_ICON, LOCKED_ICON, KeyboardKey, Column


@@ -57,7 +64,7 @@ def insert_marker(view, bouquets, selected_bouquet, services, parent_window, m_t
            show_dialog(DialogType.ERROR, parent_window, "The text of marker is empty, please try again!")
            return

-        fav_id = "1:64:0:0:0:0:0:0:0:0::{}\n#DESCRIPTION {}\n".format(response, response)
+        fav_id = f"1:64:0:0:0:0:0:0:0:0::{response}\n#DESCRIPTION {response}\n"
        text = response

    s_type = m_type.name
@@ -103,8 +110,8 @@ def move_items(key, view: Gtk.TreeView):
            children_num = model.iter_n_children(parent_itr)
            if key in (KeyboardKey.PAGE_DOWN, KeyboardKey.END, KeyboardKey.END_KP, KeyboardKey.PAGE_DOWN_KP):
                children_num -= 1
-            min_path = Gtk.TreePath.new_from_string("{}:{}".format(parent_index, 0))
-            max_path = Gtk.TreePath.new_from_string("{}:{}".format(parent_index, children_num))
+            min_path = Gtk.TreePath.new_from_string(f"{parent_index}:{0}")
+            max_path = Gtk.TreePath.new_from_string(f"{parent_index}:{children_num}")
            is_tree_store = True

    if key is KeyboardKey.UP:
@@ -274,7 +281,7 @@ def set_lock(blacklist, services, model, paths, target, services_model):
    locked = has_locked_hide(model, paths, col_num)

    ids = []
-    skip_type = {BqServiceType.MARKER.name, BqServiceType.SPACE.name}
+    skip_type = {BqServiceType.MARKER.name, BqServiceType.SPACE.name, BqServiceType.ALT.name}

    for path in paths:
        itr = model.get_iter(path)
@@ -379,26 +386,36 @@ def scroll_to(index, view, paths=None):
    selection.select_path(index)


-# ***************** Picons *********************#
+# ***************** Picons ********************* #

-def update_picons_data(path, picons, size=32):
-    if not os.path.exists(path):
-        return
+def get_picon_dialog(transient, title, button_text, multiple=True):
+    """ Returns a copy dialog with a preview of images [picons -> *.png]. """
+    dialog = Gtk.FileChooserNative.new(title, transient, Gtk.FileChooserAction.OPEN, button_text)
+    dialog.set_select_multiple(multiple)
+    dialog.set_modal(True)
+    # Filter.
+    file_filter = Gtk.FileFilter()
+    file_filter.set_name("*.png")
+    file_filter.add_pattern("*.png")
+    file_filter.add_mime_type("image/png") if IS_DARWIN else None
+    dialog.add_filter(file_filter)

-    for file in os.listdir(path):
-        pf = get_picon_pixbuf(path + file, size)
-        if pf:
-            picons[file] = pf
+    if IS_LINUX:
+        preview_image = Gtk.Image(margin_right=10)
+        dialog.set_preview_widget(preview_image)

+        def update_preview_widget(dlg):
+            path = dialog.get_preview_filename()
+            if not path:
+                return

-def append_picons(picons, model):
-    def append_picons_data(pcs, mod):
-        for r in mod:
-            mod.set_value(mod.get_iter(r.path), Column.SRV_PICON, pcs.get(r[Column.SRV_PICON_ID], None))
-            yield True
+            pix = get_picon_pixbuf(path, 220)
+            preview_image.set_from_pixbuf(pix)
+            dlg.set_preview_widget_active(bool(pix))

-    app = append_picons_data(picons, model)
-    GLib.idle_add(lambda: next(app, False), priority=GLib.PRIORITY_LOW)
+        dialog.connect("update-preview", update_preview_widget)
+
+    return dialog


 def assign_picons(target, srv_view, fav_view, transient, picons, settings, services, src_path=None, dst_path=None):
@@ -408,10 +425,12 @@ def assign_picons(target, srv_view, fav_view, transient, picons, settings, servi
    picons_files = []

    if not src_path:
-        src_path = get_chooser_dialog(transient, settings, "*.png files", ("*.png",))
-        if src_path == Gtk.ResponseType.CANCEL:
+        dialog = get_picon_dialog(transient, get_message("Picon selection"), get_message("Open"), False)
+        if dialog.run() in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT) or not dialog.get_filenames():
            return picons_files

+        src_path = dialog.get_filenames()[0]
+
    if IS_WIN:
        src_path = src_path.lstrip("/")
        dst_path = dst_path.lstrip("/") if dst_path else dst_path
@@ -443,7 +462,7 @@ def assign_picons(target, srv_view, fav_view, transient, picons, settings, servi
                pass  # NOP
            else:
                picons_files.append(picon_file)
-                picon = get_picon_pixbuf(picon_file)
+                picon = get_picon_pixbuf(picon_file, settings.list_picon_size)
                picons[picon_id] = picon
                model.set_value(itr, p_pos, picon)
                if target is ViewTarget.SERVICES:
--- a/app/ui/picons.glade
+++ b/app/ui/picons.glade
@@ -3,7 +3,7 @@

 The MIT License (MIT)

-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2022 Dmitriy Yefremov

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -33,6 +33,26 @@ Author: Dmitriy Yefremov
  <!-- interface-name DemonEditor -->
  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
  <!-- interface-authors Dmitriy Yefremov -->
+  <object class="GtkMenu" id="add_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="open_menu_item">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Open folder</property>
+        <signal name="activate" handler="on_add" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="extract_menu_item">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Extract...</property>
+        <signal name="activate" handler="on_extract" swapped="no"/>
+      </object>
+    </child>
+  </object>
  <object class="GtkListStore" id="picons_dest_list_store">
    <columns>
      <!-- column-name picon -->
@@ -176,11 +196,6 @@ Author: Dmitriy Yefremov
      <column type="gboolean"/>
    </columns>
  </object>
-  <object class="GtkImage" id="remove_selection_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-undo</property>
-  </object>
  <object class="GtkMenu" id="providers_popup_menu">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
@@ -199,12 +214,16 @@ Author: Dmitriy Yefremov
        <property name="label" translatable="yes">Remove selection</property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
-        <property name="image">remove_selection_image</property>
        <property name="use_stock">False</property>
        <signal name="activate" handler="on_unselect_all" object="providers_view" swapped="no"/>
      </object>
    </child>
  </object>
+  <object class="GtkImage" id="remove_selection_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">edit-undo</property>
+  </object>
  <object class="GtkListStore" id="satellites_list_store">
    <columns>
      <!-- column-name satellite -->
@@ -215,7 +234,7 @@ Author: Dmitriy Yefremov
      <column type="gchararray"/>
    </columns>
  </object>
-  <object class="GtkFrame" id="picon_manager_frame">
+  <object class="GtkFrame" id="main_frame">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="label_xalign">0.49000000953674316</property>
@@ -227,7 +246,6 @@ Author: Dmitriy Yefremov
        <property name="margin_left">5</property>
        <property name="margin_right">5</property>
        <property name="margin_top">2</property>
-        <property name="margin_bottom">5</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkBox" id="header_box">
@@ -249,7 +267,7 @@ Author: Dmitriy Yefremov
                  <object class="GtkImage" id="convert_button_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="icon_name">edit-redo-symbolic</property>
+                    <property name="icon_name">object-rotate-right-symbolic</property>
                  </object>
                </child>
              </object>
@@ -270,7 +288,7 @@ Author: Dmitriy Yefremov
                  <object class="GtkImage" id="cancel_button_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-cancel</property>
+                    <property name="stock">gtk-close</property>
                  </object>
                </child>
              </object>
@@ -285,6 +303,29 @@ Author: Dmitriy Yefremov
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkMenuButton" id="add_menu_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Add picons</property>
+                    <property name="popup">add_menu</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">list-add</property>
+                        <property name="icon_size">0</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
                <child>
                  <object class="GtkButton" id="receive_button">
                    <property name="sensitive">False</property>
@@ -385,56 +426,84 @@ Author: Dmitriy Yefremov
              <object class="GtkButtonBox" id="header_button_box">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
+                <property name="halign">center</property>
                <property name="layout_style">expand</property>
                <child>
                  <object class="GtkRadioButton" id="manager_button">
-                    <property name="label" translatable="yes">Explorer</property>
+                    <property name="width_request">50</property>
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Explorer</property>
                    <property name="active">True</property>
                    <property name="draw_indicator">False</property>
                    <property name="group">converter_button</property>
                    <signal name="toggled" handler="on_tool_switched" swapped="no"/>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">folder-open-symbolic</property>
+                      </object>
+                    </child>
                  </object>
                  <packing>
                    <property name="expand">True</property>
                    <property name="fill">True</property>
                    <property name="position">0</property>
+                    <property name="non_homogeneous">True</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkRadioButton" id="downloader_button">
-                    <property name="label" translatable="yes">Downloader</property>
+                    <property name="width_request">50</property>
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Downloader</property>
                    <property name="active">True</property>
                    <property name="draw_indicator">False</property>
                    <property name="group">manager_button</property>
                    <signal name="toggled" handler="on_tool_switched" swapped="no"/>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">insert-image-symbolic</property>
+                      </object>
+                    </child>
                  </object>
                  <packing>
                    <property name="expand">True</property>
                    <property name="fill">True</property>
                    <property name="position">1</property>
+                    <property name="non_homogeneous">True</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkRadioButton" id="converter_button">
-                    <property name="label" translatable="yes">Converter</property>
+                    <property name="width_request">50</property>
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Converter</property>
                    <property name="active">True</property>
                    <property name="draw_indicator">False</property>
                    <property name="group">manager_button</property>
                    <signal name="toggled" handler="on_tool_switched" swapped="no"/>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">object-rotate-right-symbolic</property>
+                      </object>
+                    </child>
                  </object>
                  <packing>
                    <property name="expand">True</property>
                    <property name="fill">True</property>
                    <property name="position">2</property>
+                    <property name="non_homogeneous">True</property>
                  </packing>
                </child>
              </object>
@@ -521,11 +590,11 @@ Author: Dmitriy Yefremov
          <object class="GtkStack" id="stack">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
-            <property name="margin_bottom">5</property>
            <child>
              <object class="GtkBox" id="explorer_box">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
+                <property name="margin_top">3</property>
                <property name="orientation">vertical</property>
                <property name="spacing">5</property>
                <child>
@@ -540,6 +609,7 @@ Author: Dmitriy Yefremov
                        <property name="primary_icon_name">edit-find-replace-symbolic</property>
                        <property name="primary_icon_activatable">False</property>
                        <property name="primary_icon_sensitive">False</property>
+                        <property name="placeholder_text" translatable="yes">Filter: N1|N2|N3, etc..</property>
                        <signal name="search-changed" handler="on_picons_filter_changed" swapped="no"/>
                      </object>
                      <packing>
@@ -549,10 +619,10 @@ Author: Dmitriy Yefremov
                      </packing>
                    </child>
                    <child>
-                      <object class="GtkSwitch" id="auto_filer_switch">
+                      <object class="GtkSwitch" id="auto_filter_switch">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Automatically set the name selected in the favorites list. </property>
+                        <property name="tooltip_text" translatable="yes">Automatically set the name selected in the favorites list.</property>
                        <property name="valign">center</property>
                        <property name="margin_right">5</property>
                      </object>
@@ -564,7 +634,7 @@ Author: Dmitriy Yefremov
                      </packing>
                    </child>
                    <child>
-                      <object class="GtkLabel" id="auto_filer_label">
+                      <object class="GtkLabel" id="auto_filter_label">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="label" translatable="yes">Auto</property>
@@ -580,7 +650,7 @@ Author: Dmitriy Yefremov
                  <packing>
                    <property name="expand">False</property>
                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                  </packing>
                </child>
                <child>
@@ -606,7 +676,7 @@ Author: Dmitriy Yefremov
                                <property name="can_focus">False</property>
                                <child>
                                  <object class="GtkCheckButton" id="src_filter_button">
-                                    <property name="label" translatable="yes">Filer</property>
+                                    <property name="label" translatable="yes">Filter</property>
                                    <property name="can_focus">False</property>
                                    <property name="focus_on_click">False</property>
                                    <property name="receives_default">False</property>
@@ -636,8 +706,9 @@ Author: Dmitriy Yefremov
                                  <object class="GtkTreeView" id="picons_src_view">
                                    <property name="visible">True</property>
                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Drag the services to the desired picon or picon to the list of selected services. </property>
+                                    <property name="tooltip_text" translatable="yes">Drag the services to the desired picon or picon to the list of selected services.</property>
                                    <property name="model">picons_src_sort_model</property>
+                                    <property name="fixed_height_mode">True</property>
                                    <property name="enable_grid_lines">horizontal</property>
                                    <property name="tooltip_column">0</property>
                                    <property name="activate_on_single_click">True</property>
@@ -653,11 +724,14 @@ Author: Dmitriy Yefremov
                                    </child>
                                    <child>
                                      <object class="GtkTreeViewColumn" id="src_picon_column">
+                                        <property name="sizing">fixed</property>
                                        <property name="min_width">150</property>
                                        <property name="title" translatable="yes">Picon</property>
                                        <property name="alignment">0.49000000953674316</property>
                                        <child>
-                                          <object class="GtkCellRendererPixbuf" id="picons_src_renderer"/>
+                                          <object class="GtkCellRendererPixbuf" id="picons_src_renderer">
+                                            <property name="ypad">5</property>
+                                          </object>
                                          <attributes>
                                            <attribute name="pixbuf">0</attribute>
                                          </attributes>
@@ -666,6 +740,7 @@ Author: Dmitriy Yefremov
                                    </child>
                                    <child>
                                      <object class="GtkTreeViewColumn" id="src_title_column">
+                                        <property name="sizing">fixed</property>
                                        <property name="title" translatable="yes">Name</property>
                                        <property name="alignment">0.49000000953674316</property>
                                        <child>
@@ -681,6 +756,7 @@ Author: Dmitriy Yefremov
                                    <child>
                                      <object class="GtkTreeViewColumn" id="src_path_column">
                                        <property name="visible">False</property>
+                                        <property name="sizing">fixed</property>
                                        <property name="title" translatable="yes">column</property>
                                        <child>
                                          <object class="GtkCellRendererText" id="path_src_renderer"/>
@@ -725,7 +801,7 @@ Author: Dmitriy Yefremov
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="orientation">vertical</property>
-                            <property name="spacing">5</property>
+                            <property name="spacing">2</property>
                            <child>
                              <object class="GtkBox" id="dst_title_box">
                                <property name="visible">True</property>
@@ -766,6 +842,7 @@ Author: Dmitriy Yefremov
                                    <property name="can_focus">True</property>
                                    <property name="tooltip_text" translatable="yes">Drag the services to the desired picon or picon to the list of selected services. </property>
                                    <property name="model">picons_dst_sort_model</property>
+                                    <property name="fixed_height_mode">True</property>
                                    <property name="enable_grid_lines">horizontal</property>
                                    <property name="tooltip_column">0</property>
                                    <property name="activate_on_single_click">True</property>
@@ -782,11 +859,14 @@ Author: Dmitriy Yefremov
                                    </child>
                                    <child>
                                      <object class="GtkTreeViewColumn" id="dest_picon_column">
+                                        <property name="sizing">fixed</property>
                                        <property name="min_width">150</property>
                                        <property name="title" translatable="yes">Picon</property>
                                        <property name="alignment">0.49000000953674316</property>
                                        <child>
-                                          <object class="GtkCellRendererPixbuf" id="picons_dest_renderer"/>
+                                          <object class="GtkCellRendererPixbuf" id="picons_dest_renderer">
+                                            <property name="ypad">5</property>
+                                          </object>
                                          <attributes>
                                            <attribute name="pixbuf">0</attribute>
                                          </attributes>
@@ -795,6 +875,7 @@ Author: Dmitriy Yefremov
                                    </child>
                                    <child>
                                      <object class="GtkTreeViewColumn" id="dest_title_column">
+                                        <property name="sizing">fixed</property>
                                        <property name="title" translatable="yes">Name</property>
                                        <property name="expand">True</property>
                                        <property name="alignment">0.49000000953674316</property>
@@ -811,6 +892,7 @@ Author: Dmitriy Yefremov
                                    <child>
                                      <object class="GtkTreeViewColumn" id="dest_path_column">
                                        <property name="visible">False</property>
+                                        <property name="sizing">fixed</property>
                                        <property name="title" translatable="yes">column</property>
                                        <child>
                                          <object class="GtkCellRendererText" id="path_dest_renderer"/>
@@ -826,7 +908,7 @@ Author: Dmitriy Yefremov
                              <packing>
                                <property name="expand">True</property>
                                <property name="fill">True</property>
-                                <property name="position">3</property>
+                                <property name="position">1</property>
                              </packing>
                            </child>
                          </object>
@@ -847,71 +929,48 @@ Author: Dmitriy Yefremov
                  <packing>
                    <property name="expand">True</property>
                    <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                  </packing>
                </child>
                <child>
-                  <object class="GtkFrame" id="explorer_info_bar_frame">
+                  <object class="GtkFrame" id="explorer_info_box_frame">
                    <property name="can_focus">False</property>
                    <property name="label_xalign">0</property>
                    <property name="shadow_type">in</property>
                    <child>
-                      <object class="GtkInfoBar" id="explorer_info_bar">
+                      <object class="GtkBox" id="info_box">
+                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="message_type">other</property>
-                        <child internal-child="action_area">
-                          <object class="GtkButtonBox">
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkImage" id="picon_info_image">
+                            <property name="width_request">128</property>
+                            <property name="height_request">72</property>
+                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <property name="layout_style">end</property>
+                            <property name="stock">gtk-missing-image</property>
+                            <property name="icon_size">6</property>
+                            <signal name="drag-data-received" handler="on_picon_info_image_drag_data_received" swapped="no"/>
                          </object>
                          <packing>
                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child internal-child="content_area">
-                          <object class="GtkBox" id="explorer_info_bar_box">
-                            <property name="can_focus">False</property>
-                            <property name="spacing">10</property>
-                            <child>
-                              <object class="GtkImage" id="picon_info_image">
-                                <property name="width_request">128</property>
-                                <property name="height_request">72</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="stock">gtk-missing-image</property>
-                                <property name="icon_size">6</property>
-                                <signal name="drag-data-received" handler="on_picon_info_image_drag_data_received" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="picon_info_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="ellipsize">end</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
+                            <property name="fill">True</property>
                            <property name="position">0</property>
                          </packing>
                        </child>
                        <child>
-                          <placeholder/>
+                          <object class="GtkLabel" id="picon_info_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="ellipsize">end</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
                        </child>
                      </object>
                    </child>
@@ -922,7 +981,7 @@ Author: Dmitriy Yefremov
                  <packing>
                    <property name="expand">False</property>
                    <property name="fill">True</property>
-                    <property name="position">6</property>
+                    <property name="position">2</property>
                  </packing>
                </child>
              </object>
@@ -1220,7 +1279,6 @@ Author: Dmitriy Yefremov
                                    <property name="height_request">150</property>
                                    <property name="visible">True</property>
                                    <property name="can_focus">True</property>
-                                    <property name="margin_bottom">2</property>
                                    <property name="shadow_type">out</property>
                                    <child>
                                      <object class="GtkTreeView" id="providers_view">
@@ -1347,33 +1405,6 @@ Author: Dmitriy Yefremov
                                    <property name="position">2</property>
                                  </packing>
                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="picons_dir_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Current picons path:</property>
-                                    <property name="xalign">0.019999999552965164</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="picons_dir_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="secondary_icon_name">folder-open</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <signal name="icon-press" handler="on_picons_dir_open" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">5</property>
-                                  </packing>
-                                </child>
                              </object>
                              <packing>
                                <property name="resize">True</property>
@@ -1403,7 +1434,7 @@ Author: Dmitriy Yefremov
                  <object class="GtkGrid" id="format_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="column_spacing">2</property>
+                    <property name="column_spacing">5</property>
                    <property name="column_homogeneous">True</property>
                    <child>
                      <object class="GtkFrame">
@@ -1415,6 +1446,7 @@ Author: Dmitriy Yefremov
                          <object class="GtkBox" id="name_format_box">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
+                            <property name="margin_bottom">5</property>
                            <property name="orientation">vertical</property>
                            <child>
                              <object class="GtkBox" id="box2">
@@ -1489,6 +1521,7 @@ Author: Dmitriy Yefremov
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="halign">center</property>
+                                <property name="margin_bottom">5</property>
                                <child>
                                  <object class="GtkRadioButton" id="resize_no_radio_button">
                                    <property name="label" translatable="yes">No(default)</property>
@@ -1696,41 +1729,162 @@ Author: Dmitriy Yefremov
          </packing>
        </child>
        <child>
-          <object class="GtkExpander" id="expander">
-            <property name="visible">True</property>
+          <object class="GtkFrame" id="info_bar_frame">
            <property name="can_focus">False</property>
+            <property name="margin_top">5</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">in</property>
            <child>
-              <object class="GtkScrolledWindow" id="scrolled_window">
-                <property name="height_request">150</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
-                <property name="min_content_width">240</property>
-                <child>
-                  <object class="GtkTextView" id="text_view">
+              <object class="GtkInfoBar" id="info_bar">
+                <property name="can_focus">False</property>
+                <property name="baseline_position">bottom</property>
+                <property name="message_type">other</property>
+                <property name="show_close_button">True</property>
+                <child internal-child="action_area">
+                  <object class="GtkButtonBox">
+                    <property name="can_focus">False</property>
+                    <property name="layout_style">end</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child internal-child="content_area">
+                  <object class="GtkBox" id="info_bar_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="editable">False</property>
-                    <property name="wrap_mode">word-char</property>
-                    <property name="left_margin">5</property>
-                    <property name="right_margin">5</property>
-                    <property name="overwrite">True</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="info_scrolled_window">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTextView" id="info_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="editable">False</property>
+                            <property name="left_margin">5</property>
+                            <property name="right_margin">5</property>
+                            <property name="top_margin">2</property>
+                            <property name="bottom_margin">2</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
                </child>
              </object>
            </child>
-            <child type="label">
-              <object class="GtkLabel" id="expander_label">
+            <child type="label_item">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="bottom_bar_box">
+            <property name="height_request">24</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_top">2</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkImage" id="count_image">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Extra:</property>
+                <property name="icon_name">document-properties</property>
              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="dst_count_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">0</property>
+                <property name="width_chars">4</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="bottom_bar_path_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Current picons path</property>
+                <property name="icon_name">document-open-symbolic</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="current_path_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Current picons path</property>
+                <property name="label" translatable="yes">/</property>
+                <property name="ellipsize">end</property>
+                <property name="xalign">0</property>
+                <attributes>
+                  <attribute name="size" value="8000"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
            </child>
          </object>
          <packing>
            <property name="expand">False</property>
            <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">4</property>
          </packing>
        </child>
      </object>
--- a/app/ui/picons.py
+++ b/app/ui/picons.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -35,16 +35,16 @@ from urllib.parse import urlparse, unquote

 from gi.repository import GLib, GdkPixbuf, Gio

-from app.commons import run_idle, run_task, run_with_delay
+from app.commons import run_idle, run_task, run_with_delay, log
 from app.connections import upload_data, DownloadType, download_data, remove_picons
-from app.settings import SettingsType, Settings, SEP
+from app.settings import SettingsType, Settings, SEP, IS_DARWIN
 from app.tools.picons import (PiconsParser, parse_providers, Provider, convert_to, download_picon, PiconsCzDownloader,
                              PiconsError)
 from app.tools.satellites import SatellitesParser, SatelliteSource
-from .dialogs import show_dialog, DialogType, get_message, get_builder
+from .dialogs import show_dialog, DialogType, get_message, get_builder, get_chooser_dialog
 from .main_helper import (update_entry_data, append_text_to_tview, scroll_to, on_popup_menu, get_base_model, set_picon,
-                          get_picon_pixbuf)
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TV_ICON, Column, KeyboardKey, Page
+                          get_picon_pixbuf, get_picon_dialog)
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TV_ICON, Column, KeyboardKey, Page, ViewTarget


 class PiconManager(Gtk.Box):
@@ -58,6 +58,8 @@ class PiconManager(Gtk.Box):
        self._app = app
        self._app.connect("page-changed", self.update_picons_dest)
        self._app.connect("filter-toggled", self.on_app_filter_toggled)
+        self._app.connect("profile-changed", self.on_profile_changed)
+        self._app.connect("picon-assign", self.on_picon_assign)
        self._app.fav_view.connect("row-activated", self.on_fav_changed)
        self._picon_ids = picon_ids
        self._sat_positions = sat_positions
@@ -78,6 +80,8 @@ class PiconManager(Gtk.Box):
        self._picon_cz_downloader = None

        handlers = {"on_tool_switched": self.on_tool_switched,
+                    "on_add": self.on_add,
+                    "on_extract": self.on_extract,
                    "on_receive": self.on_receive,
                    "on_cancel": self.on_cancel,
                    "on_send": self.on_send,
@@ -127,15 +131,10 @@ class PiconManager(Gtk.Box):
        self._picons_src_filter_model.set_visible_func(self.picons_src_filter_function)
        self._picons_dst_filter_model = builder.get_object("picons_dst_filter_model")
        self._picons_dst_filter_model.set_visible_func(self.picons_dst_filter_function)
-        self._expander = builder.get_object("expander")
-        self._text_view = builder.get_object("text_view")
        self._src_filter_button = builder.get_object("src_filter_button")
        self._dst_filter_button = builder.get_object("dst_filter_button")
        self._picons_filter_entry = builder.get_object("picons_filter_entry")
-        self._picons_dir_entry = builder.get_object("picons_dir_entry")
-        self._info_check_button = builder.get_object("info_check_button")
-        self._picon_info_image = builder.get_object("picon_info_image")
-        self._picon_info_label = builder.get_object("picon_info_label")
+        self._current_path_label = builder.get_object("current_path_label")
        self._download_source_button = builder.get_object("download_source_button")
        self._receive_button = builder.get_object("receive_button")
        self._convert_button = builder.get_object("convert_button")
@@ -163,9 +162,18 @@ class PiconManager(Gtk.Box):
        self._cancel_button.bind_property("visible", self._header_download_box, "visible", 4)
        self._convert_button.bind_property("visible", self._header_download_box, "visible", 4)
        self._download_source_button.bind_property("visible", self._receive_button, "visible")
+        # Info.
+        self._dst_count_label = builder.get_object("dst_count_label")
+        self._info_check_button = builder.get_object("info_check_button")
+        self._picon_info_image = builder.get_object("picon_info_image")
+        self._picon_info_label = builder.get_object("picon_info_label")
+        self._info_view = builder.get_object("info_view")
+        self._info_bar = builder.get_object("info_bar")
+        self._info_bar.bind_property("visible", builder.get_object("info_bar_frame"), "visible")
+        self._info_bar.connect("response", lambda b, r: b.set_visible(False))
        # Filter.
        self._filter_bar = builder.get_object("filter_bar")
-        self._auto_filer_switch = builder.get_object("auto_filer_switch")
+        self._auto_filter_switch = builder.get_object("auto_filter_switch")
        self._filter_button = builder.get_object("filter_button")
        self._filter_button.bind_property("active", self._filter_bar, "visible")
        self._filter_button.bind_property("active", self._src_filter_button, "visible")
@@ -178,9 +186,7 @@ class PiconManager(Gtk.Box):
        self._src_button.bind_property("active", builder.get_object("explorer_dst_label"), "visible")
        self._src_button.bind_property("active", builder.get_object("src_picon_box_frame"), "visible")
        self._filter_button.bind_property("visible", self._src_button, "visible")
-        explorer_info_bar = builder.get_object("explorer_info_bar")
-        explorer_info_bar.bind_property("visible", builder.get_object("explorer_info_bar_frame"), "visible")
-        self._info_check_button.bind_property("active", explorer_info_bar, "visible")
+        self._info_check_button.bind_property("active", builder.get_object("explorer_info_box_frame"), "visible")
        # Header buttons. -> Used instead stack switcher.
        self._manager_button = builder.get_object("manager_button")
        self._manager_button.bind_property("active", builder.get_object("manager_label"), "visible")
@@ -188,14 +194,20 @@ class PiconManager(Gtk.Box):
        self._downloader_button.bind_property("active", builder.get_object("downloader_label"), "visible")
        self._converter_button = builder.get_object("converter_button")
        self._converter_button.bind_property("active", builder.get_object("converter_label"), "visible")
+        self._manager_button.bind_property("active", builder.get_object("add_menu_button"), "visible")
        # Init drag-and-drop
        self.init_drag_and_drop()
+        # Rendering.
+        column = builder.get_object("dest_picon_column")
+        column.set_cell_data_func(builder.get_object("picons_dest_renderer"), self.picon_data_func)
+        column = builder.get_object("src_picon_column")
+        column.set_cell_data_func(builder.get_object("picons_src_renderer"), self.picon_data_func)
        # Settings
        self._settings = settings
        self._s_type = settings.setting_type
-        self._picons_dir_entry.set_text(self._settings.profile_picons_path)
+        self._current_path_label.set_text(self._settings.profile_picons_path)

-        self.pack_start(builder.get_object("picon_manager_frame"), True, True, 0)
+        self.pack_start(builder.get_object("main_frame"), True, True, 0)
        self.show()

        if not len(self._picon_ids) and self._s_type is SettingsType.ENIGMA_2:
@@ -240,6 +252,23 @@ class PiconManager(Gtk.Box):
            self._services = {s.picon_id: s for s in self._app.current_services.values() if s.picon_id}
            self.update_picons_data(self._picons_dest_view)

+    def on_profile_changed(self, app, data):
+        self._current_path_label.set_text(self._settings.profile_picons_path)
+        self.update_picons_dest(app, self._app.page)
+
+    def on_picon_assign(self, app, target):
+        if target is ViewTarget.SERVICES:
+            model, paths = app.services_view.get_selection().get_selected_rows()
+            ids = {model[p][Column.SRV_FAV_ID] for p in paths}
+        else:
+            model, paths = app.fav_view.get_selection().get_selected_rows()
+            ids = {model[p][Column.FAV_ID] for p in paths}
+
+        self._filter_button.set_active(True)
+        self._dst_filter_button.set_active(True)
+        self._picons_filter_entry.set_text(
+            "|".join(s.service for f, s in self._app.current_services.items() if f in ids))
+
    def update_picons_data(self, view, path=None):
        if view is self._picons_dest_view:
            self.update_picon_info()
@@ -250,27 +279,30 @@ class PiconManager(Gtk.Box):
    def update_picons(self, path, view):
        p_model = view.get_model()
        model = get_base_model(p_model)
-        factor = self._app.DEL_FACTOR
+        factor = self._app.DEL_FACTOR * 2

        for index, itr in enumerate([row.iter for row in model]):
            model.remove(itr)
            if index % factor == 0:
                yield True

-        if not os.path.isdir(path):
-            return
-
-        for file in os.listdir(path):
+        self._dst_count_label.set_text("0")
+        os.makedirs(os.path.dirname(path), exist_ok=True)
+        for index, file in enumerate(os.listdir(path)):
            if self._terminate:
                return

-            p_path = "{}{}{}".format(path, SEP, file)
-            p = self.get_pixbuf_at_scale(p_path, 72, 48, True)
-            if p:
-                yield model.append((p, file, p_path))
+            model.append((None, file, f"{path}{SEP}{file}"))
+            if index % factor == 0:
+                self._dst_count_label.set_text(str(len(model)))
+                yield True

+        self._dst_count_label.set_text(str(len(model)))
        yield True

+    def picon_data_func(self, column, renderer, model, itr, data):
+        renderer.set_property("pixbuf", self.get_pixbuf_at_scale(model.get_value(itr, 2), 72, 48, True))
+
    def update_picons_from_file(self, view, uri):
        """ Adds picons in the view on dragging from file system. """
        path = Path(urlparse(unquote(uri)).path.strip())
@@ -323,8 +355,11 @@ class PiconManager(Gtk.Box):
    def on_picons_view_drag_data_get(self, view, drag_context, data, info, time):
        model, path = view.get_selection().get_selected_rows()
        if path:
-            data.set_uris([Path(model[path][-1]).as_uri(),
-                           Path(self._settings.profile_picons_path).as_uri()])
+            dest_uri = Path(self._settings.profile_picons_path).as_uri()
+            if IS_DARWIN:
+                data.set_uris([f"{Path(model[path][-1]).as_uri()}{self._app.DRAG_SEP}{dest_uri}"])
+            else:
+                data.set_uris([Path(model[path][-1]).as_uri(), dest_uri])

    def on_picons_view_drag_drop(self, view, drag_context, x, y, time):
        view.stop_emission_by_name("drag_drop")
@@ -341,7 +376,7 @@ class PiconManager(Gtk.Box):
            self.update_picons_from_file(view, txt)
            return

-        itr_str, sep, src = txt.partition("::::")
+        itr_str, sep, src = txt.partition(self._app.DRAG_SEP)
        if src == self._app.BQ_MODEL_NAME:
            return

@@ -359,7 +394,7 @@ class PiconManager(Gtk.Box):

        t_mod = target_view.get_model()
        dest_path = self._settings.profile_picons_path
-        self.update_picons_dest_view(self._app.on_assign_picon(target_view, model[path][-1], dest_path))
+        self.update_picons_dest_view(self._app.on_assign_picon_file(target_view, model[path][-1], dest_path))
        self.show_assign_info([t_mod.get_value(t_mod.get_iter_from_string(itr), c_id) for itr in itr_str.split(",")])

    @run_idle
@@ -380,15 +415,17 @@ class PiconManager(Gtk.Box):
                        itr = dest_model.append((p, p_name, p_path))
                    scroll_to(dest_model.get_path(itr), self._picons_dest_view)

+            self._dst_count_label.set_text(str(len(dest_model)))
+
    @run_idle
    def show_assign_info(self, fav_ids):
-        self._expander.set_expanded(True)
-        self._text_view.get_buffer().set_text("")
+        self._info_bar.show()
+        self._info_view.get_buffer().set_text("")
        for i in fav_ids:
            srv = self._app.current_services.get(i, None)
            if srv:
                info = self._app.get_hint_for_srv_list(srv)
-                self.append_output("Picon assignment for the service:\n{}\n{}\n".format(info, " * " * 30))
+                self.append_output(f"Picon assignment for the service:\n{info}\n{' * ' * 30}\n")

    def on_picons_view_drag_end(self, view, drag_context):
        self.update_picons_dest_view(self._app.picons_buffer)
@@ -402,7 +439,7 @@ class PiconManager(Gtk.Box):
        if len(uris) == 2:
            name, fav_id = self._current_picon_info
            src = urlparse(unquote(uris[0])).path
-            dst = "{}{}{}".format(urlparse(unquote(uris[1])).path, SEP, name)
+            dst = f"{urlparse(unquote(uris[1])).path}{SEP}{name}"
            if src != dst:
                shutil.copy(src, dst)
                for row in get_base_model(self._picons_dest_view.get_model()):
@@ -439,6 +476,51 @@ class PiconManager(Gtk.Box):
        yield set_picon(fav_id, get_base_model(self._app.services_view.get_model()), picon, Column.SRV_FAV_ID, p_pos)
        yield set_picon(fav_id, get_base_model(self._app.fav_view.get_model()), picon, Column.FAV_ID, p_pos)

+    # ************************ Add/Extract ******************************** #
+
+    def on_add(self, item):
+        """ Adds (copies) picons from an external folder to the profile picons folder. """
+        dialog = get_picon_dialog(self._app_window, get_message("Add picons"), get_message("Add"))
+        if dialog.run() in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
+            return
+
+        self.copy_picons_file(dialog.get_filenames())
+
+    def on_extract(self, item):
+        """ Extracts picons from an archives to the profile picons folder. """
+        file_filter = None
+        if IS_DARWIN:
+            file_filter = Gtk.FileFilter()
+            file_filter.set_name("*.zip, *.gz")
+            file_filter.add_mime_type("application/zip")
+            file_filter.add_mime_type("application/gzip")
+
+        response = get_chooser_dialog(self._app_window, self._settings, "*.zip, *.gz files",
+                                      ("*.zip", "*.gz"), "Extract picons", file_filter)
+        if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
+            return
+
+        arch_path = self._app.get_archive_path(response)
+        if arch_path:
+            self.copy_picons_file(Path(arch_path.name).glob("*.png"), arch_path.cleanup)
+
+    def copy_picons_file(self, files, callback=None):
+        """ Copies files to the profile picons folder. """
+        picon_path = self._settings.profile_picons_path
+        os.makedirs(os.path.dirname(picon_path), exist_ok=True)
+
+        try:
+            picons = [shutil.copy(p, picon_path) for p in files]
+        except shutil.SameFileError as e:
+            log(e)
+            self.show_info_message(str(e), Gtk.MessageType.ERROR)
+        else:
+            self.update_picons_dest_view(picons)
+            self._app.update_picons()
+        finally:
+            if callback:
+                callback()
+
    # ******************** Download/Upload/Remove ************************* #

    def on_selective_send(self, view):
@@ -468,10 +550,14 @@ class PiconManager(Gtk.Box):
                itr = filter_model.convert_iter_to_child_iter(model.convert_iter_to_child_iter(itr))
                base_model.remove(itr)

+        if view is self._picons_dest_view:
+            self._dst_count_label.set_text(str(len(model)))
+
    def on_send(self, item=None, files_filter=None, path=None):
        dest_path = path or self._settings.profile_picons_path
        settings = Settings(self._settings.settings)
-        settings.profile_picons_path = "{}{}".format(dest_path, SEP)
+        settings.profile_picons_path = f"{dest_path}{SEP}"
+        settings.current_profile = self._settings.current_profile
        self.show_info_message(get_message("Please, wait..."), Gtk.MessageType.INFO)
        self.run_func(lambda: upload_data(settings=settings,
                                          download_type=DownloadType.PICONS,
@@ -484,6 +570,7 @@ class PiconManager(Gtk.Box):
        path = path or self._settings.profile_picons_path
        settings = Settings(self._settings.settings)
        settings.profile_picons_path = path + SEP
+        settings.current_profile = self._settings.current_profile
        self.run_func(lambda: download_data(settings=settings,
                                            download_type=DownloadType.PICONS,
                                            callback=self.append_output,
@@ -602,7 +689,7 @@ class PiconManager(Gtk.Box):
        try:
            for sat in sorted(sats):
                pos = sat[1]
-                name = "{} ({})".format(sat[0], pos)
+                name = f"{sat[0]} ({pos})"
                if is_filter and pos not in self._sat_positions:
                    continue
                if not model:
@@ -663,7 +750,7 @@ class PiconManager(Gtk.Box):
    @run_task
    def start_download(self, providers):
        self._is_downloading = True
-        GLib.idle_add(self._expander.set_expanded, True)
+        GLib.idle_add(self._info_bar.set_visible, True)

        for prv in providers:
            if self._download_src is self.DownloadSource.LYNG_SAT and not self._POS_PATTERN.match(prv[2]):
@@ -673,7 +760,7 @@ class PiconManager(Gtk.Box):
                return

        try:
-            picons_path = self._picons_dir_entry.get_text()
+            picons_path = self._current_path_label.get_text()
            os.makedirs(os.path.dirname(picons_path), exist_ok=True)
            self.show_info_message(get_message("Please, wait..."), Gtk.MessageType.INFO)
            providers = (Provider(*p) for p in providers)
@@ -731,7 +818,7 @@ class PiconManager(Gtk.Box):
            for p in providers:
                self._picon_cz_downloader.download(p, path, p_ids)
        except PiconsError as e:
-            self.append_output("Error: {}\n".format(str(e)))
+            self.append_output(f"Error: {str(e)}\n")
            self.show_info_message(str(e), Gtk.MessageType.ERROR)
        else:
            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
@@ -752,12 +839,12 @@ class PiconManager(Gtk.Box):
        return {services.get(fav_id).picon_id for fav_id in fav_bouquet}

    def process_provider(self, prv, picons_path):
-        self.append_output("Getting links to picons for: {}.\n".format(prv.name))
+        self.append_output(f"Getting links to picons for: {prv.name}.\n")
        return PiconsParser.parse(prv, picons_path, self._picon_ids, self.get_picons_format())

    @run_idle
    def append_output(self, char):
-        append_text_to_tview(char, self._text_view)
+        append_text_to_tview(char, self._info_view)

    @run_task
    def resize(self, path):
@@ -767,7 +854,7 @@ class PiconManager(Gtk.Box):
            from pathlib import Path
            from PIL import Image
        except ImportError as e:
-            self.show_info_message("{} {}".format(get_message("Conversion error."), e), Gtk.MessageType.ERROR)
+            self.show_info_message(f"{get_message('Conversion error.')} {e}", Gtk.MessageType.ERROR)
        else:
            res = (220, 132) if self._resize_220_132_radio_button.get_active() else (100, 60)

@@ -790,19 +877,10 @@ class PiconManager(Gtk.Box):
        self._is_downloading = False
        self.show_info_message(get_message("The task is canceled!"), Gtk.MessageType.WARNING)

-    def on_close(self, window, event):
-        if self.on_cancel():
-            return True
-
-        self._terminate = True
-        self._is_downloading = False
-        self._app.update_picons()
-        GLib.idle_add(self._app_window.destroy)
-
    @run_task
    def run_func(self, func, update=False):
        try:
-            GLib.idle_add(self._expander.set_expanded, True)
+            GLib.idle_add(self._info_bar.set_visible, True)
            GLib.idle_add(self._header_download_box.set_sensitive, False)
            func()
        except OSError as e:
@@ -841,7 +919,7 @@ class PiconManager(Gtk.Box):
            self._filter_button.set_active(not self._filter_button.get_active())

    def on_fav_changed(self, view, path, column):
-        if self._app.page is Page.PICONS and self._auto_filer_switch.get_active():
+        if self._app.page is Page.PICONS and self._auto_filter_switch.get_active():
            model = view.get_model()
            self._picons_filter_entry.set_text(model.get_value(model.get_iter(path), Column.FAV_SERVICE))

@@ -856,10 +934,10 @@ class PiconManager(Gtk.Box):

    @run_with_delay(0.5)
    def on_picons_filter_changed(self, entry):
-        txt = entry.get_text().upper()
        self._filter_cache.clear()
+        txt = entry.get_text().upper().split("|")
        for s in self._app.current_services.values():
-            self._filter_cache[s.picon_id] = txt in s.service.upper()
+            self._filter_cache[s.picon_id] = any(t in s.service.upper() or t in str(s.picon_id) for t in txt)

        GLib.idle_add(self._picons_src_filter_model.refilter, priority=GLib.PRIORITY_LOW)
        GLib.idle_add(self._picons_dst_filter_model.refilter, priority=GLib.PRIORITY_LOW)
@@ -954,7 +1032,7 @@ class PiconManager(Gtk.Box):
            self._app.show_error_message("Select paths!")
            return

-        self._expander.set_expanded(True)
+        self._info_bar.set_visible(True)
        convert_to(src_path=picons_path,
                   dest_path=save_path,
                   s_type=SettingsType.ENIGMA_2,
--- a/app/ui/playback.glade
+++ b/app/ui/playback.glade
@@ -148,7 +148,7 @@
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="tooltip_text" translatable="yes">Audio Track</property>
-                    <property name="icon_name">multimedia-volume-control</property>
+                    <property name="icon_name">audio-volume-high</property>
                  </object>
                </child>
              </object>
--- a/app/ui/playback.py
+++ b/app/ui/playback.py
@@ -36,9 +36,9 @@ from app.connections import HttpAPI
 from app.eparser.ecommons import BqServiceType
 from app.settings import PlayStreamsMode, IS_DARWIN, SettingsType
 from app.tools.media import Player
-from app.ui.dialogs import get_builder
+from app.ui.dialogs import get_builder, get_message
 from app.ui.main_helper import get_iptv_url
-from app.ui.uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, Column, IS_GNOME_SESSION
+from app.ui.uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, Column, IS_GNOME_SESSION, Page


 class PlayerBox(Gtk.Box):
@@ -295,7 +295,7 @@ class PlayerBox(Gtk.Box):
        """ Returns a string representation of time from duration in milliseconds """
        m, s = divmod(duration // 1000, 60)
        h, m = divmod(m, 60)
-        return "{}{:02d}:{:02d}".format(str(h) + ":" if h else "", m, s)
+        return f"{str(h) + ':' if h else ''}{m:02d}:{s:02d}"

    def set_player_area_size(self, widget):
        w, h = self._app.app_window.get_size()
@@ -310,6 +310,7 @@ class PlayerBox(Gtk.Box):

        if self._playback_window:
            self._playback_window.show()
+            self._playback_window.set_title(self.get_playback_title())
        else:
            self._playback_window = Gtk.Window(title=self.get_playback_title(),
                                               window_position=Gtk.WindowPosition.CENTER,
@@ -331,10 +332,13 @@ class PlayerBox(Gtk.Box):
        self._playback_window.show()

    def get_playback_title(self):
-        path, column = self._fav_view.get_cursor()
-        if path:
-            return "DemonEditor [{}]".format(self._app.fav_view.get_model()[path][:][Column.FAV_SERVICE])
-        return "DemonEditor [Playback]"
+        if self._app.page is not Page.RECORDINGS:
+            path, column = self._fav_view.get_cursor()
+            if path:
+                return f"DemonEditor [{self._app.fav_view.get_model()[path][:][Column.FAV_SERVICE]}]"
+        else:
+            return f"DemonEditor [{get_message('Recordings')}]"
+        return f"DemonEditor [{get_message('Playback')}]"

    def on_play_stream(self):
        path, column = self._fav_view.get_cursor()
@@ -396,11 +400,13 @@ class PlayerBox(Gtk.Box):
        else:
            self._current_mrl = url

+    @run_idle
    def on_played(self, player, duration):
-        GLib.idle_add(self._fav_view.set_sensitive, True)
+        self._fav_view.set_sensitive(True)
        if not IS_DARWIN:
            self.on_duration_changed(duration)

+    @run_idle
    def on_error(self, player, msg):
        self._app.show_error_message(msg)
        self._fav_view.set_sensitive(True)
--- a/app/ui/satellites.glade
+++ b/app/ui/satellites.glade
@@ -166,7 +166,7 @@ Author: Dmitriy Yefremov
        <property name="use_underline">True</property>
        <property name="use_stock">True</property>
        <signal name="activate" handler="on_edit" object="satellite_view" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="e" signal="activate" modifiers="Primary"/>
      </object>
    </child>
    <child>
@@ -220,7 +220,7 @@ Author: Dmitriy Yefremov
        <property name="use_underline">True</property>
        <property name="use_stock">True</property>
        <signal name="activate" handler="on_edit" object="transponder_view" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <accelerator key="e" signal="activate" modifiers="Primary"/>
      </object>
    </child>
    <child>
@@ -292,24 +292,12 @@ Author: Dmitriy Yefremov
    <property name="icon_name">window-close-symbolic</property>
    <property name="icon_size">1</property>
  </object>
-  <object class="GtkImage" id="sat_update_filter_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-find-replace-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkImage" id="sat_update_image">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="icon_name">emblem-synchronizing-symbolic</property>
    <property name="icon_size">1</property>
  </object>
-  <object class="GtkImage" id="sat_update_search_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-find-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkListStore" id="satellite_view_model">
    <columns>
      <!-- column-name name -->
@@ -1409,13 +1397,14 @@ Author: Dmitriy Yefremov
    <property name="skip_taskbar_hint">True</property>
    <property name="skip_pager_hint">True</property>
    <signal name="delete-event" handler="on_quit" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
    <child>
      <object class="GtkBox" id="satellites_update_main_box">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
-        <property name="margin_bottom">2</property>
        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
        <child>
          <object class="GtkBox" id="sat_update_header">
            <property name="visible">True</property>
@@ -1496,7 +1485,7 @@ Author: Dmitriy Yefremov
                        <property name="image">sat_update_cancel_image</property>
                        <property name="always_show_image">True</property>
                        <signal name="clicked" handler="on_cancel_receive" swapped="no"/>
-                        <accelerator key="z" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="z" signal="clicked" modifiers="Primary"/>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -1518,15 +1507,21 @@ Author: Dmitriy Yefremov
                    <property name="layout_style">expand</property>
                    <child>
                      <object class="GtkToggleButton" id="sat_update_filter_button">
-                        <property name="label" translatable="yes">Filter</property>
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="receives_default">True</property>
                        <property name="tooltip_text" translatable="yes">Filter</property>
-                        <property name="image">sat_update_filter_image</property>
                        <property name="always_show_image">True</property>
                        <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
-                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <child>
+                          <object class="GtkImage" id="sat_update_filter_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">edit-find-replace-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
+                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | Primary"/>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -1536,15 +1531,21 @@ Author: Dmitriy Yefremov
                    </child>
                    <child>
                      <object class="GtkToggleButton" id="sat_update_find_button">
-                        <property name="label" translatable="yes">Search</property>
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="receives_default">True</property>
                        <property name="tooltip_text" translatable="yes">Find</property>
-                        <property name="image">sat_update_search_image</property>
                        <property name="always_show_image">True</property>
                        <signal name="toggled" handler="on_find_toggled" swapped="no"/>
-                        <accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                        <child>
+                          <object class="GtkImage" id="sat_update_search_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">edit-find-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
+                        <accelerator key="f" signal="clicked" modifiers="Primary"/>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -1584,6 +1585,8 @@ Author: Dmitriy Yefremov
              <object class="GtkBox" id="search_bar_box">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
                <child>
                  <object class="GtkSearchEntry" id="sat_update_search_entry">
                    <property name="width_request">200</property>
@@ -1658,6 +1661,7 @@ Author: Dmitriy Yefremov
              <object class="GtkGrid" id="source_header_grid">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
+                <property name="margin_top">2</property>
                <property name="margin_bottom">2</property>
                <property name="column_spacing">2</property>
                <child>
@@ -1779,118 +1783,179 @@ Author: Dmitriy Yefremov
            <property name="can_focus">True</property>
            <property name="margin_left">5</property>
            <property name="margin_right">5</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
            <property name="wide_handle">True</property>
            <child>
              <object class="GtkFrame" id="sat_update_frame">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
+                <property name="label_xalign">0.49000000953674316</property>
                <property name="shadow_type">in</property>
                <child>
-                  <object class="GtkScrolledWindow" id="sat_update_scrolled_window">
+                  <object class="GtkBox" id="sat_update_box">
                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
                    <property name="margin_left">5</property>
                    <property name="margin_right">5</property>
                    <property name="margin_top">5</property>
                    <property name="margin_bottom">5</property>
-                    <property name="shadow_type">in</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">5</property>
                    <child>
-                      <object class="GtkTreeView" id="sat_update_tree_view">
+                      <object class="GtkScrolledWindow" id="sat_update_scrolled_window">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
-                        <property name="model">update_sat_list_model_sort</property>
-                        <property name="search_column">0</property>
-                        <property name="activate_on_single_click">True</property>
-                        <signal name="button-press-event" handler="on_popup_menu" object="satellites_update_popup_menu" swapped="no"/>
-                        <signal name="select-all" handler="on_select_all" swapped="no"/>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection">
-                            <property name="mode">multiple</property>
-                          </object>
-                        </child>
+                        <property name="shadow_type">in</property>
                        <child>
-                          <object class="GtkTreeViewColumn" id="upd_satellite_column">
-                            <property name="title" translatable="yes">Satellite</property>
-                            <property name="expand">True</property>
-                            <property name="clickable">True</property>
-                            <property name="alignment">0.5</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">0</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="upd_satellite_cellrenderertext">
-                                <property name="xalign">0.0099999997764825821</property>
+                          <object class="GtkTreeView" id="sat_update_tree_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="model">update_sat_list_model_sort</property>
+                            <property name="search_column">0</property>
+                            <property name="activate_on_single_click">True</property>
+                            <signal name="button-press-event" handler="on_popup_menu" object="satellites_update_popup_menu" swapped="no"/>
+                            <signal name="select-all" handler="on_select_all" swapped="no"/>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection">
+                                <property name="mode">multiple</property>
                              </object>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="upd_position_column">
-                            <property name="title" translatable="yes">Position</property>
-                            <property name="clickable">True</property>
-                            <property name="alignment">0.5</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">1</property>
                            <child>
-                              <object class="GtkCellRendererText" id="upd_position_cellrenderertext">
-                                <property name="xalign">0.49000000953674316</property>
+                              <object class="GtkTreeViewColumn" id="upd_satellite_column">
+                                <property name="title" translatable="yes">Satellite</property>
+                                <property name="expand">True</property>
+                                <property name="clickable">True</property>
+                                <property name="alignment">0.5</property>
+                                <property name="reorderable">True</property>
+                                <property name="sort_column_id">0</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="upd_satellite_cellrenderertext">
+                                    <property name="xalign">0.0099999997764825821</property>
+                                    <property name="ellipsize">end</property>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
                              </object>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="upd_type_column">
-                            <property name="title" translatable="yes">Type</property>
-                            <property name="clickable">True</property>
-                            <property name="alignment">0.5</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">2</property>
                            <child>
-                              <object class="GtkCellRendererText" id="upd_type_cellrenderertext">
-                                <property name="xalign">0.49000000953674316</property>
+                              <object class="GtkTreeViewColumn" id="upd_position_column">
+                                <property name="title" translatable="yes">Position</property>
+                                <property name="clickable">True</property>
+                                <property name="alignment">0.5</property>
+                                <property name="reorderable">True</property>
+                                <property name="sort_column_id">1</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="upd_position_cellrenderertext">
+                                    <property name="xalign">0.49000000953674316</property>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="text">1</attribute>
+                                  </attributes>
+                                </child>
                              </object>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="upd_url_column">
-                            <property name="visible">False</property>
-                            <property name="title" translatable="yes">Url</property>
                            <child>
-                              <object class="GtkCellRendererText" id="upd_url_cellrenderertext"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="upd_selected_column">
-                            <property name="title" translatable="yes">Selected</property>
-                            <property name="clickable">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">4</property>
-                            <child>
-                              <object class="GtkCellRendererToggle" id="upd_selected_cellrenderer">
-                                <signal name="toggled" handler="on_satellite_toggled" swapped="no"/>
+                              <object class="GtkTreeViewColumn" id="upd_type_column">
+                                <property name="title" translatable="yes">Type</property>
+                                <property name="clickable">True</property>
+                                <property name="alignment">0.5</property>
+                                <property name="reorderable">True</property>
+                                <property name="sort_column_id">2</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="upd_type_cellrenderertext">
+                                    <property name="xalign">0.49000000953674316</property>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="text">2</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="upd_url_column">
+                                <property name="visible">False</property>
+                                <property name="title" translatable="yes">Url</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="upd_url_cellrenderertext"/>
+                                  <attributes>
+                                    <attribute name="text">3</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="upd_selected_column">
+                                <property name="title" translatable="yes">Selected</property>
+                                <property name="clickable">True</property>
+                                <property name="reorderable">True</property>
+                                <property name="sort_column_id">4</property>
+                                <child>
+                                  <object class="GtkCellRendererToggle" id="upd_selected_cellrenderer">
+                                    <signal name="toggled" handler="on_satellite_toggled" swapped="no"/>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="active">4</attribute>
+                                  </attributes>
+                                </child>
                              </object>
-                              <attributes>
-                                <attribute name="active">4</attribute>
-                              </attributes>
                            </child>
                          </object>
                        </child>
                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                    </child>
+                    <child>
+                      <object class="GtkBox" id="sat_update_status_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">10</property>
+                        <property name="margin_right">10</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkImage" id="satellites_count_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">document-properties-symbolic</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="satellites_count_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label">0</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="sat_update_frame_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Satellites</property>
                  </object>
                </child>
              </object>
@@ -1900,190 +1965,318 @@ Author: Dmitriy Yefremov
              </packing>
            </child>
            <child>
-              <object class="GtkFrame" id="sat_update_tr_frame">
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
+              <object class="GtkPaned" id="sat_update_tr_paned">
+                <property name="can_focus">True</property>
+                <property name="orientation">vertical</property>
+                <property name="wide_handle">True</property>
                <child>
-                  <object class="GtkPaned" id="sat_update_tr_paned">
+                  <object class="GtkFrame" id="sat_update_tr_frame">
                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                    <property name="wide_handle">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0.49000000953674316</property>
+                    <property name="shadow_type">in</property>
                    <child>
-                      <object class="GtkScrolledWindow" id="sat_update_tr_scrolled_window">
+                      <object class="GtkBox" id="sat_update_tr_box">
                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">5</property>
                        <child>
-                          <object class="GtkTreeView" id="sat_update_tr_view">
+                          <object class="GtkScrolledWindow" id="sat_update_tr_scrolled_window">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
-                            <property name="model">update_transponder_store</property>
-                            <property name="search_column">0</property>
-                            <property name="activate_on_single_click">True</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection"/>
-                            </child>
+                            <property name="shadow_type">in</property>
                            <child>
-                              <object class="GtkTreeViewColumn" id="tr_view_tr_column">
-                                <property name="title" translatable="yes">Transponder</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="upd_tr_renderer">
-                                    <property name="xalign">0.0099999997764825821</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
+                              <object class="GtkTreeView" id="sat_update_tr_view">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">update_transponder_store</property>
+                                <property name="search_column">0</property>
+                                <property name="activate_on_single_click">True</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection"/>
                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="tr_view_link_column">
-                                <property name="visible">False</property>
-                                <property name="title" translatable="yes">link</property>
                                <child>
-                                  <object class="GtkCellRendererText" id="upd_tr_link_renderer"/>
-                                  <attributes>
-                                    <attribute name="text">1</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="tr_view_selected_column">
-                                <property name="title" translatable="yes">Selected</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" id="upd_tr_select_renderer">
-                                    <signal name="toggled" handler="on_transponder_toggled" swapped="no"/>
+                                  <object class="GtkTreeViewColumn" id="tr_view_tr_column">
+                                    <property name="title" translatable="yes">Transponder</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="upd_tr_renderer">
+                                        <property name="xalign">0.0099999997764825821</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="tr_view_link_column">
+                                    <property name="visible">False</property>
+                                    <property name="title" translatable="yes">link</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="upd_tr_link_renderer"/>
+                                      <attributes>
+                                        <attribute name="text">1</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="tr_view_selected_column">
+                                    <property name="title" translatable="yes">Selected</property>
+                                    <child>
+                                      <object class="GtkCellRendererToggle" id="upd_tr_select_renderer">
+                                        <signal name="toggled" handler="on_transponder_toggled" swapped="no"/>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="active">2</attribute>
+                                      </attributes>
+                                    </child>
                                  </object>
-                                  <attributes>
-                                    <attribute name="active">2</attribute>
-                                  </attributes>
                                </child>
                              </object>
                            </child>
                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="sat_update_tr_status_box">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">10</property>
+                            <property name="margin_right">10</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkImage" id="transponders_count_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">document-properties-symbolic</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="transponders_count_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="resize">True</property>
-                        <property name="shrink">True</property>
-                      </packing>
                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" id="sat_update_srv_scrolled_window">
+                    <child type="label">
+                      <object class="GtkLabel" id="sat_update_tr_frame_label">
                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="sat_update_srv_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="model">update_service_store</property>
-                            <property name="search_column">1</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection"/>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="srv_view_servcie_column">
-                                <property name="title" translatable="yes">Service</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererPixbuf" id="srv_picon_renderer">
-                                    <property name="xpad">2</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="pixbuf">0</attribute>
-                                  </attributes>
-                                </child>
-                                <child>
-                                  <object class="GtkCellRendererText" id="srv_service_renderer">
-                                    <property name="xalign">0.0099999997764825821</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">1</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="srv_view_package_column">
-                                <property name="title" translatable="yes">Package</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="srv_package_renderer">
-                                    <property name="ellipsize">end</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">2</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="srv_view_type_column">
-                                <property name="title" translatable="yes">Type</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="srv_type_renderer">
-                                    <property name="xalign">0.49000000953674316</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">3</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="srv_view_sid_column">
-                                <property name="title" translatable="yes">SID</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="srv_sid_renderer">
-                                    <property name="xalign">0.49000000953674316</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">4</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="srv_view_cas_column">
-                                <property name="visible">False</property>
-                                <property name="title" translatable="yes">CAS</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="srv_cas_renderer">
-                                    <property name="xalign">0.49000000953674316</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Transponders</property>
                      </object>
-                      <packing>
-                        <property name="resize">True</property>
-                        <property name="shrink">True</property>
-                      </packing>
                    </child>
                  </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
                </child>
-                <child type="label_item">
-                  <placeholder/>
+                <child>
+                  <object class="GtkFrame" id="sat_update_srv_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0.49000000953674316</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkBox" id="sat_update_srv_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="sat_update_srv_scrolled_window">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkTreeView" id="sat_update_srv_view">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">update_service_store</property>
+                                <property name="search_column">1</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection"/>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="srv_view_servcie_column">
+                                    <property name="title" translatable="yes">Service</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf" id="srv_picon_renderer">
+                                        <property name="xpad">2</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="pixbuf">0</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="srv_service_renderer">
+                                        <property name="xalign">0.0099999997764825821</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">1</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="srv_view_package_column">
+                                    <property name="title" translatable="yes">Package</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="srv_package_renderer">
+                                        <property name="ellipsize">end</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">2</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="srv_view_type_column">
+                                    <property name="title" translatable="yes">Type</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="srv_type_renderer">
+                                        <property name="xalign">0.49000000953674316</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">3</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="srv_view_sid_column">
+                                    <property name="title" translatable="yes">SID</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="srv_sid_renderer">
+                                        <property name="xalign">0.49000000953674316</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">4</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="srv_view_cas_column">
+                                    <property name="visible">False</property>
+                                    <property name="title" translatable="yes">CAS</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="srv_cas_renderer">
+                                        <property name="xalign">0.49000000953674316</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="sat_update_srv_status_box">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">10</property>
+                            <property name="margin_right">10</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkImage" id="services_count_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">document-properties-symbolic</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="services_count_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="sat_update_srv_frame_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Services</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
                </child>
              </object>
              <packing>
@@ -2099,42 +2292,70 @@ Author: Dmitriy Yefremov
          </packing>
        </child>
        <child>
-          <object class="GtkExpander" id="sat_update_expander">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_left">1</property>
-            <property name="margin_right">1</property>
-            <property name="margin_top">2</property>
-            <property name="margin_bottom">2</property>
+          <object class="GtkFrame" id="log_frame">
+            <property name="can_focus">False</property>
+            <property name="margin_left">4</property>
+            <property name="margin_right">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">in</property>
            <child>
-              <object class="GtkScrolledWindow" id="text_view_scrolled_window">
-                <property name="height_request">120</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkTextView" id="text_view">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="left_margin">5</property>
-                    <property name="right_margin">5</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="Extra:">
+              <object class="GtkInfoBar" id="log_info_bar">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Extra:</property>
+                <property name="message_type">other</property>
+                <property name="show_close_button">True</property>
+                <child internal-child="action_area">
+                  <object class="GtkButtonBox" id="log_info_bar_button_box">
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <property name="layout_style">end</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child internal-child="content_area">
+                  <object class="GtkBox" id="log_info_bar_box">
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="text_view_scrolled_window">
+                        <property name="height_request">120</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTextView" id="text_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="editable">False</property>
+                            <property name="left_margin">5</property>
+                            <property name="right_margin">5</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
              </object>
            </child>
          </object>
          <packing>
            <property name="expand">False</property>
            <property name="fill">True</property>
-            <property name="position">5</property>
+            <property name="position">4</property>
          </packing>
        </child>
        <child>
@@ -2148,9 +2369,6 @@ Author: Dmitriy Yefremov
                <property name="can_focus">False</property>
                <property name="spacing">6</property>
                <property name="layout_style">end</property>
-                <child>
-                  <placeholder/>
-                </child>
              </object>
              <packing>
                <property name="expand">False</property>
@@ -2181,9 +2399,6 @@ Author: Dmitriy Yefremov
                <property name="position">0</property>
              </packing>
            </child>
-            <child>
-              <placeholder/>
-            </child>
          </object>
          <packing>
            <property name="expand">False</property>
--- a/app/ui/satellites.py
+++ b/app/ui/satellites.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -170,10 +170,10 @@ class SatellitesTool(Gtk.Box):
        self.on_edit(view, force=True)

    def on_satellite_add(self, item):
-        self.on_satellite(None)
+        self.on_satellite()

    def on_transponder_add(self, item):
-        self.on_transponder(None)
+        self.on_transponder()

    def on_edit(self, view, force=False):
        """ Common edit """
@@ -435,24 +435,25 @@ class UpdateDialog:
                                       "update_sat_list_model_filter", "update_sat_list_model_sort", "side_store",
                                       "pos_adjustment", "pos_adjustment2", "satellites_update_popup_menu",
                                       "remove_selection_image", "sat_update_cancel_image", "sat_receive_image",
-                                       "sat_update_filter_image", "sat_update_search_image", "sat_update_image",
-                                       "update_transponder_store", "update_service_store"))
+                                       "sat_update_image", "update_transponder_store", "update_service_store"))

        self._window = builder.get_object("satellites_update_window")
        self._window.set_transient_for(transient)
        if title:
            self._window.set_title(title)

-        self._transponder_frame = builder.get_object("sat_update_tr_frame")
+        self._transponder_paned = builder.get_object("sat_update_tr_paned")
        self._sat_view = builder.get_object("sat_update_tree_view")
        self._transponder_view = builder.get_object("sat_update_tr_view")
        self._service_view = builder.get_object("sat_update_srv_view")
        self._source_box = builder.get_object("source_combo_box")
-        self._sat_update_expander = builder.get_object("sat_update_expander")
        self._text_view = builder.get_object("text_view")
        self._receive_button = builder.get_object("receive_data_button")
        self._sat_update_info_bar = builder.get_object("sat_update_info_bar")
        self._info_bar_message_label = builder.get_object("info_bar_message_label")
+        self._satellites_count_label = builder.get_object("satellites_count_label")
+        self._transponders_count_label = builder.get_object("transponders_count_label")
+        self._services_count_label = builder.get_object("services_count_label")
        self._receive_button.bind_property("visible", builder.get_object("cancel_data_button"), "visible", 4)
        update_button = builder.get_object("sat_update_button")
        self._sat_view.bind_property("sensitive", update_button, "sensitive")
@@ -470,7 +471,10 @@ class UpdateDialog:
        self._filter_model.set_visible_func(self.filter_function)
        self._filter_positions = (0, 0)
        self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
-        # Search
+        # Log.
+        self._log_frame = builder.get_object("log_frame")
+        builder.get_object("log_info_bar").connect("response", lambda b, r: self._log_frame.set_visible(False))
+        # Search.
        self._search_bar = builder.get_object("sat_update_search_bar")
        self._search_bar.bind_property("search-mode-enabled", self._search_bar, "visible")
        search_provider = SearchProvider(self._sat_view,
@@ -501,9 +505,7 @@ class UpdateDialog:
            show_dialog(DialogType.ERROR, self._window, "The task is already running!")
            return

-        get_base_model(self._sat_view.get_model()).clear()
-        self._transponder_view.get_model().clear()
-        self._service_view.get_model().clear()
+        self.clear_data()

        self.is_download = True
        self._sat_view.set_sensitive(False)
@@ -513,6 +515,14 @@ class UpdateDialog:

        self.get_sat_list(src, self.append_satellites)

+    def clear_data(self):
+        get_base_model(self._sat_view.get_model()).clear()
+        self._transponder_view.get_model().clear()
+        self._service_view.get_model().clear()
+        self._satellites_count_label.set_text("0")
+        self._transponders_count_label.set_text("0")
+        self._services_count_label.set_text("0")
+
    @run_task
    def get_sat_list(self, src, callback):
        sat_src = SatelliteSource.FLYSAT
@@ -522,8 +532,7 @@ class UpdateDialog:
            sat_src = SatelliteSource.KINGOFSAT

        sats = self._parser.get_satellites_list(sat_src)
-        if sats:
-            callback(sats)
+        callback(sats)
        self.is_download = False

    @run_idle
@@ -533,6 +542,7 @@ class UpdateDialog:
            model.append(sat)

        self._sat_view.set_sensitive(True)
+        self._satellites_count_label.set_text(str(len(model)))

    @run_idle
    def on_receive_data(self, item):
@@ -541,8 +551,8 @@ class UpdateDialog:
            return

    @run_idle
-    def update_expander(self):
-        self._sat_update_expander.set_expanded(True)
+    def update_log_visibility(self):
+        self._log_frame.set_visible(True)
        self._text_view.get_buffer().set_text("", 0)

    def append_output(self):
@@ -652,7 +662,7 @@ class SatellitesUpdateDialog(UpdateDialog):
    @run_task
    def receive_satellites(self):
        self.is_download = True
-        self.update_expander()
+        self.update_log_visibility()
        model = self._sat_view.get_model()
        start = time.time()

@@ -677,10 +687,10 @@ class SatellitesUpdateDialog(UpdateDialog):
            appender.send("-" * 75 + "\n")
            sat_count = len(sats)

-            sats = {s[2]: s for s in sats}  # key = position, v = satellite
+            sats = {s[0]: s for s in sats}  # key = name, v = satellite

            for row in self._main_model:
-                pos = row[2]
+                pos = row[0]
                if pos in sats:
                    sat = sats.pop(pos)
                    appender.send(f"Updating satellite: {row[0]}\n")
@@ -728,7 +738,7 @@ class ServicesUpdateDialog(UpdateDialog):
        self._transponder_view.connect("button-press-event", lambda w, e: on_popup_menu(tr_popup_menu, e))
        self._transponder_view.connect("select_all", lambda w: self.update_transponder_selection(True))

-        self._transponder_frame.set_visible(True)
+        self._transponder_paned.set_visible(True)
        self._source_box.remove(0)
        self._source_box.connect("changed", self.on_update_satellites_list)
        self._source_box.set_active(0)
@@ -744,7 +754,7 @@ class ServicesUpdateDialog(UpdateDialog):
    @run_task
    def receive_services(self):
        self.is_download = True
-        self.update_expander()
+        self.update_log_visibility()
        model = self._sat_view.get_model()
        appender = self.append_output()
        next(appender)
@@ -753,7 +763,7 @@ class ServicesUpdateDialog(UpdateDialog):
        non_cached_sats = []
        sat_names = {}
        t_names = {}
-        t_urls = []
+        t_urls = set()
        services = []

        for r in (r for r in model if r[-1]):
@@ -765,7 +775,7 @@ class ServicesUpdateDialog(UpdateDialog):
            trs = self._transponders.get(url, None)
            if trs:
                for t in filter(lambda tp: tp.url in self._selected_transponders, trs):
-                    t_urls.append(t.url)
+                    t_urls.add(t.url)
                    t_names[t.url] = t.text
            else:
                non_cached_sats.append(url)
@@ -782,7 +792,7 @@ class ServicesUpdateDialog(UpdateDialog):

                    appender.send(f"Getting transponders for: {sat_names.get(futures[future])}.\n")
                    for t in future.result():
-                        t_urls.append(t.url)
+                        t_urls.add(t.url)
                        t_names[t.url] = t.text

                appender.send("-" * 75 + "\n")
@@ -803,14 +813,17 @@ class ServicesUpdateDialog(UpdateDialog):
                        return

                    appender.send(f"Getting services for: {t_names.get(futures[future], '')}.\n")
-                    list(map(services.append, future.result()))
+                    try:
+                        list(map(services.append, future.result()))
+                    except ValueError as e:
+                        log(f"Getting services error: {e} [{t_names.get(futures[future])}]")

        appender.send("-" * 75 + "\n")
        appender.send(f"Consumed: {time.time() - start:0.0f}s, {len(services)} services received.")

        try:
            from app.eparser.enigma.lamedb import LameDbReader
-            # Used for double checking!
+            # Used for double check!
            reader = LameDbReader(path=None)
            srvs = reader.get_services_list("".join(reader.get_services_lines(services)))
        except ValueError as e:
@@ -828,8 +841,7 @@ class ServicesUpdateDialog(UpdateDialog):
            self._services_parser.source = sat_src

        sats = self._parser.get_satellites_list(sat_src)
-        if sats:
-            callback(sats)
+        callback(sats)
        self.is_download = False

    def on_satellite_toggled(self, toggle, path):
@@ -895,6 +907,7 @@ class ServicesUpdateDialog(UpdateDialog):
        model.clear()
        list(map(model.append, [(t.text, t.url, t.url in self._selected_transponders) for t in trs_list]))
        self._sat_view.set_sensitive(True)
+        self._transponders_count_label.set_text(str(len(model)))

    @run_task
    def on_activate_transponder(self, view, path, column):
@@ -914,6 +927,7 @@ class ServicesUpdateDialog(UpdateDialog):
            model.append((None, s.service, s.package, s.service_type, str(s.ssid), None))

        self._transponder_view.set_sensitive(True)
+        self._services_count_label.set_text(str(len(model)))

    def update_transponder_selection(self, select):
        m = self._transponder_view.get_model()
--- a/app/ui/service_details_dialog.glade
+++ b/app/ui/service_details_dialog.glade
@@ -275,6 +275,38 @@ Author: Dmitriy Yefremov
    <child type="titlebar">
      <placeholder/>
    </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="label" translatable="yes">Cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="valign">center</property>
+        <signal name="clicked" handler="on_cancel" swapped="no"/>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="apply_button">
+        <property name="label" translatable="yes">Apply</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Save current service</property>
+        <property name="valign">center</property>
+        <signal name="clicked" handler="on_save" swapped="no"/>
+        <accelerator key="Return" signal="activate"/>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="create_button">
+        <property name="label" translatable="yes">Create</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Create and save as new service</property>
+        <property name="valign">center</property>
+        <signal name="clicked" handler="on_create_new" swapped="no"/>
+      </object>
+    </child>
    <child internal-child="vbox">
      <object class="GtkBox" id="dialog_vbox">
        <property name="can_focus">False</property>
@@ -287,53 +319,6 @@ Author: Dmitriy Yefremov
            <property name="can_focus">False</property>
            <property name="valign">center</property>
            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_cancel" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="apply_button">
-                <property name="label" translatable="yes">Apply</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Save current service</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_save" swapped="no"/>
-                <accelerator key="Return" signal="activate"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="create_button">
-                <property name="label" translatable="yes">Create</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Create and save as new service</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_create_new" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
          </object>
          <packing>
            <property name="expand">False</property>
@@ -1644,6 +1629,9 @@ Author: Dmitriy Yefremov
        </child>
      </object>
    </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+    </action-widgets>
  </object>
  <object class="GtkListStore" id="transponder_services_liststore">
    <columns>
@@ -1676,6 +1664,24 @@ Author: Dmitriy Yefremov
    <child>
      <placeholder/>
    </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_no_button">
+        <property name="label" translatable="yes">Cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="valign">center</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_ok_button">
+        <property name="label" translatable="yes">OK</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="valign">center</property>
+      </object>
+    </child>
    <child internal-child="vbox">
      <object class="GtkBox" id="tr_services_dialog_vbox">
        <property name="can_focus">False</property>
@@ -1685,34 +1691,6 @@ Author: Dmitriy Yefremov
          <object class="GtkButtonBox">
            <property name="can_focus">False</property>
            <property name="valign">center</property>
-            <child>
-              <object class="GtkButton" id="tr_services_no_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="tr_services_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
          </object>
          <packing>
            <property name="expand">False</property>
--- a/app/ui/service_details_dialog.py
+++ b/app/ui/service_details_dialog.py
@@ -259,7 +259,7 @@ class ServiceDetailsDialog:
    def init_enigma2_flags(self, flags):
        f_flags = list(filter(lambda x: x.startswith("f:"), flags))
        if f_flags:
-            value = int(f_flags[0][2:])
+            value = Flag.parse(f_flags[0])
            self._keep_check_button.set_active(Flag.is_keep(value))
            self._hide_check_button.set_active(Flag.is_hide(value))
            self._use_pids_check_button.set_active(Flag.is_pids(value))
@@ -468,7 +468,7 @@ class ServiceDetailsDialog:
        extra_data = {Column.SRV_TOOLTIP: None, Column.SRV_BACKGROUND: None}
        if self._s_type is SettingsType.ENIGMA_2 and flags:
            f_flags = list(filter(lambda x: x.startswith("f:"), flags.split(",")))
-            if f_flags and Flag.is_new(int(f_flags[0][2:])):
+            if f_flags and Flag.is_new(Flag.parse(f_flags[0])):
                extra_data[Column.SRV_BACKGROUND] = self._new_color

        self._current_model.set(self._current_itr, extra_data)
--- a/app/ui/settings_dialog.glade
+++ b/app/ui/settings_dialog.glade
--- a/app/ui/settings_dialog.py
+++ b/app/ui/settings_dialog.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ from app.connections import test_telnet, test_ftp, TestException, test_http, Htt
 from app.settings import SettingsType, Settings, PlayStreamsMode, IS_LINUX, SEP, IS_WIN
 from app.ui.dialogs import show_dialog, DialogType, get_message, get_chooser_dialog, get_builder
 from .main_helper import update_entry_data, scroll_to, get_picon_pixbuf
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, DEFAULT_ICON, APP_FONT
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, DEFAULT_ICON, APP_FONT, IS_GNOME_SESSION


 def show_settings_dialog(transient, options):
@@ -50,7 +50,6 @@ class SettingsDialog:
                    "on_settings_type_changed": self.on_settings_type_changed,
                    "on_reset": self.on_reset,
                    "on_response": self.on_response,
-                    "apply_settings": self.apply_settings,
                    "on_connection_test": self.on_connection_test,
                    "on_info_bar_close": self.on_info_bar_close,
                    "on_set_color_switch": self.on_set_color_switch,
@@ -86,11 +85,12 @@ class SettingsDialog:
                    "on_icon_theme_add": self.on_icon_theme_add,
                    "on_icon_theme_remove": self.on_icon_theme_remove}

-        # Settings
+        # Settings.
        self._ext_settings = settings
        self._settings = Settings(settings.settings)
        self._profiles = self._settings.profiles
        self._s_type = self._settings.setting_type
+        self._updated = False

        builder = get_builder(UI_RESOURCES_PATH + "settings_dialog.glade", handlers)

@@ -135,7 +135,7 @@ class SettingsDialog:
        self._neutrino_radio_button = builder.get_object("neutrino_radio_button")
        self._support_ver5_switch = builder.get_object("support_ver5_switch")
        self._force_bq_name_switch = builder.get_object("force_bq_name_switch")
-        # Streaming
+        # Streaming.
        self._apply_presets_button = builder.get_object("apply_presets_button")
        self._transcoding_switch = builder.get_object("transcoding_switch")
        self._edit_preset_switch = builder.get_object("edit_preset_switch")
@@ -192,7 +192,6 @@ class SettingsDialog:
        self._enable_exp_switch.bind_property("active", builder.get_object("enable_direct_playback_box"), "sensitive")
        # Enigma2 only.
        self._enigma_radio_button.bind_property("active", builder.get_object("bq_naming_grid"), "sensitive")
-        self._enigma_radio_button.bind_property("active", builder.get_object("enable_http_box"), "sensitive")
        self._enigma_radio_button.bind_property("active", builder.get_object("enable_experimental_box"), "sensitive")
        self._enigma_radio_button.bind_property("active", builder.get_object("program_frame"), "sensitive")
        self._enigma_radio_button.bind_property("active", builder.get_object("experimental_box"), "sensitive")
@@ -200,6 +199,9 @@ class SettingsDialog:
        self._profile_view = builder.get_object("profile_tree_view")
        self._profile_add_button = builder.get_object("profile_add_button")
        self._profile_remove_button = builder.get_object("profile_remove_button")
+        # Network.
+        # Separated due to a bug with response (presumably in the builder) in ubuntu 18.04 and derivatives.
+        builder.get_object("network_settings_frame").add(builder.get_object("network_box"))
        # Style.
        self._style_provider = Gtk.CssProvider()
        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
@@ -208,6 +210,16 @@ class SettingsDialog:
        for el in self._digit_elems:
            el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
                                                           Gtk.STYLE_PROVIDER_PRIORITY_USER)
+
+        if IS_GNOME_SESSION:
+            switcher = builder.get_object("main_stack_switcher")
+            switcher.set_margin_top(0)
+            switcher.set_margin_bottom(0)
+            builder.get_object("main_box").remove(switcher)
+            header_bar = Gtk.HeaderBar(visible=True, show_close_button=True)
+            header_bar.set_custom_title(switcher)
+            self._dialog.set_titlebar(header_bar)
+
        self.init_ui_elements()
        self.init_profiles()

@@ -233,8 +245,7 @@ class SettingsDialog:
        self._neutrino_radio_button.set_active(self._s_type is SettingsType.NEUTRINO_MP)
        self.update_picon_paths()
        self.update_title()
-        http_active = self._support_http_api_switch.get_active()
-        self._click_mode_zap_button.set_sensitive(is_enigma_profile and http_active)
+        self._click_mode_zap_button.set_sensitive(self._support_http_api_switch.get_active())
        self._lang_combo_box.set_active_id(self._ext_settings.language)
        self.on_info_bar_close() if is_enigma_profile else self.show_info_message(
            "The Neutrino has only experimental support. Not all features are supported!", Gtk.MessageType.WARNING)
@@ -267,14 +278,15 @@ class SettingsDialog:
            self._picons_paths_box.set_active(0)

    def show(self):
-        self._dialog.run()
+        return self._dialog.run()
+
+    def is_updated(self):
+        return self._updated

    def on_response(self, dialog, resp):
-        if resp == Gtk.ResponseType.OK and not self.apply_settings():
-            return
-
-        self._dialog.destroy()
-        return resp
+        if resp == Gtk.ResponseType.ACCEPT:
+            self._updated = self.on_save_settings()
+        dialog.destroy()

    def on_field_icon_press(self, entry, icon, event_button):
        update_entry_data(entry, self._dialog, self._settings)
@@ -324,12 +336,12 @@ class SettingsDialog:
        self._picons_size_button.set_active_id(str(self._settings.list_picon_size))
        self._tooltip_logo_size_button.set_active_id(str(self._settings.tooltip_logo_size))
        self._list_font_button.set_font(self._settings.list_font)
+        self._support_http_api_switch.set_active(self._settings.http_api_support)

        if self._s_type is SettingsType.ENIGMA_2:
            self._enable_exp_switch.set_active(self._settings.is_enable_experimental)
            self._support_ver5_switch.set_active(self._settings.v5_support)
            self._force_bq_name_switch.set_active(self._settings.force_bq_names)
-            self._support_http_api_switch.set_active(self._settings.http_api_support)
            self._enable_yt_dl_switch.set_active(self._settings.enable_yt_dl)
            self._enable_update_yt_dl_switch.set_active(self._settings.enable_yt_dl_update)
            self._enable_send_to_switch.set_active(self._settings.enable_send_to)
@@ -366,9 +378,9 @@ class SettingsDialog:
        self._settings.satellites_xml_path = self._satellites_xml_field.get_text()
        self._settings.picons_path = self._picons_paths_box.get_active_id()

-    def apply_settings(self, item=None):
+    def on_save_settings(self, item=None):
        if show_dialog(DialogType.QUESTION, self._dialog) != Gtk.ResponseType.OK:
-            return
+            return False

        self.on_apply_profile_settings()
        self._ext_settings.profiles = self._settings.profiles
@@ -391,6 +403,7 @@ class SettingsDialog:
        self._ext_settings.list_picon_size = int(self._picons_size_button.get_active_id())
        self._ext_settings.tooltip_logo_size = int(self._tooltip_logo_size_button.get_active_id())
        self._ext_settings.list_font = self._list_font_button.get_font()
+        self._ext_settings.http_api_support = self._support_http_api_switch.get_active()

        if not IS_LINUX:
            self._ext_settings.dark_mode = self._dark_mode_switch.get_active()
@@ -406,13 +419,13 @@ class SettingsDialog:
            self._ext_settings.extra_color = self._extra_color_button.get_rgba().to_string()
            self._ext_settings.v5_support = self._support_ver5_switch.get_active()
            self._ext_settings.force_bq_names = self._force_bq_name_switch.get_active()
-            self._ext_settings.http_api_support = self._support_http_api_switch.get_active()
            self._ext_settings.enable_yt_dl = self._enable_yt_dl_switch.get_active()
            self._ext_settings.enable_yt_dl_update = self._enable_update_yt_dl_switch.get_active()
            self._ext_settings.enable_send_to = self._enable_send_to_switch.get_active()

        self._ext_settings.default_profile = list(filter(lambda r: r[1], self._profile_view.get_model()))[0][0]
        self._ext_settings.save()
+
        return True

    @run_task
@@ -594,7 +607,7 @@ class SettingsDialog:
        self._ext_settings.picons_paths = tuple(r[0] for r in model)

    def on_remove_picon_path(self, button):
-        msg = f"{get_message('This may change the settings of other profiles!')}\n\n\t\t{'Are you sure?'}"
+        msg = f"{get_message('This may change the settings of other profiles!')}\n\n\t\t{get_message('Are you sure?')}"
        if show_dialog(DialogType.QUESTION, self._dialog, msg) != Gtk.ResponseType.OK:
            return

@@ -790,15 +803,16 @@ class SettingsDialog:
    @run_task
    def unpack_theme(self, src, dst, button):
        try:
-            os.makedirs(os.path.dirname(dst), exist_ok=True)
+            from shutil import unpack_archive

-            import subprocess
-            log("Unpacking '{}' started...".format(src))
-            p = subprocess.Popen(["tar", "-xvf", src, "-C", dst],
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT)
-            p.communicate()
+            log(f"Unpacking '{src}' started...")
+            os.makedirs(os.path.dirname(dst), exist_ok=True)
+            unpack_archive(src, dst)
            log("Unpacking end.")
+        except (ValueError, OSError) as e:
+            msg = f"Unpacking error: {e}"
+            log(msg)
+            self.show_info_message(msg, Gtk.MessageType.ERROR)
        finally:
            self.update_theme_button(button, dst)

--- a/app/ui/style.css
+++ b/app/ui/style.css
@@ -61,12 +61,13 @@ paned > separator {
 }

 .stack-switcher > button > label {
-  padding-left: 2px;
-  padding-right: 2px;
-  min-width: 75px;
+  padding-left: 5px;
+  padding-right: 5px;
+  min-width: 50px;
 }

 .stack-switcher > button.text-button {
-  padding-left: 2px;
-  padding-right: 2px;
+  padding-left: 5px;
+  padding-right: 5px;
+  min-width: 50px;
 }
--- a/app/ui/telnet.glade
+++ b/app/ui/telnet.glade
@@ -27,7 +27,7 @@ Author: Dmitriy Yefremov

 -->
 <interface domain="demon-editor">
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk+" version="3.18"/>
  <!-- interface-license-type mit -->
  <!-- interface-name DemonEditor -->
  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
@@ -46,16 +46,10 @@ Author: Dmitriy Yefremov
  <object class="GtkFrame" id="telnet_frame">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
-    <property name="margin_left">5</property>
-    <property name="margin_right">5</property>
-    <property name="margin_top">5</property>
-    <property name="margin_bottom">5</property>
    <property name="label_xalign">0.49000000953674316</property>
    <property name="shadow_type">in</property>
    <child>
      <object class="GtkBox" id="telnet_main_box">
-        <property name="width_request">480</property>
-        <property name="height_request">180</property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="margin_left">5</property>
--- a/app/ui/telnet.py
+++ b/app/ui/telnet.py
@@ -1,3 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2021 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
 import re
 import selectors
 import socket
@@ -44,7 +72,7 @@ class TelnetClient(Gtk.Box):
    _ALL_PATTERN = re.compile(r'(\x1b\[|\x9b)[0-?]*[@-~]')
    _NOT_SUPPORTED = {"mc", "mcedit", "vi", "nano"}

-    def __init__(self, app, settings, *args, **kwargs):
+    def __init__(self, app, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self._app = app
        self._app.connect("profile-changed", self.on_profile_changed)
--- a/app/ui/uicommons.py
+++ b/app/ui/uicommons.py
@@ -1,3 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2021 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
 import locale
 import os
 from enum import Enum, IntEnum
@@ -7,7 +35,7 @@ import gi

 gi.require_version("Gtk", "3.0")
 gi.require_version("Gdk", "3.0")
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk, Gdk, GLib

 from app.settings import Settings, SettingsException, IS_DARWIN, GTK_PATH, IS_LINUX

@@ -52,7 +80,8 @@ else:
                                                     Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)

 if IS_LINUX:
-    locale.bindtextdomain(TEXT_DOMAIN, LANG_PATH)
+    if UI_RESOURCES_PATH == BASE_PATH:
+        locale.bindtextdomain(TEXT_DOMAIN, LANG_PATH)
    # Init notify
    try:
        gi.require_version("Notify", "0.7")
@@ -77,16 +106,22 @@ else:
 theme = Gtk.IconTheme.get_default()
 theme.append_search_path(UI_RESOURCES_PATH + "icons")

-_IMAGE_MISSING = theme.load_icon("image-missing", 16, 0) if theme.lookup_icon("image-missing", 16, 0) else None
-CODED_ICON = theme.load_icon("emblem-readonly", 16, 0) if theme.lookup_icon(
-    "emblem-readonly", 16, 0) else _IMAGE_MISSING
-LOCKED_ICON = theme.load_icon("changes-prevent-symbolic", 16, 0) if theme.lookup_icon(
-    "system-lock-screen", 16, 0) else _IMAGE_MISSING
-HIDE_ICON = theme.load_icon("go-jump", 16, 0) if theme.lookup_icon("go-jump", 16, 0) else _IMAGE_MISSING
-TV_ICON = theme.load_icon("tv-symbolic", 16, 0) if theme.lookup_icon("tv-symbolic", 16, 0) else _IMAGE_MISSING
-IPTV_ICON = theme.load_icon("emblem-shared", 16, 0) if theme.lookup_icon("emblem-shared", 16, 0) else None
-EPG_ICON = theme.load_icon("gtk-index", 16, 0) if theme.lookup_icon("gtk-index", 16, 0) else None
-DEFAULT_ICON = theme.load_icon("emblem-default", 16, 0) if theme.lookup_icon("emblem-default", 16, 0) else None
+
+def get_icon(name, size, default=None):
+    try:
+        return theme.load_icon(name, size, 0) if theme.lookup_icon(name, size, 0) else default
+    except GLib.Error:
+        return default
+
+
+_IMAGE_MISSING = get_icon("image-missing", 16)
+CODED_ICON = get_icon("emblem-readonly", 16, _IMAGE_MISSING)
+LOCKED_ICON = get_icon("changes-prevent-symbolic", 16, _IMAGE_MISSING)
+HIDE_ICON = get_icon("go-jump", 16, _IMAGE_MISSING)
+TV_ICON = get_icon("tv-symbolic", 16, _IMAGE_MISSING)
+IPTV_ICON = get_icon("emblem-shared", 16, _IMAGE_MISSING)
+EPG_ICON = get_icon("gtk-index", 16, _IMAGE_MISSING)
+DEFAULT_ICON = get_icon("emblem-default", 16, _IMAGE_MISSING)


@lru_cache(maxsize=1)
@@ -262,10 +297,13 @@ if IS_LINUX:
        LEFT = 113
        RIGHT = 114
        F2 = 68
+        F4 = 70
+        F5 = 71
        F7 = 73
        SPACE = 65
        DELETE = 119
        BACK_SPACE = 22
+        RETURN = 36
        CTRL_L = 37
        CTRL_R = 105
        # Laptop codes
@@ -300,10 +338,13 @@ elif IS_DARWIN:
        LEFT = 123
        RIGHT = 123
        F2 = 120
+        F4 = 118
+        F5 = 96
        F7 = 98
        SPACE = 49
        DELETE = 51
        BACK_SPACE = 76
+        RETURN = 36
        CTRL_L = 55
        CTRL_R = 55
        # Laptop codes.
@@ -336,10 +377,13 @@ else:
        LEFT = 37
        RIGHT = 39
        F2 = 113
+        F4 = 115
+        F5 = 116
        F7 = 118
        SPACE = 32
        DELETE = 46
        BACK_SPACE = 8
+        RETURN = 13
        CTRL_L = 17
        CTRL_R = 163
        # Laptop codes.
--- a/app/ui/win_style.css
+++ b/app/ui/win_style.css
@@ -6,3 +6,11 @@ button {
  min-height: 24px;
  min-width: 24px;
 }
+
+entry {
+  min-height: 24px;
+}
+
+switch {
+ margin-right: 2px;
+}
--- a/build/linux/build-deb.sh
+++ b/build/linux/build-deb.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VER="2.0.0_Alpha"
+VER="2.1.0_Beta"
 B_PATH="dist/DemonEditor"
 DEB_PATH="$B_PATH/usr/share/demoneditor"

--- a/build/linux/deb/DEBIAN/control
+++ b/build/linux/deb/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: demon-editor
-Version: 2.0.0-Alpha
+Version: 2.1.0-Beta
 Section: utils
 Priority: optional
 Architecture: all
@@ -10,6 +10,7 @@ Depends: python3 (>= 3.6),
         python3-gi-cairo,
         gir1.2-notify-0.7
 Recommends: libmpv1,
-            python3-chardet
+            python3-chardet,
+            libgtksourceview (>= 3.0)
 Maintainer: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
 Description: Enigma2 channel and satellite list editor
--- a/build/linux/deb/DEBIAN/copyright
+++ b/build/linux/deb/DEBIAN/copyright
@@ -5,7 +5,7 @@ Source: https://github.com/DYefremov/DemonEditor
 Files: *
 MIT License

-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2022 Dmitriy Yefremov

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/build/linux/deb/usr/share/locale/be/LC_MESSAGES/demon-editor.mo
+++ b/build/linux/deb/usr/share/locale/be/LC_MESSAGES/demon-editor.mo
--- a/build/linux/deb/usr/share/locale/de/LC_MESSAGES/demon-editor.mo
+++ b/build/linux/deb/usr/share/locale/de/LC_MESSAGES/demon-editor.mo
--- a/build/linux/deb/usr/share/locale/it/LC_MESSAGES/demon-editor.mo
+++ b/build/linux/deb/usr/share/locale/it/LC_MESSAGES/demon-editor.mo
--- a/build/linux/deb/usr/share/locale/pl/LC_MESSAGES/demon-editor.mo
+++ b/build/linux/deb/usr/share/locale/pl/LC_MESSAGES/demon-editor.mo
--- a/build/linux/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo
+++ b/build/linux/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo
--- a/build/linux/deb/usr/share/locale/tr/LC_MESSAGES/demon-editor.mo
+++ b/build/linux/deb/usr/share/locale/tr/LC_MESSAGES/demon-editor.mo
--- a/build/mac/DemonEditor.spec
+++ b/build/mac/DemonEditor.spec
@@ -69,7 +69,7 @@ app = BUNDLE(coll,
                 'CFBundleGetInfoString': "Enigma2 channel and satellite editor",
                 'LSApplicationCategoryType': 'public.app-category.utilities',
                 'LSMinimumSystemVersion': '10.13',
-                 'CFBundleShortVersionString': f"2.0.0.{BUILD_DATE} Alpha",
+                 'CFBundleShortVersionString': f"2.1.0.{BUILD_DATE} Beta",
                 'NSHumanReadableCopyright': u"Copyright © 2021, Dmitriy Yefremov",
                 'NSRequiresAquaSystemAppearance': 'false'
             })
--- a/po/be/demon-editor.po
+++ b/po/be/demon-editor.po
@@ -50,6 +50,9 @@ msgstr "Цякучы IP:"
 msgid "Assign"
 msgstr "Прывязаць"

+msgid "Assign file"
+msgstr "Прывязаць файл"
+
 msgid "Bouquet details"
 msgstr "Сэрвісы букета"

@@ -203,8 +206,8 @@ msgstr "Цякучы шлях да дадзеных:"
 msgid "Data:"
 msgstr "Дадзеныя:"

-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Рэдактар спіса каналаў і спадарожнікаў Enigma2\n для GNU/Linux."
+msgid "Enigma2 channel and satellite list editor."
+msgstr "Рэдактар спіса каналаў і спадарожнікаў Enigma2."

 msgid "Host:"
 msgstr "Адрас рэсівера:"
@@ -230,6 +233,9 @@ msgstr "Скід профілю"
 msgid "Satellites"
 msgstr "Спадарожнікі"

+msgid "Transponders"
+msgstr "Транспондары"
+
 msgid "Satellites.xml file:"
 msgstr "Файл satellites.xml:"

@@ -296,8 +302,8 @@ msgstr "Фармат імя піконаў:"
 msgid "Resize:"
 msgstr "Змяніць памер:"

-msgid "Current picons path:"
-msgstr "Цякучы шлях да піконаў:"
+msgid "Current picons path"
+msgstr "Цякучы шлях да піконаў"

 msgid "Receiver picons path:"
 msgstr "Шлях да піконаў рэсівера:"
@@ -1249,3 +1255,81 @@ msgstr "Запісы"

 msgid "Help"
 msgstr "Даведка"
+
+msgid "HTTP API is not activated. Check your settings!"
+msgstr "HTTP API не актывавана. Праверце налады!"
+
+msgid "Add picons"
+msgstr "Дадаць піконы"
+
+msgid "Logs"
+msgstr "Логі"
+
+msgid "Title"
+msgstr "Назва"
+
+msgid "Time"
+msgstr "Час"
+
+msgid "Length"
+msgstr "Працягласць"
+
+msgid "Additional source"
+msgstr "Дадатковая крыніца"
+
+msgid "Automatically set the name selected in the favorites list."
+msgstr "Аўтаматычная ўсталёўка імя са спіса абранага."
+
+msgid "Playback"
+msgstr "Прайграванне"
+
+msgid "Audio"
+msgstr "Аўдыё"
+
+msgid "Audio Track"
+msgstr "Аўдыёдарожка"
+
+msgid "Subtitle"
+msgstr "Субтытры"
+
+msgid "Subtitle Track"
+msgstr "Дарожка субтытраў"
+
+msgid "Aspect ratio"
+msgstr "Стасунак бакоў"
+
+msgid "This may change the settings of other profiles!"
+msgstr "Гэта можа змяніць налады іншых профіляў!"
+
+msgid "Drag the services to the desired picon or picon to the list of selected services."
+msgstr "Перацягніце сэрвісы на патрэбны пікон ці пікон на спіс абраных сэрвісаў."
+
+msgid "Sets the profile folder as default to store picons, backups, etc."
+msgstr "Усталёўвае тэчку профілю па змаўчанні для захоўвання  піконаў, рэзервовых копій і т. п."
+
+msgid "New sub-bouquet"
+msgstr "Стварыць саббукет"
+
+msgid "Mark not presented in Bouquets"
+msgstr "Адзначыць адсутныя у букетах"
+
+msgid "Not in Bouquets"
+msgstr "Адсутныя у букетах"
+
+msgid "Do not show services present in Bouquets."
+msgstr "Не паказваць сэрвісы якія прысутнічаюць у букетах."
+
+msgid "IPTV services only"
+msgstr "Толькі IPTV сэрвісы"
+
+msgid "Display picons"
+msgstr "Адлюстроўваць пiконы"
+
+msgid "Alternate layout"
+msgstr "Альтэрнатыўная кампаноўка"
+
+msgid "Layout of elements has been changed!"
+msgstr "Зменена месцаванне элементаў!"
+
+msgid "Restart the program to apply all changes."
+msgstr "Перазапусціце праграму, каб ужыць усе змены."
--- a/po/de/demon-editor.po
+++ b/po/de/demon-editor.po
@@ -52,6 +52,9 @@ msgstr "Akt.IP:"
 msgid "Assign"
 msgstr "Zuweisen"

+msgid "Assign file"
+msgstr "Datei zuweisen"
+
 msgid "Bouquet details"
 msgstr "Bouquet-Details"

@@ -205,8 +208,8 @@ msgstr "Aktueller Datenpfad:"
 msgid "Data:"
 msgstr "Daten:"

-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Enigma2 Kanal- und Satellitenlisteneditor für GNU/Linux."
+msgid "Enigma2 channel and satellite list editor."
+msgstr "Enigma2 Kanal- und Satellitenlisteneditor."

 msgid "Host:"
 msgstr "Host:"
@@ -232,6 +235,9 @@ msgstr "Profil zurücksetzen"
 msgid "Satellites"
 msgstr "Satelliten"

+msgid "Transponders"
+msgstr "Transpondern"
+
 msgid "Satellites.xml file:"
 msgstr "Satellites.xml Datei:"

@@ -298,8 +304,8 @@ msgstr "Picon Namens-Format:"
 msgid "Resize:"
 msgstr "Größe ändern:"

-msgid "Current picons path:"
-msgstr "Aktueller Piconspfad:"
+msgid "Current picons path"
+msgstr "Aktueller Piconspfad"

 msgid "Receiver picons path:"
 msgstr "Receiver Piconspfad:"
@@ -1263,3 +1269,81 @@ msgstr "Aufnahmen"

 msgid "Help"
 msgstr "Hilfe"
+
+msgid "HTTP API is not activated. Check your settings!"
+msgstr "HTTP API ist nicht aktiviert. Überprüfe deine Einstellungen!"
+
+msgid "Add picons"
+msgstr "Picons hinzufügen"
+
+msgid "Logs"
+msgstr "Logs"
+
+msgid "Title"
+msgstr "Titel"
+
+msgid "Time"
+msgstr "Zeit"
+
+msgid "Length"
+msgstr "Dauer"
+
+msgid "Additional source"
+msgstr "Zusätzliche Quelle"
+
+msgid "Automatically set the name selected in the favorites list."
+msgstr "Automatisch den in der Favoritenliste ausgewählten Namen einstellen."
+
+msgid "Playback"
+msgstr "Wiedergabe"
+
+msgid "Audio"
+msgstr ""
+
+msgid "Audio Track"
+msgstr "Audio"
+
+msgid "Subtitle"
+msgstr "Untertitel"
+
+msgid "Subtitle Track"
+msgstr "Untertitelspur"
+
+msgid "Aspect ratio"
+msgstr "Seitenverhältnis"
+
+msgid "This may change the settings of other profiles!"
+msgstr "Dadurch können sich die Einstellungen anderer Profile ändern!"
+
+msgid "Drag the services to the desired picon or picon to the list of selected services."
+msgstr "Ziehe die Dienste auf das gewünschte Picon oder Picon in die Liste der ausgewählten Dienste."
+
+msgid "Sets the profile folder as default to store picons, backups, etc."
+msgstr "Legt den Profilordner als Standardordner zum Speichern von Piconen, Backups usw. fest."
+
+msgid "New sub-bouquet"
+msgstr "Neues Sub-Bouquet"
+
+msgid "Mark not presented in Bouquets"
+msgstr "Markieren die nicht in Bouquets vorhanden"
+
+msgid "Not in Bouquets"
+msgstr "Nicht in Bouquets"
+
+msgid "Do not show services present in Bouquets."
+msgstr "Vorhandene in Bouquets Dienste nicht anzeigen."
+
+msgid "IPTV services only"
+msgstr "Nur IPTV-Dienste"
+
+msgid "Display picons"
+msgstr "Picons anzeigen"
+
+msgid "Alternate layout"
+msgstr "Alternatives Layout"
+
+msgid "Layout of elements has been changed!"
+msgstr "Das Layout der Elemente wurde geändert!"
+
+msgid "Restart the program to apply all changes."
+msgstr "Starte das Programm neu, um alle Änderungen zu übernehmen."
--- a/po/it/demon-editor.po
+++ b/po/it/demon-editor.po
@@ -1233,7 +1233,7 @@ msgid "Mark duplicates"
 msgstr "Seleziona duplicati"

 msgid "Load only for selected bouquet"
-msgstr "Larica solo per i bouquet selezionati"
+msgstr "Scarica solo per i bouquet selezionati"

 msgid "The task is canceled!"
 msgstr "Operazione cancellata!"
--- a/po/pl/demon-editor.po
+++ b/po/pl/demon-editor.po
@@ -1,30 +1,26 @@
-# Copyright (C) 2018-2020 Dmitriy Yefremov
+# Copyright (C) 2018-2019 Dmitriy Yefremov
 # This file is distributed under the MIT license.
 #
 #
 msgid ""
 msgstr ""
-"Last-Translator: wwns\n"
+"Last-Translator: wwns <https://github.com/wwns>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 3.0\n"

 msgid "translator-credits"
 msgstr "wwns"

 # Main
-msgid "File"
-msgstr "Plik"
-
-msgid "View"
-msgstr "Widok"
-
-msgid "Lock"
-msgstr "Zablokuj"
-
 msgid "Service"
-msgstr "Serwis"
+msgstr "Usługa"

 msgid "Package"
 msgstr "Pakiet"
@@ -48,7 +44,7 @@ msgid "System"
 msgstr "System"

 msgid "Pos"
-msgstr "Pos"
+msgstr "Poz"

 msgid "Num"
 msgstr "Num"
@@ -113,6 +109,9 @@ msgstr "Ustaw domyślną nazwę"
 msgid "Insert marker"
 msgstr "Wstaw znacznik"

+msgid "Insert space"
+msgstr "Wstaw spację"
+
 msgid "Locate in services"
 msgstr "Znajdź w usługach"

@@ -179,6 +178,9 @@ msgstr "Zapisz"
 msgid "Search"
 msgstr "Szukaj"

+msgid "Services"
+msgstr "Kanały"
+
 msgid "Services filter"
 msgstr "Filtr kanałów"

@@ -206,8 +208,8 @@ msgstr "Aktualna ścieżka danych:"
 msgid "Data:"
 msgstr "Dane:"

-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Edytor kanałów Enigma2 i listy satelitów dla GNU/Linux."
+msgid "Enigma2 channel and satellite list editor."
+msgstr "Edytor kanałów i list satelitarnych Enigma2."

 msgid "Host:"
 msgstr "Host:"
@@ -222,7 +224,7 @@ msgid "Receive files from receiver"
 msgstr "Pobieranie plików z odbiornika"

 msgid "Receiver IP:"
-msgstr "Odbiornik IP:"
+msgstr "Adres IP odbiornika:"

 msgid "Remove unused bouquets"
 msgstr "Usuń nieużywany bouquet"
@@ -252,22 +254,7 @@ msgid "User bouquet files:"
 msgstr "Pliki bukietu użytkownika:"

 msgid "Extra:"
-msgstr "Dodatkowe"
-
-msgid "IPTV tools"
-msgstr "Narzędzia IPTV"
-
-msgid "Picons manager"
-msgstr "Menedżer pikonów"
-
-msgid "Hide/Skip"
-msgstr "Ukryj/Pomiń"
-
-msgid "Parent lock"
-msgstr "Blokada rodzicielska"
-
-msgid "There are unsaved changes.\n\n\t Save them now?"
-msgstr "Istnieją niezapisane zmiany.\n\n\t Zapisać je teraz?"
+msgstr "Dodatkowe:"

 # Filter bar
 msgid "Only free"
@@ -280,6 +267,9 @@ msgid "All types"
 msgstr "Wszystkie typy"

 # Streams player
+msgid "Play"
+msgstr "Odtwarzaj"
+
 msgid "Stop playback"
 msgstr "Zatrzymaj odtwarzanie"

@@ -311,8 +301,8 @@ msgstr "Format nazw pikon:"
 msgid "Resize:"
 msgstr "Zmień rozmiar:"

-msgid "Current picons path:"
-msgstr "Aktualna ścieżka pikon:"
+msgid "Current picons path"
+msgstr "Aktualna ścieżka pikon"

 msgid "Receiver picons path:"
 msgstr "Ścieżka pikon odbiornika:"
@@ -390,12 +380,6 @@ msgid "Remove selection"
 msgstr "Usuń wybrane"

 # Service details dialog
-msgid "To the top"
-msgstr "Przenieś na góre bukietu"
-
-msgid "To the end"
-msgstr "Przenieś na koniec bukietu"
-
 msgid "Service data:"
 msgstr "Dane usług:"

@@ -467,7 +451,7 @@ msgid "Preferences"
 msgstr "Preferencje"

 msgid "Profile:"
-msgstr "Profil:"
+msgstr "Profile:"

 msgid "Timeout between commands in seconds"
 msgstr "Limit czasu między poleceniami w sekundach"
@@ -481,6 +465,9 @@ msgstr "Login:"
 msgid "Options"
 msgstr "Opcje"

+msgid "Rename"
+msgstr "Zmień nazwę"
+
 msgid "Password:"
 msgstr "Hasło:"

@@ -497,13 +484,13 @@ msgid "Picons path:"
 msgstr "Ścieżka pikon:"

 msgid "Network settings:"
-msgstr "Ustawienia sieci:"
+msgstr "Ustawienia połaczenia:"

 msgid "STB file paths:"
 msgstr "Ścieżki do plików w STB:"

 msgid "Local file paths:"
-msgstr "Lokalne ścieżki plików:"
+msgstr "Lokalne ścieżki do plików:"

 # Dialogs messages
 msgid "Error. No bouquet is selected!"
@@ -539,6 +526,9 @@ msgstr "Wybierz tylko jeden element!"
 msgid "No png file is selected!"
 msgstr "Nie wybrano pliku png!"

+msgid "No profile selected!"
+msgstr "Nie wybroano profilu !"
+
 msgid "No reference is present!"
 msgstr "Brak referencji!"

@@ -606,6 +596,15 @@ msgstr "Brak danych do zapisania!"
 msgid "Network"
 msgstr "Sieć"

+msgid "Paths"
+msgstr "Ścieżki"
+
+msgid "Program"
+msgstr "Program"
+
+msgid "Backup:"
+msgstr "Kopia:"
+
 msgid "Backup"
 msgstr "Kopia"

@@ -621,11 +620,26 @@ msgstr "Przywróć bukiety"
 msgid "Restore all"
 msgstr "Przywrócić wszystko"

+msgid "Before saving"
+msgstr "Przed zapisaniem"
+
+msgid "Before downloading from the receiver"
+msgstr "Przed pobraniem z odbiornika"
+
+msgid "Set background color for the services"
+msgstr "Ustaw kolor tła dla usług"
+
+msgid "Marked as new:"
+msgstr "Oznacz jako nowy:"
+
+msgid "With an extra name in the bouquet:"
+msgstr "Z dodatkową nazwą w bukiecie:"
+
 msgid "Select"
 msgstr "Wybierz"

 msgid "About"
-msgstr "Wersja"
+msgstr "O programie"

 msgid "Exit"
 msgstr "Wyjście"
@@ -633,15 +647,6 @@ msgstr "Wyjście"
 msgid "Tools"
 msgstr "Narzędzia"

-msgid "Cut"
-msgstr "Wytnij"
-
-msgid "Paste"
-msgstr "Wklej"
-
-msgid "Insert space"
-msgstr "Wstaw spację"
-
 # Import
 msgid "Import"
 msgstr "Importuj"
@@ -664,12 +669,27 @@ msgstr "Usuń wszystkie nieużywane"
 msgid "Test"
 msgstr "Test"

-msgid "Details"
-msgstr "Właściwości"
-
 msgid "Test connection"
 msgstr "Testuj połączenie"

+msgid "Double click on the service in the bouquet list:"
+msgstr "Kliknij dwukrotnie usługę na liście bukietów:"
+
+msgid "Zap"
+msgstr "Przełącz"
+
+msgid "Play  stream"
+msgstr "Odtwórz strumień"
+
+msgid "Disabled"
+msgstr "Wyłączone"
+
+msgid "Enable lamedb ver. 5 support"
+msgstr "Włącz wsparcie dla lamedb w wer.5"
+
+msgid "Enable HTTP API"
+msgstr "Włącz API HTTP"
+
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Przełącz(zap) kanał(Ctrl + Z)"

@@ -770,11 +790,26 @@ msgstr "Import listy odtwarzania"
 msgid "Getting link error:"
 msgstr "Błąd pobierania łącza:"

+msgid "Extra"
+msgstr "Ekstra"
+
+msgid "Apply profile settings"
+msgstr "Zastosuj ustawienia profilu"
+
 msgid "Settings type:"
 msgstr "Ustawienia dla:"

 msgid "Set default"
-msgstr "Ustaw domyślnie"
+msgstr "Uataw domyślnie"
+
+msgid "Language:"
+msgstr "Język:"
+
+msgid "Load the last open configuration at program startup"
+msgstr "Załaduj ostatnią otwartą konfigurację podczas uruchamiania programu"
+
+msgid "Enable direct playback bar"
+msgstr "Włącz pasek bezpośredniego odtwarzania"

 msgid "Enables direct sending and playback of media links on the receiver"
 msgstr "Umożliwia bezpośrednie wysyłanie i odtwarzanie łączy multimedialnych w odbiorniku"
@@ -782,23 +817,8 @@ msgstr "Umożliwia bezpośrednie wysyłanie i odtwarzanie łączy multimedialnyc
 msgid "Watch the channel in the program"
 msgstr "Obejrzyj kanał w programie"

-msgid "Receiver info"
-msgstr "Informacje o odbiorniku"
-
-msgid "Operates in standby mode or current active transponder!"
-msgstr "Działa w trybie gotowości lub aktualnie jest aktywny transponder!"
-
-msgid "Download picons from the receiver"
-msgstr "Pobierz pikony z odbiornika"
-
-msgid "Remove picons from the receiver"
-msgstr "Usuń pikony z odbiornika"
-
-msgid "Use http to reload data in the receiver."
-msgstr "Użyj http aby przeładować dane w odbiorniku."
-
-msgid "Apply profile settings"
-msgstr "Zastosuj ustawienia profilu"
+msgid "Zap and Play"
+msgstr "Przełącz i Odtwórz"

 msgid "Drag  or paste the link here"
 msgstr "Przeciągnij lub wklej tutaj link"
@@ -809,34 +829,156 @@ msgstr "Usuń dodane linki z listy odtwarzania"
 msgid "A bouquet with that name exists!"
 msgstr "Istnieje bukiet o tej nazwie!"

+msgid "Details"
+msgstr "Właściwości"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Reset"
+msgstr "Reset profilu"
+
+msgid "File"
+msgstr "Plik"
+
+msgid "Picons manager"
+msgstr "Menedżer pikonów"
+
+msgid "Explorer"
+msgstr "Explorer"
+
+msgid "Satellite url:"
+msgstr "Satelitarny url:"
+
+msgid "Cut"
+msgstr "Wytnij"
+
+msgid "Paste"
+msgstr "Wklej"
+
+msgid "To the top"
+msgstr "Przenieś na góre bukietu"
+
+msgid "To the end"
+msgstr "Przenieś na koniec bukietu"
+
+msgid "View"
+msgstr "Widok"
+
+msgid "Lock"
+msgstr "Zablokuj"
+
+msgid "Parent lock"
+msgstr "Blokada rodzicielska"
+
+msgid "Hide/Skip"
+msgstr "Ukryj/Pomiń"
+
+msgid "IPTV tools"
+msgstr "Narzędzia IPTV"
+
+msgid "Make profile folder as default for the additional data"
+msgstr "Ustaw folder profilu jako domyślny dla dodatkowych danych"
+
+msgid "Default data path:"
+msgstr "Domyślna ścieżka danych:"
+
+msgid "Streams record path:"
+msgstr "Ścieżka zapisu nagrań:"
+
+msgid "Record"
+msgstr "Nagrania"
+
+msgid "Record:"
+msgstr "Nagrania:"
+
+msgid "Record to disk:"
+msgstr "Zapis na dysk:"
+
+msgid "Streaming"
+msgstr "Transmisja"
+
+msgid "Activate transcoding"
+msgstr "Aktywuj"
+
+msgid "Presets:"
+msgstr "Ustawienia transkodowania:"
+
+msgid "Video options:"
+msgstr "Opcje wideo:"
+
+msgid "Audio options:"
+msgstr "Opcje audio:"
+
+msgid "Bitrate (kb/s):"
+msgstr "Szybkość transmisji (kb/s):"
+
+msgid "Codec:"
+msgstr "Kodek:"
+
+msgid "Width (px):"
+msgstr "Szerokość (px):"
+
+msgid "Height (px):"
+msgstr "Wysokość (px):"
+
 msgid "Channels:"
 msgstr "Kanały:"

-msgid "Remove all picons from the receiver"
-msgstr "Usuń wszystkie pikony z odbiornika"
+msgid "Sample rate (Hz):"
+msgstr "Częstotliwość próbkowania (Hz):"

-msgid "Download from the receiver"
-msgstr "Pobierz z odbiornika"
+msgid "Play streams mode:"
+msgstr "Tryb odtwarzania strumieni:"

-msgid "The Neutrino has only experimental support. Not all features are supported!"
-msgstr "Neutrino ma jedynie wsparcie eksperymentalne. Nie wszystkie funkcje są obsługiwane!"
+msgid "Built-in player"
+msgstr "Wbudowany odtwarzacz"
+
+msgid "In a separate window"
+msgstr "W osobnym oknie"
+
+msgid "Only get m3u file"
+msgstr "Tylko pobierz plik m3u"
+
+msgid "Save and restart the program to apply the settings."
+msgstr "Zapisz i uruchom ponownie program, aby zastosować ustawienia."

 msgid "Some images may have problems displaying the favorites list!"
 msgstr "Niektóre obrazy mogą mieć problemy z wyświetlaniem listy ulubionych!"

-# Appearance
+msgid "Operates in standby mode or current active transponder!"
+msgstr "Działa w trybie gotowości lub aktualnie jest aktywny transponder!"
+
+msgid "No connection to the receiver!"
+msgstr "Brak połączenia z odbiornikiem!"
+
+msgid "Signal level"
+msgstr "Poziom sygnału"
+
+msgid "Receiver info"
+msgstr "Informacje o odbiorniku"
+
+msgid "A profile with that name exists!"
+msgstr "Profil o tej nazwie już istnieje!"
+
+msgid "Show short info as hints in the main services list"
+msgstr "Pokaż krótkie informacje jako wskazówki na głównej liście usług"
+
+msgid "Show detailed info as hints in the bouquet list"
+msgstr "Pokaż szczegółowe informacje jako wskazówki na liście bukietów"
+
+msgid "Enable alternate bouquet file naming"
+msgstr "Włącz alternatywne nazewnictwo plików bukietów"
+
+msgid "Allows you to name bouquet files using their names."
+msgstr "Pozwala nazwać pliki bukietów przy użyciu ich nazw."
+
 msgid "Appearance"
 msgstr "Wygląd"

-msgid "Enable Dark Mode"
-msgstr "Włącz tryb ciemny"
-
 msgid "Enable Themes support"
 msgstr "Włącz obsługę motywów"

-msgid "EXPERIMENTAL!"
-msgstr "EKSPERYMENTALNE!"
-
 msgid "Gtk3 Theme:"
 msgstr "Gtk3 motyw:"

@@ -846,159 +988,346 @@ msgstr "Motyw ikon:"
 msgid "Gtk3 Themes and Icons:"
 msgstr "Gtk3 motywy i ikony:"

-msgid "Save and restart the program to apply the settings."
-msgstr "Zapisz i uruchom ponownie program, aby zastosować ustawienia."
+msgid "Deleting data..."
+msgstr "Usuwanie danych…"

-# Extra
-msgid "Extra"
-msgstr "Ekstra"
+msgid "Download from the receiver"
+msgstr "Pobierz z odbiornika"

-msgid "Enable alternate bouquet file naming"
-msgstr "Włącz alternatywne nazewnictwo plików bukietów"
+msgid "Remove all picons from the receiver"
+msgstr "Usuń wszystkie pikony z odbiornika"

-msgid "Allows you to name bouquet files using their names."
-msgstr "Pozwala nazwać pliki bukietów przy użyciu ich nazw."
-
-msgid "Enable HTTP API"
-msgstr "Włącz API HTTP"
-
-msgid "Double click on the service in the bouquet list:"
-msgstr "Kliknij dwukrotnie usługę na liście bukietów:"
-
-msgid "Zap"
-msgstr "Przełącz"
-
-msgid "Play"
-msgstr "Odtwarzaj"
-
-msgid "Zap and Play"
-msgstr "Przełącz i Odtwórz"
-
-msgid "Play  stream"
-msgstr "Odtwórz strumień"
-
-msgid "Disabled"
-msgstr "Wyłączone"
-
-msgid "Enable experimental features"
-msgstr "Włącz funkcje eksperymentalne"
-
-msgid "Enable lamedb ver. 5 support"
-msgstr "Włącz wsparcie dla lamedb w wer.5"
+msgid "Service reference"
+msgstr "Odniesienie do usługi"

 msgid "Enable support for"
 msgstr "Włącz obsługę"

-msgid "Enables parsing links using youtube-dl to get direct links to media"
-msgstr "Umożliwia analizowanie linków za pomocą youtube-dl, aby uzyskać bezpośrednie linki do multimediów"
-
 msgid "Auto-check for updates"
 msgstr "Automatyczne sprawdzanie aktualizacji"

-msgid "Enable direct playback bar"
-msgstr "Włącz pasek bezpośredniego odtwarzania"
+msgid "Filter services"
+msgstr "Filtruj usługi"

-#Program
-msgid "Program"
-msgstr "Program"
+msgid "Filter services in the main list."
+msgstr "Filtruj usługi na głównej liście."

-msgid "Language:"
-msgstr "Język:"
+msgid "Destination:"
+msgstr "Miejsce docelowe:"

-msgid "Load the last open configuration at program startup"
-msgstr "Załaduj ostatnią otwartą konfigurację podczas uruchamiania programu"
+msgid "EXPERIMENTAL!"
+msgstr "EKSPERYMENTALNE!"

-msgid "Show short info as hints in the main services list"
-msgstr "Pokaż krótkie informacje jako wskazówki na głównej liście usług"
+msgid "Sorting data..."
+msgstr "Sortowanie danych…"

-msgid "Show detailed info as hints in the bouquet list" 
-msgstr "Pokaż szczegółowe informacje jako wskazówki na liście bukietów"
+msgid ""
+"There are unsaved changes.\n"
+"\n"
+"\t Save them now?"
+msgstr ""
+"Istnieją niezapisane zmiany.\n"
+"\n"
+"\t Zapisać je teraz?"

-msgid "Set background color for the services"
-msgstr "Ustaw kolor tła dla usług"
+msgid ""
+"Are you sure you want to change the order\n"
+"\t of services in this bouquet?"
+msgstr ""
+"Czy na pewno chcesz zmienić kolejność?\n"
+"\t usług w tym bukiecie?"

-msgid "Marked as new:"
-msgstr "Oznacz jako nowy:"
+msgid "Remove from the receiver"
+msgstr "Usuń z odbiornika"

-msgid "With an extra name in the bouquet:"
-msgstr "Z dodatkową nazwą w bukiecie:"
+msgid "Screenshot"
+msgstr "Zrzut ekranu"

-msgid "Backup:"
-msgstr "Kopia:"
+msgid "Video"
+msgstr "Opcje wideo"

-msgid "Before saving"
-msgstr "Przed zapisaniem"
+msgid "The Neutrino has only experimental support. Not all features are supported!"
+msgstr "Neutrino ma jedynie wsparcie eksperymentalne. Nie wszystkie funkcje są obsługiwane!"

-msgid "Before downloading from the receiver"
-msgstr "Przed pobraniem z odbiornika"
+msgid "Enable experimental features"
+msgstr "Włącz funkcje eksperymentalne"

-#Streaming
-msgid "Streaming"
-msgstr "Transmisja"
+msgid "Can't Playback!"
+msgstr "Nie można odtworzyć!"

-msgid "Record to disk:"
-msgstr "Nagrywanie na dysk:"
+msgid "Enable Dark Mode"
+msgstr "Włącz tryb ciemny"

-msgid "Activate transcoding"
-msgstr "Aktywuj transkodowanie"
+msgid "Extract..."
+msgstr "Rozpakuj…"

-msgid "Presets:"
-msgstr "Ustawienia wstępne:"
+msgid "Unsupported format!"
+msgstr "Format nieobsługiwany!"

-msgid "720p TV/device"
-msgstr "Dla urządzeń z obsługą rozdzielczości 720p"
+msgid "Combine with the current data?"
+msgstr "Połączyć z aktualnymi danymi?"

-msgid "1080p TV/device"
-msgstr "Dla urządzeń z obsługą rozdzielczości 1080p"
+msgid "Importing data done!"
+msgstr "Importowanie danych zakończone!"

-msgid "Video options:"
-msgstr "Opcje wideo:"
+msgid "Current service"
+msgstr "Bieżąca usługa"

-msgid "Width (px):"
-msgstr "Szerokość (px):"
+msgid "Open folder"
+msgstr "Otwórz folder"

-msgid "Height (px):"
-msgstr "Wysokość (px):"
+msgid "Open archive"
+msgstr "Otwórz archiwum"

-msgid "Codec:"
-msgstr "Kodek:"
+msgid "Import from Web"
+msgstr "Importuj z sieci"

-msgid "Audio options:"
-msgstr "Opcje audio:"
+msgid "Control"
+msgstr "Kontrola"

-msgid "Services"
-msgstr "Kanały"
+msgid "Timers"
+msgstr "Timery"

-msgid "Sample rate (Hz):"
-msgstr "Częstotliwość próbkowania (Hz):"
+msgid "Timer"
+msgstr "Timer"

-msgid "Play streams mode:"
-msgstr "Odtwarzaj tryb strumieni:"
+msgid "Add timer"
+msgstr "Dodaj timer"

-msgid "Bulit-in player"
-msgstr "Wbudowany odtwarzacz"
+msgid "Hr."
+msgstr "Hr."

-msgid "VLC media player"
-msgstr "Odtwarzacz multimedialny VLC"
+msgid "Min."
+msgstr "Min."

-msgid "Only get m3u file"
-msgstr "Tylko pobierz plik m3u"
+msgid "Power"
+msgstr "Włącz"

-# Paths
-msgid "Paths"
-msgstr "Ścieżki"
+msgid "Standby"
+msgstr "Czuwanie"

-msgid "Make profile folder as default for the additional data"
-msgstr "Ustaw folder profilu jako domyślny dla dodatkowych danych"
+msgid "Wake Up"
+msgstr "Wybudź"
+
+msgid "Reboot"
+msgstr "Restart"
+
+msgid "Restart GUI"
+msgstr "Restart Interfejsu Graficznego"
+
+msgid "Shutdown"
+msgstr "Wyłącz"
+
+msgid "Shut down"
+msgstr "Wyłacz"
+
+msgid "Do Nothing"
+msgstr "Nie rób nic"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Grab screenshot"
+msgstr "Zrób zrzut ekranu"
+
+msgid "Enabled:"
+msgstr "Włączony:"
+
+msgid "Name:"
+msgstr "Nazwa:"
+
+msgid "Description:"
+msgstr "Opis:"
+
+msgid "Service:"
+msgstr "Usługa:"
+
+msgid "Service reference:"
+msgstr "Odniesienie do usługi:"
+
+msgid "Event ID:"
+msgstr "Identyfikator wydarzenia:"
+
+msgid "Begins:"
+msgstr "Początek:"
+
+msgid "Ends:"
+msgstr "Koniec:"
+
+msgid "Repeated:"
+msgstr "Powtórz:"
+
+msgid "Action:"
+msgstr "Akcja:"
+
+msgid "After event:"
+msgstr "Po wydarzeniu:"
+
+msgid "Location:"
+msgstr "Lokalizacja:"
+
+msgid "Mo"
+msgstr "Po"
+
+msgid "Tu"
+msgstr "Wt"
+
+msgid "We"
+msgstr "Śr"
+
+msgid "Th"
+msgstr "Cz"
+
+msgid "Fr"
+msgstr "Pt"
+
+msgid "Sa"
+msgstr "So"
+
+msgid "Su"
+msgstr "Ni"
+
+msgid "Set"
+msgstr "Ustaw"
+
+msgid "Services update"
+msgstr "Aktualizacja usług"
+
+msgid "Create folder"
+msgstr "Utwórz folder"
+
+msgid "FTP client"
+msgstr "Klient-FTP"
+
+msgid "The file size is too large!"
+msgstr "Rozmiar pliku jest za duży!"
+
+msgid "Connect"
+msgstr "Połącz"
+
+msgid "Disconnect"
+msgstr "Rozłącz"
+
+msgid "Size"
+msgstr "Rozmiar"
+
+msgid "Date"
+msgstr "Data"
+
+msgid "Toggle display position"
+msgstr "Przełącz pozycję wyświetlania"
+
+msgid "Alternatives"
+msgstr "Alternatywy"
+
+msgid "Add alternatives"
+msgstr "Dodaj alternatywy"
+
+msgid "DreamOS only!"
+msgstr "Tylko DreamOS!"
+
+msgid "A similar service is already in this list!"
+msgstr "Podobna usługa jest już na tej liście!"
+
+msgid ""
+"Play mode has been changed!\n"
+"Restart the program to apply the settings."
+msgstr ""
+"Tryb odtwarzania został zmieniony!\n"
+"Uruchom ponownie, aby zastosować ustawienia."
+
+msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
+msgstr "Ustaw wartości dla TID, NID i Namespace dla poprawnego nazewnictwa pikonów!"
+
+msgid "Streams detected:"
+msgstr "Wykryte strumienie:"
+
+msgid "Download picons"
+msgstr "Pobierz pikony"
+
+msgid "Errors:"
+msgstr "Błędy:"
+
+msgid "Use to play streams:"
+msgstr "Użyj do odtwarzania strumieni:"
+
+msgid "Font in the lists:"
+msgstr "Czcionka na listach:"
+
+msgid "Picons size in the lists:"
+msgstr "Rozmiar pikonów na listach:"
+
+msgid "Logo size in tooltips:"
+msgstr "Rozmiar logo w podpowiedziach:"
+
+msgid "Save as"
+msgstr "Zapisz jako"
+
+msgid "Mark duplicates"
+msgstr "Zaznacz duplikaty"
+
+msgid "Load only for selected bouquet"
+msgstr "Załaduj tylko dla wybranego bukietu"
+
+msgid "The task is canceled!"
+msgstr "Zadanie anulowane!"
+
+msgid "Data loading in progress!"
+msgstr "Trwa ładowanie danych!"
+
+msgid "Recordings"
+msgstr "Nagrania"
+
+msgid "Help"
+msgstr "Pomoc"
+
+msgid "HTTP API is not activated. Check your settings!"
+msgstr "Interfejs API HTTP nie jest aktywowany. Sprawdź swoje ustawienia!"
+
+msgid "Add picons"
+msgstr "Dodaj pikony"
+
+msgid "Logs"
+msgstr "Logi"
+
+msgid "Title"
+msgstr "Tytuł"
+
+msgid "Time"
+msgstr "Czas"
+
+msgid "Length"
+msgstr "Długość"
+
+msgid "Additional source"
+msgstr "Dodatkowe źródło"
+
+msgid "Automatically set the name selected in the favorites list."
+msgstr "Automatycznie ustaw nazwę wybraną na liście ulubionych."
+
+msgid "Playback"
+msgstr "Odtwarzanie"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Audio Track"
+msgstr "Ścieżka Audio"
+
+msgid "Subtitle"
+msgstr "Napisy"
+
+msgid "Subtitle Track"
+msgstr "Ścieżka napisów"
+
+msgid "Aspect ratio"
+msgstr "Współczynnik proporcji"
+
+msgid "This may change the settings of other profiles!"
+msgstr "Może to zmienić ustawienia innych profili!"
+
+msgid "Drag the services to the desired picon or picon to the list of selected services."
+msgstr "Przeciągnij usługi na żądaną ikonę lub na listę wybranych usług."

 msgid "Sets the profile folder as default to store picons, backups, etc."
 msgstr "Ustawia folder profilu jako domyślny do przechowywania pikonów, kopii zapasowych itp."
-
-msgid "Default data path:"
-msgstr "Domyślna ścieżka danych:"
-
-msgid "Record:"
-msgstr "Nagrania:"
-
-msgid "Streams record path:"
-msgstr "Ścieżka zapisu nagrań:"
--- a/po/ru/demon-editor.po
+++ b/po/ru/demon-editor.po
@@ -50,6 +50,9 @@ msgstr "Текущий IP:"
 msgid "Assign"
 msgstr "Привязать"

+msgid "Assign file"
+msgstr "Привязать файл"
+
 msgid "Bouquet details"
 msgstr "Сервисы букета"

@@ -203,8 +206,8 @@ msgstr "Текущий путь к данным:"
 msgid "Data:"
 msgstr "Данные:"

-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Редактор списка каналов и спутников Enigma2\n для GNU/Linux."
+msgid "Enigma2 channel and satellite list editor."
+msgstr "Редактор списка каналов и спутников Enigma2."

 msgid "Host:"
 msgstr "Адрес ресивера:"
@@ -230,6 +233,9 @@ msgstr "Сброс профиля"
 msgid "Satellites"
 msgstr "Спутники"

+msgid "Transponders"
+msgstr "Транспондеры"
+
 msgid "Satellites.xml file:"
 msgstr "Файл satellites.xml:"

@@ -296,8 +302,8 @@ msgstr "Формат имени пиконов:"
 msgid "Resize:"
 msgstr "Обрезать:"

-msgid "Current picons path:"
-msgstr "Текущий путь к пиконам:"
+msgid "Current picons path"
+msgstr "Текущий путь к пиконам"

 msgid "Receiver picons path:"
 msgstr "Путь к пиконам ресивера:"
@@ -1246,3 +1252,81 @@ msgstr "Записи"

 msgid "Help"
 msgstr "Справка"
+
+msgid "HTTP API is not activated. Check your settings!"
+msgstr "HTTP API не активировано. Проверьте настройки!"
+
+msgid "Add picons"
+msgstr "Добавить пиконы"
+
+msgid "Logs"
+msgstr "Журнал"
+
+msgid "Title"
+msgstr "Название"
+
+msgid "Time"
+msgstr "Время"
+
+msgid "Length"
+msgstr "Длительность"
+
+msgid "Additional source"
+msgstr "Дополнительный источник"
+
+msgid "Automatically set the name selected in the favorites list."
+msgstr "Автоматическая установка имени из списка избранного."
+
+msgid "Playback"
+msgstr "Воспроизведение"
+
+msgid "Audio"
+msgstr "Аудио"
+
+msgid "Audio Track"
+msgstr "Аудиодорожка"
+
+msgid "Subtitle"
+msgstr "Субтитры"
+
+msgid "Subtitle Track"
+msgstr "Дорожка субтитров"
+
+msgid "Aspect ratio"
+msgstr "Соотношение сторон"
+
+msgid "This may change the settings of other profiles!"
+msgstr "Это может изменить настройки других профилей!"
+
+msgid "Drag the services to the desired picon or picon to the list of selected services."
+msgstr "Перетащите сервисы на нужный пикон или пикон на список выбранных сервисов."
+
+msgid "Sets the profile folder as default to store picons, backups, etc."
+msgstr "Устанавливает папку профиля по умолчанию для хранения пиконов, резервных копий и т. п."
+
+msgid "New sub-bouquet"
+msgstr "Создать суббукет"
+
+msgid "Mark not presented in Bouquets"
+msgstr "Отметить отсутствующие в букетах"
+
+msgid "Not in Bouquets"
+msgstr "Не в букетах"
+
+msgid "Do not show services present in Bouquets."
+msgstr "Не показывать сервисы присутствующие в букетах."
+
+msgid "IPTV services only"
+msgstr "Только IPTV сервисы"
+
+msgid "Display picons"
+msgstr "Отображать пиконы"
+
+msgid "Alternate layout"
+msgstr "Альтернативная компоновка"
+
+msgid "Layout of elements has been changed!"
+msgstr "Изменено расположение элементов!"
+
+msgid "Restart the program to apply all changes."
+msgstr "Перезапустите программу, чтобы применить все изменения."
--- a/po/tr/demon-editor.po
+++ b/po/tr/demon-editor.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: DemonEditor\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-16 15:59+0300\n"
-"PO-Revision-Date: 2021-06-13 14:54+0300\n"
+"PO-Revision-Date: 2021-11-11 23:49+0300\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: audi06_19 <info@dreamosat-forum.com>\n"
+"Last-Translator: audi06_19 <audi06_19@hotmail.com>\n"
 "Language-Team: \n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 3.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: tr\n"

@@ -206,8 +206,8 @@ msgstr "Mevcut veri yolu:"
 msgid "Data:"
 msgstr "Veri:"

-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "GNU/Linux için Enigma2 kanalı ve uydu listesi editörü."
+msgid "Enigma2 channel and satellite list editor."
+msgstr "Enigma2 kanal ve uydu listesi düzenleyicisi."

 msgid "Host:"
 msgstr "Ana bilgisayar:"
@@ -299,8 +299,8 @@ msgstr "Piconların adı biçimi:"
 msgid "Resize:"
 msgstr "Yeniden boyutlandır:"

-msgid "Current picons path:"
-msgstr "Geçerli picon yolları:"
+msgid "Current picons path"
+msgstr "Mevcut piconların yolu"

 msgid "Receiver picons path:"
 msgstr "Alıcı picon yolu:"
@@ -1269,3 +1269,63 @@ msgstr "Yalnızca seçilen buket için yükle"

 msgid "The task is canceled!"
 msgstr "Görev iptal edildi!"
+
+msgid "Data loading in progress!"
+msgstr "Veri yükleme devam ediyor!"
+
+msgid "Recordings"
+msgstr "Kayıtlar"
+
+msgid "Help"
+msgstr "Yardım"
+
+msgid "HTTP API is not activated. Check your settings!"
+msgstr "HTTP API etkinleştirilmedi. Ayarlarınızı kontrol edin!"
+
+msgid "Add picons"
+msgstr "Piconlar ekle"
+
+msgid "Logs"
+msgstr "Loglar"
+
+msgid "Title"
+msgstr "Başlık"
+
+msgid "Time"
+msgstr "Zaman"
+
+msgid "Length"
+msgstr "Uzunluk"
+
+msgid "Additional source"
+msgstr "Ek kaynak"
+
+msgid "Automatically set the name selected in the favorites list."
+msgstr "Favoriler listesinde seçilen adı otomatik olarak ayarlayın."
+
+msgid "Playback"
+msgstr "Oynatım"
+
+msgid "Audio"
+msgstr "Ses"
+
+msgid "Audio Track"
+msgstr "Ses parçası"
+
+msgid "Subtitle"
+msgstr "Altyazı"
+
+msgid "Subtitle Track"
+msgstr "Altyazı Parçası"
+
+msgid "Aspect ratio"
+msgstr "En boy oranı"
+
+msgid "This may change the settings of other profiles!"
+msgstr "Bu, diğer profillerin ayarlarını değiştirebilir!"
+
+msgid "Drag the services to the desired picon or picon to the list of selected services."
+msgstr "Hizmetleri istediğiniz simgeye veya simgeyi seçili hizmetler listesine sürükleyin."
+
+msgid "Sets the profile folder as default to store picons, backups, etc."
+msgstr "Picon'ları, yedekleri vb. depolamak için profil klasörünü varsayılan olarak ayarlar."
Author	SHA1	Message	Date
DYefremov	dc24c899af	version update	2022-01-25 18:16:00 +03:00
DYefremov	a55495fd7c	reworked built-in function for getting yt links	2022-01-25 18:07:34 +03:00
DYefremov	ed3aea42f5	minor corrections for EPG dialog	2022-01-24 19:17:11 +03:00
DYefremov	a6904360f9	improvement of EPG refs mapping (#59 )	2022-01-24 16:39:59 +03:00
DYefremov	1e42d693cc	added info panel auto closing for playback (#58 )	2022-01-23 14:52:34 +03:00
DYefremov	5e64605be6	minor changes in saving the EPG link mapping list (#59 )	2022-01-23 14:24:50 +03:00
DYefremov	63c55ea2ed	Russian, Belarusian and German translations update	2022-01-19 22:32:47 +03:00
DYefremov	c7f85b027d	bump version	2022-01-05 15:10:10 +03:00
DYefremov	b24910a9a5	fixed command to open file for FTP	2022-01-05 14:57:39 +03:00
DYefremov	1bdb4f123f	minor data cleaning optimization	2022-01-05 12:16:16 +03:00
DYefremov	8f8d7633b8	added display picons option	2022-01-05 00:41:06 +03:00
DYefremov	c997724300	refactoring of picon assignment	2022-01-04 20:39:59 +03:00
DYefremov	727a3fa8a2	data rendering optimization	2022-01-03 00:08:31 +03:00
DYefremov	4009f5c2a2	multi-stream support for services web import	2022-01-01 23:09:31 +03:00
DYefremov	ca5d648032	multi-stream transponders support for LyngSat	2021-12-30 15:54:09 +03:00
DYefremov	938fe297c5	corrected satellite update from KingOfSat	2021-12-30 00:02:32 +03:00
DYefremov	db29b78fd7	basic editing support for FTP client	2021-12-29 00:21:11 +03:00
DYefremov	e599ea04c7	improved bouquet export to *.m3u (#56 )	2021-12-28 15:17:39 +03:00
DYefremov	50a2f66fc3	bump version	2021-12-24 11:42:33 +03:00
DYefremov	34056b1006	minor rework of recordings tab	2021-12-24 00:15:17 +03:00
DYefremov	6188fecda9	reduced waiting time for web import	2021-12-23 22:07:06 +03:00
DYefremov	eb41b9629e	minor revision of satellite update dialog	2021-12-22 14:19:10 +03:00
DYefremov	7694754919	fixed satellites web update from FlySat (#55 )	2021-12-21 22:08:54 +03:00
DYefremov	11f240a81f	minor rework of ftp client	2021-12-19 20:37:23 +03:00
DYefremov	1b75034317	basic alternate layout support	2021-12-19 13:15:58 +03:00
DYefremov	5b6900cae7	tooltips support for the bouquets list	2021-12-11 16:48:13 +03:00
DYefremov	eeeca881e8	added default id value for iptv service	2021-12-10 12:09:27 +03:00
DYefremov	ed16fb0195	minor correction for settings dialog	2021-12-07 15:05:58 +03:00
DYefremov	833b386356	win style correction	2021-12-07 14:54:12 +03:00
DYefremov	83424124d3	fix saving sub-bouquets	2021-12-07 14:39:31 +03:00
DYefremov	d77aa68a39	Russian, Belarusian and German translations update	2021-12-04 14:53:47 +03:00
DYefremov	94266e13b8	bump version	2021-12-03 21:11:00 +03:00
DYefremov	8db6fb1b0b	improved picons filtering and assignment (#49 )	2021-12-03 20:05:46 +03:00
DYefremov	e07c5d4bf7	minor code cleanup	2021-12-02 17:28:25 +03:00
DYefremov	6f3090a7e1	sub-bouquets creation support	2021-12-02 15:39:33 +03:00
DYefremov	b73c1d1118	sub bouquets saving support	2021-12-01 11:37:23 +03:00
DYefremov	df127c05f3	services marking not presented in bouquets	2021-11-28 23:41:16 +03:00
DYefremov	9b579af528	added filter option "not in bouquets"	2021-11-28 18:55:37 +03:00
DYefremov	8290e723c9	state saving for the main paned widgets	2021-11-27 10:20:10 +03:00
DYefremov	b12c29be84	minor correction for tid and nid values	2021-11-24 23:54:16 +03:00
DYefremov	1780fbadbd	fixed signal update for control tab	2021-11-22 19:41:30 +03:00
DYefremov	4fe4e92442	fixed some folders display for the recording tab	2021-11-22 16:33:24 +03:00
DYefremov	bfad5cf9ac	bump version	2021-11-22 14:19:52 +03:00
DYefremov	5d285f61c0	fixed a typo in the Italian translation	2021-11-18 19:52:40 +03:00
DYefremov	f61d9a1f61	fix tid and nid order for KingOfSat web source	2021-11-18 11:31:01 +03:00
DYefremov	8d115677d1	minor fix for picon downloader	2021-11-17 22:42:09 +03:00
DYefremov	f7c6cd6908	preventing gen bouquets for an empty config	2021-11-17 13:05:15 +03:00
DYefremov	2d2a90542c	main icons initialization refactoring	2021-11-16 13:21:52 +03:00
DYefremov	535c9c9102	fix themes unpacking on Windows	2021-11-16 12:09:29 +03:00
DYefremov	866e18762d	enabled http api setting for Neutrino	2021-11-14 23:37:56 +03:00
DYefremov	aef5027d23	bump version	2021-11-14 17:28:38 +03:00
DYefremov	3a142eca4a	README update	2021-11-14 17:16:40 +03:00
DYefremov	606bad7716	fix getting youtube-dl for Windows	2021-11-13 13:13:52 +03:00
DYefremov	fa07f8bf85	fix picon path on profile change	2021-11-12 19:11:19 +03:00
DYefremov	92280162c6	added logging for transponder validation	2021-11-12 16:23:20 +03:00
DYefremov	5d285e88d8	copied tr *.mo file	2021-11-12 11:10:56 +03:00
audi06_19	0355714e92	Turkish translation update (#53 )	2021-11-12 11:05:37 +03:00
DYefremov	b06e877a0c	update of pl *.mo file	2021-11-11 22:37:58 +03:00
Wieslaw Weglowski	9b479b051d	Polish translation update (#52 )	2021-11-11 22:28:23 +03:00
DYefremov	b953ee8762	minor fix of playback window title	2021-11-08 11:06:31 +03:00
DYefremov	0e7d6bec69	fixed some configs loading with dvb-t	2021-11-07 23:34:47 +03:00
DYefremov	cb9824d404	changed audio menu icon	2021-11-07 21:47:11 +03:00
DYefremov	c87adb256f	fix sid config for IPTV lists	2021-11-07 21:20:06 +03:00
DYefremov	899d05a186	added "Return" key support for FTP client	2021-11-07 00:10:15 +03:00
DYefremov	bd4f86e91e	Russian, Belarusian and German translations update	2021-11-06 15:45:58 +03:00
DYefremov	42fb365b45	fix picon assignment by drag for mac	2021-11-06 14:42:13 +03:00
DYefremov	67d6ea861e	minor playback fixes	2021-11-06 12:11:05 +03:00
DYefremov	d887a61636	fix settings saving for Ubuntu [18.04]	2021-11-05 23:01:07 +03:00
DYefremov	9d9efb7577	Russian, Belarusian and German translations update	2021-11-03 18:14:41 +03:00
DYefremov	b6d331a311	redesigned info output for download dialog	2021-11-03 18:09:46 +03:00
DYefremov	1060e169a1	minor refactoring	2021-11-03 12:30:23 +03:00
DYefremov	562c1a5955	modifiers correction	2021-11-01 11:09:45 +03:00
DYefremov	3c4dec323f	minor mac style correction	2021-11-01 00:44:12 +03:00
DYefremov	3bafe08030	adapting dialogs for Gnome	2021-10-31 20:26:19 +03:00
DYefremov	722f8df813	header bar for Gnome in epg dialog	2021-10-31 16:09:07 +03:00
DYefremov	8f6984dbaf	added src and pos display for epg (#51 )	2021-10-31 13:34:48 +03:00
DYefremov	bf6e9617ec	header bar changes in the backup dialog	2021-10-30 18:25:20 +03:00
DYefremov	ec27c32d35	bump version	2021-10-29 17:26:34 +03:00
DYefremov	bfa3b1aa66	added dialog call before reset of settings	2021-10-29 17:21:30 +03:00
DYefremov	a1e32abd07	minor settings dialog changes for Gnome	2021-10-29 15:57:28 +03:00
DYefremov	f93370293b	Russian, Belarusian and German translations update	2021-10-29 11:31:59 +03:00
DYefremov	79a2a034eb	fix app menu translation for Windows	2021-10-29 10:45:13 +03:00
DYefremov	791c073d1a	redesigned info output for sat update dialog	2021-10-26 12:24:46 +03:00
DYefremov	de5ec53a18	Russian, Belarusian and German translations update	2021-10-26 11:47:26 +03:00
DYefremov	156ac7d364	bump version	2021-10-25 20:29:14 +03:00
DYefremov	5680423f14	added picons extraction from archives	2021-10-25 20:06:33 +03:00
DYefremov	fa256c5a0b	added picon copying menu from ext path	2021-10-25 17:06:23 +03:00
DYefremov	d9a5d9a972	added tool menu for Gnome session	2021-10-23 19:25:19 +03:00
DYefremov	4e59bdf38e	redesigned info displaying for the picons tab	2021-10-23 11:48:20 +03:00
DYefremov	7edb03836a	added support for setting id for iptv	2021-10-23 00:18:51 +03:00
DYefremov	0ea0c889d4	fixed language selection for *.deb	2021-10-22 10:51:15 +03:00
DYefremov	e494a34bc4	fix for display dvb-t2 system (#50 )	2021-10-21 22:50:35 +03:00
DYefremov	4a57234293	added logs display in the gui	2021-10-21 18:53:57 +03:00
DYefremov	aca4875ee6	fixed data loading with hex flag values (#50 )	2021-10-20 11:46:22 +03:00