Russian, Belarusian and German translations update

added separator to profile toolbar
changed alternatives naming
2026-05-09 10:06:48 +02:00 · 2021-01-12 11:53:00 +03:00 · 2021-01-12 11:22:57 +03:00 · 2021-01-11 17:15:39 +03:00 · 2021-01-11 12:30:44 +03:00 · 2021-01-10 22:42:16 +03:00
79 changed files with 9617 additions and 14139 deletions
--- a/DemonEditor.desktop
+++ b/DemonEditor.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=DemonEditor
+Comment=Channel and satellite list editor for Enigma2
+Comment[ru]=Редактор списка каналов и спутников для Enigma2
+Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
+Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
+Icon=demon-editor
+Exec=bash -c 'cd $(dirname %k) && ./start.py'
+Terminal=false
+Type=Application
+Categories=Utility;Application;
+StartupNotify=false
--- a/DemonEditor.spec
+++ b/DemonEditor.spec
@@ -1,74 +0,0 @@
-import os
-import datetime
-import distutils.util
-
-EXE_NAME = 'start.py'
-DIR_PATH = os.getcwd()
-COMPILING_PLATFORM = distutils.util.get_platform()
-PATH_EXE = [os.path.join(DIR_PATH, EXE_NAME)]
-STRIP = True
-BUILD_DATE = datetime.datetime.now().strftime("%Y%m%d")
-
-block_cipher = None
-
-excludes = ['app.tools.mpv',
-            'gi.repository.Gst',
-            'gi.repository.GstBase',
-            'gi.repository.GstVideo',
-            'youtube_dl',
-            'tkinter']
-
-ui_files = [('app/ui/*.glade', 'ui'),
-            ('app/ui/*.css', 'ui'),
-            ('app/ui/*.ui', 'ui'),
-            ('app/ui/lang*', 'share/locale'),
-            ('app/ui/icons*', 'share/icons')
-            ]
-
-a = Analysis([EXE_NAME],
-             pathex=PATH_EXE,
-             binaries=None,
-             datas=ui_files,
-             hiddenimports=['fileinput', 'uuid'],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=excludes,
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher)
-
-pyz = PYZ(a.pure,
-          a.zipped_data,
-          cipher=block_cipher)
-
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='DemonEditor',
-          debug=False,
-          strip=STRIP,
-          upx=True,
-          console=False)
-
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=STRIP,
-               upx=True,
-               name='DemonEditor')
-
-app = BUNDLE(coll,
-             name='DemonEditor.app',
-             icon='icon.icns',
-             bundle_identifier=None,
-             info_plist={
-                 'NSPrincipalClass': 'NSApplication',
-                 'CFBundleName': 'DemonEditor',
-                 'CFBundleDisplayName': 'DemonEditor',
-                 'CFBundleGetInfoString': "Enigma2 channel and satellites editor",
-                 'LSApplicationCategoryType': 'public.app-category.utilities',
-                 'CFBundleShortVersionString': "1.0.8 Beta (Build: {})".format(BUILD_DATE),
-                 'NSHumanReadableCopyright': u"Copyright © 2021, Dmitriy Yefremov",
-                 'NSRequiresAquaSystemAppearance': 'false'
-             })
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2020 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/README.md
+++ b/README.md
@@ -1,90 +1,81 @@
 # <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-macos-lightgrey)
-## Enigma2 channel and satellite list editor for macOS.
-[<img src="https://user-images.githubusercontent.com/7511379/119127827-76924180-ba3d-11eb-8ba8-1dc3bdc7f191.png" width="655"/>](https://user-images.githubusercontent.com/7511379/119127827-76924180-ba3d-11eb-8ba8-1dc3bdc7f191.png)  
+[![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/103152885-4a7bd880-479d-11eb-96e8-4ad0f5dc3e2e.png" width="560"/>](https://user-images.githubusercontent.com/7511379/103152885-4a7bd880-479d-11eb-96e8-4ad0f5dc3e2e.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).                                
-**The functionality and performance of this version may be different from the [Linux version](https://github.com/DYefremov/DemonEditor)!**
+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).

 ## Main features of the program
 * Editing bouquets, channels, satellites.  
-  [<img src="https://user-images.githubusercontent.com/7511379/119127978-b822ec80-ba3d-11eb-8720-e458f0ccf60e.png" width="480"/>](https://user-images.githubusercontent.com/7511379/119127978-b822ec80-ba3d-11eb-8720-e458f0ccf60e.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/100156250-a3fc9900-2eb9-11eb-8729-7bcb6ddcdd4a.png" width="480"/>](https://user-images.githubusercontent.com/7511379/100156250-a3fc9900-2eb9-11eb-8729-7bcb6ddcdd4a.png)
 * Import function.  
-   [<img src="https://user-images.githubusercontent.com/7511379/119128084-d852ab80-ba3d-11eb-8bf9-d40f4f59314b.png" width="480"/>](https://user-images.githubusercontent.com/7511379/119128084-d852ab80-ba3d-11eb-8bf9-d40f4f59314b.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/103150878-8a38c500-4789-11eb-9e03-0c8ee832ff99.png" width="480"/>](https://user-images.githubusercontent.com/7511379/103150878-8a38c500-4789-11eb-9e03-0c8ee832ff99.png)
 * Backup function.  
-  [<img src="https://user-images.githubusercontent.com/7511379/119128119-e4d70400-ba3d-11eb-88b4-86e6bea21314.png" width="480"/>](https://user-images.githubusercontent.com/7511379/119128119-e4d70400-ba3d-11eb-88b4-86e6bea21314.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/103150886-a0df1c00-4789-11eb-88fa-91996b72d1f9.png" width="480"/>](https://user-images.githubusercontent.com/7511379/103150886-a0df1c00-4789-11eb-88fa-91996b72d1f9.png)
 * Support of picons.  
-  [<img src="https://user-images.githubusercontent.com/7511379/119128127-e99bb800-ba3d-11eb-93d9-3444b7332778.png" width="480"/>](https://user-images.githubusercontent.com/7511379/119128127-e99bb800-ba3d-11eb-93d9-3444b7332778.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/103150891-accade00-4789-11eb-8804-e1807df89c99.png" width="480"/>](https://user-images.githubusercontent.com/7511379/103150891-accade00-4789-11eb-8804-e1807df89c99.png)
 * Importing services, downloading picons and updating satellites from the Web.  
-   [<img src="https://user-images.githubusercontent.com/7511379/119128104-de488c80-ba3d-11eb-800c-e070f476f6a8.png" width="250"/>](https://user-images.githubusercontent.com/7511379/119128104-de488c80-ba3d-11eb-800c-e070f476f6a8.png)
-  [<img src="https://user-images.githubusercontent.com/7511379/119128066-d2f56100-ba3d-11eb-864a-bf2c22c74d5e.png" width="259"/>](https://user-images.githubusercontent.com/7511379/119128066-d2f56100-ba3d-11eb-864a-bf2c22c74d5e.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/97909451-4c0ac080-1d59-11eb-9626-85bed91f7ccc.png" width="250"/>](https://user-images.githubusercontent.com/7511379/97909451-4c0ac080-1d59-11eb-9626-85bed91f7ccc.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/103150872-77be8b80-4789-11eb-8a74-7a49fb3edd98.png" width="292"/>](https://user-images.githubusercontent.com/7511379/103150872-77be8b80-4789-11eb-8a74-7a49fb3edd98.png)
 * Extended support of IPTV.
 * Import to bouquet(Neutrino WEBTV) from m3u.
 * Export of bouquets with IPTV services in m3u.
-* Assignment of EPGs from DVB or XML for IPTV services (only Enigma2, experimental).
-* Playback of IPTV or other streams directly from the bouquet list (should be installed [VLC](https://www.videolan.org/vlc/)).
+* 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 (should be installed [VLC](https://www.videolan.org/vlc/)).    
+  [<img src="https://user-images.githubusercontent.com/7511379/103151911-89a52c00-4793-11eb-9941-8430f4e87eef.png" width="480"/>](https://user-images.githubusercontent.com/7511379/103151911-89a52c00-4793-11eb-9941-8430f4e87eef.png)
 * Control panel with the ability to view EPG and manage timers (via HTTP API, experimental).  
-  [<img src="https://user-images.githubusercontent.com/7511379/119128157-f28c8980-ba3d-11eb-975e-cdbac32349ed.png" width="480"/>](https://user-images.githubusercontent.com/7511379/119128157-f28c8980-ba3d-11eb-975e-cdbac32349ed.png)
+  [<img src="https://user-images.githubusercontent.com/7511379/103150898-c79d5280-4789-11eb-9d16-e7f89225738b.png" width="480"/>](https://user-images.githubusercontent.com/7511379/103150898-c79d5280-4789-11eb-9d16-e7f89225738b.png)
 * Simple FTP client (experimental).   
-[<img src="https://user-images.githubusercontent.com/7511379/119128176-f7e9d400-ba3d-11eb-813d-08972d103cce.png" width="480"/>](https://user-images.githubusercontent.com/7511379/119128176-f7e9d400-ba3d-11eb-813d-08972d103cce.png)
-
-#### Keyboard shortcuts                                                                                                                                                                                            
-* **&#8984; + X** - only in bouquet list.
-* **&#8984; + C** - only in services list.                                                                                                                                                    
-Clipboard is **"rubber"**. There is an accumulation before the insertion!                                                              
-* **&#8984; + E** - edit. 
-* **&#8984; + R, F2** - rename.
-* **&#8984; + S, T** in Satellites edit tool for create satellite or transponder.
-* **&#8984; + L** - parental lock.
-* **&#8984; + H** - hide/skip.                                                                                                                                                                                                 
-* **&#8984; + P** - start play IPTV or other stream in the bouquet list.
-* **&#8984; + Z** - switch(**zap**) the channel(works when the HTTP API is enabled, Enigma2 only).                         
-* **&#8984; + W** - switch to the channel and watch in the program.
-* **&#8984; + Up/Down** - move selected items in the list. 
-* **&#8984; + O** - (re)load user data from current dir. 
-* **&#8984; + D** - load data from receiver. 
-* **&#8984; + U/B** - upload data/bouquets to receiver.
-* **&#8984; + F** - show/hide search bar.
-* **&#8679; + &#8984; + F** - show/hide filter bar.
-* **Left/Right** - remove selection.
-
-For **multiple** selection with the mouse, press and hold the **&#8984;** key!
+  [<img src="https://user-images.githubusercontent.com/7511379/103152009-7e9ecb80-4794-11eb-85f1-c97e189a3195.png" width="480"/>](https://user-images.githubusercontent.com/7511379/103152009-7e9ecb80-4794-11eb-85f1-c97e189a3195.png)
+  
+#### Keyboard shortcuts
+* **Ctrl + X** - only in bouquet list.
+* **Ctrl + C** - only in services list.                                                              
+Clipboard is **"rubber"**. There is an accumulation before the insertion!                                                                                                                     
+* **Ctrl + Insert** - copies the selected channels from the main list to the bouquet  
+  beginning or inserts (creates) a new bouquet.  
+* **Ctrl + BackSpace** - copies the selected channels from the main list to the bouquet end.
+* **Ctrl + E** - edit.                                                                                                                                                                                                                                                                                                                    
+* **Ctrl + R, F2** - rename.                                                                                                                                                                                                                                                                                                                     
+* **Ctrl + S, T** in Satellites edit tool for create satellite or transponder.                                                                 
+* **Ctrl + L** - parental lock.                                                                                                          
+* **Ctrl + H** - hide/skip.                                                                                                                                                                                                 
+* **Ctrl + P** - start play IPTV or other stream in the bouquet list.                                                                                        
+* **Ctrl + Z** - switch(**zap**) the channel(works when the HTTP API is enabled, Enigma2 only).                         
+* **Ctrl + W** - switch to the channel and watch in the program.                                                                                                                                                                                                                                                                                                                                                                                                     
+* **Space** - select/deselect.                                                                                                                                                                                                                                                                                                           
+* **Left/Right** - remove selection.                                                                                       
+* **Ctrl + Up, Down, PageUp, PageDown, Home, End**- move selected items in the list.  
+* **Ctrl + O** - (re)load user data from current dir.                                                                   
+* **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 + Shift + F** - show/hide filter bar.
+                                                                          
+For **multiple** selection with the mouse, press and hold the **Ctrl** key!

 ## Minimum requirements
-*Python >= 3.5.2, GTK+ >= 3.22 with PyGObject bindings, python3-requests.*
-                                                                    
-## Installation and Launch                                                                          
-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```                                                                                                                                                                                          
-#### Optional:                                                                                                          
-```pip3 install pillow, pyobjc```
+*Python >= 3.5.2, GTK+ >= 3.16 with PyGObject bindings, python3-requests.*   
+   
+***Optional:** python3-gi-cairo, python3-pil, python3-chardet.*                        
+## Installation and Launch
+* ### Linux                                                                                                          
+To start the program, in most cases it is enough to download the [archive](https://github.com/DYefremov/DemonEditor/archive/master.zip), unpack  
+and run it by double clicking on DemonEditor.desktop in the root directory,  
+or launching from the console with the command:```./start.py```                                                                                
+Extra folders can be deleted, excluding the *app* folder and root files like *DemonEditor.desktop* and *start.py*!      

-To start the program, just download the [archive](https://github.com/DYefremov/DemonEditor/archive/experimental-mac.zip), unpack and run it from the terminal   
-with the command: ```./start.py```
-## Standalone package
-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!  
-**The package may not contain all the latest changes. Not all features can be supported and tested!**
-
-THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY.                                                                        
-AUTHOR IS NOT LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY CONNECTION WITH THIS SOFTWARE.                           
-The package 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 package you agree to the terms of this [license](http://www.gnu.org/licenses/gpl-3.0.html) and the possible inconvenience associated with this! 
-
-#### Building your own package                                                                                                                                                                                                                                                                
-Install [PyInstaller](https://www.pyinstaller.org/) with the command from the terminal:
-                                                                   
-```pip3 install pyinstaller```
-                                                                                          
-and in the root dir run command: 
-                                                                                        
-```pyinstaller DemonEditor.spec``` 
+To create a simple **debian package**, you can use the *build-deb.sh.* You can also download a ready-made *.deb package from the [releases](https://github.com/DYefremov/DemonEditor/releases) page.                                                 
+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.
+* ### macOS (experimental)
+**This program can also be run on macOS.**
+To work in this OS, you must use a [separate branch](https://github.com/DYefremov/DemonEditor/tree/experimental-mac).  
+**The functionality and performance of this version may be different from the Linux version!**
+ 
 ## Important
-**This version may not be fully tested!**
+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!

 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!                                                                                                                                                        
@@ -97,7 +88,6 @@ just load your data via *"File/Open"* and press *"Save"*. When importing separat
 #### Command line arguments:
 * **-l** - write logs to file.
 * **-d on/off** - turn on/off debug mode. Allows to display more information in the logs.
-* **-t on/off** - show/hide simple built-in **telnet** client (experimental). **ANSI escape sequences are not supported!**

 ## License
-Licensed under the [MIT](LICENSE) license.                                     
+Licensed under the [MIT](LICENSE) license.                  
--- a/app/eparser/init.py
+++ b/app/eparser/init.py
@@ -1,30 +1,3 @@
-# -*- 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
-#
-
 from app.commons import run_task
 from app.settings import SettingsType
 from .ecommons import Service, Satellite, Transponder, Bouquet, Bouquets, is_transponder_valid
@@ -59,15 +32,6 @@ def get_bouquets(path, s_type):
        return get_neutrino_bouquets(path)


-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)
-    elif s_type is SettingsType.NEUTRINO_MP:
-        from .neutrino.bouquets import write_bouquet
-        write_bouquet(path, bq)
-
-
@run_task
 def write_bouquets(path, bouquets, s_type, force_bq_names=False):
    if s_type is SettingsType.ENIGMA_2:
--- a/app/eparser/ecommons.py
+++ b/app/eparser/ecommons.py
@@ -17,8 +17,7 @@ class BqServiceType(Enum):
    ALT = "ALT"  # Service with alternatives


-Bouquet = namedtuple("Bouquet", ["name", "type", "services", "locked", "hidden", "file"])
-Bouquet.__new__.__defaults__ = (None, BqServiceType.DEFAULT, [], None, None, None)  # For Python3 < 3.7
+Bouquet = namedtuple("Bouquet", ["name", "type", "services", "locked", "hidden"])
 Bouquets = namedtuple("Bouquets", ["name", "type", "bouquets"])
 BouquetService = namedtuple("BouquetService", ["name", "type", "data", "num"])

@@ -35,7 +34,6 @@ class TrType(Enum):
    Satellite = "s"
    Terrestrial = "t"
    Cable = "c"
-    ATSC = "a"


 class BqType(Enum):
@@ -148,10 +146,6 @@ T_SYSTEM = {"0": "DVB-T", "1": "DVB-T2", "-1": "DVB-T/T2"}
 # Cable
 C_MODULATION = {"0": "Auto", "1": "QAM16", "2": "QAM32", "3": "QAM64", "4": "QAM128", "5": "QAM256"}

-# ATSC
-A_MODULATION = {"0": "Auto", "1": "QAM16", "2": "QAM32", "3": "QAM64", "4": "QAM128", "5": "QAM256", "6": "8VSB",
-                "7": "16VSB"}
-
 # CAS
 CAS = {"C:26": "BISS", "C:0B": "Conax", "C:06": "Irdeto", "C:18": "Nagravision", "C:05": "Viaccess", "C:01": "SECA",
       "C:0E": "PowerVu", "C:4A": "DRE-Crypt", "C:7B": "DRE-Crypt", "C:56": "Verimatrix", "C:09": "VideoGuard"}
--- a/app/eparser/enigma/bouquets.py
+++ b/app/eparser/enigma/bouquets.py
@@ -27,9 +27,9 @@ class BouquetsWriter:
        self._path = path
        self._bouquets = bouquets
        self._force_bq_names = force_bq_names
-        self._marker_index = 1
+        self._marker_index = 0
        self._space_index = 0
-        self._alt_names = set()
+        self._alt_index = 0

    def write(self):
        line = []
@@ -38,21 +38,13 @@ class BouquetsWriter:
        for bqs in self._bouquets:
            line.clear()
            line.append("#NAME {}\n".format(bqs.name))
-            bq_file_names = {b.file for b in bqs.bouquets}
-            count = 1
-
-            for bq in bqs.bouquets:
-                bq_name = bq.file
-                if not bq_name:
-                    if self._force_bq_names:
-                        bq_name = re.sub(pattern, "_", bq.name)
-                    else:
-                        bq_name = "de{0:02d}".format(count)
-                        while bq_name in bq_file_names:
-                            count += 1
-                            bq_name = "de{0:02d}".format(count)
-                        bq_file_names.add(bq_name)

+            for index, bq in enumerate(bqs.bouquets):
+                bq_name = bq.name
+                if bq_name == "Favourites (TV)" or bq_name == "Favourites (Radio)":
+                    bq_name = _DEFAULT_BOUQUET_NAME
+                else:
+                    bq_name = re.sub(pattern, "_", bq.name) if self._force_bq_names else "de{0:02d}".format(index)
                line.append(self._SERVICE.format(2 if bq.type == BqType.RADIO.value else 1, bq_name, bq.type))
                self.write_bouquet(self._path + "userbouquet.{}.{}".format(bq_name, bq.type), bq.name, bq.services)

@@ -78,13 +70,12 @@ class BouquetsWriter:
                services = srv.transponder
                if services:
                    p = Path(path)
-                    alt_name = srv.data_id
-                    f_name = "alternatives.{}{}".format(alt_name, p.suffix)
-
                    if self._force_bq_names:
                        alt_name = re.sub(self._ALT_PAT, "_", srv.service).lower()
                        f_name = "alternatives.{}{}".format(alt_name, p.suffix)
-
+                    else:
+                        f_name = "alternatives.de{:02d}{}".format(self._alt_index, p.suffix)
+                        self._alt_index += 1
                    alt_path = "{}/{}".format(p.parent, f_name)
                    bouquet.append(self._ALT.format(f_name))
                    self.write_bouquet(alt_path, srv.service, services)
@@ -144,7 +135,7 @@ class BouquetsReader:
                        else:
                            real_b_names[rb_name] = 0

-                        bouquets[2].append(Bouquet(rb_name, bq_type, services, None, None, b_name))
+                        bouquets[2].append(Bouquet(rb_name, bq_type, services, None, None))
                    else:
                        raise ValueError("No bouquet name found for: {}".format(line))

@@ -178,7 +169,7 @@ class BouquetsReader:
                    if alt:
                        alt_name, alt_type = alt.group(1), alt.group(2)
                        alt_bq_name, alt_srvs = BouquetsReader.get_bouquet(path, alt_name, alt_type, "alternatives")
-                        services.append(BouquetService(alt_bq_name, BqServiceType.ALT, alt_name, tuple(alt_srvs)))
+                        services.append(BouquetService(alt_bq_name, BqServiceType.ALT, srv.lstrip(), tuple(alt_srvs)))
                elif srv_data[0].strip() in BouquetsReader._STREAM_TYPES or srv_data[10].startswith(("http", "rtsp")):
                    stream_data, sep, desc = srv.partition("#DESCRIPTION")
                    desc = desc.lstrip(":").strip() if desc else srv_data[-1].strip()
--- a/app/eparser/enigma/lamedb.py
+++ b/app/eparser/enigma/lamedb.py
@@ -13,303 +13,282 @@ _END_LINE = "# File was created in DemonEditor.\n# ....Enjoy watching!....\n"


 def get_services(path, format_version):
-    return LameDbReader(path, format_version).parse()
+    return parse(path, format_version)


 def write_services(path, services, format_version=4):
-    LameDbWriter(path, services, format_version).write()
+    if format_version == 4:
+        write_to_lamedb(path, services)
+    elif format_version == 5:
+        write_to_lamedb5(path, services)


-class LameDbReader:
-    """ Lamedb parser class.
-
-        Reads and parses the Enigma2 lamedb[5] file.
-        Supports versions 3, 4 and 5..
-    """
-    __slots__ = ["_path", "_fmt"]
-
-    def __init__(self, path, fmt=4):
-        self._path = path
-        self._fmt = fmt
-
-    def parse(self):
-        """ Parsing lamedb. """
-        if self._fmt == 4:
-            return self.parse_v4()
-        elif self._fmt == 5:
-            return self.parse_v5()
-        raise SyntaxError("Unsupported version of the format.")
-
-    def parse_v3(self, services, transponders):
-        """ Parsing version 3. """
-        for t in transponders:
-            tr = transponders[t].lower()
-            tr_type = tr[0:1]
-            if tr_type == "c":
-                tr += ":0:0:0"
-            elif tr_type == "t" or tr_type == "a":
-                tr += ":0:0"
-            else:
-                tr_data = tr.split(_SEP)
-                len_data = len(tr_data)
-                if len_data == 6:
-                    tr_data.append("0")
-                elif len_data == 9:
-                    tr_data.insert(6, "0")
-                    tr_data.append("0")
-                    tr_data.append("2")
-
-                tr = _SEP.join(tr_data)
-
-            transponders[t] = tr
-
-        return self.parse_services(services, transponders)
-
-    def parse_v4(self):
-        """ Parsing version 4. """
-        with open(self._path + _FILE_NAME, "r", encoding="utf-8", errors="replace") as file:
-            try:
-                data = str(file.read())
-            except UnicodeDecodeError as e:
-                log("lamedb parse error: " + str(e))
-            else:
-                return self.get_services_list(data)
-
-    def parse_v5(self):
-        """ Parsing version 5. """
-        with open(self._path + "lamedb5", "r", encoding="utf-8", errors="replace") as file:
-            lns = file.readlines()
-
-            if lns and not lns[0].endswith("/5/\n"):
-                raise SyntaxError("lamedb ver.5 parsing error: unsupported format.")
-
-            trs, srvs = {}, [""]
-            for line in lns:
-                if line.startswith("s:"):
-                    srv_data = line.strip("s:").split(",", 2)
-                    srv_data[1] = srv_data[1].strip("\"")
-                    data_len = len(srv_data)
-                    if data_len == 3:
-                        srv_data[2] = srv_data[2].strip()
-                    elif data_len == 2:
-                        srv_data.append("p:")
-                    srvs.extend(srv_data)
-                elif line.startswith("t:"):
-                    data = line.split(",")
-                    len_data = len(data)
-                    if len_data > 1:
-                        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))
-
-            return self.parse_services(srvs, trs)
-
-    def parse_services(self, services, transponders):
-        """ Parsing services. """
-        services_list = []
-        blacklist = get_blacklist(self._path) if self._path else {}
-        srvs = self.split(services, 3)
-        if srvs[0][0] == "":  # Remove first empty element.
-            srvs.remove(srvs[0])
-
-        for srv in srvs:
-            data_id = str(srv[0]).lower()  # Lower is for lamedb ver.3.
-            data = data_id.split(_SEP)
-            sp = "0"
-            tid = data[2]
-            nid = data[3]
-            # For lamedb ver.3
-            is_v3 = False
-            if len(tid) < 4:
-                is_v3 = True
-                tid = "{:0>4}".format(tid)
-                data[2] = tid
-            if len(nid) < 4:
-                is_v3 = True
-                nid = "{:0>4}".format(nid)
-                data[3] = nid
-            if is_v3:
-                data[0] = "{:0>4}".format(data[0])
-                data_id = _SEP.join(data)
-
-            srv_type = int(data[4])
-            transponder_id = "{}:{}:{}".format(data[1], tid, nid)
-            transponder = transponders.get(transponder_id, None)
-
-            tid = tid.lstrip(sp).upper()
-            nid = nid.lstrip(sp).upper()
-            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)
-
-            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
-            locked = LOCKED_ICON if s_id in blacklist else None
-
-            package = list(filter(lambda x: x.startswith("p:"), all_flags))
-            package = package[0][2:] if package else ""
-
-            if transponder is not None:
-                tr_type, sp, tr = str(transponder).partition(" ")
-                tr_type = TrType(tr_type)
-                tr = tr.split(_SEP)
-                service_type = SERVICE_TYPE.get(data[4], SERVICE_TYPE["-2"])
-                # Removing all non printable symbols!
-                srv_name = "".join(c for c in srv[1] if c.isprintable())
-                freq = tr[0]
-                rate = tr[1]
-                pol = None
-                fec = None
-                system = None
-                pos = None
-
-                if tr_type is TrType.Satellite:
-                    pol = POLARIZATION.get(tr[2], None)
-                    fec = FEC.get(tr[3], None)
-                    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)
-                    pos = "T"
-                    fec = T_FEC.get(tr[3], None)
-                elif tr_type is TrType.Cable:
-                    system = "DVB-C"
-                    pos = "C"
-                    fec = FEC_DEFAULT.get(tr[4])
-                elif tr_type is TrType.ATSC:
-                    system = "ATSC"
-                    pos = "T"
-                    fec = FEC_DEFAULT.get("0")
-
-                # Formatting displayed values.
-                try:
-                    freq = "{}".format(int(freq) // 1000)
-                    rate = "{}".format(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")
-                except ValueError as e:
-                    log("Parse error [parse_services]: {}".format(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)
-
-                services_list.append(s)
-        return services_list
-
-    def get_services_list(self, data):
-        """ Returns a list of services from a string data representation. """
-        transponders, sep, services = data.partition("transponders")  # 1 step
-        pattern = re.compile("/[34]/$")
-        match = re.search(pattern, transponders)
-        if not match:
-            msg = "lamedb parsing error: unsupported format."
-            log(msg)
-            raise SyntaxError(msg)
-
-        transponders, sep, services = services.partition("services")  # 2 step
-        services, sep, _ = services.partition("\nend")  # 3 step
-
-        if match.group() == "/3/":
-            return self.parse_v3(services.split("\n"), self.parse_transponders(transponders.split("/")))
-
-        return self.parse_services(services.split("\n"), self.parse_transponders(transponders.split("/")))
-
-    @staticmethod
-    def get_services_lines(services):
-        """ Returns a list of strings from services for lamedb [v.4]. """
-        lines = [_HEADER.format(4), "\ntransponders\n"]
-        tr_lines = []
-        services_lines = ["end\nservices\n"]
-        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])
-            if tr_id not in tr_set:
-                transponder = "{}\n\t{}\n/\n".format(tr_id, srv.transponder)
-                tr_lines.append(transponder)
-                tr_set.add(tr_id)
-            # Services
-            services_lines.append("{}\n{}\n{}\n".format(srv.data_id, srv.service, srv.flags_cas))
-
-        tr_lines.sort()
-        lines.extend(tr_lines)
-        lines.extend(services_lines)
-        lines.append("end\n" + _END_LINE)
-
-        return lines
-
-    def parse_transponders(self, arg):
-        """ Parsing transponders. """
-        transponders = {}
-        for ar in arg:
-            tr = ar.replace("\n", "").split("\t")
-            if len(tr) == 2:
-                transponders[tr[0]] = tr[1]
-
-        return transponders
-
-    def split(self, itr, size):
-        """ Divide the iterable. """
-        srv = []
-        tmp = []
-        for i, line in enumerate(itr):
-            tmp.append(line)
-            if i % size == 0:
-                srv.append(tuple(tmp))
-                tmp.clear()
-
-        return srv
+def write_to_lamedb(path, services):
+    """ Writing lamedb file ver.4  """
+    with open(path + _FILE_NAME, "w") as file:
+        file.writelines(get_services_lines(services))


-class LameDbWriter:
-    """ Writes the Enigma2 lamedb[5] file.
+def get_services_lines(services):
+    """ Returns a list of strings from services for lamedb [v.4]. """
+    lines = [_HEADER.format(4), "\ntransponders\n"]
+    tr_lines = []
+    services_lines = ["end\nservices\n"]
+    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])
+        if tr_id not in tr_set:
+            transponder = "{}\n\t{}\n/\n".format(tr_id, srv.transponder)
+            tr_lines.append(transponder)
+            tr_set.add(tr_id)
+        # Services
+        services_lines.append("{}\n{}\n{}\n".format(srv.data_id, srv.service, srv.flags_cas))

-        Version 4 will be used instead of version 3!
-    """
-    __slots__ = ["_path", "_fmt", "_services"]
+    tr_lines.sort()
+    lines.extend(tr_lines)
+    lines.extend(services_lines)
+    lines.append("end\n" + _END_LINE)

-    def __init__(self, path, services, fmt=4):
-        self._path = path
-        self._fmt = fmt
-        self._services = services
+    return lines

-    def write(self):
-        if self._fmt == 4:
-            # Writing lamedb file ver.4
-            with open(self._path + _FILE_NAME, "w") as file:
-                file.writelines(LameDbReader.get_services_lines(self._services))
-        elif self._fmt == 5:
-            self.write_to_lamedb5()

-    def write_to_lamedb5(self):
-        """ Writing lamedb5 file. """
-        lines = [_HEADER.format(5) + "\n"]
-        services_lines = []
-        tr_set = set()
+def write_to_lamedb5(path, services):
+    """ Writing lamedb5 file. """
+    lines = [_HEADER.format(5) + "\n"]
+    services_lines = []
+    tr_set = set()

-        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)))
-            # 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))
+    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_set.add("t:{},{}\n".format(tr_id, srv.transponder.replace(" ", ":", 1)))
+        # 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))

-        lines.extend(sorted(tr_set))
-        lines.extend(services_lines)
-        lines.append(_END_LINE)
+    lines.extend(sorted(tr_set))
+    lines.extend(services_lines)
+    lines.append(_END_LINE)

-        with open(self._path + "lamedb5", "w") as file:
-            file.writelines(lines)
+    with open(path + "lamedb5", "w") as file:
+        file.writelines(lines)
+
+
+def parse(path, version=4):
+    """ Parsing lamedb. """
+    if version == 4:
+        return parse_v4(path)
+    elif version == 5:
+        return parse_v5(path)
+    raise SyntaxError("Unsupported version of the format.")
+
+
+def parse_v3(services, transponders, path):
+    """ Parsing version 3. """
+    for t in transponders:
+        tr = transponders[t].lower()
+        tr_type = tr[0:1]
+        if tr_type == "c":
+            tr += ":0:0:0"
+        elif tr_type == "t":
+            tr += ":0:0"
+        else:
+            tr_data = tr.split(_SEP)
+            len_data = len(tr_data)
+            if len_data == 6:
+                tr_data.append("0")
+            elif len_data == 9:
+                tr_data.insert(6, "0")
+                tr_data.append("0")
+                tr_data.append("2")
+
+            tr = _SEP.join(tr_data)
+
+        transponders[t] = tr
+
+    return parse_services(services, transponders, path)
+
+
+def parse_v4(path):
+    """ Parsing version 4. """
+    with open(path + _FILE_NAME, "r", encoding="utf-8", errors="replace") as file:
+        try:
+            data = str(file.read())
+        except UnicodeDecodeError as e:
+            log("lamedb parse error: " + str(e))
+        else:
+            return get_services_list(data, path)
+
+
+def get_services_list(data, path=None):
+    """ Returns a list of services from a string data representation. """
+    transponders, sep, services = data.partition("transponders")  # 1 step
+    pattern = re.compile("/[34]/$")
+    match = re.search(pattern, transponders)
+    if not match:
+        msg = "lamedb parsing error: unsupported format."
+        log(msg)
+        raise SyntaxError(msg)
+
+    transponders, sep, services = services.partition("services")  # 2 step
+    services, sep, _ = services.partition("\nend")  # 3 step
+
+    if match.group() == "/3/":
+        return parse_v3(services.split("\n"), parse_transponders(transponders.split("/")), path)
+
+    return parse_services(services.split("\n"), parse_transponders(transponders.split("/")), path)
+
+
+def parse_v5(path):
+    """ Parsing version 5. """
+    with open(path + "lamedb5", "r", encoding="utf-8", errors="replace") as file:
+        lns = file.readlines()
+
+        if lns and not lns[0].endswith("/5/\n"):
+            raise SyntaxError("lamedb v.5 parsing error: unsupported format.")
+
+        trs, srvs = {}, [""]
+        for line in lns:
+            if line.startswith("s:"):
+                srv_data = line.strip("s:").split(",", 2)
+                srv_data[1] = srv_data[1].strip("\"")
+                data_len = len(srv_data)
+                if data_len == 3:
+                    srv_data[2] = srv_data[2].strip()
+                elif data_len == 2:
+                    srv_data.append("p:")
+                srvs.extend(srv_data)
+            elif line.startswith("t:"):
+                tr, srv = line.split(",")
+                trs[tr.strip("t:")] = srv.strip().replace(":", " ", 1)
+
+        return parse_services(srvs, trs, path)
+
+
+def parse_transponders(arg):
+    """ Parsing transponders. """
+    transponders = {}
+    for ar in arg:
+        tr = ar.replace("\n", "").split("\t")
+        if len(tr) == 2:
+            transponders[tr[0]] = tr[1]
+
+    return transponders
+
+
+def parse_services(services, transponders, path):
+    """ Parsing services. """
+    services_list = []
+    blacklist = get_blacklist(path) if path else {}
+    srvs = split(services, 3)
+    if srvs[0][0] == "":  # remove first empty element
+        srvs.remove(srvs[0])
+
+    for srv in srvs:
+        data_id = str(srv[0]).lower()  # lower is for lamedb ver.3
+        data = data_id.split(_SEP)
+        sp = "0"
+        tid = data[2]
+        nid = data[3]
+        # For lamedb ver.3
+        is_v3 = False
+        if len(tid) < 4:
+            is_v3 = True
+            tid = "{:0>4}".format(tid)
+            data[2] = tid
+        if len(nid) < 4:
+            is_v3 = True
+            nid = "{:0>4}".format(nid)
+            data[3] = nid
+        if is_v3:
+            data[0] = "{:0>4}".format(data[0])
+            data_id = _SEP.join(data)
+
+        srv_type = int(data[4])
+        transponder_id = "{}:{}:{}".format(data[1], tid, nid)
+        transponder = transponders.get(transponder_id, None)
+
+        tid = tid.lstrip(sp).upper()
+        nid = nid.lstrip(sp).upper()
+        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)
+
+        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
+        locked = LOCKED_ICON if s_id in blacklist else None
+
+        package = list(filter(lambda x: x.startswith("p:"), all_flags))
+        package = package[0][2:] if package else ""
+
+        if transponder is not None:
+            tr_type, sp, tr = str(transponder).partition(" ")
+            tr_type = TrType(tr_type)
+            tr = tr.split(_SEP)
+            service_type = SERVICE_TYPE.get(data[4], SERVICE_TYPE["-2"])
+            # removing all non printable symbols!
+            srv_name = "".join(c for c in srv[1] if c.isprintable())
+            pol = None
+            fec = None
+            system = None
+            pos = None
+
+            if tr_type is TrType.Satellite:
+                pol = POLARIZATION.get(tr[2], None)
+                fec = FEC.get(tr[3], None)
+                system = "DVB-S2" if len(tr) > 7 else "DVB-S"
+                pos = "{}.{}".format(tr[4][:-1], tr[4][-1:])
+            if tr_type is TrType.Terrestrial:
+                system = T_SYSTEM.get(tr[9], None)
+                pos = "T"
+                fec = T_FEC.get(tr[3], None)
+            elif tr_type is TrType.Cable:
+                system = "DVB-C"
+                pos = "C"
+                fec = FEC_DEFAULT.get(tr[4])
+
+            services_list.append(Service(flags_cas=srv[2],
+                                         transponder_type=tr_type.value,
+                                         coded=coded,
+                                         service=srv_name,
+                                         locked=locked,
+                                         hide=hide,
+                                         package=package,
+                                         service_type=service_type,
+                                         picon=None,
+                                         picon_id=picon_id,
+                                         ssid=data[0],
+                                         freq=tr[0],
+                                         rate=tr[1],
+                                         pol=pol,
+                                         fec=fec,
+                                         system=system,
+                                         pos=pos,
+                                         data_id=data_id,
+                                         fav_id=fav_id,
+                                         transponder=transponder))
+    return services_list
+
+
+def split(itr, size):
+    """ Divide the iterable. """
+    srv = []
+    tmp = []
+    for i, line in enumerate(itr):
+        tmp.append(line)
+        if i % size == 0:
+            srv.append(tuple(tmp))
+            tmp.clear()
+
+    return srv


 if __name__ == "__main__":
--- a/app/eparser/iptv.py
+++ b/app/eparser/iptv.py
@@ -3,10 +3,9 @@ import re
 from enum import Enum
 from urllib.parse import unquote, quote

-from app.commons import log
-from app.eparser.ecommons import BqServiceType, Service
 from app.settings import SettingsType
 from app.ui.uicommons import IPTV_ICON
+from .ecommons import BqServiceType, Service

 # url, description, urlkey, account, usrname, psw, s_type, iconsrc, iconsrc_b, group
 NEUTRINO_FAV_ID_FORMAT = "{}::{}::{}::{}::{}::{}::{}::{}::{}::{}"
@@ -23,7 +22,7 @@ class StreamType(Enum):
    E_SERVICE_HLS = "8739"


-def parse_m3u(path, s_type, detect_encoding=True, params=None):
+def parse_m3u(path, s_type, detect_encoding=True):
    with open(path, "rb") as file:
        data = file.read()
        encoding = "utf-8"
@@ -38,56 +37,28 @@ def parse_m3u(path, s_type, detect_encoding=True, params=None):
                encoding = enc.get("encoding", "utf-8")

        aggr = [None] * 10
-        s_aggr = aggr[: -3]
        services = []
        groups = set()
-        marker_counter = 1
-        sid_counter = 1
+        counter = 0
        name = None
-        picon = None
-        p_id = "1_0_1_0_0_0_0_0_0_0.png"
-        st = BqServiceType.IPTV.name
-        params = params or [0, 0, 0, 0]

        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)
-                size = len(data)
-                if size < 3:
-                    continue
-                d = {data[i].lower().strip(" ="): data[i + 1] for i in range(0, len(data) - 1, 2)}
-                picon = d.get("tvg-logo", None)
-
-                grp_name = d.get("group-title", None)
-                if grp_name not in groups:
-                    groups.add(grp_name)
-                    fav_id = MARKER_FORMAT.format(marker_counter, grp_name, grp_name)
-                    marker_counter += 1
-                    mr = Service(None, None, None, grp_name, *aggr[0:3], BqServiceType.MARKER.name, *aggr, fav_id, None)
-                    services.append(mr)
+                name = line[1 + line.index(","):].strip()
            elif line.startswith("#EXTGRP") and s_type is SettingsType.ENIGMA_2:
                grp_name = line.strip("#EXTGRP:").strip()
                if grp_name not in groups:
                    groups.add(grp_name)
-                    fav_id = MARKER_FORMAT.format(marker_counter, grp_name, grp_name)
-                    marker_counter += 1
+                    fav_id = MARKER_FORMAT.format(counter, grp_name, grp_name)
+                    counter += 1
                    mr = Service(None, None, None, grp_name, *aggr[0:3], BqServiceType.MARKER.name, *aggr, fav_id, None)
                    services.append(mr)
            elif not line.startswith("#"):
                url = line.strip()
-                params[0] = sid_counter
-                sid_counter += 1
-                fav_id = get_fav_id(url, name, s_type, params)
-                if all((name, url, fav_id)):
-                    srv = Service(None, None, IPTV_ICON, name, *aggr[0:3], st, picon, p_id, *s_aggr, url, fav_id, None)
+                fav_id = get_fav_id(url, name, s_type)
+                if name and url:
+                    srv = Service(None, None, IPTV_ICON, name, *aggr[0:3], BqServiceType.IPTV.name, *aggr, fav_id, None)
                    services.append(srv)
-                else:
-                    log("*.m3u* parse error ['{}']: name[{}], url[{}], fav id[{}]".format(path, name, url, fav_id))

    return services

@@ -115,13 +86,12 @@ def export_to_m3u(path, bouquet, s_type):
        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, service_name, s_type):
    """ Returns fav id depending on the profile. """
-    if settings_type is SettingsType.ENIGMA_2:
-        stream_type = stream_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)
-    elif settings_type is SettingsType.NEUTRINO_MP:
+    if s_type is SettingsType.ENIGMA_2:
+        stream_type = StreamType.NONE_TS.value
+        return ENIGMA2_FAV_ID_FORMAT.format(stream_type, 1, 0, 0, 0, 0, quote(url), service_name, service_name, None)
+    elif s_type is SettingsType.NEUTRINO_MP:
        return NEUTRINO_FAV_ID_FORMAT.format(url, "", 0, None, None, None, None, "", "", 1)


--- a/app/eparser/neutrino/bouquets.py
+++ b/app/eparser/neutrino/bouquets.py
@@ -89,8 +89,11 @@ def parse_webtv(path, name, bq_type):
            group = group.value if group else group
            fav_id = NEUTRINO_FAV_ID_FORMAT.format(url, description, urlkey, account, usrname, psw, s_type, iconsrc,
                                                   iconsrc_b, group)
-            services.append(BouquetService(name=title, type=BqServiceType.IPTV, data=fav_id, num=0))
-
+            srv = BouquetService(name=title,
+                                 type=BqServiceType.IPTV,
+                                 data=fav_id,
+                                 num=0)
+            services.append(srv)
    bouquet = Bouquet(name="default", type=bq_type, services=services, locked=None, hidden=None)
    bouquets[2].append(bouquet)

@@ -122,15 +125,14 @@ def write_bouquet(file, bouquet):
        root.appendChild(bq_elem)

        for srv in bq.services:
-            f_data = srv.flags_cas.split(":")
            tr_id, on, ssid = srv.fav_id.split(":")
            srv_elem = doc.createElement("S")
            srv_elem.setAttribute("i", ssid)
            srv_elem.setAttribute("n", srv.service)
            srv_elem.setAttribute("t", tr_id)
            srv_elem.setAttribute("on", on)
-            srv_elem.setAttribute("s", f_data[1])
-            srv_elem.setAttribute("frq", srv.freq)
+            srv_elem.setAttribute("s", srv.pos.replace(".", ""))
+            srv_elem.setAttribute("frq", srv.freq[:-3])
            srv_elem.setAttribute("l", "0")  # temporary !!!
            bq_elem.appendChild(srv_elem)

--- a/app/eparser/neutrino/services.py
+++ b/app/eparser/neutrino/services.py
@@ -1,6 +1,5 @@
 from xml.dom.minidom import parse, Document

-from app.commons import log
 from ..ecommons import Service, POLARIZATION, FEC, SYSTEM, SERVICE_TYPE, PROVIDER

 _FILE = "services.xml"
@@ -29,7 +28,7 @@ def write_services(path, services):
        tr_atr = sat.split(":")
        sat_elem = doc.createElement("sat")
        sat_elem.setAttribute("name", tr_atr[0])
-        sat_elem.setAttribute("position", tr_atr[1])
+        sat_elem.setAttribute("position", tr_atr[1].replace(".", ""))
        sat_elem.setAttribute("diseqc", tr_atr[2])
        sat_elem.setAttribute("uncommited", tr_atr[3])
        root.appendChild(sat_elem)
@@ -89,6 +88,7 @@ def parse_services(path):
            if elem.hasAttributes():
                sat_name = elem.attributes["name"].value
                sat_pos = elem.attributes["position"].value
+                sat_pos = "{}.{}".format(sat_pos[:-1], sat_pos[-1:])
                diseqc = elem.attributes.get("diseqc")
                diseqc = diseqc.value if diseqc else diseqc
                uncommited = elem.attributes.get("uncommited")
@@ -117,15 +117,6 @@ def parse_transponder(api, sat, sat_pos, services, tr_elem):

    tr = "{}:{}:{}:{}:{}:{}:{}:{}:{}".format(tr_id, on, freq, inv, rate, fec, pol, mod, sys)
    tr_id = tr_id.lstrip("0")
-    pol = POLARIZATION.get(pol)
-    # Formatting displayed values.
-    try:
-        freq = "{}".format(int(freq) // 1000)
-        rate = "{}".format(int(rate) // 1000)
-        sat_pos = int(sat_pos)
-        sat_pos = "{:0.1f}{}".format(abs(sat_pos / 10), "W" if sat_pos < 0 else "E")
-    except ValueError as e:
-        log("Neutrino parsing error [parse_transponder]: {}".format(e))

    for srv_elem in tr_elem.getElementsByTagName("S"):
        if srv_elem.hasAttributes():
@@ -150,10 +141,27 @@ def parse_transponder(api, sat, sat_pos, services, tr_elem):
            data_id = "{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}".format(api, srv_type, sys, num, f, v, a, p, pmt, tx, vt)
            fav_id = "{}:{}:{}".format(tr_id, on.lstrip("0"), ssid.lstrip("0"))
            picon_id = "{}{}{}.png".format(tr_id, on, ssid)
-            prv, st, = PROVIDER.get(int(on, 16)), SERVICE_TYPE.get(str(int(srv_type, 16)), SERVICE_TYPE.get("-2"))

-            srv = Service(sat, None, None, name, None, None, prv, st, None, picon_id, ssid, freq, rate, pol,
-                          FEC.get(fec), SYSTEM.get(sys), sat_pos, data_id, fav_id, tr)
+            srv = Service(flags_cas=sat,
+                          transponder_type=None,
+                          coded=None,
+                          service=name,
+                          locked=None,
+                          hide=None,
+                          package=PROVIDER.get(int(on, 16)),
+                          service_type=SERVICE_TYPE.get(str(int(srv_type, 16))),
+                          picon=None,
+                          picon_id=picon_id,
+                          ssid=ssid,
+                          freq=freq,
+                          rate=rate,
+                          pol=POLARIZATION.get(pol),
+                          fec=FEC.get(fec),
+                          system=SYSTEM.get(sys),
+                          pos=sat_pos,
+                          data_id=data_id,
+                          fav_id=fav_id,
+                          transponder=tr)
            services.append(srv)


--- a/app/eparser/satxml.py
+++ b/app/eparser/satxml.py
@@ -53,9 +53,9 @@ def write_satellites(satellites, data_path):
            transponder_child.setAttribute("frequency", tr.frequency)
            transponder_child.setAttribute("symbol_rate", tr.symbol_rate)
            transponder_child.setAttribute("polarization", get_key_by_value(POLARIZATION, tr.polarization))
-            transponder_child.setAttribute("fec_inner", get_key_by_value(FEC, tr.fec_inner) or "0")
-            transponder_child.setAttribute("system", get_key_by_value(SYSTEM, tr.system) or "0")
-            transponder_child.setAttribute("modulation", get_key_by_value(MODULATION, tr.modulation) or "0")
+            transponder_child.setAttribute("fec_inner", get_key_by_value(FEC, tr.fec_inner))
+            transponder_child.setAttribute("system", get_key_by_value(SYSTEM, tr.system))
+            transponder_child.setAttribute("modulation", get_key_by_value(MODULATION, tr.modulation))
            if tr.pls_mode:
                transponder_child.setAttribute("pls_mode", tr.pls_mode)
            if tr.pls_code:
@@ -90,6 +90,7 @@ def parse_transponders(elem, sat_name):
                                 atr["is_id"].value if "is_id" in atr else None)
            except Exception as e:
                message = "Error: can't parse transponder for '{}' satellite! {}".format(sat_name, repr(e))
+                print(message)
                log(message)
            else:
                transponders.append(tr)
--- a/app/settings.py
+++ b/app/settings.py
@@ -1,31 +1,3 @@
-# -*- 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 copy
 import json
 import locale
@@ -41,7 +13,6 @@ HOME_PATH = str(Path.home())
 CONFIG_PATH = HOME_PATH + "/.config/demon-editor/"
 CONFIG_FILE = CONFIG_PATH + "config.json"
 DATA_PATH = HOME_PATH + "/DemonEditor/data/"
-GTK_PATH = os.environ.get("GTK_PATH", None)

 IS_DARWIN = sys.platform == "darwin"

@@ -59,11 +30,8 @@ class Defaults(Enum):
    USE_COLORS = True
    NEW_COLOR = "rgb(255,230,204)"
    EXTRA_COLOR = "rgb(179,230,204)"
-    TOOLTIP_LOGO_SIZE = 96
-    LIST_PICON_SIZE = 32
    FAV_CLICK_MODE = 0
    PLAY_STREAMS_MODE = 1 if IS_DARWIN else 0
-    STREAM_LIB = "vlc"
    PROFILE_FOLDER_DEFAULT = False
    RECORDS_PATH = DATA_PATH + "records/"
    ACTIVATE_TRANSCODING = False
@@ -164,7 +132,7 @@ class SettingsReadException(SettingsException):
 class PlayStreamsMode(IntEnum):
    """ Behavior mode when opening streams. """
    BUILT_IN = 0
-    WINDOW = 1
+    VLC = 1
    M3U = 2


@@ -468,14 +436,6 @@ class Settings:
    def play_streams_mode(self, value):
        self._settings["play_streams_mode"] = value

-    @property
-    def stream_lib(self):
-        return self._settings.get("stream_lib", Defaults.STREAM_LIB.value)
-
-    @stream_lib.setter
-    def stream_lib(self, value):
-        self._settings["stream_lib"] = value
-
    # *********** EPG ************ #

    @property
@@ -553,6 +513,30 @@ class Settings:
    def enable_send_to(self, value):
        self._settings["enable_send_to"] = value

+    @property
+    def use_colors(self):
+        return self._settings.get("use_colors", Defaults.USE_COLORS.value)
+
+    @use_colors.setter
+    def use_colors(self, value):
+        self._settings["use_colors"] = value
+
+    @property
+    def new_color(self):
+        return self._settings.get("new_color", Defaults.NEW_COLOR.value)
+
+    @new_color.setter
+    def new_color(self, value):
+        self._settings["new_color"] = value
+
+    @property
+    def extra_color(self):
+        return self._settings.get("extra_color", Defaults.EXTRA_COLOR.value)
+
+    @extra_color.setter
+    def extra_color(self, value):
+        self._settings["extra_color"] = value
+
    @property
    def fav_click_mode(self):
        return self._settings.get("fav_click_mode", Defaults.FAV_CLICK_MODE.value)
@@ -598,63 +582,7 @@ class Settings:
    # *********** Appearance *********** #

    @property
-    def list_font(self):
-        return self._settings.get("list_font", "")
-
-    @list_font.setter
-    def list_font(self, value):
-        self._settings["list_font"] = value
-
-    @property
-    def list_picon_size(self):
-        return self._settings.get("list_picon_size", Defaults.LIST_PICON_SIZE.value)
-
-    @list_picon_size.setter
-    def list_picon_size(self, value):
-        self._settings["list_picon_size"] = value
-
-    @property
-    def tooltip_logo_size(self):
-        return self._settings.get("tooltip_logo_size", Defaults.TOOLTIP_LOGO_SIZE.value)
-
-    @tooltip_logo_size.setter
-    def tooltip_logo_size(self, value):
-        self._settings["tooltip_logo_size"] = value
-
-    @property
-    def use_colors(self):
-        return self._settings.get("use_colors", Defaults.USE_COLORS.value)
-
-    @use_colors.setter
-    def use_colors(self, value):
-        self._settings["use_colors"] = value
-
-    @property
-    def new_color(self):
-        return self._settings.get("new_color", Defaults.NEW_COLOR.value)
-
-    @new_color.setter
-    def new_color(self, value):
-        self._settings["new_color"] = value
-
-    @property
-    def extra_color(self):
-        return self._settings.get("extra_color", Defaults.EXTRA_COLOR.value)
-
-    @extra_color.setter
-    def extra_color(self, value):
-        self._settings["extra_color"] = value
-
-    @property
-    @lru_cache(1)
    def dark_mode(self):
-        if IS_DARWIN:
-            import subprocess
-
-            cmd = ["defaults", "read", "-g", "AppleInterfaceStyle"]
-            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-            return "Dark" in str(p[0])
-
        return self._settings.get("dark_mode", False)

    @dark_mode.setter
--- a/app/tools/media.py
+++ b/app/tools/media.py
@@ -1,384 +1,59 @@
 import os
+import subprocess
 import sys
-from abc import ABC, abstractmethod
 from datetime import datetime
+from enum import Enum
+from urllib.request import urlopen

-from gi.repository import Gdk, Gtk
+from app.commons import run_task, log, _DATE_FORMAT
+from app.settings import PlayStreamsMode

-from app.commons import run_task, log, _DATE_FORMAT, run_with_delay
-
-
-class Player(ABC):
-    """ Base player class. Also used as a factory. """
-
-    @abstractmethod
-    def get_play_mode(self):
-        pass
-
-    @abstractmethod
-    def play(self, mrl=None):
-        pass
-
-    @abstractmethod
-    def stop(self):
-        pass
-
-    @abstractmethod
-    def pause(self):
-        pass
-
-    @abstractmethod
-    def set_time(self, time):
-        pass
-
-    @abstractmethod
-    def release(self):
-        pass
-
-    @abstractmethod
-    def is_playing(self):
-        pass
-
-    @abstractmethod
-    def get_instance(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        pass
-
-    def get_window_handle(self, widget):
-        """ Returns the identifier [pointer] for the window.
-
-            Based on gtkvlc.py[get_window_pointer] example from here:
-            https://github.com/oaubert/python-vlc/tree/master/examples
-        """
-        if sys.platform == "linux":
-            return widget.get_window().get_xid()
-        else:
-            is_darwin = sys.platform == "darwin"
-            try:
-                import ctypes
-
-                libgdk = ctypes.CDLL("libgdk-3.0.dylib" if is_darwin else "libgdk-3-0.dll")
-            except OSError as e:
-                log("{}: Load library error: {}".format(__class__.__name__, e))
-            else:
-                # https://gitlab.gnome.org/GNOME/pygobject/-/issues/112
-                ctypes.pythonapi.PyCapsule_GetPointer.restype = ctypes.c_void_p
-                ctypes.pythonapi.PyCapsule_GetPointer.argtypes = [ctypes.py_object]
-                gpointer = ctypes.pythonapi.PyCapsule_GetPointer(widget.get_window().__gpointer__, None)
-                get_pointer = libgdk.gdk_quartz_window_get_nsview if is_darwin else libgdk.gdk_win32_window_get_handle
-                get_pointer.restype = ctypes.c_void_p
-                get_pointer.argtypes = [ctypes.c_void_p]
-
-                return get_pointer(gpointer)
-
-    def get_video_widget(self, widget):
-        area = Gtk.DrawingArea(visible=True)
-        area.connect("draw", self.on_drawing_area_draw)
-        area.connect("motion-notify-event", self.on_mouse_motion)
-        area.set_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK)
-        widget.add(area)
-
-        return area
-
-    def on_drawing_area_draw(self, widget, cr):
-        """ Used for black background drawing in the player drawing area. """
-        cr.set_source_rgb(0, 0, 0)
-        cr.paint()
-
-    def on_mouse_motion(self, widget, event):
-        display = widget.get_display()
-        window = widget.get_window()
-        cursor = Gdk.Cursor.new_from_name(display, "default")
-        window.set_cursor(cursor)
-
-        self.hide_mouse_cursor(window, display)
-
-    @run_with_delay(3)
-    def hide_mouse_cursor(self, window, display):
-        cursor = Gdk.Cursor.new_for_display(display, Gdk.CursorType.BLANK_CURSOR)
-        window.set_cursor(cursor)
-
-    @staticmethod
-    def make(name, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
-        """ Factory method. We will not use a separate factory to return a specific implementation.
-
-            @param name: implementation name.
-            @param mode: current player mode [Built-in or windowed].
-            @param widget: parent of video widget.
-            @param buf_cb: buffering callback.
-            @param position_cb: time (position) callback.
-            @param error_cb: error callback.
-            @param playing_cb: playing state callback.
-
-            Throws a NameError if there is no implementation for the given name.
-        """
-        if name == "mpv":
-            return MpvPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        elif name == "gst":
-            return GstPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        elif name == "vlc":
-            return VlcPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        else:
-            raise NameError("There is no such [{}] implementation.".format(name))
-
-
-class MpvPlayer(Player):
-    """ Simple wrapper for MPV media player.
-
-        Uses python-mvp [https://github.com/jaseg/python-mpv].
-    """
-    __INSTANCE = None
-
-    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        try:
-            from app.tools import mpv
-
-            self._player = mpv.MPV(wid=str(self.get_window_handle(self.get_video_widget(widget), )),
-                                   input_default_bindings=False,
-                                   input_cursor=False,
-                                   cursor_autohide="no")
-        except OSError as e:
-            log("{}: Load library error: {}".format(__class__.__name__, e))
-            raise ImportError("No libmpv is found. Check that it is installed!")
-        else:
-            self._mode = mode
-            self._is_playing = False
-
-            @self._player.event_callback(mpv.MpvEventID.FILE_LOADED)
-            def on_open(event):
-                log("Starting playback...")
-                playing_cb()
-
-            @self._player.event_callback(mpv.MpvEventID.END_FILE)
-            def on_end(event):
-                event = event.get("event", {})
-                if event.get("reason", mpv.MpvEventEndFile.ERROR) == mpv.MpvEventEndFile.ERROR:
-                    log("Stream playback error: {}".format(event.get("error", mpv.ErrorCode.GENERIC)))
-                    error_cb()
-
-    @classmethod
-    def get_instance(cls, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        if not cls.__INSTANCE:
-            cls.__INSTANCE = MpvPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        return cls.__INSTANCE
-
-    def get_play_mode(self):
-        return self._mode
-
-    @run_task
-    def play(self, mrl=None):
-        if not mrl:
-            return
-
-        self._player.play(mrl)
-        self._is_playing = True
-
-    @run_task
-    def stop(self):
-        self._player.stop()
-        self._is_playing = True
-
-    def pause(self):
-        pass
-
-    def set_time(self, time):
-        pass
-
-    @run_task
-    def release(self):
-        self._player.terminate()
-        self.__INSTANCE = None
-
-    def is_playing(self):
-        return self._is_playing
-
-
-class GstPlayer(Player):
-    """ Simple wrapper for GStreamer playbin. """
-
-    __INSTANCE = None
-
-    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        try:
-            import gi
-
-            gi.require_version("Gst", "1.0")
-            gi.require_version("GstVideo", "1.0")
-            from gi.repository import Gst, GstVideo
-            # Initialization of GStreamer.
-            Gst.init(sys.argv)
-            gtk_sink = Gst.ElementFactory.make("gtksink")
-            if not gtk_sink:
-                msg = "GStreamer error: gtksink plugin not installed!"
-                log(msg)
-                raise ImportError(msg)
-        except (OSError, ValueError) as e:
-            log("{}: Load library error: {}".format(__class__.__name__, e))
-            raise ImportError("No GStreamer is found. Check that it is installed!")
-        else:
-            self._error_cb = error_cb
-            self._playing_cb = playing_cb
-
-            self.STATE = Gst.State
-            self.STAT_RETURN = Gst.StateChangeReturn
-
-            self._mode = mode
-            self._is_playing = False
-            self._player = Gst.ElementFactory.make("playbin", "player")
-            # Initialization of the playback widget.
-            self._player.set_property("video-sink", gtk_sink)
-            vid_widget = gtk_sink.get_property("widget")
-            vid_widget.connect("motion-notify-event", self.on_mouse_motion)
-            widget.add(vid_widget)
-            vid_widget.show()
-
-            bus = self._player.get_bus()
-            bus.add_signal_watch()
-            bus.connect("message::error", self.on_error)
-            bus.connect("message::state-changed", self.on_state_changed)
-            bus.connect("message::eos", self.on_eos)
-
-    @classmethod
-    def get_instance(cls, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
-        if not cls.__INSTANCE:
-            cls.__INSTANCE = GstPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        return cls.__INSTANCE
-
-    def get_play_mode(self):
-        return self._mode
-
-    def play(self, mrl=None):
-        self._player.set_state(self.STATE.READY)
-        if not mrl:
-            return
-
-        self._player.set_property("uri", mrl)
-
-        log("Setting the URL for playback: {}".format(mrl))
-        ret = self._player.set_state(self.STATE.PLAYING)
-
-        if ret == self.STAT_RETURN.FAILURE:
-            log("ERROR: Unable to set the 'PLAYING' state for '{}'.".format(mrl))
-        else:
-            self._is_playing = True
-
-    def stop(self):
-        log("Stop playback...")
-        self._player.set_state(self.STATE.READY)
-        self._is_playing = False
-
-    def pause(self):
-        self._player.set_state(self.STATE.PAUSED)
-
-    def set_time(self, time):
-        pass
-
-    @run_task
-    def release(self):
-        self._is_playing = False
-        self._player.set_state(self.STATE.NULL)
-        self.__INSTANCE = None
-
-    def set_mrl(self, mrl):
-        self._player.set_property("uri", mrl)
-
-    def is_playing(self):
-        return self._is_playing
-
-    def on_error(self, bus, msg):
-        err, dbg = msg.parse_error()
-        log(err)
-        self._error_cb()
-
-    def on_state_changed(self, bus, msg):
-        if not msg.src == self._player:
-            # Not from the player.
-            return
-
-        old_state, new_state, pending = msg.parse_state_changed()
-        if new_state is self.STATE.PLAYING:
-            log("Starting playback...")
-            self._playing_cb()
-            self.get_stream_info()
-
-    def on_eos(self, bus, msg):
-        """ Called when an end-of-stream message appears. """
-        self._player.set_state(self.STATE.READY)
-        self._is_playing = False
-
-    def get_stream_info(self):
-        log("Getting stream info...")
-        nr_video = self._player.get_property("n-video")
-        for i in range(nr_video):
-            # Retrieve the stream's video tags.
-            tags = self._player.emit("get-video-tags", i)
-            if tags:
-                _, cod = tags.get_string("video-codec")
-                log("Video codec: {}".format(cod or "unknown"))
-
-        nr_audio = self._player.get_property("n-audio")
-        for i in range(nr_audio):
-            # Retrieve the stream's video tags.
-            tags = self._player.emit("get-audio-tags", i)
-            if tags:
-                _, cod = tags.get_string("audio-codec")
-                log("Audio codec: {}".format(cod or "unknown"))
-
-
-class VlcPlayer(Player):
-    """ Simple wrapper for VLC media player.
-
-        Uses python-vlc [https://github.com/oaubert/python-vlc].
-    """

+class Player:
    __VLC_INSTANCE = None
+    __PLAY_STREAMS_MODE = PlayStreamsMode.BUILT_IN

-    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
+    def __init__(self, rewind_callback, position_callback, error_callback, playing_callback):
        try:
            from app.tools import vlc
            from app.tools.vlc import EventType
-
+        except OSError as e:
+            log("{}: Load library error: {}".format(__class__.__name__, e))
+            raise ImportError
+        else:
+            self._is_playing = False
            args = "--quiet {}".format("" if sys.platform == "darwin" else "--no-xlib")
            self._player = vlc.Instance(args).media_player_new()
-            vlc.libvlc_video_set_key_input(self._player, False)
-            vlc.libvlc_video_set_mouse_input(self._player, False)
-        except (OSError, AttributeError) as e:
-            log("{}: Load library error: {}".format(__class__.__name__, e))
-            raise ImportError("No VLC is found. Check that it is installed!")
-        else:
-            self._mode = mode
-            self._is_playing = False
-
            ev_mgr = self._player.event_manager()

-            if buf_cb:
+            if rewind_callback:
                # TODO look other EventType options
                ev_mgr.event_attach(EventType.MediaPlayerBuffering,
-                                    lambda et, p: buf_cb(p.get_media().get_duration()),
+                                    lambda et, p: rewind_callback(p.get_media().get_duration()),
                                    self._player)
-            if position_cb:
+            if position_callback:
                ev_mgr.event_attach(EventType.MediaPlayerTimeChanged,
-                                    lambda et, p: position_cb(p.get_time()),
+                                    lambda et, p: position_callback(p.get_time()),
                                    self._player)

-            if error_cb:
+            if error_callback:
                ev_mgr.event_attach(EventType.MediaPlayerEncounteredError,
-                                    lambda et, p: error_cb(),
+                                    lambda et, p: error_callback(),
                                    self._player)
-            if playing_cb:
+            if playing_callback:
                ev_mgr.event_attach(EventType.MediaPlayerPlaying,
-                                    lambda et, p: playing_cb(),
+                                    lambda et, p: playing_callback(),
                                    self._player)

-            self.init_video_widget(widget)
-
    @classmethod
-    def get_instance(cls, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
+    def get_instance(cls, rewind_callback=None, position_callback=None, error_callback=None, playing_callback=None):
        if not cls.__VLC_INSTANCE:
-            cls.__VLC_INSTANCE = VlcPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
+            cls.__VLC_INSTANCE = Player(rewind_callback, position_callback, error_callback, playing_callback)
        return cls.__VLC_INSTANCE

-    def get_play_mode(self):
-        return self._mode
+    @staticmethod
+    def get_play_mode():
+        return Player.__PLAY_STREAMS_MODE

    @run_task
    def play(self, mrl=None):
@@ -405,7 +80,29 @@ class VlcPlayer(Player):
            self._is_playing = False
            self._player.stop()
            self._player.release()
-            self.__VLC_INSTANCE = None
+
+    def set_xwindow(self, xid):
+        self._player.set_xwindow(xid)
+
+    def set_nso(self, widget):
+        """ Used on MacOS to set NSObject.
+
+            Based on gtkvlc.py[get_window_pointer] example from here:
+            https://github.com/oaubert/python-vlc/tree/master/examples
+        """
+        try:
+            import ctypes
+            g_dll = ctypes.CDLL("libgdk-3.0.dylib")
+        except OSError as e:
+            log("{}: Load library error: {}".format(__class__.__name__, e))
+        else:
+            get_nsview = g_dll.gdk_quartz_window_get_nsview
+            get_nsview.restype, get_nsview.argtypes = ctypes.c_void_p, [ctypes.c_void_p]
+            ctypes.pythonapi.PyCapsule_GetPointer.restype = ctypes.c_void_p
+            ctypes.pythonapi.PyCapsule_GetPointer.argtypes = [ctypes.py_object]
+            # Get the C void* pointer to the window
+            pointer = ctypes.pythonapi.PyCapsule_GetPointer(widget.get_window().__gpointer__, None)
+            self._player.set_nsobject(get_nsview(pointer))

    def set_mrl(self, mrl):
        self._player.set_mrl(mrl)
@@ -413,14 +110,94 @@ class VlcPlayer(Player):
    def is_playing(self):
        return self._is_playing

-    def init_video_widget(self, widget):
-        video_widget = self.get_video_widget(widget)
-        if sys.platform == "linux":
-            self._player.set_xwindow(video_widget.get_window().get_xid())
-        elif sys.platform == "darwin":
-            self._player.set_nsobject(self.get_window_handle(video_widget))
+    def set_full_screen(self, full):
+        self._player.set_fullscreen(full)
+
+
+class HttpPlayer:
+    """ Simple wrapper for VLC media player to interact over http. """
+
+    __VLC_INSTANCE = None
+    __PLAY_STREAMS_MODE = PlayStreamsMode.VLC
+
+    class Commands(Enum):
+        STATUS = "http://127.0.0.1:{}/requests/status.xml"
+        PLAY = "http://127.0.0.1:{}/requests/status.xml?command=in_play&input={}"
+        STOP = "http://127.0.0.1:{}/requests/status.xml?command=pl_stop"
+        CLEAR = "http://127.0.0.1:{}/requests/status.xml?command=pl_empty"
+
+    def __init__(self, exe, port, is_darwin):
+        from concurrent.futures import ThreadPoolExecutor as PoolExecutor
+
+        self._executor = PoolExecutor(max_workers=1)
+        self._cmd = [exe, "--no-stats", "--verbose=-1", "--extraintf", "http", "--http-port", port, "--quiet"]
+        if not is_darwin:
+            self._cmd.append("--one-instance")
+
+        self._p = None
+        self._state = None
+        self._port = port
+
+    @classmethod
+    def get_instance(cls, settings):
+        if not cls.__VLC_INSTANCE:
+            import shutil
+
+            is_darwin = settings.is_darwin
+            # TODO Add options[vlc_exe and port] to the settings!
+            exe = "/Applications/VLC.app/Contents/MacOS/VLC" if is_darwin else "/usr/bin/vlc"
+            if shutil.which(exe) is None:
+                raise ImportError
+            cls.__VLC_INSTANCE = HttpPlayer(exe=exe, port=str(9090), is_darwin=is_darwin)
+        return cls.__VLC_INSTANCE
+
+    @staticmethod
+    def get_play_mode():
+        return HttpPlayer.__PLAY_STREAMS_MODE
+
+    @run_task
+    def play(self, mrl=None):
+        if not self._p or self._p and self._p.poll() is not None:
+            self._p = subprocess.Popen(self._cmd + [mrl], preexec_fn=os.setsid)
+            self._p.communicate()
        else:
-            log("Video widget initialization error: platform '{}' is not supported. ".format(sys.platform))
+            self._executor.submit(self.open_command, self.Commands.CLEAR)
+            self._executor.submit(self.open_command, self.Commands.PLAY, mrl)
+
+    def open_command(self, command, url=None):
+        if command is self.Commands.PLAY:
+            url = self.Commands.PLAY.value.format(self._port, url)
+        else:
+            url = command.value.format(self._port)
+
+        try:
+            with urlopen(url, timeout=5) as f:
+                self._state = command
+        except Exception as e:
+            log("{}[open_command, {}] error: {}".format(__class__.__name__, command, e))
+
+    def stop(self):
+        if self._state is self.Commands.PLAY:
+            self._executor.submit(self.open_command, self.Commands.STOP)
+
+    def pause(self):
+        pass
+
+    def set_time(self, time):
+        pass
+
+    @run_task
+    def release(self):
+        if self._p and self._p.poll() is None:
+            import signal
+            # Good explanation here: https://stackoverflow.com/a/4791612
+            os.killpg(os.getpgid(self._p.pid), signal.SIGTERM)
+
+    def is_playing(self):
+        return self._state is self.Commands.PLAY
+
+    def set_full_screen(self, full):
+        pass


 class Recorder:
--- a/app/tools/mpv.py
+++ b/app/tools/mpv.py
--- a/app/tools/picons.py
+++ b/app/tools/picons.py
@@ -1,227 +1,22 @@
-# -*- 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 glob
 import os
 import re
 import shutil
-import subprocess
 from collections import namedtuple
 from html.parser import HTMLParser

-import requests
-
 from app.commons import run_task, log
-from app.settings import SettingsType, GTK_PATH
-from .satellites import _HEADERS
+from app.settings import SettingsType

 _ENIGMA2_PICON_KEY = "{:X}:{:X}:{}"
 _NEUTRINO_PICON_KEY = "{:x}{:04x}{:04x}.png"

 Provider = namedtuple("Provider", ["logo", "name", "pos", "url", "on_id", "ssid", "single", "selected"])
-Picon = namedtuple("Picon", ["ref", "ssid"])
-
-
-class PiconsError(Exception):
-    pass
-
-
-class PiconsCzDownloader:
-    """ The main class for loading picons from the https://picon.cz/ source (by Chocholoušek). """
-
-    _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/1.0.8", "Referer": ""}
-    _LINK_PATTERN = re.compile(r"((.*)-\d+x\d+)-(.*)_by_chocholousek.7z$")
-    _FILE_PATTERN = re.compile(b"\\s+(1_.*\\.png).*")
-
-    def __init__(self, picon_ids=set(), appender=log):
-        self._perm_links = {}
-        self._providers = {}
-        self._provider_logos = {}
-        self._picon_ids = picon_ids
-        self._appender = appender
-
-    def init(self):
-        """ Initializes dict with values: download_id -> perm link and provider data.  """
-        if self._perm_links:
-            return
-
-        self._HEADER["Referer"] = self._PERM_URL
-
-        with requests.get(url=self._PERM_URL, headers=self._HEADER, stream=True) as request:
-            if request.reason == "OK":
-                logo_map = self.get_logos_map()
-                name_map = self.get_name_map()
-
-                for line in request.iter_lines():
-                    l_id, perm_link = line.decode(encoding="utf-8", errors="ignore").split(maxsplit=1)
-                    self._perm_links[str(l_id)] = str(perm_link)
-                    data = re.match(self._LINK_PATTERN, perm_link)
-                    if data:
-                        sat_pos = data.group(3)
-                        # Logo url.
-                        logo = logo_map.get(data.group(2), None)
-                        l_name = name_map.get(sat_pos, None) or sat_pos.replace(".", "")
-                        logo_url = "{}{}/{}.png".format(self._BASE_LOGO_URL, logo, l_name) if logo else None
-
-                        prv = Provider(None, data.group(1), sat_pos, self._BASE_URL + l_id, l_id, logo_url, None, False)
-                        if sat_pos in self._providers:
-                            self._providers[sat_pos].append(prv)
-                        else:
-                            self._providers[sat_pos] = [prv]
-            else:
-                log("{} [get permalinks] error: {}".format(self.__class__.__name__, request.reason))
-                raise PiconsError(request.reason)
-
-    @property
-    def providers(self):
-        return self._providers
-
-    def get_sat_providers(self, url):
-        return self._providers.get(url, [])
-
-    def download(self, provider, picons_path, picon_ids=None):
-        self._HEADER["Referer"] = provider.url
-        with requests.get(url=provider.url, headers=self._HEADER, stream=True) as request:
-            if request.reason == "OK":
-                dest = "{}{}.7z".format(picons_path, provider.on_id)
-                self._appender("Downloading: {}\n".format(provider.url))
-                with open(dest, mode="bw") as f:
-                    for data in request.iter_content(chunk_size=1024):
-                        f.write(data)
-                self._appender("Extracting: {}\n".format(provider.on_id))
-                self.extract(dest, picons_path, picon_ids)
-            else:
-                log("{} [download] error: {}".format(self.__class__.__name__, request.reason))
-
-    def extract(self, src, dest, picon_ids=None):
-        """ Extracts 7z archives. """
-        # TODO: think about https://github.com/miurahr/py7zr
-        exe = "./7zr" if GTK_PATH else "7zr"
-        cmd = [exe, "l", src]
-        try:
-            out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-            if err:
-                log("{} [extract] error: {}".format(self.__class__.__name__, err))
-                raise PiconsError(err)
-        except OSError as e:
-            log("{} [extract] error: {}".format(self.__class__.__name__, e))
-            raise PiconsError(e)
-
-        is_filter = bool(picon_ids)
-        ids = picon_ids or self._picon_ids
-        to_extract = []
-
-        for o in re.finditer(self._FILE_PATTERN, out):
-            p_id = o.group(1).decode("utf-8", errors="ignore")
-            if p_id in ids:
-                to_extract.append(p_id)
-
-        if is_filter and not to_extract:
-            if os.path.isfile(src):
-                os.remove(src)
-            raise PiconsError("No matching picons found!")
-
-        cmd = [exe, "e", src, "-o{}".format(dest), "-y", "-r"]
-        cmd.extend(to_extract)
-        try:
-            out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-            if err:
-                log("{} [extract] error: {}".format(self.__class__.__name__, err))
-                raise PiconsError(err)
-            else:
-                if os.path.isfile(src):
-                    os.remove(src)
-        except OSError as e:
-            log(e)
-            raise PiconsError(e)
-
-    def get_logo_data(self, url):
-        """ Returns the logo data if present. """
-        return self._provider_logos.get(url, None)
-
-    def get_provider_logo(self, url):
-        """ Retrieves package logo. """
-        # Getting package logo.
-        logo = self._provider_logos.get(url, None)
-        if logo:
-            return logo
-
-        try:
-            with requests.get(url=url, stream=True) as logo_request:
-                if logo_request.reason == "OK":
-                    data = logo_request.content
-                    self._provider_logos[url] = data
-                    return data
-                else:
-                    log("Downloading package logo error: {}".format(logo_request.reason))
-        except requests.exceptions.ConnectionError as e:
-            log("{} error [get provider logo]: {}".format(self.__class__.__name__, e))
-
-    def get_logos_map(self):
-        return {"piconblack": "b50",
-                "picontransparent": "t50",
-                "piconwhite": "w50",
-                "piconmirrorglass": "mr100",
-                "piconnoName": "n100",
-                "piconsrhd": "srhd100",
-                "piconfreezeframe": "ff220",
-                "piconfreezewhite": "fw100",
-                "piconpoolrainbow": "r100",
-                "piconsimpleblack": "s220",
-                "piconjustblack": "jb220",
-                "picondirtypaper": "dp220",
-                "picongray": "g400",
-                "piconmonochrom": "m220",
-                "picontransparentwhite": "tw100",
-                "picontransparentdark": "td220",
-                "piconoled": "o96",
-                "piconblack80": "b50",
-                "piconblack3d": "b50"
-                }
-
-    def get_name_map(self):
-        return {"antiksat": "ANTIK",
-                "digiczsk": "DIGI",
-                "DTTitaly": "picon_trs-it",
-                "dvbtCZSK": "picon_trs",
-                "PolandDTT": "picon_trs-pl",
-                "freeSAT": "UPC DIRECT",
-                "orangesat": "ORANGE TV",
-                "skylink": "M7 GROUP",
-                }
+Picon = namedtuple("Picon", ["ref", "ssid", "v_pid"])


 class PiconsParser(HTMLParser):
    """ Parser for package html page. (https://www.lyngsat.com/packages/*provider-name*.html) """
-    _BASE_URL = "https://www.lyngsat.com"

    def __init__(self, entities=False, separator=' ', single=None):

@@ -263,16 +58,19 @@ class PiconsParser(HTMLParser):
            row = self._current_row
            ln = len(row)

-            if self._single and ln == 4 and row[0].startswith("/logo/"):
-                self.picons.append(Picon(row[0].strip(), "0"))
+            if self._single and ln == 4 and row[0].startswith("../../logo/"):
+                self.picons.append(Picon(row[0].strip("../"), "0", "0"))
            else:
-                if ln > 8:
+                if 9 < ln < 13:
                    url = None
-                    if row[2].startswith("/logo/"):
-                        url = row[2]
+                    if row[0].startswith("../logo/"):
+                        url = row[0]
+                    elif row[1].startswith("../logo/"):
+                        url = row[1]

-                    if url and row[0].isdigit():
-                        self.picons.append(Picon(url, row[0]))
+                    ssid = row[-4]
+                    if url and len(ssid) > 2:
+                        self.picons.append(Picon(url, ssid, row[-3]))

            self._current_row = []

@@ -280,47 +78,37 @@ class PiconsParser(HTMLParser):
        pass

    @staticmethod
-    def parse(provider, picons_path, picon_ids, s_type=SettingsType.ENIGMA_2):
-        """ Returns tuple(url, picon file name) list. """
-        req = requests.get(provider.url, timeout=5)
-        if req.status_code == 200:
-            logo_data = req.text
-        else:
-            log("Provider picons downloading error: {} {}".format(provider.url, req.reason))
+    def parse(open_path, picons_path, tmp_path, provider, picon_ids, s_type=SettingsType.ENIGMA_2):
+        if not os.path.isfile(open_path):
+            log("PiconsParser error [parse]. No such file or directory: {}".format(open_path))
            return

-        on_id, pos, ssid, single = provider.on_id, provider.pos, provider.ssid, provider.single
-        neg_pos = pos.endswith("W")
-        pos = int("".join(c for c in pos if c.isdigit()))
-        # For negative (West) positions 3600 - numeric position value!!!
-        if neg_pos:
-            pos = 3600 - pos
-
-        parser = PiconsParser(single=provider.single)
-        parser.reset()
-        parser.feed(logo_data)
-        picons = parser.picons
-        picons_data = []
-
-        if picons:
-            for p in picons:
-                try:
-                    if single:
-                        on_id, freq = on_id.strip().split("::")
-                        namespace = "{:X}{:X}".format(int(pos), int(freq))
-                    else:
-                        namespace = "{:X}0000".format(int(pos))
-
-                    if single and not ssid.isdigit():
-                        ssid = "".join(c for c in ssid if c.isdigit()) or "0"
-                    name = PiconsParser.format(ssid if single else p.ssid, on_id, namespace, picon_ids, s_type)
-                    p_name = picons_path + (name if name else os.path.basename(p.ref))
-                    picons_data.append(("{}{}".format(PiconsParser._BASE_URL, p.ref), p_name))
-                except (TypeError, ValueError) as e:
-                    msg = "Picons format parse error: {}".format(p) + "\n" + str(e)
-                    log(msg)
-
-        return picons_data
+        with open(open_path, encoding="utf-8", errors="replace") as f:
+            on_id, pos, ssid, single = provider.on_id, provider.pos, provider.ssid, provider.single
+            neg_pos = pos.endswith("W")
+            pos = int("".join(c for c in pos if c.isdigit()))
+            # For negative (West) positions 3600 - numeric position value!!!
+            if neg_pos:
+                pos = 3600 - pos
+            parser = PiconsParser(single=single)
+            parser.reset()
+            parser.feed(f.read())
+            picons = parser.picons
+            if picons:
+                os.makedirs(picons_path, exist_ok=True)
+                for p in picons:
+                    try:
+                        if single:
+                            on_id, freq = on_id.strip().split("::")
+                            namespace = "{:X}{:X}".format(int(pos), int(freq))
+                        else:
+                            namespace = "{:X}0000".format(int(pos))
+                        name = PiconsParser.format(ssid if single else p.ssid, on_id, namespace, picon_ids, s_type)
+                        p_name = picons_path + (name if name else os.path.basename(p.ref))
+                        shutil.copyfile(tmp_path + "www.lyngsat.com/" + p.ref.lstrip("."), p_name)
+                    except (TypeError, ValueError) as e:
+                        msg = "Picons format parse error: {}".format(p) + "\n" + str(e)
+                        log(msg)

    @staticmethod
    def format(ssid, on_id, namespace, picon_ids, s_type):
@@ -339,8 +127,7 @@ class ProviderParser(HTMLParser):
    _POSITION_PATTERN = re.compile("at\s\d+\..*(?:E|W)']")
    _ONID_TID_PATTERN = re.compile("^\d+-\d+.*")
    _TRANSPONDER_FREQUENCY_PATTERN = re.compile("^\d+ [HVLR]+")
-    _DOMAINS = {"/tvchannels/", "/radiochannels/", "/packages/", "/logo/"}
-    _BASE_URL = "https://www.lyngsat.com"
+    _DOMAINS = {"/tvchannels/", "/radiochannels/", "/packages/"}

    def __init__(self, entities=False, separator=' '):

@@ -368,17 +155,26 @@ class ProviderParser(HTMLParser):
        if tag == 'tr':
            self._is_th = True
        if tag == "img":
-            if attrs[0][1].startswith("/logo/"):
+            if attrs[0][1].startswith("logo/"):
                self._current_row.append(attrs[0][1])
        if tag == "a":
            url = attrs[0][1]
            if any(d in url for d in self._DOMAINS):
                self._current_row.append(url)
+        if tag == "font" and len(attrs) == 1:
+            atr = attrs[0]
+            if len(atr) == 2 and atr[1] == "darkgreen":
+                self._is_onid_tid = True

    def handle_data(self, data):
        """ Save content to a cell """
        if self._is_td or self._is_th:
            self._current_cell.append(data.strip())
+        if self._is_onid_tid:
+            m = self._ONID_TID_PATTERN.match(data)
+            if m:
+                self._on_id, tid = m.group().split("-")
+            self._is_onid_tid = False

    def handle_endtag(self, tag):
        if tag == 'td':
@@ -391,49 +187,41 @@ class ProviderParser(HTMLParser):
            self._current_row.append(final_cell)
            self._current_cell = []
        elif tag == 'tr':
-            row = self._current_row
+            r = self._current_row
            # Satellite position
            if not self._positon:
-                pos = re.findall(self._POSITION_PATTERN, str(row))
+                pos = re.findall(self._POSITION_PATTERN, str(r))
                if pos:
                    self._positon = "".join(c for c in str(pos) if c.isdigit() or c in ".EW")

-            len_row = len(row)
+            len_row = len(r)
            if len_row > 2:
-                m = self._TRANSPONDER_FREQUENCY_PATTERN.match(row[0])
+                m = self._TRANSPONDER_FREQUENCY_PATTERN.match(r[1])
                if m:
                    self._freq = m.group().split()[0]

-            if len_row > 12:
+            if len_row == 12:
                # Providers
-                name = row[5]
+                name = r[5]
                self._prv_names.add(name)
-                m = self._ONID_TID_PATTERN.match(str(row[-5]))
+                m = self._ONID_TID_PATTERN.match(str(r[-2]))
                if m:
                    on_id, tid = m.group().split("-")
                    if on_id not in self._ids:
-                        self._on_id = on_id
-                        row[-2] = on_id
+                        r[-2] = on_id
                        self._ids.add(on_id)
-                        row[0] = self._positon
+                        r[0] = self._positon
                    if name + on_id not in self._prv_names:
                        self._prv_names.add(name + on_id)
-                        logo_data = None
-                        if row[2].startswith("/logo/"):
-                            req = requests.get(self._BASE_URL + row[2], timeout=5)
-                            if req.status_code == 200:
-                                logo_data = req.content
-                            else:
-                                log("Downloading provider logo error: {}".format(req.reason))
-                        self.rows.append(Provider(logo=logo_data, name=name, pos=self._positon, url=row[6], on_id=on_id,
+                        self.rows.append(Provider(logo=r[2], name=name, pos=self._positon, url=r[6], on_id=on_id,
                                                  ssid=None, single=False, selected=True))
-            elif 6 < len_row < 12:
+            elif 6 < len_row < 10:
                # Single services
                name, url, ssid = None, None, None
-                if row[0].startswith("http"):
-                    name, url, ssid = row[1], row[0], row[0]
-                elif row[1].startswith("http"):
-                    name, url, ssid = row[2], row[1], row[0]
+                if r[0].startswith("http"):
+                    name, url, ssid = r[1], r[0], r[4]
+                elif r[1].startswith("http"):
+                    name, url, ssid = r[2], r[1], r[5]

                if name and url:
                    on_id = "{}::{}".format(self._on_id if self._on_id else "1", self._freq)
@@ -449,51 +237,14 @@ class ProviderParser(HTMLParser):
        super().reset()


-def parse_providers(url):
-    """ Returns a list of providers sorted by logo [single channels after providers]. """
+def parse_providers(open_path):
    parser = ProviderParser()
+    parser.reset()

-    request = requests.get(url=url, headers=_HEADERS)
-    if request.status_code == 200:
-        parser.feed(request.text)
-    else:
-        log("Parse providers error [{}]: {}".format(url, request.reason))
+    with open(open_path, encoding="utf-8", errors="replace") as f:
+        parser.feed(f.read())

-    def srt(p):
-        if p.logo is None:
-            return 1
-        return 0
-
-    providers = parser.rows
-    providers.sort(key=srt)
-
-    return providers
-
-
-def download_picon(src_url, dest_path, callback):
-    """ Downloads and saves the picon to file.  """
-    err_msg = "Picon download error: {}  [{}]"
-    timeout = (3, 5)  # connect and read timeouts
-
-    if callback:
-        callback("Downloading: {}.\n".format(os.path.basename(dest_path)))
-
-    req = requests.get(src_url, timeout=timeout, stream=True)
-    if req.status_code != 200:
-        err_msg = err_msg.format(src_url, req.reason)
-        log(err_msg)
-        if callback:
-            callback(err_msg + "\n")
-    else:
-        try:
-            with open(dest_path, "wb") as f:
-                for chunk in req:
-                    f.write(chunk)
-        except OSError as e:
-            err_msg = "Saving picon [{}] error: {}".format(dest_path, e)
-            log(err_msg)
-            if callback:
-                callback(err_msg + "\n")
+        return parser.rows


@run_task
--- a/app/tools/satellites.py
+++ b/app/tools/satellites.py
@@ -14,14 +14,13 @@ from app.eparser import Satellite, Transponder, is_transponder_valid
 from app.eparser.ecommons import (PLS_MODE, get_key_by_value, FEC, SYSTEM, POLARIZATION, MODULATION, SERVICE_TYPE,
                                  Service, CAS)

-_HEADERS = {"User-Agent": "Mozilla/5.0 (Linux x86_64; rv:85.0) Gecko/20100101 Firefox/85.0"}
+_HEADERS = {"User-Agent": "Mozilla/5.0 (X11; Linux i586; rv:31.0) Gecko/20100101 Firefox/69.0"}


 class SatelliteSource(Enum):
    FLYSAT = ("https://www.flysat.com/satlist.php",)
    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",)

    @staticmethod
    def get_sources(src):
@@ -77,8 +76,6 @@ class Cell:
 class SatellitesParser(HTMLParser):
    """ Parser for satellite html page. """

-    POS_PAT = re.compile(r".*?(\d+\.\d°?[EW]).*")
-
    def __init__(self, source=SatelliteSource.FLYSAT, entities=False, separator=' '):

        HTMLParser.__init__(self)
@@ -99,9 +96,7 @@ class SatellitesParser(HTMLParser):
        if tag == "tr":
            self._is_th = True
        if tag == "a":
-            for atr in attrs:
-                if atr[0] == "href":
-                    self._current_row.append(atr[1])
+            self._current_row.append(attrs[0][1])

    def handle_data(self, data):
        """ Save content to a cell """
@@ -152,27 +147,41 @@ class SatellitesParser(HTMLParser):

                return list(map(get_sat, filter(lambda x: all(x) and len(x) == 5, self._rows)))
            elif self._source is SatelliteSource.LYNGSAT:
+                extra_pattern = re.compile(r"^https://www\.lyngsat\.com/[\w-]+\.html")
                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
+                names = set()
+                current_pos = "0"
+                for row in filter(lambda x: len(x) in (5, 7, 8), self._rows):
+                    r_len = len(row)
+                    if r_len == 7:
+                        current_pos = self.parse_position(row[2])
+                        name = row[1].rsplit("/")[-1].rstrip(".html").replace("-", " ")
+                        if name not in names:
+                            # [all in one] satellites
+                            sats.append((name, current_pos, row[5], base_url + row[1], False))
+                            names.add(name)
+                        name = row[4]
+                        if name not in names:
+                            sats.append((name, current_pos, row[5], base_url + row[3], False))
+                            names.add(name)
+                    if r_len == 8:  # for a very limited number of satellites
+                        data = list(filter(None, row))
+                        urls = set()
+                        sat_type = ""
+                        for d in data:
+                            url = re.match(extra_pattern, d)
+                            if url:
+                                urls.add(url.group(0))
+                            if d in ("C", "Ku", "CKu"):
+                                sat_type = d
+                        current_pos = self.parse_position(data[1])
+                        for url in urls:
+                            name = url.rsplit("/")[-1].rstrip(".html").replace("-", " ")
+                            sats.append((name, current_pos, sat_type, base_url + url, False))
+                    elif r_len == 5:
+                        sats.append((row[2], current_pos, row[3], base_url + row[1], False))
                return sats
-            elif source is SatelliteSource.KINGOFSAT:
-                def get_sat(r):
-                    return r[3], self.parse_position(r[1]), None, r[0], False
-
-                return list(map(get_sat, filter(lambda x: len(x) == 17, self._rows)))

    def get_satellite(self, sat):
        pos = sat[1]
@@ -192,29 +201,16 @@ class SatellitesParser(HTMLParser):
    def get_transponders(self, sat_url):
        """ Getting transponders(sorted by frequency). """
        self._rows.clear()
+        url = "https://www.flysat.com/" + sat_url if self._source is SatelliteSource.FLYSAT else sat_url
+        request = requests.get(url=url, headers=_HEADERS)
+        reason = request.reason
        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
-
-        try:
-            request = requests.get(url=url, headers=_HEADERS)
-        except requests.exceptions.ConnectionError as e:
-            log("Getting transponders error: {}".format(e))
-        else:
-            if request.status_code == 200:
-                self.feed(request.text)
-                if self._source is SatelliteSource.FLYSAT:
-                    self.get_transponders_for_fly_sat(trs)
-                elif self._source is SatelliteSource.LYNGSAT:
-                    self.get_transponders_for_lyng_sat(trs)
-                elif self._source is SatelliteSource.KINGOFSAT:
-                    self.get_transponders_for_king_of_sat(trs)
-            else:
-                log("SatellitesParser [get transponders] error: {}  {}".format(url, request.reason))
+        if reason == "OK":
+            self.feed(request.text)
+            if self._source is SatelliteSource.FLYSAT:
+                self.get_transponders_for_fly_sat(trs)
+            elif self._source is SatelliteSource.LYNGSAT:
+                self.get_transponders_for_lyng_sat(trs)

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

@@ -270,53 +266,42 @@ class SatellitesParser(HTMLParser):
            trs.extend(n_trs)

    def get_transponders_for_lyng_sat(self, trs):
-        """ Parsing transponders for LyngSat. """
+        """ 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+))?.*")
+        sr_fec_pattern = re.compile("^(\\d{4,5})-(\\d/\\d)(.+PSK)?(.*)?$")
+        sys_pattern = re.compile("(DVB-S[2]?) ?(PLS+ (Root|Gold|Combo)+ (\\d+))* ?(multistream stream (\\d+))?",
+                                 re.IGNORECASE)
        zeros = "000"
-        pls_mode, pls_code, pls_id = None, None, None
+        pls_modes = {v: k for k, v in PLS_MODE.items()}

-        for row in filter(lambda x: len(x) > 8, self._rows):
-            for frq in row[1], row[2], row[3]:
+        for r in filter(lambda x: len(x) > 8, self._rows):
+            for frq in r[1], r[2], r[3]:
                freq = re.match(frq_pol_pattern, frq)
                if freq:
                    break
            if not freq:
                continue
-
            frq, pol = freq.group(1), freq.group(2)
-            srf = " ".join(row[3:5])
-            sr_fec = re.search(sr_fec_pattern, srf)
+            sr_fec = re.match(sr_fec_pattern, r[-3])
            if not sr_fec:
                continue
-
-            sys, mod, sr, fec = sr_fec.group(1), sr_fec.group(2), sr_fec.group(3), sr_fec.group(4)
+            sr, fec, mod = sr_fec.group(1), sr_fec.group(2), sr_fec.group(3)
            mod = mod.strip() if mod else "Auto"
-            pls_id = sr_fec.group(5)
+
+            res = re.match(sys_pattern, r[-4])
+            if not res:
+                continue
+
+            sys = res.group(1)
+            pls_mode = res.group(3)
+            pls_mode = pls_modes.get(pls_mode.capitalize(), None) if pls_mode else pls_mode
+            pls_code = res.group(4)
+            pls_id = res.group(6)

            tr = Transponder(frq + zeros, sr + zeros, pol, fec, sys, mod, pls_mode, pls_code, pls_id)
            if is_transponder_valid(tr):
                trs.append(tr)

-    def get_transponders_for_king_of_sat(self, trs):
-        """ Getting transponders for KingOfSat source.
-
-            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+)$")
-
-        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)
-
-                tr = Transponder(freq + zeros, sr + zeros, pol, fec, sys, mod, None, pls_code, pls_id)
-                if is_transponder_valid(tr):
-                    trs.append(tr)
-

 class ServicesParser(HTMLParser):
    """ Services parser for LYNGSAT source. """
@@ -325,13 +310,11 @@ class ServicesParser(HTMLParser):

        HTMLParser.__init__(self)

-        self._S_TYPES = {"": "2", "MPEG-2 SD": "1", "MPEG-2/SD": "1", "SD": "1", "MPEG-4 SD": "22", "MPEG-4/SD": "22",
-                         "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"}
-        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._S_TYPES = {"": "2", "MPEG-2 SD": "1", "SD": "1", "MPEG-4 SD": "22", "HEVC SD": "22", "MPEG-4 HD": "25",
+                         "MPEG-4 HD 1080": "25", "MPEG-4 HD 720": "25", "HEVC HD": "25", "HEVC UHD": "31",
+                         "HEVC UHD 4K": "31"}
+        self._TR_PAT = re.compile(r"(DVB-S[2]?)/?(.*PSK)?\s+SR\s+(\d+)\s+FEC\s+(\d/\d).*ONID/TID:\s+(\d+)/(\d+)\s+.*")
+        self._PTR_PAT = re.compile(r".*?(\d+\.\d°[EW]):\s+(\d+)\s+([RLHV]).*")
        self._TR = "s {}000:{}000:{}:{}:{}:{}:{}:{}"
        self._S2_TR = "{}:{}:{}:{}"

@@ -404,8 +387,8 @@ class ServicesParser(HTMLParser):
            log(e)
        else:
            url = "https://www.lyngsat.com/muxes/"
-            return [row[0] for row in
-                    filter(lambda x: x and len(x) > 8 and x[0].url and x[0].url.startswith(url), self._rows)]
+            return [row[1] for row in
+                    filter(lambda x: x and len(x) > 8 and x[1].url and x[1].url.startswith(url), self._rows)]
        return []

    def get_transponder_services(self, tr_url, sat_position=None, use_pids=False):
@@ -423,33 +406,26 @@ class ServicesParser(HTMLParser):
        else:
            pos, freq, sr, fec, pol, namespace, tid, nid = sat_position or 0, 0, 0, 0, 0, 0, 0, 0
            sys = "DVB-S"
+            tr_found = False
            pos_found = False
            tr = None
            # Transponder
-            for r in filter(lambda x: x and 6 < len(x) < 9, self._rows):
+            for r in filter(lambda x: x and len(x) == 2, self._rows):
                if not pos_found:
-                    pos_tr = re.match(self._POS_PAT, r[0].text)
-                    if not pos_tr:
-                        continue
+                    pos_tr = re.match(self._PTR_PAT, r[1].text)
+                    if pos_tr:
+                        if not sat_position:
+                            pos = int(SatellitesParser.get_position(
+                                "".join(c for c in pos_tr.group(1) if c.isdigit() or c.isalpha())))
+                        freq = int(pos_tr.group(2))
+                        pol = get_key_by_value(POLARIZATION, pos_tr.group(3))
+                        pos_found = True

-                    if not sat_position:
-                        pos = int(SatellitesParser.get_position(
-                            "".join(c for c in pos_tr.group(1) if c.isdigit() or c.isalpha())))
-
-                    pos_found = True
-
-                if pos_found:
-                    text = " ".join(c.text for c in r[1:])
-                    td = re.match(self._TR_PAT, text)
+                if pos_found and not tr_found:
+                    td = re.match(self._TR_PAT, r[1].text) or re.match(self._TR_PAT, r[0].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, nid, tid = td.group(1), td.group(2), td.group(3), td.group(4), td.group(
+                            5), td.group(6)
                        neg_pos = False  # POS = W
                        # For negative (West) positions: 3600 - numeric position value!!!
                        namespace = "{:04x}0000".format(3600 - pos if neg_pos else pos)
@@ -463,6 +439,7 @@ class ServicesParser(HTMLParser):
                        s2_flags = "" if sys == "DVB-S" else self._S2_TR.format(tr_flag, mod or 0, roll_off, pilot)
                        nid, tid = int(nid), int(tid)
                        tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)
+                        tr_found = True

            if not tr:
                msg = "ServicesParser error [get transponder services]: {}"
@@ -472,8 +449,8 @@ class ServicesParser(HTMLParser):

            # 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()
+                sid, name, cas, pkg, s_type, v_pid, a_pid = r[0].text, r[2].text, r[4].text, r[5].text, r[
+                    6].text.strip(), r[7].text, r[8].text.split()

                try:
                    s_type = self._S_TYPES.get(s_type, "3")  # 3 = Data
@@ -492,8 +469,27 @@ class ServicesParser(HTMLParser):
                    else:
                        flags = ",".join(filter(None, (flags, cas)))

-                    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))
+                    srv = Service(flags_cas=flags,
+                                  transponder_type="s",
+                                  coded=None,
+                                  service=name,
+                                  locked=None,
+                                  hide=None,
+                                  package=pkg,
+                                  service_type=_s_type,
+                                  picon=r[1].img,
+                                  picon_id=picon_id,
+                                  ssid=sid,
+                                  freq=freq,
+                                  rate=sr,
+                                  pol=pol,
+                                  fec=fec,
+                                  system=sys,
+                                  pos=pos,
+                                  data_id=data_id,
+                                  fav_id=fav_id,
+                                  transponder=tr)
+                    services.append(srv)
                except ValueError as e:
                    log("ServicesParser error [get transponder services]: {}".format(e))

--- a/app/ui/app_menu_bar.ui
+++ b/app/ui/app_menu_bar.ui
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <menu id="app-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.on_about_app</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Settings</attribute>
-        <attribute name="action">app.on_settings</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Exit</attribute>
-        <attribute name="action">app.on_close_app</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="menu_bar">
-    <submenu>
-      <attribute name="label" translatable="yes">File</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <submenu>
-          <attribute name="label" translatable="yes">Import</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">Bouquet</attribute>
-              <attribute name="action">app.on_import_bouquet</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">Bouquets and services</attribute>
-              <attribute name="action">app.on_import_bouquets</attribute>
-            </item>
-          </section>
-        </submenu>
-        <item>
-          <attribute name="label" translatable="yes">Import from Web</attribute>
-          <attribute name="action">app.on_import_from_web</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">New empty configuration</attribute>
-          <attribute name="action">app.on_new_configuration</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Open</attribute>
-          <attribute name="action">app.on_data_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Extract...</attribute>
-          <attribute name="action">app.on_archive_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save</attribute>
-          <attribute name="action">app.on_data_save</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">FTP-transfer</attribute>
-          <attribute name="action">app.on_download</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Edit</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-      <item>
-        <attribute name="label" translatable="yes">Lock</attribute>
-        <attribute name="action">app.on_locked</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Hide</attribute>
-        <attribute name="action">app.on_hide</attribute>
-      </item>
-    </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">View</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Search</attribute>
-          <attribute name="action">win.search</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Filter</attribute>
-          <attribute name="action">win.filter</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Tools</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Satellites editor</attribute>
-          <attribute name="action">app.on_satellite_editor_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Picons manager</attribute>
-          <attribute name="action">app.on_picons_manager_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Backups</attribute>
-          <attribute name="action">app.on_backup_tool_show</attribute>
-        </item>
-      </section>
-      <section id="telnet_section">
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">IPTV</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Add IPTV or stream service</attribute>
-        <attribute name="action">app.on_iptv</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Import YouTube playlist</attribute>
-        <attribute name="action">app.on_import_yt_list</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Import m3u</attribute>
-        <attribute name="action">app.on_import_m3u</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Export to m3u</attribute>
-        <attribute name="action">app.on_export_to_m3u</attribute>
-      </item>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">EPG configuration</attribute>
-          <attribute name="action">app.on_epg_list_configuration</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">List configuration</attribute>
-          <attribute name="action">app.on_iptv_list_configuration</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Remove all unavailable</attribute>
-          <attribute name="action">app.on_remove_all_unavailable</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">FTP client</attribute>
-      <attribute name="action">app.show_ftp_menu</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Close</attribute>
-        <attribute name="action">app.on_ftp_client_close</attribute>
-      </item>
-    </submenu>
-  </menu>
-</interface>
--- a/app/ui/backup.py
+++ b/app/ui/backup.py
@@ -8,9 +8,9 @@ from enum import Enum

 from app.commons import run_idle
 from app.settings import SettingsType
-from app.ui.dialogs import show_dialog, DialogType, get_builder
+from app.ui.dialogs import show_dialog, DialogType
 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


 class RestoreType(Enum):
@@ -30,7 +30,10 @@ class BackupDialog:
                    "on_resize": self.on_resize,
                    "on_key_release": self.on_key_release}

-        builder = get_builder(UI_RESOURCES_PATH + "backup_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.set_translation_domain("demon-editor")
+        builder.add_from_file(UI_RESOURCES_PATH + "backup_dialog.glade")
+        builder.connect_signals(handlers)

        self._settings = settings
        self._s_type = settings.setting_type
@@ -173,7 +176,7 @@ class BackupDialog:
        if not KeyboardKey.value_exist(key_code):
            return
        key = KeyboardKey(key_code)
-        ctrl = event.state & MOD_MASK
+        ctrl = event.state & Gdk.ModifierType.CONTROL_MASK

        if key is KeyboardKey.DELETE:
            self.on_remove(view)
--- a/app/ui/backup_dialog.glade
+++ b/app/ui/backup_dialog.glade
@@ -33,12 +33,6 @@ Author: Dmitriy Yefremov
  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="details_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">emblem-important-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkListStore" id="main_list_store">
    <columns>
      <!-- column-name date -->
@@ -47,89 +41,133 @@ Author: Dmitriy Yefremov
      <column type="gboolean"/>
    </columns>
  </object>
-  <object class="GtkMenu" id="popup_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImageMenuItem" id="restore_bouquets_popup_menu_item">
-        <property name="label" translatable="yes">Restore bouquets</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_restore_bouquets" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="restore_all_popup_menu_item">
-        <property name="label" translatable="yes">Restore all</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_restore_all" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="Primary"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="popup_menu_separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="remove_popup_menu_item">
-        <property name="label">gtk-remove</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_remove" swapped="no"/>
-        <accelerator key="Delete" signal="activate"/>
-      </object>
-    </child>
-  </object>
-  <object class="GtkImage" id="remove_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">user-trash-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="restore_all_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-select-all-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="restore_bouquets_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-revert-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkWindow" id="dialog_window">
    <property name="width_request">560</property>
    <property name="height_request">320</property>
    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Backups</property>
    <property name="modal">True</property>
    <property name="window_position">center-on-parent</property>
    <property name="destroy_with_parent">True</property>
    <property name="icon_name">document-revert</property>
    <property name="gravity">center</property>
    <signal name="check-resize" handler="on_resize" swapped="no"/>
-    <child>
-      <placeholder/>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header_bar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title" translatable="yes">Backups</property>
+        <property name="spacing">2</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkBox" id="header_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkButton" id="restore_bouquets_header_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Restore bouquets</property>
+                <signal name="clicked" handler="on_restore_bouquets" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="restore_bouquets_header_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">document-revert</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="restore_all_header_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Restore all</property>
+                <signal name="clicked" handler="on_restore_all" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="restore_all_header_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">edit-select-all</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="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="GtkButton" id="remove_header_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>
+                <signal name="clicked" handler="on_remove" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="remove_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">user-trash</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="info_check_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Details</property>
+            <property name="draw_indicator">False</property>
+            <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="info_check_button_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-dialog-info</property>
+              </object>
+            </child>
+            <accelerator key="i" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
    </child>
    <child>
      <object class="GtkBox" id="main_box">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
-        <property name="margin_left">1</property>
-        <property name="margin_right">1</property>
-        <property name="margin_top">1</property>
-        <property name="margin_bottom">1</property>
        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
        <child>
          <object class="GtkPaned" id="main_paned">
            <property name="visible">True</property>
@@ -213,106 +251,6 @@ Author: Dmitriy Yefremov
            <property name="position">0</property>
          </packing>
        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">15</property>
-            <property name="margin_right">15</property>
-            <child>
-              <object class="GtkButtonBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="margin_top">10</property>
-                <property name="margin_bottom">10</property>
-                <property name="layout_style">expand</property>
-                <child>
-                  <object class="GtkButton" id="restore_bouquets_header_button">
-                    <property name="label" translatable="yes">Restore bouquets</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">restore_bouquets_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_restore_bouquets" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="restore_all_header_button">
-                    <property name="label" translatable="yes">Restore all</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">restore_all_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_restore_all" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="remove_header_button">
-                    <property name="label" translatable="yes">Remove</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">remove_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_remove" swapped="no"/>
-                    <accelerator key="Delete" signal="clicked"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</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="GtkCheckButton" id="info_check_button">
-                <property name="label" translatable="yes">Details</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="valign">center</property>
-                <property name="image">details_image</property>
-                <property name="always_show_image">True</property>
-                <property name="draw_indicator">False</property>
-                <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
-                <accelerator key="i" signal="clicked" modifiers="Primary"/>
-              </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>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
        <child>
          <object class="GtkInfoBar" id="info_bar">
            <property name="can_focus">False</property>
@@ -363,4 +301,57 @@ Author: Dmitriy Yefremov
      </object>
    </child>
  </object>
+  <object class="GtkImage" id="restore_popup_menu_item_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-revert-to-saved</property>
+  </object>
+  <object class="GtkImage" id="restore_popup_menu_item_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-select-all</property>
+  </object>
+  <object class="GtkMenu" id="popup_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="restore_bouquets_popup_menu_item">
+        <property name="label" translatable="yes">Restore bouquets</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">restore_popup_menu_item_image</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_restore_bouquets" swapped="no"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="restore_all_popup_menu_item">
+        <property name="label" translatable="yes">Restore all</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">restore_popup_menu_item_image2</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_restore_all" swapped="no"/>
+        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="popup_menu_separator">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="remove_popup_menu_item">
+        <property name="label">gtk-remove</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_remove" swapped="no"/>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+  </object>
 </interface>
--- a/app/ui/control.glade
+++ b/app/ui/control.glade
@@ -367,6 +367,7 @@ Author: Dmitriy Yefremov
    <property name="can_focus">False</property>
    <property name="margin_left">1</property>
    <property name="margin_right">1</property>
+    <property name="margin_top">1</property>
    <property name="margin_bottom">1</property>
    <property name="label_xalign">0</property>
    <property name="shadow_type">in</property>
@@ -968,7 +969,7 @@ audio-volume-medium-symbolic</property>
                        <property name="can_focus">True</property>
                        <property name="tooltip_text" translatable="yes">Filter</property>
                        <property name="primary_icon_stock">gtk-spell-check</property>
-                        <property name="primary_icon_name">edit-find-replace-symbolic</property>
+                        <property name="primary_icon_name">tools-check-spelling</property>
                        <property name="primary_icon_activatable">False</property>
                        <property name="primary_icon_sensitive">False</property>
                        <property name="placeholder_text" translatable="yes">Filter</property>
@@ -1176,7 +1177,7 @@ audio-volume-medium-symbolic</property>
                      <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>
+                        <property name="primary_icon_name">gtk-edit</property>
                      </object>
                      <packing>
                        <property name="left_attach">1</property>
@@ -1187,7 +1188,7 @@ audio-volume-medium-symbolic</property>
                      <object class="GtkEntry" id="timer_desc_entry">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_name">gtk-edit</property>
                      </object>
                      <packing>
                        <property name="left_attach">1</property>
@@ -1198,7 +1199,7 @@ audio-volume-medium-symbolic</property>
                      <object class="GtkEntry" id="timer_name_entry">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_name">gtk-edit</property>
                      </object>
                      <packing>
                        <property name="left_attach">1</property>
@@ -1485,7 +1486,7 @@ audio-volume-medium-symbolic</property>
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="editable">False</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_name">gtk-edit</property>
                          </object>
                        </child>
                        <style>
@@ -1556,7 +1557,7 @@ audio-volume-medium-symbolic</property>
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="editable">False</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_name">gtk-edit</property>
                          </object>
                        </child>
                        <style>
@@ -1607,11 +1608,11 @@ audio-volume-medium-symbolic</property>
                          <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>
+                            <property name="icon_name">gtk-edit</property>
                          </object>
                          <packing>
                            <property name="expand">False</property>
-                            <property name="fill">True</property>
+                            <property name="fill">False</property>
                            <property name="position">0</property>
                          </packing>
                        </child>
@@ -1621,8 +1622,8 @@ audio-volume-medium-symbolic</property>
                            <property name="can_focus">True</property>
                          </object>
                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                            <property name="pack_type">end</property>
                            <property name="position">1</property>
                          </packing>
@@ -1638,7 +1639,7 @@ audio-volume-medium-symbolic</property>
                        <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="primary_icon_name">gtk-edit</property>
                        <property name="placeholder_text" translatable="yes">Default</property>
                      </object>
                      <packing>
--- a/app/ui/control.py
+++ b/app/ui/control.py
@@ -6,11 +6,10 @@ from urllib.parse import quote

 from gi.repository import GLib

-from .dialogs import show_dialog, DialogType, get_message, get_builder
+from .dialogs import get_dialogs_string, show_dialog, DialogType
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column
 from ..commons import run_task, run_with_delay, log, run_idle
 from ..connections import HttpAPI
-from ..eparser.ecommons import BqServiceType


 class ControlBox(Gtk.HBox):
@@ -61,19 +60,19 @@ class ControlBox(Gtk.HBox):

        @property
        def event_data(self):
-            return self._event_data or {}
+            return self._event_data

        @property
        def title(self):
-            return self._title or ""
+            return self._title

        @property
        def desc(self):
-            return self._desc or ""
+            return self._desc

        @property
        def time_header(self):
-            return self._time_header or ""
+            return self._time_header

    class TimerRow(Gtk.ListBoxRow):

@@ -84,7 +83,8 @@ class ControlBox(Gtk.HBox):

            self._timer = timer

-            builder = get_builder(self._UI_PATH, None, use_str=True)
+            builder = Gtk.Builder()
+            builder.add_from_string(get_dialogs_string(self._UI_PATH))
            row_box = builder.get_object("timer_row_box")
            name_label = builder.get_object("timer_name_label")
            description_label = builder.get_object("timer_description_label")
@@ -129,7 +129,9 @@ class ControlBox(Gtk.HBox):
                    "on_timers_press": self.on_timers_press,
                    "on_timers_drag_data_received": self.on_timers_drag_data_received}

-        builder = get_builder(UI_RESOURCES_PATH + "control.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "control.glade")
+        builder.connect_signals(handlers)

        self.add(builder.get_object("main_box_frame"))
        self._stack = builder.get_object("stack")
@@ -337,7 +339,7 @@ class ControlBox(Gtk.HBox):

    def on_service_changed(self, ref):
        self._app._wait_dialog.show()
-        self._http_api.send(HttpAPI.Request.EPG, quote(ref), self.update_epg_data)
+        self._http_api.send(HttpAPI.Request.EPG, ref, self.update_epg_data)

    @run_idle
    def update_epg_data(self, epg):
@@ -354,7 +356,7 @@ class ControlBox(Gtk.HBox):
    def on_epg_filter_changed(self, entry):
        self._epg_list_box.invalidate_filter()

-    def epg_filter_function(self, row):
+    def epg_filter_function(self, row: EpgRow):
        txt = self._epg_filter_entry.get_text().upper()
        return any((not txt, txt in row.time_header.upper(), txt in row.title.upper(), txt in row.desc.upper()))

@@ -421,7 +423,7 @@ class ControlBox(Gtk.HBox):
        refs = {}
        for row in rows:
            timer = row.timer
-            ref = "timerdelete?sRef={}&begin={}&end={}".format(quote(timer.get("e2servicereference", "")),
+            ref = "timerdelete?sRef={}&begin={}&end={}".format(timer.get("e2servicereference", ""),
                                                               timer.get("e2timebegin", ""),
                                                               timer.get("e2timeend", ""))
            refs[ref] = row
@@ -482,7 +484,7 @@ class ControlBox(Gtk.HBox):
    def on_timer_save(self, action, value=None):
        args = []
        t_data = self.get_timer_data()
-        s_ref = quote(t_data.get("sRef", ""))
+        s_ref = t_data.get("sRef", "")

        if self._timer_action is self.TimerAction.EVENT:
            args.append("timeraddbyeventid?sRef={}".format(s_ref))
@@ -667,12 +669,6 @@ class ControlBox(Gtk.HBox):

            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!"))
-                    show_dialog(DialogType.ERROR, transient=self._app._main_window, text=msg)
-                    context.finish(False, False, time)
-                    return
-
                self._timer_name_entry.set_text(service.service)
                self._timer_service_entry.set_text(service.service)
                self._timer_service_ref_entry.set_text(service.picon_id.rstrip(".png").replace("_", ":"))
--- a/app/ui/default_style.css
+++ b/app/ui/default_style.css
@@ -1,43 +0,0 @@
-* {
-  -GtkDialog-action-area-border: 5em;
-}
-
-entry {
-  min-height: 2em;
-}
-
-button {
-  min-height: 1.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-  padding-top: 0.1em;
-  padding-bottom: 0.1em;
-}
-
-spinbutton {
-  min-height: 1.5em;
-}
-
-toolbutton {
-  padding: 0.1em;
-}
-
-spinner {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-infobar {
-  min-height: 2em;
-}
-
-switch slider {
-  min-height: 1.5em;
-  min-width: 1.5em;
-}
-
-paned > separator {
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: 1px 24px;
-}
--- 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-2020 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
@@ -30,8 +30,8 @@ Author: Dmitriy Yefremov
  <requires lib="gtk+" version="3.16"/>
  <!-- interface-license-type mit -->
  <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
+  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
+  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
  <!-- interface-authors Dmitriy Yefremov -->
  <object class="GtkAboutDialog" id="about_dialog">
    <property name="can_focus">False</property>
@@ -40,12 +40,11 @@ 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">1.0.8 Beta</property>
-    <property name="copyright">2018-2021 Dmitriy Yefremov
+    <property name="version">1.0.4 Beta</property>
+    <property name="copyright">2018-2020 Dmitriy Yefremov
 </property>
-    <property name="comments" translatable="yes">Enigma2 channel and satellite list editor for MacOS.
-    (Experimental)</property>
-    <property name="website">https://github.com/DYefremov/DemonEditor/tree/experimental-mac</property>
+    <property name="comments" translatable="yes">Enigma2 channel and satellite list editor for GNU/Linux.</property>
+    <property name="website">https://dyefremov.github.io/DemonEditor/</property>
    <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
 Подробнее в &lt;a href="http://opensource.org/licenses/mit-license.php"&gt;The MIT License (MIT)&lt;/a&gt;.</property>
    <property name="authors">Dmitriy Yefremov
@@ -66,9 +65,7 @@ Author: Dmitriy Yefremov
        <child internal-child="action_area">
          <object class="GtkButtonBox" id="aboutdialog_action_area">
            <property name="can_focus">False</property>
-            <property name="margin_left">50</property>
-            <property name="margin_right">50</property>
-            <property name="layout_style">expand</property>
+            <property name="layout_style">end</property>
          </object>
          <packing>
            <property name="expand">False</property>
@@ -89,62 +86,36 @@ Author: Dmitriy Yefremov
    <property name="window_position">center</property>
    <property name="default_width">320</property>
    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">utility</property>
+    <property name="type_hint">dialog</property>
    <property name="skip_taskbar_hint">True</property>
    <property name="skip_pager_hint">True</property>
    <property name="gravity">center</property>
-    <child type="titlebar">
-      <placeholder/>
+    <child type="action">
+      <object class="GtkButton" id="input_dialog_cancel_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="input_dialog_ok_button">
+        <property name="label">gtk-ok</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</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>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
        <child>
          <object class="GtkEntry" id="input_entry">
            <property name="visible">True</property>
@@ -153,7 +124,7 @@ Author: Dmitriy Yefremov
            <property name="margin_right">2</property>
            <property name="margin_top">2</property>
            <property name="margin_bottom">2</property>
-            <property name="primary_icon_name">document-edit-symbolic</property>
+            <property name="primary_icon_stock">gtk-edit</property>
            <property name="primary_icon_activatable">False</property>
            <property name="secondary_icon_activatable">False</property>
            <property name="secondary_icon_sensitive">False</property>
@@ -161,7 +132,7 @@ Author: Dmitriy Yefremov
          <packing>
            <property name="expand">False</property>
            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
          </packing>
        </child>
      </object>
@@ -171,7 +142,7 @@ Author: Dmitriy Yefremov
      <action-widget response="ok">input_dialog_ok_button</action-widget>
    </action-widgets>
  </object>
-  <object class="GtkWindow" id="wait_dialog">
+  <object class="GtkDialog" id="wait_dialog">
    <property name="can_focus">False</property>
    <property name="resizable">False</property>
    <property name="modal">True</property>
@@ -181,42 +152,63 @@ Author: Dmitriy Yefremov
    <property name="skip_taskbar_hint">True</property>
    <property name="skip_pager_hint">True</property>
    <property name="decorated">False</property>
-    <property name="gravity">center</property>
-    <child type="titlebar">
+    <child>
      <placeholder/>
    </child>
-    <child>
-      <object class="GtkBox" id="wait_dialog_box">
-        <property name="width_request">100</property>
-        <property name="visible">True</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="wait_dialog_vbox">
+        <property name="width_request">120</property>
        <property name="can_focus">False</property>
-        <property name="margin_top">5</property>
-        <property name="margin_bottom">5</property>
        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkSpinner" id="spinner">
-            <property name="width_request">150</property>
-            <property name="height_request">45</property>
-            <property name="visible">True</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area4">
            <property name="can_focus">False</property>
-            <property name="active">True</property>
+            <property name="opacity">0</property>
+            <property name="layout_style">end</property>
          </object>
          <packing>
            <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
            <property name="position">0</property>
          </packing>
        </child>
        <child>
-          <object class="GtkLabel" id="wait_dialog_label">
+          <object class="GtkBox" id="box4">
            <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="label" translatable="yes">Loading data...</property>
+            <property name="margin_top">2</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkSpinner" id="spinner">
+                <property name="width_request">150</property>
+                <property name="height_request">45</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">True</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="wait_dialog_label">
+                <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="label" translatable="yes">Loading data...</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="expand">True</property>
            <property name="fill">True</property>
            <property name="position">1</property>
          </packing>
--- a/app/ui/dialogs.py
+++ b/app/ui/dialogs.py
@@ -1,5 +1,5 @@
 """ Common module for showing dialogs """
-import gettext
+import locale
 from enum import Enum
 from functools import lru_cache
 from pathlib import Path
@@ -104,10 +104,12 @@ def get_chooser_dialog(transient, settings, name, patterns, title=None):


 def get_file_chooser_dialog(transient, text, settings, action_type, file_filter, buttons=None, title=None, dirs=False):
+    text = get_message(text) if text else ""
    action_type = Gtk.FileChooserAction.SELECT_FOLDER if action_type is None else action_type
-    dialog = Gtk.FileChooserNative.new(get_message(title) if title else "", transient, action_type)
+    buttons = buttons or (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
+    dialog = Gtk.FileChooserDialog(text, transient, action_type, buttons, use_header_bar=IS_GNOME_SESSION)
+    dialog.set_title(get_message(title) if title else "")
    dialog.set_create_folders(dirs)
-    dialog.set_modal(True)

    if file_filter is not None:
        dialog.add_filter(file_filter)
@@ -115,7 +117,7 @@ def get_file_chooser_dialog(transient, text, settings, action_type, file_filter,
    dialog.set_current_folder(settings.data_local_path)
    response = dialog.run()

-    if response == Gtk.ResponseType.ACCEPT:
+    if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
        path = Path(dialog.get_filename() or dialog.get_current_folder())
        if path.is_dir():
            response = "{}/".format(path.resolve())
@@ -174,7 +176,7 @@ def get_dialog_from_xml(dialog_type, transient, use_header=0, title=""):

 def get_message(message):
    """ returns translated message """
-    return gettext.dgettext(TEXT_DOMAIN, message)
+    return locale.dgettext(TEXT_DOMAIN, message)


@lru_cache(maxsize=5)
@@ -183,26 +185,5 @@ def get_dialogs_string(path):
        return "".join(f)


-def get_builder(path, handlers=None, use_str=False, objects=None):
-    """ Creates and returns a Gtk.Builder instance. """
-    builder = Gtk.Builder()
-    builder.set_translation_domain(TEXT_DOMAIN)
-
-    if use_str:
-        if objects:
-            builder.add_objects_from_string(get_dialogs_string(path).format(use_header=IS_GNOME_SESSION), objects)
-        else:
-            builder.add_from_string(get_dialogs_string(path).format(use_header=IS_GNOME_SESSION))
-    else:
-        if objects:
-            builder.add_objects_from_file(path, objects)
-        else:
-            builder.add_from_file(path)
-
-    builder.connect_signals(handlers or {})
-
-    return builder
-
-
 if __name__ == "__main__":
    pass
--- a/app/ui/download_dialog.glade
+++ b/app/ui/download_dialog.glade
@@ -3,7 +3,7 @@

 The MIT License (MIT)

-Copyright (c) 2018-2020 Dmitriy Yefremov
+Copyright (c) 2018 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
@@ -30,25 +30,12 @@ Author: Dmitriy Yefremov
  <requires lib="gtk+" version="3.16"/>
  <!-- interface-license-type mit -->
  <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
-  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
+  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
+  <!-- interface-copyright 2018 Dmitriy Yefremov -->
  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="download_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">network-receive-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="send_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">network-transmit-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkWindow" id="download_dialog_window">
    <property name="width_request">550</property>
    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">FTP-transfer</property>
    <property name="resizable">False</property>
    <property name="modal">True</property>
    <property name="window_position">center-on-parent</property>
@@ -57,20 +44,226 @@ Author: Dmitriy Yefremov
    <property name="skip_pager_hint">True</property>
    <property name="gravity">center</property>
    <child type="titlebar">
-      <placeholder/>
+      <object class="GtkHeaderBar" id="header_bar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title" translatable="yes">FTP-transfer</property>
+        <property name="spacing">5</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkBox" id="header_left_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkButton" id="receive_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Receive</property>
+                <signal name="clicked" handler="on_receive" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="receive_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-goto-bottom</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="send_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Send</property>
+                <signal name="clicked" handler="on_send" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="send_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-goto-top</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="options_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Options</property>
+            <signal name="clicked" handler="on_settings" swapped="no"/>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-properties</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
    </child>
    <child>
      <object class="GtkBox" id="main_dialog_box">
        <property name="visible">True</property>
        <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="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkBox" id="selection_data_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="margin_top">10</property>
+            <property name="margin_bottom">5</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="all_radio_button">
+                <property name="label" translatable="yes">All</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">satellites_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="bouquets_radio_button">
+                <property name="label" translatable="yes">Bouquets</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">satellites_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="satellites_radio_button">
+                <property name="label" translatable="yes">Satellites</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">all_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="webtv_radio_button">
+                <property name="label" translatable="yes">WebTV</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">all_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</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">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="profile_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Profile:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="profile_combo_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="focus_on_click">False</property>
+                <property name="active">0</property>
+                <property name="has_frame">False</property>
+                <signal name="changed" handler="on_profile_changed" swapped="no"/>
+              </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>
          <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_top">10</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
            <property name="margin_bottom">5</property>
            <property name="label_xalign">0.019999999552965164</property>
            <property name="shadow_type">in</property>
@@ -78,8 +271,8 @@ Author: Dmitriy Yefremov
              <object class="GtkBox" id="main_settings_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_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>
@@ -231,229 +424,6 @@ Author: Dmitriy Yefremov
            <property name="position">2</property>
          </packing>
        </child>
-        <child>
-          <object class="GtkFrame">
-            <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="label_xalign">0</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox" id="selection_data_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="margin_top">10</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <object class="GtkLabel" id="label10">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="all_radio_button">
-                        <property name="label" translatable="yes">All</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">satellites_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="bouquets_radio_button">
-                        <property name="label" translatable="yes">Bouquets</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">satellites_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="satellites_radio_button">
-                        <property name="label" translatable="yes">Satellites</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">all_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="webtv_radio_button">
-                        <property name="label" translatable="yes">WebTV</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">all_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</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">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Profile:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="profile_combo_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="focus_on_click">False</property>
-                        <property name="active">0</property>
-                        <property name="has_frame">False</property>
-                        <signal name="changed" handler="on_profile_changed" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="options_button">
-                        <property name="label" translatable="yes">Options</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Options</property>
-                        <property name="valign">center</property>
-                        <signal name="clicked" handler="on_settings" 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>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="label_item">
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButtonBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="margin_left">20</property>
-            <property name="margin_right">20</property>
-            <property name="margin_top">10</property>
-            <property name="margin_bottom">10</property>
-            <property name="homogeneous">True</property>
-            <property name="layout_style">expand</property>
-            <child>
-              <object class="GtkButton" id="receive_button">
-                <property name="label" translatable="yes">Receive</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Receive</property>
-                <property name="valign">center</property>
-                <property name="image">download_image</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_receive" 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="send_button">
-                <property name="label" translatable="yes">Send</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Send</property>
-                <property name="valign">center</property>
-                <property name="image">send_image</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_send" swapped="no"/>
-              </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>
-            <property name="fill">False</property>
-            <property name="position">6</property>
-          </packing>
-        </child>
        <child>
          <object class="GtkExpander" id="expander">
            <property name="visible">True</property>
@@ -490,7 +460,7 @@ Author: Dmitriy Yefremov
          <packing>
            <property name="expand">False</property>
            <property name="fill">True</property>
-            <property name="position">7</property>
+            <property name="position">4</property>
          </packing>
        </child>
        <child>
@@ -546,7 +516,7 @@ Author: Dmitriy Yefremov
          <packing>
            <property name="expand">False</property>
            <property name="fill">True</property>
-            <property name="position">8</property>
+            <property name="position">5</property>
          </packing>
        </child>
      </object>
--- a/app/ui/download_dialog.py
+++ b/app/ui/download_dialog.py
@@ -8,7 +8,7 @@ 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 .dialogs import show_dialog, DialogType, get_message, get_builder
+from .dialogs import show_dialog, DialogType, get_message
 from .uicommons import Gtk, UI_RESOURCES_PATH


@@ -27,7 +27,9 @@ class DownloadDialog:
                    "on_remove_unused_bouquets_toggled": self.on_remove_unused_bouquets_toggled,
                    "on_info_bar_close": self.on_info_bar_close}

-        builder = get_builder(UI_RESOURCES_PATH + "download_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "download_dialog.glade")
+        builder.connect_signals(handlers)

        self._dialog_window = builder.get_object("download_dialog_window")
        self._dialog_window.set_transient_for(transient)
--- a/app/ui/epg_dialog.glade
+++ b/app/ui/epg_dialog.glade
@@ -33,18 +33,6 @@ Author: Dmitriy Yefremov
  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
  <!-- interface-copyright  2018-2020 Dmitriy Yefremov -->
  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="apply_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-save-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="auto_config_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-select-all-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkListStore" id="bouquet_list_store">
    <columns>
      <!-- column-name num -->
@@ -87,16 +75,10 @@ Author: Dmitriy Yefremov
        <property name="image">copy_image</property>
        <property name="use_stock">False</property>
        <signal name="activate" handler="on_copy_ref" swapped="no"/>
-        <accelerator key="c" signal="activate" modifiers="Primary"/>
+        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
      </object>
    </child>
  </object>
-  <object class="GtkImage" id="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="insert_link_image">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
@@ -118,7 +100,7 @@ Author: Dmitriy Yefremov
        <property name="image">insert_link_image</property>
        <property name="use_stock">False</property>
        <signal name="activate" handler="on_assign_ref" swapped="no"/>
-        <accelerator key="v" signal="activate" modifiers="Primary"/>
+        <accelerator key="v" signal="activate" modifiers="GDK_CONTROL_MASK"/>
      </object>
    </child>
    <child>
@@ -148,12 +130,6 @@ Author: Dmitriy Yefremov
      </object>
    </child>
  </object>
-  <object class="GtkImage" id="save_to_xml_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-save-as-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkListStore" id="services_list_store">
    <columns>
      <!-- column-name service -->
@@ -336,7 +312,7 @@ Author: Dmitriy Yefremov
                      <object class="GtkEntry" id="url_to_xml_entry">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
-                        <property name="primary_icon_name">network-transmit-receive-symbolic</property>
+                        <property name="primary_icon_stock">gtk-connect</property>
                        <property name="primary_icon_activatable">False</property>
                      </object>
                      <packing>
@@ -436,8 +412,8 @@ Author: Dmitriy Yefremov
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="text" translatable="yes">/data/epg/</property>
-                    <property name="primary_icon_name">document-edit-symbolic</property>
-                    <property name="secondary_icon_name">folder-open-symbolic</property>
+                    <property name="primary_icon_stock">gtk-edit</property>
+                    <property name="secondary_icon_stock">gtk-directory</property>
                    <property name="primary_icon_activatable">False</property>
                    <property name="secondary_icon_tooltip_text" translatable="yes">Select</property>
                    <signal name="icon-press" handler="on_field_icon_press" swapped="no"/>
@@ -466,7 +442,7 @@ Author: Dmitriy Yefremov
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="text" translatable="yes">/etc/enigma2/</property>
-                    <property name="primary_icon_name">document-edit-symbolic</property>
+                    <property name="primary_icon_stock">gtk-edit</property>
                    <property name="primary_icon_activatable">False</property>
                  </object>
                  <packing>
@@ -583,104 +559,58 @@ Author: Dmitriy Yefremov
      </object>
    </child>
  </object>
-  <object class="GtkImage" id="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="GtkWindow" id="epg_dialog_window">
    <property name="width_request">480</property>
    <property name="height_request">320</property>
    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">EPG</property>
    <property name="modal">True</property>
    <property name="window_position">center-on-parent</property>
    <property name="default_width">480</property>
-    <property name="default_height">320</property>
+    <property name="default_height">240</property>
    <property name="destroy_with_parent">True</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="icon_name">gtk-index</property>
    <property name="skip_pager_hint">True</property>
    <property name="gravity">center</property>
    <signal name="check-resize" handler="on_resize" swapped="no"/>
    <signal name="delete-event" handler="on_close_dialog" swapped="no"/>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkBox" id="main_box">
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header_bar">
        <property name="visible">True</property>
        <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="orientation">vertical</property>
+        <property name="title" translatable="yes">EPG</property>
+        <property name="subtitle" translatable="yes">List configuration</property>
+        <property name="spacing">2</property>
+        <property name="show_close_button">True</property>
        <child>
-          <object class="GtkBox" id="main_actions_box">
+          <object class="GtkBox" id="left_header_box">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
-            <property name="margin_left">15</property>
-            <property name="margin_right">15</property>
-            <property name="margin_top">10</property>
-            <property name="margin_bottom">10</property>
-            <property name="spacing">10</property>
+            <property name="spacing">2</property>
            <child>
-              <object class="GtkButtonBox" id="left_action_box">
+              <object class="GtkButton" id="apply_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Apply</property>
+                <signal name="clicked" handler="on_apply" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="apply_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-apply</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="GtkSeparator">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
-                <property name="layout_style">expand</property>
-                <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">Apply</property>
-                    <property name="image">apply_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_apply" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="update_button">
-                    <property name="label" translatable="yes">Update</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Update</property>
-                    <property name="image">update_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_update" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToggleButton" id="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">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"/>
-                  </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>
@@ -688,11 +618,20 @@ Author: Dmitriy Yefremov
                <property name="position">1</property>
              </packing>
            </child>
-            <child type="center">
-              <object class="GtkLabel" id="list_label">
+            <child>
+              <object class="GtkButton" id="update_button">
                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">List configuration</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Update</property>
+                <signal name="clicked" handler="on_update" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="update_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-refresh</property>
+                  </object>
+                </child>
              </object>
              <packing>
                <property name="expand">False</property>
@@ -701,106 +640,111 @@ Author: Dmitriy Yefremov
              </packing>
            </child>
            <child>
-              <object class="GtkButtonBox" id="right_action_box">
+              <object class="GtkToggleButton" id="filter_button">
                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="layout_style">expand</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Filter</property>
+                <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
                <child>
-                  <object class="GtkButton" id="auto_config_button">
-                    <property name="label" translatable="yes">Auto</property>
+                  <object class="GtkImage" id="filter_button_image">
                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Auto configuration by service names.</property>
-                    <property name="image">auto_config_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_auto_configuration" swapped="no"/>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-spell-check</property>
                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                </child>
+                <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="right_header_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkButton" id="auto_config_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Auto configuration by service names.</property>
+                <signal name="clicked" handler="on_auto_configuration" swapped="no"/>
                <child>
-                  <object class="GtkButton" id="save_to_xml_button">
-                    <property name="label" translatable="yes">Save</property>
+                  <object class="GtkImage" id="auto_config_button_image">
                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Save list to xml.</property>
-                    <property name="image">save_to_xml_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_save_to_xml" swapped="no"/>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-find-and-replace</property>
                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkMenuButton" id="options_menu_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="direction">none</property>
-                    <property name="popover">options_popover</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="options_button_image">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Options</property>
-                            <property name="icon_name">applications-system-symbolic</property>
-                            <property name="icon_size">1</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Options</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </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>
                <property name="fill">True</property>
-                <property name="pack_type">end</property>
                <property name="position">0</property>
              </packing>
            </child>
+            <child>
+              <object class="GtkButton" id="save_to_xml_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Save list to xml.</property>
+                <signal name="clicked" handler="on_save_to_xml" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="save_to_xml_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-save-as</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="GtkMenuButton" id="options_menu_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="direction">none</property>
+                <property name="popover">options_popover</property>
+                <child>
+                  <object class="GtkImage" id="options_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Options</property>
+                    <property name="stock">gtk-properties</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
          </object>
          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
          </packing>
        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox" id="main_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
        <child>
          <object class="GtkSearchBar" id="filter_bar">
            <property name="visible">True</property>
@@ -809,7 +753,7 @@ Author: Dmitriy Yefremov
              <object class="GtkSearchEntry" id="filter_entry">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
-                <property name="primary_icon_name">edit-find-replace-symbolic</property>
+                <property name="primary_icon_name">tools-check-spelling</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"/>
@@ -918,14 +862,13 @@ Author: Dmitriy Yefremov
                    <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">2</property>
                    <property name="spacing">2</property>
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="icon_name">document-properties-symbolic</property>
-                        <property name="icon_size">1</property>
+                        <property name="stock">gtk-properties</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -947,7 +890,6 @@ Author: Dmitriy Yefremov
                    </child>
                    <child>
                      <object class="GtkBox" id="source_info_box">
-                        <property name="height_request">26</property>
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">center</property>
@@ -1201,17 +1143,16 @@ Author: Dmitriy Yefremov
                </child>
                <child>
                  <object class="GtkBox" id="bouquet_info_bar_box">
-                    <property name="height_request">26</property>
+                    <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">2</property>
                    <property name="spacing">2</property>
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="icon_name">document-properties-symbolic</property>
-                        <property name="icon_size">1</property>
+                        <property name="stock">gtk-properties</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -1248,9 +1189,7 @@ Author: Dmitriy Yefremov
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="margin_left">2</property>
                        <property name="stock">gtk-index</property>
-                        <property name="icon_size">1</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
--- a/app/ui/epg_dialog.py
+++ b/app/ui/epg_dialog.py
@@ -9,13 +9,13 @@ 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
 from app.connections import download_data, DownloadType
 from app.eparser.ecommons import BouquetService, BqServiceType
 from app.tools.epg import EPG, ChannelsParser
-from app.ui.dialogs import get_message, show_dialog, DialogType, get_builder
+from app.ui.dialogs import get_message, show_dialog, DialogType
 from .main_helper import on_popup_menu, update_entry_data
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column, EPG_ICON, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, Column, EPG_ICON, KeyboardKey


 class RefsSource(Enum):
@@ -67,7 +67,10 @@ class EpgDialog:
        self._show_tooltips = True
        self._download_xml_is_active = False

-        builder = get_builder(UI_RESOURCES_PATH + "epg_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_from_file(UI_RESOURCES_PATH + "epg_dialog.glade")
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("epg_dialog_window")
        self._dialog.set_transient_for(transient)
@@ -276,7 +279,7 @@ class EpgDialog:
        if not KeyboardKey.value_exist(key_code):
            return
        key = KeyboardKey(key_code)
-        ctrl = event.state & MOD_MASK
+        ctrl = event.state & Gdk.ModifierType.CONTROL_MASK

        if ctrl and key is KeyboardKey.C:
            self.on_copy_ref()
@@ -536,7 +539,6 @@ class EpgDialog:

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

-    @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)
--- a/app/ui/ftp.glade
+++ b/app/ui/ftp.glade
@@ -89,101 +89,32 @@ Author: Dmitriy Yefremov
    <property name="can_focus">False</property>
    <property name="margin_left">1</property>
    <property name="margin_right">1</property>
+    <property name="margin_top">1</property>
    <property name="margin_bottom">1</property>
    <property name="label_xalign">0</property>
    <property name="shadow_type">in</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="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="spacing">2</property>
+        <property name="wide_handle">True</property>
        <child>
-          <object class="GtkBox" id="ftp_button_box">
+          <object class="GtkBox" id="ftp_bpx">
            <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="orientation">vertical</property>
            <property name="spacing">2</property>
            <child>
-              <object class="GtkButton" id="connect_button">
+              <object class="GtkBox">
                <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>
-            <child>
-              <object class="GtkBox" id="ftp_bpx">
-                <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="ftp_info_box">
                    <property name="visible">True</property>
@@ -193,7 +124,9 @@ Author: Dmitriy Yefremov
                      <object class="GtkLabel" id="ftp_label">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
+                        <property name="margin_left">10</property>
                        <property name="label">FTP:</property>
+                        <property name="yalign">1</property>
                        <attributes>
                          <attribute name="weight" value="semibold"/>
                        </attributes>
@@ -209,7 +142,7 @@ Author: Dmitriy Yefremov
                        <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="max_width_chars">25</property>
                        <property name="yalign">1</property>
                      </object>
                      <packing>
@@ -226,158 +159,24 @@ Author: Dmitriy Yefremov
                  </packing>
                </child>
                <child>
-                  <object class="GtkScrolledWindow" id="ftp_view_scrolled_window">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
-                    <property name="min_content_height">100</property>
-                    <child>
-                      <object class="GtkTreeView" id="ftp_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="model">ftp_list_store</property>
-                        <property name="search_column">1</property>
-                        <property name="rubber_banding">True</property>
-                        <signal name="button-press-event" handler="on_view_popup_menu" object="ftp_popup_menu" swapped="no"/>
-                        <signal name="button-press-event" handler="on_view_press" swapped="no"/>
-                        <signal name="button-release-event" handler="on_view_release" swapped="no"/>
-                        <signal name="drag-begin" handler="on_view_drag_begin" after="yes" swapped="no"/>
-                        <signal name="drag-data-get" handler="on_ftp_drag_data_get" swapped="no"/>
-                        <signal name="drag-data-received" handler="on_ftp_drag_data_received" swapped="no"/>
-                        <signal name="drag-end" handler="on_view_drag_end" swapped="no"/>
-                        <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
-                        <signal name="row-activated" handler="on_ftp_row_activated" swapped="no"/>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="ftp_selection">
-                            <property name="mode">multiple</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_name_column">
-                            <property name="resizable">True</property>
-                            <property name="min_width">100</property>
-                            <property name="title" translatable="yes">Name</property>
-                            <property name="expand">True</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">1</property>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" id="ftp_icon_column_renderer">
-                                <property name="xalign">0.019999999552965164</property>
-                              </object>
-                              <attributes>
-                                <attribute name="pixbuf">0</attribute>
-                              </attributes>
-                            </child>
-                            <child>
-                              <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"/>
-                              </object>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_size_column">
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Size</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">2</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_size_column_renderer">
-                                <property name="xalign">0.94999998807907104</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_date_column">
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Date</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">3</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_date_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_attr_column">
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Attr.</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">4</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_attr_column_renderer">
-                                <property name="xalign">0.50999999046325684</property>
-                                <property name="ellipsize">end</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">4</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_extra_column">
-                            <property name="visible">False</property>
-                            <property name="title" translatable="yes">Extra</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_extra_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">5</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</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="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" id="ftp_button_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
-                    <property name="spacing">5</property>
+                    <property name="spacing">2</property>
                    <child>
-                      <object class="GtkLabel" id="pc_label">
+                      <object class="GtkButton" id="connect_button">
                        <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="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>
@@ -386,11 +185,18 @@ Author: Dmitriy Yefremov
                      </packing>
                    </child>
                    <child>
-                      <object class="GtkLabel" id="pc_info_label">
-                        <property name="visible">True</property>
+                      <object class="GtkButton" id="disconnect_button">
                        <property name="can_focus">False</property>
-                        <property name="ellipsize">end</property>
-                        <property name="max_width_chars">75</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>
@@ -398,6 +204,189 @@ Author: Dmitriy Yefremov
                        <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="pack_type">end</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </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>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="ftp_view_scrolled_window">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">100</property>
+                <child>
+                  <object class="GtkTreeView" id="ftp_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">ftp_list_store</property>
+                    <property name="search_column">1</property>
+                    <property name="rubber_banding">True</property>
+                    <signal name="button-press-event" handler="on_view_popup_menu" object="ftp_popup_menu" swapped="no"/>
+                    <signal name="button-press-event" handler="on_view_press" swapped="no"/>
+                    <signal name="button-release-event" handler="on_view_release" swapped="no"/>
+                    <signal name="drag-begin" handler="on_view_drag_begin" after="yes" swapped="no"/>
+                    <signal name="drag-data-get" handler="on_ftp_drag_data_get" swapped="no"/>
+                    <signal name="drag-data-received" handler="on_ftp_drag_data_received" swapped="no"/>
+                    <signal name="drag-end" handler="on_view_drag_end" swapped="no"/>
+                    <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
+                    <signal name="row-activated" handler="on_ftp_row_activated" swapped="no"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="ftp_selection">
+                        <property name="mode">multiple</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="ftp_name_column">
+                        <property name="resizable">True</property>
+                        <property name="min_width">100</property>
+                        <property name="title" translatable="yes">Name</property>
+                        <property name="expand">True</property>
+                        <property name="alignment">0.5</property>
+                        <property name="sort_column_id">1</property>
+                        <child>
+                          <object class="GtkCellRendererPixbuf" id="ftp_icon_column_renderer">
+                            <property name="xalign">0.019999999552965164</property>
+                          </object>
+                          <attributes>
+                            <attribute name="pixbuf">0</attribute>
+                          </attributes>
+                        </child>
+                        <child>
+                          <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"/>
+                          </object>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="ftp_size_column">
+                        <property name="sizing">fixed</property>
+                        <property name="min_width">75</property>
+                        <property name="title" translatable="yes">Size</property>
+                        <property name="alignment">0.5</property>
+                        <property name="sort_column_id">2</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="ftp_size_column_renderer">
+                            <property name="xalign">0.94999998807907104</property>
+                          </object>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="ftp_date_column">
+                        <property name="min_width">75</property>
+                        <property name="title" translatable="yes">Date</property>
+                        <property name="alignment">0.5</property>
+                        <property name="sort_column_id">3</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="ftp_date_column_renderer"/>
+                          <attributes>
+                            <attribute name="text">3</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="ftp_attr_column">
+                        <property name="sizing">fixed</property>
+                        <property name="min_width">50</property>
+                        <property name="title" translatable="yes">Attr.</property>
+                        <property name="alignment">0.5</property>
+                        <property name="sort_column_id">4</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="ftp_attr_column_renderer">
+                            <property name="xalign">0.50999999046325684</property>
+                            <property name="ellipsize">end</property>
+                          </object>
+                          <attributes>
+                            <attribute name="text">4</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="ftp_extra_column">
+                        <property name="visible">False</property>
+                        <property name="title" translatable="yes">Extra</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="ftp_extra_column_renderer"/>
+                          <attributes>
+                            <attribute name="text">5</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</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="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">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="pc_label">
+                    <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>
                  </object>
                  <packing>
                    <property name="expand">False</property>
@@ -406,137 +395,150 @@ Author: Dmitriy Yefremov
                  </packing>
                </child>
                <child>
-                  <object class="GtkScrolledWindow" id="file_view_scrolled_window">
+                  <object class="GtkLabel" id="pc_info_label">
                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
-                    <property name="min_content_height">100</property>
-                    <child>
-                      <object class="GtkTreeView" id="file_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="model">file_list_store</property>
-                        <property name="search_column">1</property>
-                        <property name="rubber_banding">True</property>
-                        <signal name="button-press-event" handler="on_view_popup_menu" object="file_popup_menu" swapped="no"/>
-                        <signal name="button-press-event" handler="on_view_press" swapped="no"/>
-                        <signal name="button-release-event" handler="on_view_release" swapped="no"/>
-                        <signal name="drag-begin" handler="on_view_drag_begin" after="yes" swapped="no"/>
-                        <signal name="drag-data-get" handler="on_file_drag_data_get" swapped="no"/>
-                        <signal name="drag-data-received" handler="on_file_drag_data_received" swapped="no"/>
-                        <signal name="drag-end" handler="on_view_drag_end" swapped="no"/>
-                        <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
-                        <signal name="row-activated" handler="on_file_row_activated" swapped="no"/>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="file_selection">
-                            <property name="mode">multiple</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_name_column">
-                            <property name="resizable">True</property>
-                            <property name="min_width">100</property>
-                            <property name="title" translatable="yes">Name</property>
-                            <property name="expand">True</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">1</property>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" id="file_icon_column_renderer">
-                                <property name="xalign">0.20000000298023224</property>
-                              </object>
-                              <attributes>
-                                <attribute name="pixbuf">0</attribute>
-                              </attributes>
-                            </child>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_name_column_renderer">
-                                <property name="ellipsize">end</property>
-                                <signal name="edited" handler="on_file_edited" swapped="no"/>
-                              </object>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_size_column">
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Size</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">2</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_size_column_renderer">
-                                <property name="xalign">0.94999998807907104</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_date_column">
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Date</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">3</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_date_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_type_column">
-                            <property name="visible">False</property>
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">50</property>
-                            <property name="title" translatable="yes">Path</property>
-                            <property name="alignment">0.5</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_path_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">4</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_extra_column">
-                            <property name="visible">False</property>
-                            <property name="title" translatable="yes">Extra</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_extra_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">5</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
+                    <property name="can_focus">False</property>
+                    <property name="ellipsize">end</property>
+                    <property name="max_width_chars">32</property>
                  </object>
                  <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                    <property name="fill">True</property>
                    <property name="position">1</property>
                  </packing>
                </child>
              </object>
              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="file_view_scrolled_window">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">100</property>
+                <child>
+                  <object class="GtkTreeView" id="file_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">file_list_store</property>
+                    <property name="search_column">1</property>
+                    <property name="rubber_banding">True</property>
+                    <signal name="button-press-event" handler="on_view_popup_menu" object="file_popup_menu" swapped="no"/>
+                    <signal name="button-press-event" handler="on_view_press" swapped="no"/>
+                    <signal name="button-release-event" handler="on_view_release" swapped="no"/>
+                    <signal name="drag-begin" handler="on_view_drag_begin" after="yes" swapped="no"/>
+                    <signal name="drag-data-get" handler="on_file_drag_data_get" swapped="no"/>
+                    <signal name="drag-data-received" handler="on_file_drag_data_received" swapped="no"/>
+                    <signal name="drag-end" handler="on_view_drag_end" swapped="no"/>
+                    <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
+                    <signal name="row-activated" handler="on_file_row_activated" swapped="no"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="file_selection">
+                        <property name="mode">multiple</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="file_name_column">
+                        <property name="resizable">True</property>
+                        <property name="min_width">100</property>
+                        <property name="title" translatable="yes">Name</property>
+                        <property name="expand">True</property>
+                        <property name="alignment">0.5</property>
+                        <property name="sort_column_id">1</property>
+                        <child>
+                          <object class="GtkCellRendererPixbuf" id="file_icon_column_renderer">
+                            <property name="xalign">0.20000000298023224</property>
+                          </object>
+                          <attributes>
+                            <attribute name="pixbuf">0</attribute>
+                          </attributes>
+                        </child>
+                        <child>
+                          <object class="GtkCellRendererText" id="file_name_column_renderer">
+                            <property name="ellipsize">end</property>
+                            <signal name="edited" handler="on_file_edited" swapped="no"/>
+                          </object>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="file_size_column">
+                        <property name="sizing">fixed</property>
+                        <property name="min_width">75</property>
+                        <property name="title" translatable="yes">Size</property>
+                        <property name="alignment">0.5</property>
+                        <property name="sort_column_id">2</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="file_size_column_renderer">
+                            <property name="xalign">0.94999998807907104</property>
+                          </object>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="file_date_column">
+                        <property name="min_width">75</property>
+                        <property name="title" translatable="yes">Date</property>
+                        <property name="alignment">0.5</property>
+                        <property name="sort_column_id">3</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="file_date_column_renderer"/>
+                          <attributes>
+                            <attribute name="text">3</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="file_type_column">
+                        <property name="visible">False</property>
+                        <property name="sizing">fixed</property>
+                        <property name="min_width">50</property>
+                        <property name="title" translatable="yes">Path</property>
+                        <property name="alignment">0.5</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="file_path_column_renderer"/>
+                          <attributes>
+                            <attribute name="text">4</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="file_extra_column">
+                        <property name="visible">False</property>
+                        <property name="title" translatable="yes">Extra</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="file_extra_column_renderer"/>
+                          <attributes>
+                            <attribute name="text">5</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</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">True</property>
          </packing>
        </child>
      </object>
@@ -582,7 +584,7 @@ Author: Dmitriy Yefremov
        <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"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
        <accelerator key="F2" signal="activate"/>
      </object>
    </child>
@@ -631,7 +633,7 @@ Author: Dmitriy Yefremov
        <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"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
        <accelerator key="F2" signal="activate"/>
      </object>
    </child>
--- a/app/ui/ftp.py
+++ b/app/ui/ftp.py
@@ -12,7 +12,7 @@ from gi.repository import GLib

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

@@ -68,7 +68,9 @@ class FtpClientBox(Gtk.HBox):
                    "on_view_press": self.on_view_press,
                    "on_view_release": self.on_view_release}

-        builder = get_builder(UI_RESOURCES_PATH + "ftp.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "ftp.glade")
+        builder.connect_signals(handlers)

        self.add(builder.get_object("main_frame"))
        self._ftp_info_label = builder.get_object("ftp_info_label")
--- a/app/ui/import_dialog.glade
+++ b/app/ui/import_dialog.glade
@@ -26,25 +26,13 @@ THE SOFTWARE.
 Author: Dmitriy Yefremov

 -->
-<interface domain="demon-editor">
+<interface>
  <requires lib="gtk+" version="3.16"/>
-  <!-- interface-css-provider-path style.css -->
  <!-- interface-license-type mit -->
  <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
+  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="details_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">emblem-important-symbolic</property>
-  </object>
-  <object class="GtkImage" id="import_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-revert-symbolic-rtl</property>
-    <property name="icon_size">1</property>
-  </object>
  <object class="GtkListStore" id="main_list_store">
    <columns>
      <!-- column-name name -->
@@ -94,7 +82,6 @@ Author: Dmitriy Yefremov
  </object>
  <object class="GtkWindow" id="dialog_window">
    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Import</property>
    <property name="modal">True</property>
    <property name="window_position">center-on-parent</property>
    <property name="default_width">480</property>
@@ -103,8 +90,53 @@ Author: Dmitriy Yefremov
    <property name="type_hint">dialog</property>
    <property name="gravity">center</property>
    <signal name="check-resize" handler="on_resize" swapped="no"/>
-    <child>
-      <placeholder/>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header_bar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title" translatable="yes">Import</property>
+        <property name="subtitle" translatable="yes">Bouquets and services</property>
+        <property name="spacing">2</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkButton" id="import_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Import</property>
+            <signal name="clicked" handler="on_import" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="import_button_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-revert-to-saved</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="info_check_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Details</property>
+            <property name="draw_indicator">False</property>
+            <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="info_check_button_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-dialog-info</property>
+              </object>
+            </child>
+            <accelerator key="i" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
    </child>
    <child>
      <object class="GtkBox" id="main_box">
@@ -129,8 +161,8 @@ Author: Dmitriy Yefremov
                  <object class="GtkLabel">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
                    <property name="label" translatable="yes">Bouquets</property>
                  </object>
                  <packing>
@@ -228,8 +260,8 @@ Author: Dmitriy Yefremov
                  <object class="GtkLabel">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
                    <property name="label" translatable="yes">Bouquet details</property>
                  </object>
                  <packing>
@@ -305,62 +337,6 @@ Author: Dmitriy Yefremov
            <property name="position">0</property>
          </packing>
        </child>
-        <child>
-          <object class="GtkButtonBox" id="actions_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="margin_left">15</property>
-            <property name="margin_right">15</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="layout_style">start</property>
-            <child>
-              <object class="GtkButton" id="import_button">
-                <property name="label" translatable="yes">Import</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Bouquets and services</property>
-                <property name="valign">center</property>
-                <property name="image">import_image</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_import" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="info_check_button">
-                <property name="label" translatable="yes">Details</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Details</property>
-                <property name="valign">center</property>
-                <property name="image">details_image</property>
-                <property name="always_show_image">True</property>
-                <property name="draw_indicator">False</property>
-                <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
-                <accelerator key="i" signal="clicked"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
        <child>
          <object class="GtkInfoBar" id="info_bar">
            <property name="can_focus">False</property>
@@ -406,7 +382,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>
      </object>
--- a/app/ui/imports.py
+++ b/app/ui/imports.py
@@ -6,7 +6,7 @@ from app.eparser import get_bouquets, get_services, BouquetsReader
 from app.eparser.ecommons import BqType, BqServiceType, Bouquet
 from app.eparser.neutrino.bouquets import parse_webtv, parse_bouquets as get_neutrino_bouquets
 from app.settings import SettingsType
-from app.ui.dialogs import show_dialog, DialogType, get_chooser_dialog, get_message, get_builder
+from app.ui.dialogs import show_dialog, DialogType, get_chooser_dialog, get_message
 from app.ui.main_helper import on_popup_menu
 from .uicommons import Gtk, UI_RESOURCES_PATH, KeyboardKey, Column

@@ -20,7 +20,7 @@ def import_bouquet(transient, model, path, settings, services, appender, file_pa

    if profile is SettingsType.ENIGMA_2:
        pattern = ".{}".format(bq_type.value)
-        f_pattern = "*" + pattern if settings.is_darwin else "userbouquet.*{}".format(pattern)
+        f_pattern = "userbouquet.*{}".format(pattern)
    elif profile is SettingsType.NEUTRINO_MP:
        pattern = "webtv.xml" if bq_type is BqType.WEBTV else "bouquets.xml"
        f_pattern = "bouquets.xml"
@@ -33,15 +33,11 @@ def import_bouquet(transient, model, path, settings, services, appender, file_pa
    if file_path == Gtk.ResponseType.CANCEL:
        return

-    if not file_path.endswith(pattern):
+    if not str(file_path).endswith(pattern):
        show_dialog(DialogType.ERROR, transient, text="No bouquet file is selected!")
        return

    if profile is SettingsType.ENIGMA_2:
-        if settings.is_darwin and file_path.rfind("userbouquet.") < 0:
-            show_dialog(DialogType.ERROR, transient, text="No bouquet file is selected!")
-            return
-
        bq = get_enigma2_bouquet(file_path)
        imported = list(filter(lambda x: x.data in services or x.type is BqServiceType.IPTV, bq.services))

@@ -84,7 +80,10 @@ class ImportDialog:
                    "on_resize": self.on_resize,
                    "on_key_press": self.on_key_press}

-        builder = get_builder(UI_RESOURCES_PATH + "import_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.set_translation_domain("demon-editor")
+        builder.add_from_file(UI_RESOURCES_PATH + "import_dialog.glade")
+        builder.connect_signals(handlers)

        self._bq_services = {}
        self._services = {}
@@ -125,15 +124,8 @@ class ImportDialog:
                for bq in bqs.bouquets:
                    self._main_model.append((bq.name, bq.type, True))
                    self._bq_services[(bq.name, bq.type)] = bq.services
-
-            if self._profile is SettingsType.ENIGMA_2:
-                services = get_services(path, self._profile, 5 if self._settings.v5_support else 4)
-            elif self._profile is SettingsType.NEUTRINO_MP:
-                services = get_services(path, self._profile, 0)
-            else:
-                self.show_info_message("Setting format not supported!", Gtk.MessageType.ERROR)
-                return
-
+            # Note! Getting default format ver. 4
+            services = get_services(path, self._profile, 4 if self._profile is SettingsType.ENIGMA_2 else 0)
            for srv in services:
                self._services[srv.fav_id] = srv
        except FileNotFoundError as e:
--- a/app/ui/iptv.glade
+++ b/app/ui/iptv.glade
--- a/app/ui/iptv.py
+++ b/app/ui/iptv.py
@@ -1,51 +1,21 @@
-# -*- 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 concurrent.futures
-import os
 import re
 import urllib
 from urllib.error import HTTPError
 from urllib.parse import urlparse, unquote, quote
 from urllib.request import Request, urlopen

-import requests
-from gi.repository import GLib, Gio, GdkPixbuf
+from gi.repository import GLib

-from app.commons import run_idle, run_task, log
+from app.commons import run_idle, run_task
 from app.eparser.ecommons import BqServiceType, Service
-from app.eparser.iptv import (NEUTRINO_FAV_ID_FORMAT, StreamType, ENIGMA2_FAV_ID_FORMAT, get_fav_id, MARKER_FORMAT,
-                              parse_m3u)
+from app.eparser.iptv import NEUTRINO_FAV_ID_FORMAT, StreamType, ENIGMA2_FAV_ID_FORMAT, get_fav_id, MARKER_FORMAT
 from app.settings import SettingsType
 from app.tools.yt import YouTubeException, YouTube
-from app.ui.dialogs import Action, show_dialog, DialogType, get_message, get_builder
-from app.ui.main_helper import get_base_model, get_iptv_url, on_popup_menu, get_picon_pixbuf
-from app.ui.uicommons import (Gtk, Gdk, UI_RESOURCES_PATH, IPTV_ICON, Column, KeyboardKey, get_yt_icon)
+from .dialogs import Action, show_dialog, DialogType, get_dialogs_string, get_message
+from .main_helper import get_base_model, get_iptv_url, on_popup_menu
+from .uicommons import (Gtk, Gdk, TEXT_DOMAIN, UI_RESOURCES_PATH, IPTV_ICON, Column, IS_GNOME_SESSION, KeyboardKey,
+                        get_yt_icon)

 _DIGIT_ENTRY_NAME = "digit-entry"
 _ENIGMA2_REFERENCE = "{}:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0"
@@ -94,8 +64,11 @@ class IptvDialog:
        self._yt_links = None
        self._yt_dl = None

-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("iptv_dialog", "stream_type_liststore", "yt_quality_liststore"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("iptv_dialog", "stream_type_liststore", "yt_quality_liststore"))
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("iptv_dialog")
        self._dialog.set_transient_for(transient)
@@ -347,8 +320,10 @@ class SearchUnavailableDialog:
    def __init__(self, transient, model, fav_bouquet, iptv_rows, s_type):
        handlers = {"on_response": self.on_response}

-        builder = get_builder(UI_RESOURCES_PATH + "iptv.glade", handlers,
-                              objects=("search_unavailable_streams_dialog",))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_file(UI_RESOURCES_PATH + "iptv.glade", ("search_unavailable_streams_dialog",))
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("search_unavailable_streams_dialog")
        self._dialog.set_transient_for(transient)
@@ -424,10 +399,9 @@ class SearchUnavailableDialog:
        self._dialog.destroy()


-class IptvListDialog:
-    """ Base class for working with iptv lists. """
+class IptvListConfigurationDialog:

-    def __init__(self, transient, s_type):
+    def __init__(self, transient, services, iptv_rows, bouquet, fav_model, s_type):
        handlers = {"on_apply": self.on_apply,
                    "on_response": self.on_response,
                    "on_stream_type_default_togged": self.on_stream_type_default_togged,
@@ -441,15 +415,20 @@ class IptvListDialog:
                    "on_entry_changed": self.on_entry_changed,
                    "on_info_bar_close": self.on_info_bar_close}

+        self._rows = iptv_rows
+        self._services = services
+        self._bouquet = bouquet
+        self._fav_model = fav_model
        self._s_type = s_type

-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("iptv_list_configuration_dialog", "stream_type_liststore"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("iptv_list_configuration_dialog", "stream_type_liststore"))
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("iptv_list_configuration_dialog")
        self._dialog.set_transient_for(transient)
-        self._data_box = builder.get_object("iptv_list_data_box")
-        self._start_values_grid = builder.get_object("start_values_grid")
        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")
@@ -464,28 +443,22 @@ class IptvListDialog:
        self._list_tid_entry = builder.get_object("list_tid_entry")
        self._list_nid_entry = builder.get_object("list_nid_entry")
        self._list_namespace_entry = builder.get_object("list_namespace_entry")
-        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")
-        # 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._reset_to_default_switch = builder.get_object("reset_to_default_lists_switch")
+        # style
+        self._style_provider = Gtk.CssProvider()
+        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
        self._digit_elems = (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,
+            el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
                                                           Gtk.STYLE_PROVIDER_PRIORITY_USER)

    def show(self):
        self._dialog.run()

    def on_response(self, dialog, response):
-        if response == Gtk.ResponseType.APPLY:
-            return True
-
-        self._dialog.destroy()
+        if response == Gtk.ResponseType.CANCEL:
+            self._dialog.destroy()

    def on_stream_type_changed(self, box):
        self.update_reference()
@@ -521,51 +494,19 @@ class IptvListDialog:
        self._list_namespace_entry.set_sensitive(not button.get_active())

    @run_idle
-    def on_reset_to_default(self, item):
+    def on_reset_to_default(self, item, active):
+        item.set_sensitive(not active)
        self._stream_type_combobox.set_active(1)
        self._list_srv_type_entry.set_text("1")
-        for el in self._digit_elems[1:]:
+        for el in (self._list_sid_entry, self._list_nid_entry, self._list_tid_entry, self._list_namespace_entry):
            el.set_text("0")
-        for el in self._default_elems:
+        for el in (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):
            el.set_active(True)

    def on_info_bar_close(self, bar=None, resp=None):
        self._info_bar.set_visible(False)

-    def on_apply(self, item):
-        pass
-
-    @run_idle
-    def update_reference(self):
-        if is_data_correct(self._digit_elems):
-            stream_type = get_stream_type(self._stream_type_combobox)
-            self._reference_label.set_text(
-                _ENIGMA2_REFERENCE.format(stream_type, *[int(elem.get_text()) for elem in self._digit_elems]))
-
-    def on_entry_changed(self, entry):
-        if _PATTERN.search(entry.get_text()):
-            entry.set_name(_DIGIT_ENTRY_NAME)
-        else:
-            entry.set_name("GtkEntry")
-            self.update_reference()
-
-    def is_default_values(self):
-        return any(el.get_text() == "0" for el in self._digit_elems[2:])
-
-    def is_all_data_default(self):
-        return all(el.get_active() for el in self._default_elems)
-
-
-class IptvListConfigurationDialog(IptvListDialog):
-
-    def __init__(self, transient, services, iptv_rows, bouquet, fav_model, s_type):
-        super().__init__(transient, s_type)
-
-        self._rows = iptv_rows
-        self._bouquet = bouquet
-        self._fav_model = fav_model
-        self._services = services
-
    @run_idle
    def on_apply(self, item):
        if not is_data_correct(self._digit_elems):
@@ -573,13 +514,14 @@ class IptvListConfigurationDialog(IptvListDialog):
            return

        if self._s_type is SettingsType.ENIGMA_2:
+            reset = self._reset_to_default_switch.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()

-            stream_type = get_stream_type(self._stream_type_combobox)
+            stream_type = StreamType.NONE_TS.value if reset else get_stream_type(self._stream_type_combobox)
            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()))
@@ -590,7 +532,7 @@ class IptvListConfigurationDialog(IptvListDialog):
                data, sep, desc = fav_id.partition("http")
                data = data.split(":")

-                if self.is_all_data_default():
+                if reset:
                    data[2], data[3], data[4], data[5], data[6] = "10000"
                else:
                    data[0], data[2], data[4], data[5], data[6] = stream_type, srv_type, tid, nid, namespace
@@ -609,213 +551,19 @@ class IptvListConfigurationDialog(IptvListDialog):

            self._info_bar.set_visible(True)

-
-class M3uImportDialog(IptvListDialog):
-    """ Import dialog for *.m3u* playlists. """
-
-    def __init__(self, transient, s_type, m3_path, app):
-        super().__init__(transient, s_type)
-
-        self._app = app
-        self._picons = app._picons
-        self._pic_path = app._settings.picons_local_path
-        self._services = None
-        self._url_count = 0
-        self._errors_count = 0
-        self._max_count = 0
-        self._is_download = False
-        self._cancellable = Gio.Cancellable()
-        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)
-        self._info_label = Gtk.Label(visible=True, ellipsize="end", max_width_chars=30)
-        load_label = Gtk.Label(label=get_message("Loading data..."))
-        self._spinner.bind_property("active", self._spinner, "visible")
-        self._spinner.bind_property("visible", load_label, "visible")
-        self._spinner.bind_property("active", self._start_values_grid, "sensitive", 4)
-
-        progress_box = Gtk.HBox(visible=True, spacing=2)
-        progress_box.add(self._progress_bar)
-        progress_box.pack_end(self._spinner, False, False, 0)
-        progress_box.pack_start(load_label, False, False, 0)
-        # Picons
-        self._picons_switch = Gtk.Switch(visible=True)
-        self._picon_box = Gtk.HBox(visible=True, sensitive=False, spacing=2)
-        self._picon_box.pack_end(self._picons_switch, False, False, 0)
-        self._picon_box.pack_end(Gtk.Label(visible=True, label=get_message("Download picons")), False, False, 0)
-        # Extra box
-        extra_box = Gtk.HBox(visible=True, spacing=2, margin_bottom=5, margin_top=5)
-        extra_box.set_center_widget(progress_box)
-        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.add(extra_box)
-        self._data_box.add(frame)
-
-        self.get_m3u(m3_path, s_type)
-
-    @run_task
-    def get_m3u(self, path, s_type):
-        try:
-            GLib.idle_add(self._spinner.set_property, "active", True)
-            self._services = parse_m3u(path, s_type)
-            for s in self._services:
-                if s.picon:
-                    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)
-            GLib.idle_add(self._info_label.set_text, msg)
-            GLib.idle_add(self._spinner.set_property, "active", False)
-
-    def on_apply(self, item):
-        if not is_data_correct(self._digit_elems):
-            show_dialog(DialogType.ERROR, self._dialog, "Error. Verify the data!")
-            return
-
-        picons = {}
-        services = self._services
-
-        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:]
+    @run_idle
+    def update_reference(self):
+        if is_data_correct(self._digit_elems):
            stream_type = get_stream_type(self._stream_type_combobox)
+            self._reference_label.set_text(
+                _ENIGMA2_REFERENCE.format(stream_type, *[int(elem.get_text()) for elem in self._digit_elems]))

-            for i, s in enumerate(self._services, start=params[0]):
-                # Skipping markers.
-                if not s.data_id:
-                    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)
-                if s.picon:
-                    picons[s.picon] = picon_id
-
-                services.append(s._replace(picon=None, picon_id=picon_id, data_id=None, fav_id=fav_id))
-
-        if self._picons_switch.get_active():
-            if self.is_default_values():
-                show_dialog(DialogType.ERROR, self._dialog,
-                            "Set values for TID, NID and Namespace for correct naming of the picons!")
-                return
-
-            self.download_picons(picons)
+    def on_entry_changed(self, entry):
+        if _PATTERN.search(entry.get_text()):
+            entry.set_name(_DIGIT_ENTRY_NAME)
        else:
-            GLib.idle_add(self._ok_button.set_visible, True)
-            GLib.idle_add(self._info_bar.set_visible, True, priority=GLib.PRIORITY_LOW)
-
-        self._app.append_imported_services(services)
-
-    @run_task
-    def download_picons(self, picons):
-        self._is_download = True
-        os.makedirs(os.path.dirname(self._pic_path), exist_ok=True)
-        GLib.idle_add(self._apply_button.set_sensitive, False)
-        GLib.idle_add(self._progress_bar.set_visible, True)
-
-        self._errors_count = 0
-        self._url_count = len(picons)
-        self._max_count = self._url_count
-        self._cancellable.reset()
-
-        with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
-            futures = {executor.submit(self.download_picon, p, picons.get(p, None)): p for p in filter(None, picons)}
-            done, not_done = concurrent.futures.wait(futures, timeout=0)
-            while self._is_download and not_done:
-                done, not_done = concurrent.futures.wait(not_done, timeout=5)
-
-            for future in not_done:
-                future.cancel()
-            concurrent.futures.wait(not_done)
-
-            self.update_progress(self._url_count)
-            self.on_done()
-
-    def download_picon(self, url, pic_data):
-        err_msg = "Picon download error: {}  [{}]"
-        timeout = (3, 5)  # connect and read timeouts
-
-        req = requests.get(url, timeout=timeout)
-        if req.status_code != 200:
-            log(err_msg.format(url, req.reason))
-            self.update_progress(1)
-        else:
-            self.on_picon_load_done(req.content, pic_data)
-
-    @run_idle
-    def on_picon_load_done(self, data, user_data):
-        try:
-            self._info_label.set_text("Processing: {}".format(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)
-            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))
-        else:
-            self.update_progress()
-
-    @run_idle
-    def update_progress(self, error=0):
-        self._errors_count += error
-        self._url_count -= 1
-        frac = 1 - self._url_count / self._max_count
-        self._progress_bar.set_fraction(frac)
-
-    @run_idle
-    def on_done(self):
-        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._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
-        picons = self._app._picons
-        model = self._app.fav_view.get_model()
-        for r in model:
-            s = services.get(r[Column.FAV_ID], None)
-            if s:
-                model.set_value(r.iter, Column.FAV_PICON, picons.get(s.picon_id, None))
-                yield True
-
-        self._info_bar.set_visible(True)
-        self._ok_button.set_visible(True)
-        yield True
-
-    def on_response(self, dialog, response):
-        if response == Gtk.ResponseType.APPLY:
-            return True
-
-        if response == Gtk.ResponseType.CANCEL and not self._is_download or not self.on_close():
-            self._dialog.destroy()
-
-    def on_close(self, window=None, event=None):
-        if self._is_download:
-            if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
-                self._is_download = False
-                self._cancellable.cancel()
-                return False
-            return True
-
-        return False
+            entry.set_name("GtkEntry")
+            self.update_reference()


 class YtListImportDialog:
@@ -839,10 +587,12 @@ class YtListImportDialog:
        self._settings = settings
        self._yt = None

-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("yt_import_dialog_window", "yt_liststore", "yt_quality_liststore",
-                                       "yt_popup_menu", "remove_selection_image", "yt_receive_image",
-                                       "yt_import_image"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("yt_import_dialog_window", "yt_liststore", "yt_quality_liststore",
+                                         "yt_popup_menu", "remove_selection_image"))
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("yt_import_dialog_window")
        self._dialog.set_transient_for(transient)
--- 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/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/main_app_window.py
+++ b/app/ui/main_app_window.py
--- a/app/ui/main_helper.py
+++ b/app/ui/main_helper.py
@@ -353,12 +353,12 @@ def scroll_to(index, view, paths=None):

 # ***************** Picons *********************#

-def update_picons_data(path, picons, size=32):
+def update_picons_data(path, picons):
    if not os.path.exists(path):
        return

    for file in os.listdir(path):
-        pf = get_picon_pixbuf(path + file, size)
+        pf = get_picon_pixbuf(path + file)
        if pf:
            picons[file] = pf

@@ -530,7 +530,7 @@ def get_picon_pixbuf(path, size=32):

 # ***************** Bouquets *********************#

-def gen_bouquets(view, bq_view, transient, gen_type, s_type, callback):
+def gen_bouquets(view, bq_view, transient, gen_type, tv_types, s_type, callback):
    """ Auto-generate and append list of bouquets """
    fav_id_index = Column.SRV_FAV_ID
    index = Column.SRV_TYPE
@@ -545,6 +545,8 @@ def gen_bouquets(view, bq_view, transient, gen_type, s_type, callback):
        if not is_only_one_item_selected(paths, transient):
            return
        service = Service(*model[paths][:Column.SRV_TOOLTIP])
+        if service.service_type not in tv_types:
+            bq_type = BqType.RADIO.value
        append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model,
                        [service.package if gen_type is BqGenType.PACKAGE else
                         service.pos if gen_type is BqGenType.SAT else service.service_type], s_type)
@@ -590,9 +592,7 @@ def get_bouquets_names(model):

 def update_entry_data(entry, dialog, settings):
    """ Updates value in text entry from chooser dialog. """
-    response = show_dialog(dialog_type=DialogType.CHOOSER, transient=dialog, settings=settings,
-                           action_type=Gtk.FileChooserAction.CREATE_FOLDER if settings.is_darwin else None,
-                           create_dir=True)
+    response = show_dialog(dialog_type=DialogType.CHOOSER, transient=dialog, settings=settings, create_dir=True)
    if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
        entry.set_text(response)
        return response
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
--- a/app/ui/picons_manager.glade
+++ b/app/ui/picons_manager.glade
--- a/app/ui/picons_manager.py
+++ b/app/ui/picons_manager.py
@@ -1,77 +1,41 @@
-# -*- 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 shutil
-from enum import Enum
+import subprocess
+import tempfile
 from pathlib import Path
 from urllib.parse import urlparse, unquote

-from gi.repository import GLib, GdkPixbuf, Gio
+from gi.repository import GLib, GdkPixbuf

 from app.commons import run_idle, run_task, run_with_delay
 from app.connections import upload_data, DownloadType, download_data, remove_picons
 from app.settings import SettingsType, Settings
-from app.tools.picons import (PiconsParser, parse_providers, Provider, convert_to, download_picon, PiconsCzDownloader,
-                              PiconsError)
+from app.tools.picons import PiconsParser, parse_providers, Provider, convert_to
 from app.tools.satellites import SatellitesParser, SatelliteSource
-from .dialogs import show_dialog, DialogType, get_message, get_builder
-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 .dialogs import show_dialog, DialogType, get_message
+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


 class PiconsDialog:
-    class DownloadSource(Enum):
-        LYNG_SAT = "lyngsat"
-        PICON_CZ = "piconcz"
-
    def __init__(self, transient, settings, picon_ids, sat_positions, app):
        self._picon_ids = picon_ids
        self._sat_positions = sat_positions
        self._app = app
+        self._TMP_DIR = tempfile.gettempdir() + "/"
        self._BASE_URL = "www.lyngsat.com/packages/"
        self._PATTERN = re.compile(r"^https://www\.lyngsat\.com/[\w-]+\.html$")
        self._POS_PATTERN = re.compile(r"^\d+\.\d+[EW]?$")
        self._current_process = None
        self._terminate = False
-        self._is_downloading = False
        self._filter_binding = None
        self._services = None
        self._current_picon_info = None
-        # Downloader
-        self._sats = None
-        self._sat_names = None
-        self._download_src = self.DownloadSource.PICON_CZ
-        self._picon_cz_downloader = None

        handlers = {"on_receive": self.on_receive,
+                    "on_load_providers": self.on_load_providers,
                    "on_cancel": self.on_cancel,
                    "on_close": self.on_close,
                    "on_send": self.on_send,
@@ -100,10 +64,7 @@ class PiconsDialog:
                    "on_selective_remove": self.on_selective_remove,
                    "on_local_remove": self.on_local_remove,
                    "on_picons_dest_view_realize": self.on_picons_dest_view_realize,
-                    "on_download_source_changed": self.on_download_source_changed,
                    "on_satellites_view_realize": self.on_satellites_view_realize,
-                    "on_satellite_filter_toggled": self.on_satellite_filter_toggled,
-                    "on_providers_view_query_tooltip": self.on_providers_view_query_tooltip,
                    "on_satellite_selection": self.on_satellite_selection,
                    "on_select_all": self.on_select_all,
                    "on_unselect_all": self.on_unselect_all,
@@ -111,11 +72,12 @@ class PiconsDialog:
                    "on_fiter_srcs_toggled": self.on_fiter_srcs_toggled,
                    "on_filter_services_switch": self.on_filter_services_switch,
                    "on_picon_activated": self.on_picon_activated,
-                    "on_view_query_tooltip": self.on_view_query_tooltip,
                    "on_tree_view_key_press": self.on_tree_view_key_press,
                    "on_popup_menu": on_popup_menu}

-        builder = get_builder(UI_RESOURCES_PATH + "picons_manager.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "picons_manager.glade")
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("picons_dialog")
        self._dialog.set_transient_for(transient)
@@ -137,12 +99,17 @@ class PiconsDialog:
        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._ip_entry = builder.get_object("ip_entry")
+        self._picons_entry = builder.get_object("picons_entry")
+        self._url_entry = builder.get_object("url_entry")
        self._picons_dir_entry = builder.get_object("picons_dir_entry")
+        self._info_bar = builder.get_object("info_bar")
+        self._info_bar = builder.get_object("info_bar")
        self._message_label = builder.get_object("info_bar_message_label")
-        self._info_toggle_button = builder.get_object("info_toggle_button")
+        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._download_source_button = builder.get_object("download_source_button")
+        self._load_providers_button = builder.get_object("load_providers_button")
        self._receive_button = builder.get_object("receive_button")
        self._convert_button = builder.get_object("convert_button")
        self._enigma2_path_button = builder.get_object("enigma2_path_button")
@@ -156,37 +123,36 @@ class PiconsDialog:
        self._resize_no_radio_button = builder.get_object("resize_no_radio_button")
        self._resize_220_132_radio_button = builder.get_object("resize_220_132_radio_button")
        self._resize_100_60_radio_button = builder.get_object("resize_100_60_radio_button")
-        self._explorer_action_box = builder.get_object("explorer_action_box")
        self._satellite_label = builder.get_object("satellite_label")
-        self._provider_header_label = builder.get_object("provider_header_label")
-        self._satellite_filter_switch = builder.get_object("satellite_filter_switch")
-        self._bouquet_filter_switch = builder.get_object("bouquet_filter_switch")
-        self._bouquet_filter_grid = builder.get_object("bouquet_filter_grid")
        self._header_download_box = builder.get_object("header_download_box")
        self._satellite_label.bind_property("visible", builder.get_object("loading_data_label"), "visible", 4)
        self._satellite_label.bind_property("visible", builder.get_object("loading_data_spinner"), "visible", 4)
-        self._satellite_label.bind_property("visible", self._download_source_button, "sensitive")
-        self._satellite_label.bind_property("visible", self._satellites_view, "sensitive")
-        self._download_source_button.bind_property("visible", self._receive_button, "visible")
-        self._cancel_button.bind_property("visible", builder.get_object("receive_button"), "visible", 4)
-        self._convert_button.bind_property("visible", self._explorer_action_box, "visible", 4)
-        downloader_action_box = builder.get_object("downloader_action_box")
-        self._explorer_action_box.bind_property("visible", downloader_action_box, "visible", 4)
-        self._convert_button.bind_property("visible", downloader_action_box, "visible", 4)
+        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._load_providers_button.bind_property("visible", self._receive_button, "visible")
        self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
        self._explorer_src_path_button.bind_property("sensitive", builder.get_object("picons_view_sw"), "sensitive")
        self._filter_button.bind_property("active", builder.get_object("filter_service_box"), "visible")
        self._filter_button.bind_property("active", builder.get_object("src_title_grid"), "visible")
        self._filter_button.bind_property("active", builder.get_object("dst_title_grid"), "visible")
-        self._filter_button.bind_property("visible", self._info_toggle_button, "visible")
+        self._filter_button.bind_property("visible", self._info_check_button, "visible")
+        self._filter_button.bind_property("visible", self._send_button, "visible")
+        self._filter_button.bind_property("visible", self._download_button, "visible")
+        self._filter_button.bind_property("visible", self._remove_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_toggle_button.bind_property("active", explorer_info_bar, "visible")
+        self._info_check_button.bind_property("active", explorer_info_bar, "visible")
        # Init drag-and-drop
        self.init_drag_and_drop()
-        # Settings
+        # Style
+        self._style_provider = Gtk.CssProvider()
+        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
+        self._url_entry.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
+                                                                    Gtk.STYLE_PROVIDER_PRIORITY_USER)
        self._settings = settings
        self._s_type = settings.setting_type
+        self._ip_entry.set_text(self._settings.host)
+        self._picons_entry.set_text(self._settings.picons_path)
        self._picons_dir_entry.set_text(self._settings.picons_local_path)

        window_size = self._settings.get("picons_downloader_window_size")
@@ -299,9 +265,8 @@ class PiconsDialog:
    def on_picons_view_drag_data_get(self, view, drag_context, data, info, time):
        model, path = view.get_selection().get_selected_rows()
        if path:
-            p_uri = Path(model[path][-1]).as_uri()
-            dest_uri = Path(self._explorer_dest_path_button.get_filename()).as_uri()
-            data.set_uris(["{}::::{}".format(p_uri, dest_uri)])
+            data.set_uris([Path(model[path][-1]).as_uri(),
+                           Path(self._explorer_dest_path_button.get_filename()).as_uri()])

    def on_picons_src_view_drag_drop(self, view, drag_context, x, y, time):
        view.stop_emission_by_name("drag_drop")
@@ -376,11 +341,10 @@ class PiconsDialog:
            return

        uris = data.get_uris()
-        if uris:
+        if len(uris) == 2:
            name, fav_id = self._current_picon_info
-            src, sep, dst = uris[0].partition("::::")
-            src = urlparse(unquote(src)).path
-            dst = "{}/{}".format(urlparse(unquote(dst)).path, name)
+            src = urlparse(unquote(uris[0])).path
+            dst = "{}/{}".format(urlparse(unquote(uris[1])).path, name)
            if src != dst:
                shutil.copy(src, dst)
                for row in get_base_model(self._picons_dest_view.get_model()):
@@ -393,7 +357,7 @@ class PiconsDialog:

    def on_send_button_drag_data_received(self, button, drag_context, x, y, data, info, time):
        path = self.get_path_from_uris(data)
-        if path and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
+        if path:
            self.on_send(files_filter={path.name}, path=path.parent)

    def on_download_button_drag_data_received(self, button, drag_context, x, y, data, info, time):
@@ -408,9 +372,8 @@ class PiconsDialog:

    def get_path_from_uris(self, data):
        uris = data.get_uris()
-        if uris:
-            src, sep, dst = uris[0].partition("::::")
-            return Path(urlparse(unquote(src)).path).resolve()
+        if len(uris) == 2:
+            return Path(urlparse(unquote(uris[0])).path).resolve()

    def update_picon_in_lists(self, dst, fav_id):
        picon = get_picon_pixbuf(dst)
@@ -422,7 +385,7 @@ class PiconsDialog:

    def on_selective_send(self, view):
        path = self.get_selected_path(view)
-        if path and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
+        if path:
            self.on_send(files_filter={path.name}, path=path.parent)

    def on_selective_download(self, view):
@@ -475,7 +438,7 @@ class PiconsDialog:
                                            files_filter=files_filter), True)

    def on_remove(self, item=None, files_filter=None):
-        if show_dialog(DialogType.QUESTION, self._dialog) != Gtk.ResponseType.OK:
+        if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
            return

        self.run_func(lambda: remove_picons(settings=self._settings,
@@ -502,254 +465,131 @@ class PiconsDialog:

    # ******************** Downloader ************************* #

-    def on_download_source_changed(self, button):
-        self._download_src = self.DownloadSource(button.get_active_id())
-        self.set_providers_header()
-        self._bouquet_filter_grid.set_sensitive(self._download_src is self.DownloadSource.PICON_CZ)
-        GLib.idle_add(self._providers_view.get_model().clear)
-        self.init_satellites(self._satellites_view)
-
    def on_satellites_view_realize(self, view):
-        self.set_providers_header()
        self.get_satellites(view)

-    def on_satellite_filter_toggled(self, button, state):
-        self.init_satellites(self._satellites_view)
-
-    def on_providers_view_query_tooltip(self, view, x, y, keyboard_mode, tooltip):
-        if self._download_src is self.DownloadSource.LYNG_SAT:
-            return False
-
-        dest = view.get_dest_row_at_pos(x, y)
-        if not dest:
-            return False
-
-        path, pos = dest
-        model = view.get_model()
-        itr = model.get_iter(path)
-        logo_url = model.get_value(itr, 5)
-        if logo_url:
-            pix_data = self._picon_cz_downloader.get_logo_data(logo_url)
-            if pix_data:
-                pix = self.get_pixbuf(pix_data)
-                model.set_value(itr, 0, pix if pix else TV_ICON)
-                size = self._settings.tooltip_logo_size
-                tooltip.set_icon(self.get_pixbuf(pix_data, size, size))
-            else:
-                self.update_logo_data(itr, model, logo_url)
-        tooltip.set_text(model.get_value(itr, 1))
-        view.set_tooltip_row(tooltip, path)
-        return True
-
-    @run_task
-    def update_logo_data(self, itr, model, url):
-        pix_data = self._picon_cz_downloader.get_provider_logo(url)
-        if pix_data:
-            pix = self.get_pixbuf(pix_data)
-            GLib.idle_add(model.set_value, itr, 0, pix if pix else TV_ICON)
-
-    @run_idle
-    def set_providers_header(self):
-        msg = "{} [{}]"
-        tooltip = ""
-        if self._download_src is self.DownloadSource.PICON_CZ:
-            tooltip = "https://picon.cz (by Chocholoušek)"
-            msg = msg.format(get_message("Package"), tooltip)
-        elif self._download_src is self.DownloadSource.LYNG_SAT:
-            tooltip = "https://www.lyngsat.com"
-            msg = msg.format(get_message("Providers"), tooltip)
-        else:
-            msg = ""
-
-        self._provider_header_label.set_text(msg)
-        self._provider_header_label.set_tooltip_text(tooltip)
-
    @run_task
    def get_satellites(self, view):
-        self._sats = SatellitesParser().get_satellites_list(SatelliteSource.LYNGSAT)
-        if not self._sats:
+        sats = SatellitesParser().get_satellites_list(SatelliteSource.LYNGSAT)
+        if not sats:
            self.show_info_message("Getting satellites list error!", Gtk.MessageType.ERROR)
-
-        self._sat_names = {s[1]: s[0] for s in self._sats}  # position -> satellite name
-        self._picon_cz_downloader = PiconsCzDownloader(self._picon_ids, self.append_output)
-        self.init_satellites(view)
-
-    @run_task
-    def init_satellites(self, view):
-        sats = self._sats
-        if self._download_src is self.DownloadSource.PICON_CZ:
-            if not self._picon_cz_downloader:
-                return
-            try:
-                self._picon_cz_downloader.init()
-            except PiconsError as e:
-                self.show_info_message(str(e), Gtk.MessageType.ERROR)
-            else:
-                providers = self._picon_cz_downloader.providers
-                sats = ((self._sat_names.get(p, p), p, None, p, False) for p in providers)
        gen = self.append_satellites(view.get_model(), sats)
        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)

    def append_satellites(self, model, sats):
-        is_filter = self._satellite_filter_switch.get_active()
-        if model:
-            model.clear()
-
        try:
-            for sat in sorted(sats):
+            for sat in sats:
                pos = sat[1]
-                name = "{} ({})".format(sat[0], pos)
-                if is_filter and pos not in self._sat_positions:
-                    continue
-                if not model:
-                    return
-                yield model.append((name, sat[3], pos))
+                name, pos = "{} ({})".format(sat[0], pos), "{}{}".format("-" if pos[-1] == "W" else "", pos[:-1])
+
+                if not self._terminate and model:
+                    if pos in self._sat_positions:
+                        yield model.append((name, sat[3], pos))
        finally:
            self._satellite_label.show()

    def on_satellite_selection(self, view, path, column):
-        self.on_info_bar_close()
-        model = self._providers_view.get_model()
-        model.clear()
-        self._satellite_label.set_visible(False)
-        self.get_providers(view.get_model()[path][1], model)
-
-    @run_task
-    def get_providers(self, url, model):
-        if self._download_src is self.DownloadSource.LYNG_SAT:
-            providers = parse_providers(url)
-        elif self._download_src is self.DownloadSource.PICON_CZ:
-            providers = self._picon_cz_downloader.get_sat_providers(url)
-        else:
-            return
-
-        self.append_providers(providers or [], model)
+        model = view.get_model()
+        self._url_entry.set_text(model.get(model.get_iter(path), 1)[0])

    @run_idle
-    def append_providers(self, providers, model):
-        if self._download_src is self.DownloadSource.LYNG_SAT:
-            for p in providers:
-                model.append(p._replace(logo=self.get_pixbuf(p.logo) if p.logo else TV_ICON))
-        elif self._download_src is self.DownloadSource.PICON_CZ:
-            for p in providers:
-                logo_data = self._picon_cz_downloader.get_logo_data(p.ssid)
-                model.append(p._replace(logo=self.get_pixbuf(logo_data) if logo_data else TV_ICON))
+    def on_load_providers(self, item):
+        self._expander.set_expanded(True)
+        self.on_info_bar_close()
+        self._cancel_button.show()
+        url = self._url_entry.get_text()

-        self.update_receive_button_state()
-        GLib.idle_add(self._satellite_label.set_visible, True)
+        try:
+            self._current_process = subprocess.Popen(["wget", "-pkP", self._TMP_DIR, url],
+                                                     stdout=subprocess.PIPE,
+                                                     stderr=subprocess.PIPE,
+                                                     universal_newlines=True)
+        except FileNotFoundError as e:
+            self._cancel_button.hide()
+            self.show_info_message(str(e), Gtk.MessageType.ERROR)
+        else:
+            GLib.io_add_watch(self._current_process.stderr, GLib.IO_IN, self.write_to_buffer)
+            model = self._providers_view.get_model()
+            model.clear()
+            self.append_providers(url, model)

-    def get_pixbuf(self, img_data, w=48, h=32):
-        if img_data:
-            f = Gio.MemoryInputStream.new_from_data(img_data)
-            return GdkPixbuf.Pixbuf.new_from_stream_at_scale(f, w, h, True, None)
+    @run_task
+    def append_providers(self, url, model):
+        self._current_process.wait()
+        try:
+            self._terminate = False
+            providers = parse_providers(self._TMP_DIR + url[url.find("w"):])
+        except FileNotFoundError:
+            pass  # NOP
+        else:
+            if providers:
+                for p in providers:
+                    if self._terminate:
+                        return
+                    model.append((self.get_pixbuf(p[0]) if p[0] else TV_ICON, *p[1:]))
+            self.update_receive_button_state()
+        finally:
+            GLib.idle_add(self._cancel_button.hide)
+            self._terminate = False
+
+    def get_pixbuf(self, img_url):
+        return GdkPixbuf.Pixbuf.new_from_file_at_scale(filename=self._TMP_DIR + "www.lyngsat.com/" + img_url,
+                                                       width=48, height=48, preserve_aspect_ratio=True)

    def on_receive(self, item):
-        if self._is_downloading:
+        self._cancel_button.show()
+        self.start_download()
+
+    @run_task
+    def start_download(self):
+        if self._current_process.poll() is None:
            self.show_dialog("The task is already running!", DialogType.ERROR)
            return

+        self._terminate = False
+        self._expander.set_expanded(True)
+
        providers = self.get_selected_providers()
-
-        if self._download_src is self.DownloadSource.PICON_CZ and len(providers) > 1:
-            self.show_dialog("Please, select only one item!", DialogType.ERROR)
-            return
-
-        self._cancel_button.show()
-        self.start_download(providers)
-
-    @run_task
-    def start_download(self, providers):
-        self._is_downloading = True
-        GLib.idle_add(self._expander.set_expanded, True)
-
        for prv in providers:
-            if self._download_src is self.DownloadSource.LYNG_SAT and not self._POS_PATTERN.match(prv[2]):
+            if not self._POS_PATTERN.match(prv[2]):
                self.show_info_message(
                    get_message("Specify the correct position value for the provider!"), Gtk.MessageType.ERROR)
                scroll_to(prv.path, self._providers_view)
                return

        try:
-            picons_path = self._picons_dir_entry.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)
-
-            if self._download_src is self.DownloadSource.LYNG_SAT:
-                self.get_picons_for_lyngsat(picons_path, providers)
-            elif self._download_src is self.DownloadSource.PICON_CZ:
-                self.get_picons_for_picon_cz(picons_path, providers)
-
-            if not self._is_downloading:
-                return
+            for prv in providers:
+                if self._terminate:
+                    return
+                self.process_provider(Provider(*prv))

            if not self._resize_no_radio_button.get_active():
-                self.resize(picons_path)
+                self.resize(self._picons_dir_entry.get_text())
+            else:
+                self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
        finally:
            GLib.idle_add(self._cancel_button.hide)
-            self._is_downloading = False
+            self._terminate = False

-    def get_picons_for_lyngsat(self, path, providers):
-        import concurrent.futures
+    def process_provider(self, prv):
+        url = prv.url
+        self.show_info_message(get_message("Please, wait..."), Gtk.MessageType.INFO)
+        self._current_process = subprocess.Popen(["wget", "-pkP", self._TMP_DIR, url],
+                                                 stdout=subprocess.PIPE,
+                                                 stderr=subprocess.PIPE,
+                                                 universal_newlines=True)
+        GLib.io_add_watch(self._current_process.stderr, GLib.IO_IN, self.write_to_buffer)
+        self._current_process.wait()
+        path = self._TMP_DIR + (url[url.find("//") + 2:] if prv.single else self._BASE_URL + url[url.rfind("/") + 1:])
+        PiconsParser.parse(path, self._picons_dir_entry.get_text(),
+                           self._TMP_DIR, prv, self._picon_ids, self.get_picons_format())

-        with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
-            picons = []
-            # Getting links to picons.
-            futures = {executor.submit(self.process_provider, p, path): p for p in providers}
-            for future in concurrent.futures.as_completed(futures):
-                if not self._is_downloading:
-                    executor.shutdown()
-                    return
-
-                pic = future.result()
-                if pic:
-                    picons.extend(pic)
-            # Getting picon images.
-            futures = {executor.submit(download_picon, *pic, self.append_output): pic for pic in picons}
-            done, not_done = concurrent.futures.wait(futures, timeout=0)
-            while self._is_downloading and not_done:
-                done, not_done = concurrent.futures.wait(not_done, timeout=5)
-
-            for future in not_done:
-                future.cancel()
-            concurrent.futures.wait(not_done)
-            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
-
-    def get_picons_for_picon_cz(self, path, providers):
-        p_ids = None
-        if self._bouquet_filter_switch.get_active():
-            p_ids = self.get_bouquet_picon_ids()
-            if not p_ids:
-                return
-
-        try:
-            # We download it sequentially.
-            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.show_info_message(str(e), Gtk.MessageType.ERROR)
-        else:
-            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
-
-    def get_bouquet_picon_ids(self):
-        """ Returns picon ids for selected bouquet or None. """
-        bq_selected = self._app.check_bouquet_selection()
-        if not bq_selected:
-            return
-
-        model, paths = self._app.bouquets_view.get_selection().get_selected_rows()
-        if len(paths) > 1:
-            self.show_dialog("Please, select only one bouquet!", DialogType.ERROR)
-            return
-
-        fav_bouquet = self._app.current_bouquets[bq_selected]
-        services = self._app.current_services
-        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))
-        return PiconsParser.parse(prv, picons_path, self._picon_ids, self.get_picons_format())
+    def write_to_buffer(self, fd, condition):
+        if condition == GLib.IO_IN:
+            char = fd.read(1)
+            self.append_output(char)
+            return True
+        return False

    @run_idle
    def append_output(self, char):
@@ -775,7 +615,7 @@ class PiconsDialog:
            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)

    def on_cancel(self, item=None):
-        if self._is_downloading and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
+        if self.is_task_running() and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
            return True

        self.terminate_task()
@@ -783,16 +623,18 @@ class PiconsDialog:
    @run_task
    def terminate_task(self):
        self._terminate = True
-        self._is_downloading = False
-        self.show_info_message(get_message("The task is canceled!"), Gtk.MessageType.WARNING)
+
+        if self._current_process:
+            self._current_process.terminate()
+            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.save_window_size(window)
+        self.clean_data()
        self._app.update_picons()
        GLib.idle_add(self._dialog.destroy)

@@ -801,16 +643,22 @@ class PiconsDialog:
        height = size.height - self._text_view.get_allocated_height() - self._info_bar.get_allocated_height()
        self._settings.add("picons_downloader_window_size", (size.width, height))

+    @run_task
+    def clean_data(self):
+        path = self._TMP_DIR + "www.lyngsat.com"
+        if os.path.exists(path):
+            shutil.rmtree(path)
+
    @run_task
    def run_func(self, func, update=False):
        try:
            GLib.idle_add(self._expander.set_expanded, True)
-            GLib.idle_add(self._explorer_action_box.set_sensitive, False)
+            GLib.idle_add(self._header_download_box.set_sensitive, False)
            func()
        except OSError as e:
            self.show_info_message(str(e), Gtk.MessageType.ERROR)
        finally:
-            GLib.idle_add(self._explorer_action_box.set_sensitive, True)
+            GLib.idle_add(self._header_download_box.set_sensitive, True)
            if update:
                self.on_picons_dest_changed(self._explorer_dest_path_button)

@@ -819,10 +667,9 @@ class PiconsDialog:

    @run_idle
    def show_info_message(self, text, message_type):
-        self._info_bar.set_visible(False)
-        self._message_label.set_text(get_message(text))
-        self._info_bar.set_message_type(message_type)
        self._info_bar.set_visible(True)
+        self._info_bar.set_message_type(message_type)
+        self._message_label.set_text(get_message(text))

    def on_picons_dir_open(self, entry, icon, event_button):
        update_entry_data(entry, self._dialog, settings=self._settings)
@@ -890,7 +737,7 @@ class PiconsDialog:
            map(lambda s: s.picon_id, filter(lambda s: txt in s.service.upper(), self._app.current_services.values())))

    def on_picon_activated(self, view):
-        if self._info_toggle_button.get_active():
+        if self._info_check_button.get_active():
            model, path = view.get_selection().get_selected_rows()
            if not path:
                return
@@ -918,20 +765,6 @@ class PiconsDialog:
                                                       get_message("System"), srv.system, get_message("Freq"), srv.freq,
                                                       ref)

-    def on_view_query_tooltip(self, view, x, y, keyboard_mode, tooltip):
-        dest = view.get_dest_row_at_pos(x, y)
-        if not dest:
-            return False
-
-        path, pos = dest
-        model = view.get_model()
-        row = model[path][:]
-        tooltip.set_icon(get_picon_pixbuf(row[-1], size=self._settings.tooltip_logo_size))
-        tooltip.set_text(row[1])
-        view.set_tooltip_row(tooltip, path)
-
-        return True
-
    def on_tree_view_key_press(self, view, event):
        key_code = event.hardware_keycode
        if not KeyboardKey.value_exist(key_code):
@@ -944,7 +777,7 @@ class PiconsDialog:
    def on_url_changed(self, entry):
        suit = self._PATTERN.search(entry.get_text())
        entry.set_name("GtkEntry" if suit else "digit-entry")
-        self._download_source_button.set_sensitive(suit if suit else False)
+        self._load_providers_button.set_sensitive(suit if suit else False)

    def on_position_edited(self, render, path, value):
        model = self._providers_view.get_model()
@@ -954,9 +787,9 @@ class PiconsDialog:
    def on_visible_page(self, stack: Gtk.Stack, param):
        name = stack.get_visible_child_name()
        self._convert_button.set_visible(name == "converter")
-        self._download_source_button.set_visible(name == "downloader")
+        self._load_providers_button.set_visible(name == "downloader")
        is_explorer = name == "explorer"
-        self._explorer_action_box.set_visible(is_explorer)
+        self._filter_button.set_visible(is_explorer)
        if is_explorer:
            self.on_picons_dest_changed(self._explorer_dest_path_button)

@@ -1001,6 +834,9 @@ class PiconsDialog:

        return picon_format

+    def is_task_running(self):
+        return self._current_process and self._current_process.poll() is None
+

 if __name__ == "__main__":
    pass
--- a/app/ui/satellites_dialog.glade
+++ b/app/ui/satellites_dialog.glade
--- a/app/ui/satellites_dialog.py
+++ b/app/ui/satellites_dialog.py
@@ -9,10 +9,10 @@ from app.commons import run_idle, run_task, log
 from app.eparser import get_satellites, write_satellites, Satellite, Transponder
 from app.eparser.ecommons import PLS_MODE, get_key_by_value
 from app.tools.satellites import SatellitesParser, SatelliteSource, ServicesParser
-from .dialogs import show_dialog, DialogType, get_chooser_dialog, get_message, get_builder
+from .dialogs import show_dialog, DialogType, get_dialogs_string, get_chooser_dialog, get_message
 from .main_helper import move_items, scroll_to, append_text_to_tview, get_base_model, on_popup_menu
 from .search import SearchProvider
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, MOVE_KEYS, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, MOVE_KEYS, KeyboardKey, IS_GNOME_SESSION, MOD_MASK

 _UI_PATH = UI_RESOURCES_PATH + "satellites_dialog.glade"

@@ -44,10 +44,12 @@ class SatellitesDialog:
                    "on_resize": self.on_resize,
                    "on_quit": self.on_quit}

-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("satellites_editor_window", "satellites_tree_store", "popup_menu",
-                                       "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2",
-                                       "sat_editor_save_image", "sat_editor_update_image"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH),
+                                        ("satellites_editor_window", "satellites_tree_store", "popup_menu",
+                                         "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2"))
+        builder.connect_signals(handlers)

        self._window = builder.get_object("satellites_editor_window")
        self._window.set_transient_for(transient)
@@ -251,22 +253,13 @@ class SatellitesDialog:

        return paths

-    @run_idle
-    def on_remove(self, view):
-        """ Removal of selected satellites and transponders.
-
-            The satellites are removed first! Then transponders.
-        """
+    @staticmethod
+    def on_remove(view):
        selection = view.get_selection()
        model, paths = selection.get_selected_rows()
-        itrs = [model.get_iter(path) for path in paths]
-        satellites = list(filter(model.iter_has_child, itrs))
-        if len(satellites):
-            # Removing selected satellites.
-            list(map(model.remove, satellites))
-        else:
-            # Removing selected transponders.
-            list(map(model.remove, itrs))
+
+        for itr in [model.get_iter(path) for path in paths]:
+            model.remove(itr)

    @run_idle
    def on_save(self, view):
@@ -313,8 +306,13 @@ class TransponderDialog:
    def __init__(self, transient, transponder: Transponder = None):

        handlers = {"on_entry_changed": self.on_entry_changed}
-        objects = ("transponder_dialog", "pol_store", "fec_store", "mod_store", "system_store", "pls_mode_store")
-        builder = get_builder(_UI_PATH, handlers, use_str=True, objects=objects)
+
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("transponder_dialog", "pol_store", "fec_store", "mod_store", "system_store",
+                                         "pls_mode_store"))
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("transponder_dialog")
        self._dialog.set_transient_for(transient)
@@ -393,7 +391,10 @@ class SatelliteDialog:
    """ Shows dialog for adding or edit satellite """

    def __init__(self, transient, satellite: Satellite = None):
-        builder = get_builder(_UI_PATH, use_str=True, objects=("satellite_dialog", "side_store", "pos_adjustment"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("satellite_dialog", "side_store", "pos_adjustment"))

        self._dialog = builder.get_object("satellite_dialog")
        self._dialog.set_transient_for(transient)
@@ -455,13 +456,14 @@ class UpdateDialog:
        self._parser = None
        self._size_name = "{}_window_size".format("_".join(re.findall("[A-Z][^A-Z]*", self.__class__.__name__))).lower()

-        builder = get_builder(UI_RESOURCES_PATH + "satellites_dialog.glade", handlers,
-                              objects=("satellites_update_window", "update_source_store", "update_sat_list_store",
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_file(UI_RESOURCES_PATH + "satellites_dialog.glade",
+                                      ("satellites_update_window", "update_source_store", "update_sat_list_store",
                                       "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"))
+                                       "remove_selection_image", "update_transponder_store", "update_service_store"))
+        builder.connect_signals(handlers)

        self._window = builder.get_object("satellites_update_window")
        self._window.set_transient_for(transient)
@@ -527,13 +529,7 @@ class UpdateDialog:

    @run_task
    def get_sat_list(self, src, callback):
-        sat_src = SatelliteSource.FLYSAT
-        if src == 1:
-            sat_src = SatelliteSource.LYNGSAT
-        elif src == 2:
-            sat_src = SatelliteSource.KINGOFSAT
-
-        sats = self._parser.get_satellites_list(sat_src)
+        sats = self._parser.get_satellites_list(SatelliteSource.FLYSAT if src == 0 else SatelliteSource.LYNGSAT)
        if sats:
            callback(sats)
        self.is_download = False
@@ -732,8 +728,8 @@ class ServicesUpdateDialog(UpdateDialog):
        self._services_parser = ServicesParser(source=SatelliteSource.LYNGSAT)

        self._transponder_paned.set_visible(True)
-        self._source_box.remove(0)
-        self._source_box.remove(1)
+        s_model = self._source_box.get_model()
+        s_model.remove(s_model.get_iter_first())
        self._source_box.set_active(0)
        # Transponder view popup menu
        tr_popup_menu = Gtk.Menu()
@@ -827,10 +823,9 @@ class ServicesUpdateDialog(UpdateDialog):
        appender.send("Consumed: {:0.0f}s, {} services received.".format(time.time() - start, len(services)))

        try:
-            from app.eparser.enigma.lamedb import LameDbReader
+            from app.eparser.enigma.lamedb import get_services_lines, get_services_list
            # Used for double checking!
-            reader = LameDbReader(path=None)
-            srvs = reader.get_services_list("".join(reader.get_services_lines(services)))
+            srvs = get_services_list("".join(get_services_lines(services)))
        except ValueError as e:
            log("ServicesUpdateDialog [on receive data] error: {}".format(e))
        else:
--- a/app/ui/service_details_dialog.glade
+++ b/app/ui/service_details_dialog.glade
@@ -1,38 +1,7 @@
 <?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
-
-->
+<!-- Generated with glade 3.22.1 -->
 <interface>
  <requires lib="gtk+" version="3.16"/>
-  <!-- interface-license-type mit -->
-  <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellite list editor for GNU/Linux. -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
-  <!-- interface-authors Dmitriy Yefremov -->
  <object class="GtkListStore" id="fec_list_store">
    <columns>
      <!-- column-name fec -->
@@ -40,53 +9,40 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
      </row>
      <row>
-        <col id="0">1/2</col>
+        <col id="0" translatable="yes">1/2</col>
      </row>
      <row>
        <col id="0" translatable="yes">2/3</col>
      </row>
      <row>
-        <col id="0">3/4</col>
+        <col id="0" translatable="yes">3/4</col>
      </row>
      <row>
-        <col id="0">5/6</col>
+        <col id="0" translatable="yes">5/6</col>
      </row>
      <row>
-        <col id="0">7/8</col>
+        <col id="0" translatable="yes">7/8</col>
      </row>
      <row>
-        <col id="0">8/9</col>
+        <col id="0" translatable="yes">8/9</col>
      </row>
      <row>
-        <col id="0">3/5</col>
+        <col id="0" translatable="yes">3/5</col>
      </row>
      <row>
-        <col id="0">4/5</col>
+        <col id="0" translatable="yes">4/5</col>
      </row>
      <row>
-        <col id="0">6/7</col>
+        <col id="0" translatable="yes">6/7</col>
      </row>
      <row>
-        <col id="0">9/10</col>
+        <col id="0" translatable="yes">9/10</col>
      </row>
    </data>
  </object>
-  <object class="GtkComboBox" id="rate_lp_combo_box">
-    <property name="visible">True</property>
-    <property name="sensitive">False</property>
-    <property name="can_focus">False</property>
-    <property name="model">fec_list_store</property>
-    <property name="id_column">0</property>
-    <child>
-      <object class="GtkCellRendererText" id="rate_lp_cellrenderertext"/>
-      <attributes>
-        <attribute name="text">0</attribute>
-      </attributes>
-    </child>
-  </object>
  <object class="GtkListStore" id="invertion_list_store">
    <columns>
      <!-- column-name invertion -->
@@ -94,13 +50,13 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">Off</col>
+        <col id="0" translatable="yes">Off</col>
      </row>
      <row>
-        <col id="0">On</col>
+        <col id="0" translatable="yes">On</col>
      </row>
      <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
      </row>
    </data>
  </object>
@@ -111,19 +67,19 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
      </row>
      <row>
-        <col id="0">QPSK</col>
+        <col id="0" translatable="yes">QPSK</col>
      </row>
      <row>
-        <col id="0">8PSK</col>
+        <col id="0" translatable="yes">8PSK</col>
      </row>
      <row>
-        <col id="0">16APSK</col>
+        <col id="0" translatable="yes">16APSK</col>
      </row>
      <row>
-        <col id="0">32APSK</col>
+        <col id="0" translatable="yes">32APSK</col>
      </row>
    </data>
  </object>
@@ -134,13 +90,13 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">Off</col>
+        <col id="0" translatable="yes">Off</col>
      </row>
      <row>
-        <col id="0">On</col>
+        <col id="0" translatable="yes">On</col>
      </row>
      <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
      </row>
    </data>
  </object>
@@ -151,13 +107,13 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">Root</col>
+        <col id="0" translatable="yes">Root</col>
      </row>
      <row>
-        <col id="0">Gold</col>
+        <col id="0" translatable="yes">Gold</col>
      </row>
      <row>
-        <col id="0">Combo</col>
+        <col id="0" translatable="yes">Combo</col>
      </row>
    </data>
  </object>
@@ -168,16 +124,16 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">H</col>
+        <col id="0" translatable="yes">H</col>
      </row>
      <row>
-        <col id="0">V</col>
+        <col id="0" translatable="yes">V</col>
      </row>
      <row>
-        <col id="0">R</col>
+        <col id="0" translatable="yes">R</col>
      </row>
      <row>
-        <col id="0">L</col>
+        <col id="0" translatable="yes">L</col>
      </row>
    </data>
  </object>
@@ -188,20 +144,21 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">35%</col>
+        <col id="0" translatable="yes">35%</col>
      </row>
      <row>
-        <col id="0">25%</col>
+        <col id="0" translatable="yes">25%</col>
      </row>
      <row>
-        <col id="0">20%</col>
+        <col id="0" translatable="yes">20%</col>
      </row>
      <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
      </row>
    </data>
  </object>
  <object class="GtkAdjustment" id="sat_pos_adjustment">
+    <property name="lower">-180</property>
    <property name="upper">180</property>
    <property name="step_increment">0.10000000000000001</property>
    <property name="page_increment">10</property>
@@ -253,13 +210,26 @@ Author: Dmitriy Yefremov
    </columns>
    <data>
      <row>
-        <col id="0">DVB-S</col>
+        <col id="0" translatable="yes">DVB-S</col>
      </row>
      <row>
-        <col id="0">DVB-S2</col>
+        <col id="0" translatable="yes">DVB-S2</col>
      </row>
    </data>
  </object>
+  <object class="GtkComboBox" id="rate_lp_combo_box">
+    <property name="visible">True</property>
+    <property name="sensitive">False</property>
+    <property name="can_focus">False</property>
+    <property name="model">fec_list_store</property>
+    <property name="id_column">0</property>
+    <child>
+      <object class="GtkCellRendererText" id="rate_lp_cellrenderertext"/>
+      <attributes>
+        <attribute name="text">0</attribute>
+      </attributes>
+    </child>
+  </object>
  <object class="GtkDialog" id="service_details_dialog">
    <property name="use-header-bar">{use_header}</property>
    <property name="can_focus">False</property>
@@ -276,6 +246,40 @@ Author: Dmitriy Yefremov
    <child type="titlebar">
      <placeholder/>
    </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Cancel</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="apply_button">
+        <property name="label">gtk-save</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="use_stock">True</property>
+        <property name="always_show_image">True</property>
+        <signal name="clicked" handler="on_save" swapped="no"/>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="create_button">
+        <property name="label">gtk-new</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="use_stock">True</property>
+        <property name="always_show_image">True</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>
@@ -286,55 +290,6 @@ Author: Dmitriy Yefremov
        <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="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>
@@ -359,7 +314,7 @@ Author: Dmitriy Yefremov
                <property name="margin_right">5</property>
                <property name="margin_bottom">5</property>
                <property name="orientation">vertical</property>
-                <property name="spacing">5</property>
+                <property name="spacing">2</property>
                <child>
                  <object class="GtkGrid" id="srv_grid">
                    <property name="visible">True</property>
@@ -380,7 +335,7 @@ Author: Dmitriy Yefremov
                      <object class="GtkEntry" id="name_entry">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                      </object>
                      <packing>
                        <property name="left_attach">0</property>
@@ -402,7 +357,7 @@ Author: Dmitriy Yefremov
                      <object class="GtkEntry" id="package_entry">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                      </object>
                      <packing>
                        <property name="left_attach">1</property>
@@ -426,7 +381,7 @@ Author: Dmitriy Yefremov
                        <property name="can_focus">True</property>
                        <property name="width_chars">10</property>
                        <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                        <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                        <signal name="key-release-event" handler="update_reference" swapped="no"/>
                      </object>
@@ -471,7 +426,7 @@ Author: Dmitriy Yefremov
                            <property name="can_focus">True</property>
                            <property name="width_chars">7</property>
                            <property name="max_width_chars">7</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                            <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                            <signal name="changed" handler="update_reference" swapped="no"/>
                          </object>
@@ -821,14 +776,10 @@ Author: Dmitriy Yefremov
                  <object class="GtkBox" id="flags_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="spacing">10</property>
                    <child>
                      <object class="GtkGrid" id="flags_grid">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">10</property>
                        <property name="column_spacing">2</property>
                        <child>
                          <object class="GtkLabel" id="flags_label">
@@ -901,47 +852,6 @@ Author: Dmitriy Yefremov
                        <property name="position">0</property>
                      </packing>
                    </child>
-                    <child>
-                      <object class="GtkBox" id="extra_flags_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkLabel" id="extra_pids_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Extra:</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="extra_pids_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">20</property>
-                            <property name="max_width_chars">20</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
-                            <property name="placeholder_text">c:000000,etc.</property>
-                            <signal name="changed" handler="on_extra_pids_entry_changed" swapped="no"/>
-                          </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="pack_type">end</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                    <child>
                      <object class="GtkGrid" id="caids_grid">
                        <property name="visible">True</property>
@@ -952,9 +862,9 @@ Author: Dmitriy Yefremov
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="tooltip_text">C:0000,C:a1b2,etc.</property>
-                            <property name="width_chars">20</property>
-                            <property name="max_width_chars">20</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="width_chars">15</property>
+                            <property name="max_width_chars">26</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                            <property name="placeholder_text" translatable="yes">C:0000,C:a1b2,etc.</property>
                            <signal name="changed" handler="on_cas_entry_changed" swapped="no"/>
                          </object>
@@ -979,7 +889,7 @@ Author: Dmitriy Yefremov
                        <property name="expand">False</property>
                        <property name="fill">True</property>
                        <property name="pack_type">end</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                      </packing>
                    </child>
                  </object>
@@ -1057,7 +967,7 @@ Author: Dmitriy Yefremov
                        <property name="can_focus">True</property>
                        <property name="width_chars">12</property>
                        <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                        <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                      </object>
                      <packing>
@@ -1083,7 +993,7 @@ Author: Dmitriy Yefremov
                        <property name="can_focus">True</property>
                        <property name="width_chars">12</property>
                        <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                        <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                      </object>
                      <packing>
@@ -1162,7 +1072,7 @@ Author: Dmitriy Yefremov
                        <property name="can_focus">True</property>
                        <property name="width_chars">12</property>
                        <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                        <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                        <signal name="key-release-event" handler="update_reference" swapped="no"/>
                      </object>
@@ -1182,6 +1092,21 @@ Author: Dmitriy Yefremov
                        <property name="top_attach">0</property>
                      </packing>
                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="sat_pos_button">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="input_purpose">number</property>
+                        <property name="adjustment">sat_pos_adjustment</property>
+                        <property name="digits">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                    <child>
                      <object class="GtkLabel" id="tid_label">
                        <property name="visible">True</property>
@@ -1200,7 +1125,7 @@ Author: Dmitriy Yefremov
                        <property name="can_focus">True</property>
                        <property name="width_chars">8</property>
                        <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                        <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                        <signal name="key-release-event" handler="update_reference" swapped="no"/>
                      </object>
@@ -1227,7 +1152,7 @@ Author: Dmitriy Yefremov
                        <property name="can_focus">True</property>
                        <property name="width_chars">8</property>
                        <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                        <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                        <signal name="key-release-event" handler="update_reference" swapped="no"/>
                      </object>
@@ -1236,50 +1161,6 @@ Author: Dmitriy Yefremov
                        <property name="top_attach">1</property>
                      </packing>
                    </child>
-                    <child>
-                      <object class="GtkBox" id="sat_pos_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">1</property>
-                        <child>
-                          <object class="GtkSpinButton" id="sat_pos_button">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="input_purpose">number</property>
-                            <property name="adjustment">sat_pos_adjustment</property>
-                            <property name="digits">1</property>
-                            <property name="numeric">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="pos_side_box">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
-                            <property name="active">0</property>
-                            <items>
-                              <item id="E">E</item>
-                              <item id="W">W</item>
-                            </items>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
                  </object>
                  <packing>
                    <property name="expand">False</property>
@@ -1436,7 +1317,7 @@ Author: Dmitriy Yefremov
                            <property name="can_focus">True</property>
                            <property name="width_chars">8</property>
                            <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                            <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                          </object>
                          <packing>
@@ -1462,7 +1343,7 @@ Author: Dmitriy Yefremov
                            <property name="can_focus">True</property>
                            <property name="width_chars">8</property>
                            <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                            <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                          </object>
                          <packing>
@@ -1488,7 +1369,7 @@ Author: Dmitriy Yefremov
                            <property name="can_focus">True</property>
                            <property name="width_chars">8</property>
                            <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                            <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                          </object>
                          <packing>
@@ -1617,7 +1498,7 @@ Author: Dmitriy Yefremov
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="margin_left">10</property>
-                        <property name="icon_name">document-edit-symbolic</property>
+                        <property name="stock">gtk-edit</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@@ -1645,6 +1526,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>
@@ -1678,6 +1562,26 @@ Author: Dmitriy Yefremov
    <child>
      <placeholder/>
    </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_no_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_ok_button">
+        <property name="label">gtk-ok</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
    <child internal-child="vbox">
      <object class="GtkBox" id="tr_services_dialog_vbox">
        <property name="can_focus">False</property>
@@ -1686,35 +1590,6 @@ Author: Dmitriy Yefremov
        <child internal-child="action_area">
          <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>
@@ -1741,7 +1616,7 @@ Author: Dmitriy Yefremov
                    <property name="margin_right">20</property>
                    <property name="margin_top">5</property>
                    <property name="margin_bottom">5</property>
-                    <property name="label" translatable="yes">Changes will be applied to all services of this transponder!
+                     <property name="label" translatable="yes">Changes will be applied to all services of this transponder!
 Continue?</property>
                    <property name="justify">center</property>
                    <property name="lines">2</property>
--- a/app/ui/service_details_dialog.py
+++ b/app/ui/service_details_dialog.py
@@ -1,44 +1,16 @@
-# -*- 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

-from app.commons import run_idle, log
+from app.commons import run_idle
 from app.eparser import Service
 from app.eparser.ecommons import (MODULATION, Inversion, ROLL_OFF, Pilot, Flag, Pids, POLARIZATION, get_key_by_value,
                                  get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE, T_MODULATION, C_MODULATION,
                                  TrType, SystemCable, T_SYSTEM, BANDWIDTH, TRANSMISSION_MODE, GUARD_INTERVAL, T_FEC,
-                                  HIERARCHY, A_MODULATION)
+                                  HIERARCHY)
 from app.settings import SettingsType
-from .dialogs import show_dialog, DialogType, Action, get_builder
+from .dialogs import show_dialog, DialogType, Action, get_dialogs_string
 from .main_helper import get_base_model
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, CODED_ICON, Column
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, TEXT_DOMAIN, CODED_ICON, Column, IS_GNOME_SESSION

 _UI_PATH = UI_RESOURCES_PATH + "service_details_dialog.glade"

@@ -70,18 +42,19 @@ class ServiceDetailsDialog:
                    "on_tr_edit_toggled": self.on_tr_edit_toggled,
                    "update_reference": self.update_reference,
                    "on_cas_entry_changed": self.on_cas_entry_changed,
-                    "on_extra_pids_entry_changed": self.on_extra_pids_entry_changed,
                    "on_digit_entry_changed": self.on_digit_entry_changed,
-                    "on_non_empty_entry_changed": self.on_non_empty_entry_changed,
-                    "on_cancel": lambda item: self._dialog.destroy()}
+                    "on_non_empty_entry_changed": self.on_non_empty_entry_changed}

-        builder = get_builder(_UI_PATH, handlers, use_str=True)
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION))
+        builder.connect_signals(handlers)
        self._builder = builder

        self._dialog = builder.get_object("service_details_dialog")
        self._dialog.set_transient_for(transient)
        self._s_type = settings.setting_type
-        self._tr_type = TrType.Satellite
+        self._tr_type = None
        self._satellites_xml_path = settings.data_local_path + "satellites.xml"
        self._picons_dir_path = settings.picons_local_path
        self._services_view = srv_view
@@ -98,7 +71,6 @@ class ServiceDetailsDialog:
        self._DIGIT_PATTERN = re.compile("\\D")
        self._NON_EMPTY_PATTERN = re.compile("(?:^[\\s]*$|\\D)")
        self._CAID_PATTERN = re.compile("(?:^[\\s]*$)|(C:[0-9a-fA-F]{1,4})(,C:[0-9a-fA-F]{1,4})*")
-        self._PIDS_PATTERN = re.compile("(?:^[\\s]*$)|(c:[0-9]{2}[0-9a-fA-F]{4})(,c:[0-9]{2}[0-9a-fA-F]{4})*")
        # Buttons
        self._apply_button = builder.get_object("apply_button")
        self._create_button = builder.get_object("create_button")
@@ -134,7 +106,6 @@ class ServiceDetailsDialog:
        self._stream_id_entry = self._digit_elements.get("stream_id_entry")
        self._tr_flag_entry = self._digit_elements.get("tr_flag_entry")
        self._namespace_entry = self._non_empty_elements.get("namespace_entry")
-        self._extra_pids_entry = builder.get_object("extra_pids_entry")
        # Service elements
        self._name_entry = builder.get_object("name_entry")
        self._package_entry = builder.get_object("package_entry")
@@ -149,7 +120,6 @@ class ServiceDetailsDialog:
        self._pids_grid = builder.get_object("pids_grid")
        # Transponder elements
        self._sat_pos_button = builder.get_object("sat_pos_button")
-        self._pos_side_box = builder.get_object("pos_side_box")
        self._pol_combo_box = builder.get_object("pol_combo_box")
        self._fec_combo_box = builder.get_object("fec_combo_box")
        self._rate_lp_combo_box = builder.get_object("rate_lp_combo_box")
@@ -167,7 +137,7 @@ class ServiceDetailsDialog:
        self._TRANSPONDER_ELEMENTS = (self._sat_pos_button, self._pol_combo_box, self._invertion_combo_box,
                                      self._sys_combo_box, self._freq_entry, self._transponder_id_entry,
                                      self._network_id_entry, self._namespace_entry, self._fec_combo_box,
-                                      self._rate_entry, self._rate_lp_combo_box, self._pos_side_box)
+                                      self._rate_entry, self._rate_lp_combo_box)

        if self._action is Action.EDIT:
            self.update_data_elements()
@@ -175,7 +145,12 @@ class ServiceDetailsDialog:
            self.init_default_data_elements()

    def show(self):
-        self._dialog.show()
+        response = self._dialog.run()
+        if response == Gtk.ResponseType.OK:
+            pass
+        self._dialog.destroy()
+
+        return response

    @run_idle
    def init_default_data_elements(self):
@@ -234,8 +209,6 @@ class ServiceDetailsDialog:
            self.update_ui_for_terrestrial()
        elif self._tr_type is TrType.Cable:
            self.update_ui_for_cable()
-        elif self._tr_type is TrType.ATSC:
-            self.update_ui_for_atsc()
        else:
            self.set_sat_positions(srv.pos)

@@ -275,7 +248,6 @@ class ServiceDetailsDialog:
    def init_enigma2_pids(self, flags):
        pids = list(filter(lambda x: x.startswith("c:"), flags))
        if pids:
-            extra_pids = []
            for pid in pids:
                if pid.startswith(Pids.VIDEO.value):
                    self._video_pid_entry.set_text(str(int(pid[4:], 16)))
@@ -288,19 +260,15 @@ class ServiceDetailsDialog:
                elif pid.startswith(Pids.AC3.value):
                    self._ac3_pid_entry.set_text(str(int(pid[4:], 16)))
                elif pid.startswith(Pids.VIDEO_TYPE.value):
-                    extra_pids.append(pid)
+                    pass
                elif pid.startswith(Pids.AUDIO_CHANNEL.value):
-                    extra_pids.append(pid)
+                    pass
                elif pid.startswith(Pids.BIT_STREAM_DELAY.value):
                    self._bitstream_entry.set_text(str(int(pid[4:], 16)))
                elif pid.startswith(Pids.PCM_DELAY.value):
                    self._pcm_entry.set_text(str(int(pid[4:], 16)))
                elif pid.startswith(Pids.SUBTITLE.value):
-                    extra_pids.append(pid)
-                else:
-                    extra_pids.append(pid)
-
-            self._extra_pids_entry.set_text(",".join(extra_pids))
+                    pass

    def init_enigma2_transponder_data(self, srv):
        """ Transponder data initialisation """
@@ -342,11 +310,6 @@ class ServiceDetailsDialog:
            self.select_active_text(self._pls_mode_combo_box, HIERARCHY.get(tr_data[7]))
            self.select_active_text(self._invertion_combo_box, Inversion(tr_data[8]).name)
            self.select_active_text(self._sys_combo_box, T_SYSTEM.get(tr_data[9]))
-        elif tr_type is TrType.ATSC:
-            self._sys_combo_box.set_active(0)
-            self.select_active_text(self._mod_combo_box, A_MODULATION.get(tr_data[2]))
-            self.select_active_text(self._invertion_combo_box, Inversion(tr_data[1]).name)
-
        # Should be called last to properly initialize the reference
        self._srv_type_entry.set_text(data[4])

@@ -373,8 +336,7 @@ class ServiceDetailsDialog:

    def set_sat_positions(self, sat_pos):
        """ Sat positions initialisation """
-        self._sat_pos_button.set_value(float(sat_pos[:-1]))
-        self._pos_side_box.set_active_id(sat_pos[-1:])
+        self._sat_pos_button.set_value(float(sat_pos))

    def on_system_changed(self, box):
        if not self._tr_edit_switch.get_active():
@@ -414,19 +376,18 @@ class ServiceDetailsDialog:
        if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
            return

-        if self.on_edit() if self._action is Action.EDIT else self.on_new():
-            self._dialog.destroy()
+        self.on_edit() if self._action is Action.EDIT else self.on_new()
+        self._dialog.destroy()

    def on_new(self):
        """ Create new service. """
        service = self.get_service(*self.get_srv_data(), self.get_satellite_transponder_data())
        show_dialog(DialogType.ERROR, transient=self._dialog, text="Not implemented yet!")
-        return True

    def on_edit(self):
        """ Edit current service.  """
        fav_id, data_id = self.get_srv_data()
-        # Transponder
+        # transponder
        transponder = self._old_service.transponder
        if self._tr_edit_switch.get_active():
            try:
@@ -436,24 +397,17 @@ class ServiceDetailsDialog:
                    transponder = self.get_terrestrial_transponder_data()
                elif self._tr_type is TrType.Cable:
                    transponder = self.get_cable_transponder_data()
-                elif self._tr_type is TrType.ATSC:
-                    transponder = self.get_atsc_transponder_data()
            except Exception as e:
-                log("Edit service error: {}".format(e))
+                print(e)
                show_dialog(DialogType.ERROR, transient=self._dialog, text="Error getting transponder parameters!")
            else:
                if self._transponder_services_iters:
-                    self.update_transponder_services(transponder, self.get_sat_position())
-        # Service
+                    self.update_transponder_services(transponder)
+        # service
        service = self.get_service(fav_id, data_id, transponder)
        old_fav_id = self._old_service.fav_id
        if old_fav_id != fav_id:
-            if fav_id in self._services:
-                msg = "{}\n\n\t{}".format("A similar service is already in this list!", "Are you sure?")
-                if show_dialog(DialogType.QUESTION, transient=self._dialog, text=msg) != Gtk.ResponseType.OK:
-                    return False
            self.update_bouquets(fav_id, old_fav_id)
-
        self._services[fav_id] = service

        if self._old_service.picon_id != service.picon_id:
@@ -461,7 +415,7 @@ class ServiceDetailsDialog:

        flags = service.flags_cas
        extra_data = {Column.SRV_TOOLTIP: None, Column.SRV_BACKGROUND: None}
-        if self._s_type is SettingsType.ENIGMA_2 and flags:
+        if flags:
            f_flags = list(filter(lambda x: x.startswith("f:"), flags.split(",")))
            if f_flags and Flag.is_new(int(f_flags[0][2:])):
                extra_data[Column.SRV_BACKGROUND] = self._new_color
@@ -470,7 +424,6 @@ class ServiceDetailsDialog:
        self._current_model.set(self._current_itr, {i: v for i, v in enumerate(service)})
        self.update_fav_view(self._old_service, service)
        self._old_service = service
-        return True

    def update_bouquets(self, fav_id, old_fav_id):
        self._services.pop(old_fav_id, None)
@@ -538,9 +491,7 @@ class ServiceDetailsDialog:
        if self._s_type is SettingsType.ENIGMA_2:
            return self.get_enigma2_flags()
        elif self._s_type is SettingsType.NEUTRINO_MP:
-            flags = self._old_service.flags_cas.split(":")
-            flags[1] = self.get_sat_position()
-            return ":".join(flags)
+            return self._old_service.flags_cas

    def get_enigma2_flags(self):
        flags = ["p:{}".format(self._package_entry.get_text())]
@@ -570,9 +521,6 @@ class ServiceDetailsDialog:
        pcm_pid = self._pcm_entry.get_text()
        if pcm_pid:
            flags.append("{}{:04x}".format(Pids.PCM_DELAY.value, int(pcm_pid)))
-        extra_pids = self._extra_pids_entry.get_text()
-        if extra_pids:
-            flags.append(extra_pids)
        # flags
        f_flags = Flag.KEEP.value if self._keep_check_button.get_active() else 0
        f_flags = f_flags + Flag.HIDE.value if self._hide_check_button.get_active() else f_flags
@@ -595,9 +543,7 @@ class ServiceDetailsDialog:
            return fav_id, data_id
        elif self._s_type is SettingsType.NEUTRINO_MP:
            fav_id = self._NEUTRINO_FAV_ID.format(tr_id, net_id, ssid)
-            data_id = self._old_service.data_id.split(":")
-            data_id[1] = "{:x}".format(int(service_type))
-            return fav_id, ":".join(data_id)
+            return fav_id, self._old_service.data_id

    # ***************** Transponder ********************* #

@@ -605,27 +551,27 @@ class ServiceDetailsDialog:
        freq = self._freq_entry.get_text()
        fec = self._fec_combo_box.get_active_id()
        system = self._sys_combo_box.get_active_id()
-        o_srv = self._old_service

        if self._tr_type is TrType.Satellite or self._s_type is SettingsType.NEUTRINO_MP:
            freq = self._freq_entry.get_text()
            rate = self._rate_entry.get_text()
            pol = self._pol_combo_box.get_active_id()
-            pos = "{}{}".format(round(self._sat_pos_button.get_value(), 1), self._pos_side_box.get_active_id())
+            pos = str(round(self._sat_pos_button.get_value(), 1))
            return freq, rate, pol, fec, system, pos
-        elif self._tr_type in (TrType.Terrestrial, TrType.ATSC):
+        elif self._tr_type is TrType.Terrestrial:
+            o_srv = self._old_service
            return freq, o_srv.rate, o_srv.pol, fec, system, o_srv.pos
        elif self._tr_type is TrType.Cable:
+            o_srv = self._old_service
            return freq, self._rate_entry.get_text(), o_srv.pol, fec, o_srv.system, o_srv.pos

    def get_satellite_transponder_data(self):
        sys = self._sys_combo_box.get_active_id()
-        freq = "{}000".format(self._freq_entry.get_text())
-        rate = "{}000".format(self._rate_entry.get_text())
+        freq = self._freq_entry.get_text()
+        rate = self._rate_entry.get_text()
        pol = self.get_value_from_combobox_id(self._pol_combo_box, POLARIZATION)
        fec = self.get_value_from_combobox_id(self._fec_combo_box, FEC_DEFAULT)
-        sat_pos = self.get_sat_position()
-
+        sat_pos = str(round(self._sat_pos_button.get_value(), 1)).replace(".", "")
        inv = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
        srv_sys = "0"  # !!!

@@ -649,17 +595,12 @@ class ServiceDetailsDialog:
            srv_sys = None
            return self._NEUTRINO_TRANSPONDER_DATA.format(tr_id, on_id, freq, inv, rate, fec, pol, mod, srv_sys)

-    def get_sat_position(self):
-        sat_pos = self._sat_pos_button.get_value() * (-1 if self._pos_side_box.get_active_id() == "W" else 1)
-        sat_pos = str(round(sat_pos, 1)).replace(".", "")
-        return sat_pos
-
    def get_terrestrial_transponder_data(self):
        tr_data = re.split("\s|:", self._old_service.transponder)
        # frequency, bandwidth, code rate HP, code rate LP, modulation, transmission mode, guard interval, hierarchy,
        # inversion, system, plp_id
        # Bandwidth -> Pol, Rate HP -> FEC, TransmissionMode -> Roll off, GuardInterval -> Pilot, Hierarchy -> Pls Mode
-        tr_data[1] = "{}000".format(self._freq_entry.get_text())
+        tr_data[1] = self._freq_entry.get_text()
        tr_data[2] = self.get_value_from_combobox_id(self._pol_combo_box, BANDWIDTH)
        tr_data[3] = self.get_value_from_combobox_id(self._fec_combo_box, T_FEC)
        tr_data[4] = self.get_value_from_combobox_id(self._rate_lp_combo_box, T_FEC)
@@ -669,50 +610,28 @@ class ServiceDetailsDialog:
        tr_data[8] = self.get_value_from_combobox_id(self._pls_mode_combo_box, HIERARCHY)
        tr_data[9] = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
        tr_data[10] = self.get_value_from_combobox_id(self._sys_combo_box, T_SYSTEM)
-
        return "{} {}".format(tr_data[0], ":".join(tr_data[1:]))

    def get_cable_transponder_data(self):
        tr_data = re.split("\s|:", self._old_service.transponder)
        # frequency, symbol_rate, modulation, inversion, fec_inner, system;
-        tr_data[1] = "{}000".format(self._freq_entry.get_text())
-        tr_data[2] = "{}000".format(self._rate_entry.get_text())
+        tr_data[1] = self._freq_entry.get_text()
+        tr_data[2] = self._rate_entry.get_text()
        tr_data[3] = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
        tr_data[4] = self.get_value_from_combobox_id(self._mod_combo_box, C_MODULATION)
        tr_data[5] = self.get_value_from_combobox_id(self._fec_combo_box, FEC_DEFAULT)
        tr_data[6] = get_value_by_name(SystemCable, self._sys_combo_box.get_active_id())
-
        return "{} {}".format(tr_data[0], ":".join(tr_data[1:]))

-    def get_atsc_transponder_data(self):
-        tr_data = re.split("\s|:", self._old_service.transponder)
-        # frequency, inversion, modulation, system
-        tr_data[1] = "{}000".format(self._freq_entry.get_text())
-        tr_data[2] = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
-        tr_data[3] = self.get_value_from_combobox_id(self._mod_combo_box, A_MODULATION)
-
-        return "{} {}".format(tr_data[0], ":".join(tr_data[1:]))
-
-    def update_transponder_services(self, transponder, sat_pos):
+    def update_transponder_services(self, transponder):
        for itr in self._transponder_services_iters:
-            srv = self._current_model[itr][:]
+            srv = self._current_model[itr][:Column.SRV_TOOLTIP]
            srv[Column.SRV_FREQ], srv[Column.SRV_RATE], srv[Column.SRV_POL], srv[Column.SRV_FEC], srv[
                Column.SRV_SYSTEM], srv[Column.SRV_POS] = self.get_transponder_values()
            srv[Column.SRV_TRANSPONDER] = transponder
-
-            fav_id = srv[Column.SRV_FAV_ID]
-            old_srv = self._services.pop(fav_id, None)
-            if not old_srv:
-                log("Update transponder services error: No service found for ID {}".format(srv[Column.SRV_FAV_ID]))
-                continue
-
-            if self._s_type is SettingsType.NEUTRINO_MP:
-                flags = srv[Column.SRV_CAS_FLAGS].split(":")
-                flags[1] = sat_pos
-                srv[Column.SRV_CAS_FLAGS] = ":".join(flags)
-
-            self._services[fav_id] = Service(*srv[:Column.SRV_TOOLTIP])
-            self._current_model.set_row(itr, srv)
+            srv = Service(*srv)
+            self._services[srv.fav_id] = self._services.pop(srv.fav_id)._replace(transponder=transponder)
+            self._current_model.set(itr, {i: v for i, v in enumerate(srv)})

    # ***************** Others *********************#

@@ -732,9 +651,6 @@ class ServiceDetailsDialog:
    def on_cas_entry_changed(self, entry):
        entry.set_name("GtkEntry" if self._CAID_PATTERN.fullmatch(entry.get_text()) else self._DIGIT_ENTRY_NAME)

-    def on_extra_pids_entry_changed(self, entry):
-        entry.set_name("GtkEntry" if self._PIDS_PATTERN.fullmatch(entry.get_text()) else self._DIGIT_ENTRY_NAME)
-
    def get_value_from_combobox_id(self, box: Gtk.ComboBox, dc: dict):
        cb_id = box.get_active_id()
        return get_key_by_value(dc, cb_id)
@@ -744,16 +660,16 @@ class ServiceDetailsDialog:
        if active and self._action is Action.EDIT:
            self._transponder_services_iters = []
            response = TransponderServicesDialog(self._dialog,
-                                                 self._services_view,
+                                                 self._current_model,
                                                 self._old_service.transponder,
                                                 self._transponder_services_iters).show()
-            if response == Gtk.ResponseType.CANCEL or response == Gtk.ResponseType.DELETE_EVENT:
+            if response == Gtk.ResponseType.CANCEL or response == -4:
                switch.set_active(False)
                self._transponder_services_iters = None
                return

        self.update_dvb_s2_elements(active and (self._sys_combo_box.get_active_id() == "DVB-S2"
-                                                or self._old_service.transponder_type in "tca"))
+                                                or self._old_service.transponder_type in "tc"))

        for elem in self._TRANSPONDER_ELEMENTS:
            elem.set_sensitive(active)
@@ -767,8 +683,6 @@ class ServiceDetailsDialog:
                return False
        if self._cas_entry.get_name() == self._DIGIT_ENTRY_NAME:
            return False
-        if self._extra_pids_entry.get_name() == self._DIGIT_ENTRY_NAME:
-            return False
        return True

    def update_reference(self, entry, event=None):
@@ -886,18 +800,6 @@ class ServiceDetailsDialog:
        self._transponder_id_entry.set_max_width_chars(8)
        self._network_id_entry.set_max_width_chars(8)

-    def update_ui_for_atsc(self):
-        self.update_ui_for_cable()
-        tr_grid = self._builder.get_object("tr_grid")
-        tr_grid.remove_column(1)
-        tr_grid.remove_column(1)
-        # Init models
-        fec_model, modulation_model, system_model = self.get_models_for_non_satellite()
-        system_model.append((TrType.ATSC.name,))
-        [modulation_model.append((v,)) for k, v in A_MODULATION.items()]
-        # Extra
-        self._namespace_entry.set_max_width_chars(25)
-
    def get_transponder_grid_for_non_satellite(self):
        self._pids_grid.set_visible(False)
        tr_grid = self._builder.get_object("tr_grid")
@@ -915,23 +817,23 @@ class ServiceDetailsDialog:


 class TransponderServicesDialog:
-    def __init__(self, transient, services_view, transponder, tr_iters):
-        builder = get_builder(_UI_PATH, use_str=True, objects=("tr_services_dialog", "transponder_services_liststore"))
+    def __init__(self, transient, model, transponder, tr_iters):
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("tr_services_dialog", "transponder_services_liststore"))
        self._dialog = builder.get_object("tr_services_dialog")
        self._dialog.set_transient_for(transient)
        self._srv_model = builder.get_object("transponder_services_liststore")
-        self.append_services(services_view, transponder, tr_iters)
+        self.append_services(model, transponder, tr_iters)
        builder.get_object("srv_list_dialog_info_bar").connect("response", lambda bar, resp: bar.hide())

-    def append_services(self, view, transponder, tr_iters):
-        model = view.get_model()
-        filter_model = model.get_model()
+    def append_services(self, model, transponder, tr_iters):
        for row in model:
            if row[Column.SRV_TRANSPONDER] == transponder:
                self._srv_model.append((row[Column.SRV_SERVICE], row[Column.SRV_PACKAGE], row[Column.SRV_TYPE],
                                        row[Column.SRV_SSID], row[Column.SRV_FREQ], row[Column.SRV_POS]))
-                itr = model.get_iter(row.path)
-                tr_iters.append(filter_model.convert_iter_to_child_iter(model.convert_iter_to_child_iter(itr)))
+                tr_iters.append(model.get_iter(row.path))

    def show(self):
        response = self._dialog.run()
--- a/app/ui/settings_dialog.glade
+++ b/app/ui/settings_dialog.glade
--- a/app/ui/settings_dialog.py
+++ b/app/ui/settings_dialog.py
@@ -4,9 +4,9 @@ import re
 from app.commons import run_task, run_idle, log
 from app.connections import test_telnet, test_ftp, TestException, test_http, HttpApiException
 from app.settings import SettingsType, Settings, PlayStreamsMode
-from app.ui.dialogs import show_dialog, DialogType, get_message, get_chooser_dialog, get_builder
+from app.ui.dialogs import show_dialog, DialogType, get_message, get_chooser_dialog
 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


 def show_settings_dialog(transient, options):
@@ -50,7 +50,6 @@ class SettingsDialog:
                    "on_apply_presets": self.on_apply_presets,
                    "on_digit_entry_changed": self.on_digit_entry_changed,
                    "on_view_popup_menu": self.on_view_popup_menu,
-                    "on_list_font_reset": self.on_list_font_reset,
                    "on_theme_changed": self.on_theme_changed,
                    "on_theme_add": self.on_theme_add,
                    "on_theme_remove": self.on_theme_remove,
@@ -64,7 +63,9 @@ class SettingsDialog:
        self._profiles = self._settings.profiles
        self._s_type = self._settings.setting_type

-        builder = get_builder(UI_RESOURCES_PATH + "settings_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "settings_dialog.glade")
+        builder.connect_signals(handlers)

        self._dialog = builder.get_object("settings_dialog")
        self._dialog.set_transient_for(transient)
@@ -103,6 +104,7 @@ class SettingsDialog:
        self._support_ver5_switch = builder.get_object("support_ver5_switch")
        self._force_bq_name_switch = builder.get_object("force_bq_name_switch")
        # Streaming
+        header_separator = builder.get_object("header_separator")
        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")
@@ -114,31 +116,26 @@ class SettingsDialog:
        self._audio_channels_combo_box = builder.get_object("audio_channels_combo_box")
        self._audio_sample_rate_combo_box = builder.get_object("audio_sample_rate_combo_box")
        self._audio_codec_combo_box = builder.get_object("audio_codec_combo_box")
+        self._apply_presets_button.bind_property("visible", header_separator, "visible")
        self._transcoding_switch.bind_property("active", builder.get_object("record_box"), "sensitive")
        self._edit_preset_switch.bind_property("active", self._apply_presets_button, "sensitive")
        self._edit_preset_switch.bind_property("active", builder.get_object("video_options_frame"), "sensitive")
        self._edit_preset_switch.bind_property("active", builder.get_object("audio_options_frame"), "sensitive")
        self._play_in_built_radio_button = builder.get_object("play_in_built_radio_button")
-        self._play_in_window_radio_button = builder.get_object("play_in_window_radio_button")
+        self._play_in_vlc_radio_button = builder.get_object("play_in_vlc_radio_button")
        self._get_m3u_radio_button = builder.get_object("get_m3u_radio_button")
-        self._gst_lib_button = builder.get_object("gst_lib_button")
-        self._vlc_lib_button = builder.get_object("vlc_lib_button")
-        self._mpv_lib_button = builder.get_object("mpv_lib_button")
        # Program
        self._before_save_switch = builder.get_object("before_save_switch")
        self._before_downloading_switch = builder.get_object("before_downloading_switch")
-        self._load_on_startup_switch = builder.get_object("load_on_startup_switch")
-        self._bouquet_hints_switch = builder.get_object("bouquet_hints_switch")
-        self._services_hints_switch = builder.get_object("services_hints_switch")
-        self._lang_combo_box = builder.get_object("lang_combo_box")
-        # Appearance
-        self._list_font_button = builder.get_object("list_font_button")
-        self._picons_size_button = builder.get_object("picons_size_button")
-        self._tooltip_logo_size_button = builder.get_object("tooltip_logo_size_button")
+        self._enable_experimental_box = builder.get_object("enable_experimental_box")
        self._colors_grid = builder.get_object("colors_grid")
        self._set_color_switch = builder.get_object("set_color_switch")
        self._new_color_button = builder.get_object("new_color_button")
        self._extra_color_button = builder.get_object("extra_color_button")
+        self._load_on_startup_switch = builder.get_object("load_on_startup_switch")
+        self._bouquet_hints_switch = builder.get_object("bouquet_hints_switch")
+        self._services_hints_switch = builder.get_object("services_hints_switch")
+        self._lang_combo_box = builder.get_object("lang_combo_box")
        # Extra
        self._support_http_api_switch = builder.get_object("support_http_api_switch")
        self._enable_yt_dl_switch = builder.get_object("enable_yt_dl_switch")
@@ -168,7 +165,7 @@ class SettingsDialog:
        self._profile_add_button = builder.get_object("profile_add_button")
        self._profile_remove_button = builder.get_object("profile_remove_button")
        self._apply_profile_button = builder.get_object("apply_profile_button")
-        self._apply_profile_button.bind_property("visible", builder.get_object("reset_button"), "visible")
+        self._apply_profile_button.bind_property("visible", header_separator, "visible")
        # Style
        self._style_provider = Gtk.CssProvider()
        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
@@ -181,26 +178,25 @@ class SettingsDialog:
        self.init_profiles()

        if self._settings.is_darwin:
-            # Themes
-            builder.get_object("style_frame").set_visible(True)
-            builder.get_object("themes_support_frame").set_visible(True)
-            self._layout_switch = builder.get_object("layout_switch")
-            self._layout_switch.set_active(self._ext_settings.alternate_layout)
-            self._theme_frame = builder.get_object("theme_frame")
-            self._theme_frame.set_visible(True)
+            # Appearance
+            self._appearance_box = builder.get_object("appearance_box")
+            self._appearance_box.set_visible(True)
            self._theme_thumbnail_image = builder.get_object("theme_thumbnail_image")
            self._theme_combo_box = builder.get_object("theme_combo_box")
            self._icon_theme_combo_box = builder.get_object("icon_theme_combo_box")
            self._dark_mode_switch = builder.get_object("dark_mode_switch")
+            self._layout_switch = builder.get_object("layout_switch")
+            self._layout_switch.bind_property("active", builder.get_object("bouquet_box"), "sensitive")
            self._themes_support_switch = builder.get_object("themes_support_switch")
-            self._themes_support_switch.bind_property("active", self._theme_frame, "sensitive")
-            self.init_themes()
+            self._themes_support_switch.bind_property("active", builder.get_object("gtk_theme_frame"), "sensitive")
+            self._themes_support_switch.bind_property("active", builder.get_object("icon_theme_frame"), "sensitive")
+            self.init_appearance()

    @run_idle
    def init_ui_elements(self, s_type):
        is_enigma_profile = s_type is SettingsType.ENIGMA_2
        self._neutrino_radio_button.set_active(s_type is SettingsType.NEUTRINO_MP)
-        self.update_title()
+        self.update_header_bar()
        http_active = self._support_http_api_switch.get_active()
        self._click_mode_zap_button.set_sensitive(is_enigma_profile and http_active)
        self._lang_combo_box.set_active_id(self._ext_settings.language)
@@ -218,12 +214,12 @@ class SettingsDialog:
                self.on_profile_selected(self._profile_view, False)
        self._profile_remove_button.set_sensitive(len(self._profile_view.get_model()) > 1)

-    def update_title(self):
-        title = "{} [{}]"
+    def update_header_bar(self):
+        label, sep, st = self._header_bar.get_subtitle().partition(":")
        if self._s_type is SettingsType.ENIGMA_2:
-            self._dialog.set_title(title.format(get_message("Options"), self._enigma_radio_button.get_label()))
+            self._header_bar.set_subtitle("{}: {}".format(label, self._enigma_radio_button.get_label()))
        elif self._s_type is SettingsType.NEUTRINO_MP:
-            self._dialog.set_title(title.format(get_message("Options"), self._neutrino_radio_button.get_label()))
+            self._header_bar.set_subtitle("{}: {}".format(label, self._neutrino_radio_button.get_label()))

    def show(self):
        self._dialog.run()
@@ -273,7 +269,6 @@ class SettingsDialog:
        self._before_downloading_switch.set_active(self._settings.backup_before_downloading)
        self.set_fav_click_mode(self._settings.fav_click_mode)
        self.set_play_stream_mode(self._settings.play_streams_mode)
-        self.set_stream_lib(self._settings.stream_lib)
        self._load_on_startup_switch.set_active(self._settings.load_last_config)
        self._bouquet_hints_switch.set_active(self._settings.show_bq_hints)
        self._services_hints_switch.set_active(self._settings.show_srv_hints)
@@ -281,9 +276,6 @@ class SettingsDialog:
        self._transcoding_switch.set_active(self._settings.activate_transcoding)
        self._presets_combo_box.set_active_id(self._settings.active_preset)
        self.on_transcoding_preset_changed(self._presets_combo_box)
-        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)

        if self._s_type is SettingsType.ENIGMA_2:
            self._enable_exp_switch.set_active(self._settings.is_enable_experimental)
@@ -339,7 +331,6 @@ class SettingsDialog:
        self._ext_settings.backup_before_downloading = self._before_downloading_switch.get_active()
        self._ext_settings.fav_click_mode = self.get_fav_click_mode()
        self._ext_settings.play_streams_mode = self.get_play_stream_mode()
-        self._ext_settings.stream_lib = self.get_stream_lib()
        self._ext_settings.language = self._lang_combo_box.get_active_id()
        self._ext_settings.load_last_config = self._load_on_startup_switch.get_active()
        self._ext_settings.show_bq_hints = self._bouquet_hints_switch.get_active()
@@ -349,11 +340,9 @@ class SettingsDialog:
        self._ext_settings.records_path = self._record_data_dir_field.get_text()
        self._ext_settings.activate_transcoding = self._transcoding_switch.get_active()
        self._ext_settings.active_preset = self._presets_combo_box.get_active_id()
-        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()

        if self._ext_settings.is_darwin:
+            self._ext_settings.dark_mode = self._dark_mode_switch.get_active()
            self._ext_settings.alternate_layout = self._layout_switch.get_active()
            self._ext_settings.is_themes_support = self._themes_support_switch.get_active()
            self._ext_settings.theme = self._theme_combo_box.get_active_id()
@@ -608,48 +597,29 @@ class SettingsDialog:
        return FavClickMode.DISABLED

    def on_play_mode_changed(self, button):
-        if self._main_stack.get_visible_child_name() != "streaming" or not button.get_active():
+        if self._main_stack.get_visible_child_name() != "streaming":
            return

-        if self._settings.is_darwin:
-            is_gst = self._gst_lib_button.get_active()
-            self._play_in_built_radio_button.set_sensitive(is_gst)
-            self._play_in_window_radio_button.set_active(not is_gst and self._play_in_built_radio_button.get_active())
-
        if button.get_active():
            self.show_info_message("Save and restart the program to apply the settings.", Gtk.MessageType.WARNING)

    @run_idle
    def set_play_stream_mode(self, mode):
+        self._play_in_built_radio_button.set_sensitive(not self._settings.is_darwin)
        self._play_in_built_radio_button.set_active(mode is PlayStreamsMode.BUILT_IN)
-        self._play_in_window_radio_button.set_active(mode is PlayStreamsMode.WINDOW)
+        self._play_in_vlc_radio_button.set_active(mode is PlayStreamsMode.VLC)
        self._get_m3u_radio_button.set_active(mode is PlayStreamsMode.M3U)

-        if self._settings.is_darwin and self._settings.stream_lib != "gst":
-            self._play_in_built_radio_button.set_sensitive(False)
-
    def get_play_stream_mode(self):
        if self._play_in_built_radio_button.get_active():
            return PlayStreamsMode.BUILT_IN
-        if self._play_in_window_radio_button.get_active():
-            return PlayStreamsMode.WINDOW
+        if self._play_in_vlc_radio_button.get_active():
+            return PlayStreamsMode.VLC
        if self._get_m3u_radio_button.get_active():
            return PlayStreamsMode.M3U

        return self._settings.play_streams_mode

-    def set_stream_lib(self, mode):
-        self._vlc_lib_button.set_active(mode == "vlc")
-        self._gst_lib_button.set_active(mode == "gst")
-        self._mpv_lib_button.set_active(mode == "mpv")
-
-    def get_stream_lib(self):
-        if self._gst_lib_button.get_active():
-            return "gst"
-        elif self._vlc_lib_button.get_active():
-            return "vlc"
-        return "mpv"
-
    def on_transcoding_preset_changed(self, button):
        presets = self._settings.transcoding_presets
        prs = presets.get(button.get_active_id())
@@ -694,11 +664,6 @@ class SettingsDialog:
        if event.get_event_type() == Gdk.EventType.BUTTON_PRESS and event.button == Gdk.BUTTON_SECONDARY:
            menu.popup(None, None, None, None, event.button, event.time)

-    def on_list_font_reset(self, button):
-        self._list_font_button.set_font(APP_FONT)
-
-    # ******************* Themes *********************** #
-
    def on_theme_changed(self, button):
        if self._main_stack.get_visible_child_name() != "appearance":
            return
@@ -737,7 +702,7 @@ class SettingsDialog:
        response = get_chooser_dialog(self._dialog, self._settings, "Themes Archive [*.xz, *.zip]", ("*.xz", "*.zip"))
        if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
            return
-        self._theme_frame.set_sensitive(False)
+        self._appearance_box.set_sensitive(False)
        self.unpack_theme(response, path, button)

    @run_task
@@ -754,6 +719,7 @@ class SettingsDialog:
            log("Unpacking end.")
        finally:
            self.update_theme_button(button, dst)
+            self._appearance_box.set_sensitive(True)

    @run_idle
    def update_theme_button(self, button, dst):
@@ -766,7 +732,6 @@ class SettingsDialog:
                button.append(theme, theme)
                button.set_active_id(theme)
        self.show_info_message("Done!", Gtk.MessageType.INFO)
-        self._theme_frame.set_sensitive(True)

    @run_idle
    def remove_theme(self, button, path):
@@ -790,7 +755,9 @@ class SettingsDialog:
        button.set_active(0)

    @run_idle
-    def init_themes(self):
+    def init_appearance(self):
+        self._dark_mode_switch.set_active(self._ext_settings.dark_mode)
+        self._layout_switch.set_active(self._ext_settings.alternate_layout)
        t_support = self._ext_settings.is_themes_support
        self._themes_support_switch.set_active(t_support)
        if t_support:
--- a/app/ui/style.css
+++ b/app/ui/style.css
@@ -1,10 +1,16 @@
 #digit-entry {
  border-color: Red;
-  border-width: 0.15em;
 }

 #status-bar-button {
-  margin: 0.1em;
+  padding: 1px;
+  margin: 1px;
+}
+
+paned > separator {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 2px 24px;
 }

 .red-button {
@@ -27,27 +33,14 @@
  background-color: blue;
 }

-#textview-large {
-  font-size: 14px;
-}
-
 .time-entry {
  padding: 0px;
  margin: 0px;
 }

-.arrow-button {
-  padding: 0px;
-  margin: 1px;
-  min-width: 12px;
-  min-height: 12px;
-}
-
 .group {}

 .group :first-child {
-  padding-left: 0.5em;
-  padding-right: 0.5em;
  border-top-right-radius: 0;
  border-bottom-right-radius: 0;
 }
--- a/app/ui/telnet.glade
+++ b/app/ui/telnet.glade
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 
-
-The MIT License (MIT)
-
-Copyright (c) 2018-2020 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.16"/>
-  <!-- interface-license-type mit -->
-  <!-- interface-name DemonEditor -->
-  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
-  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkTextTagTable" id="tag_table">
-    <child type="tag">
-      <object class="GtkTextTag" id="end_tag">
-        <property name="font">Normal</property>
-        <property name="editable">False</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkTextBuffer" id="text_buffer">
-    <property name="tag_table">tag_table</property>
-  </object>
-  <object class="GtkWindow" id="dialog_window">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">DemonEditor [Telnet client]</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">terminal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <signal name="delete-event" handler="on_close" swapped="no"/>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkBox" id="main_box">
-        <property name="width_request">560</property>
-        <property name="height_request">320</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkScrolledWindow" id="telnet_scrolled_window">
-            <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="name">textview-large</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="wrap_mode">char</property>
-                <property name="left_margin">5</property>
-                <property name="right_margin">5</property>
-                <property name="buffer">text_buffer</property>
-                <property name="overwrite">True</property>
-                <property name="input_hints">GTK_INPUT_HINT_WORD_COMPLETION | GTK_INPUT_HINT_NONE</property>
-                <property name="monospace">True</property>
-                <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
-                <signal name="realize" handler="on_text_view_realize" swapped="no"/>
-              </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="commands_entry">
-            <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">2</property>
-            <child>
-              <object class="GtkComboBoxText" id="profile_combo_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="active">0</property>
-                <property name="has_frame">False</property>
-                <signal name="changed" handler="on_profile_changed" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="connect_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</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">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="disconnect_button">
-                <property name="can_focus">True</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">4</property>
-              </packing>
-            </child>
-            <child type="center">
-              <placeholder/>
-            </child>
-            <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="pack_type">end</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>
-          <object class="GtkInfoBar" id="info_bar">
-            <property name="app_paintable">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">2</property>
-            <property name="show_close_button">True</property>
-            <signal name="response" handler="on_info_bar_close" swapped="no"/>
-            <child internal-child="action_area">
-              <object class="GtkButtonBox">
-                <property name="can_focus">False</property>
-                <property name="layout_style">end</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </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">
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="info_bar_message_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label">Info</property>
-                    <property name="justify">center</property>
-                    <property name="wrap">True</property>
-                    <property name="wrap_mode">word-char</property>
-                    <property name="lines">2</property>
-                  </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>
-                <property name="fill">False</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">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
--- a/app/ui/telnet.py
+++ b/app/ui/telnet.py
@@ -1,256 +0,0 @@
-import re
-import selectors
-import socket
-from collections import deque
-from telnetlib import Telnet
-
-from gi.repository import GLib
-
-from app.commons import run_task, run_idle, log
-from app.settings import Settings
-from app.ui.uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
-
-
-class ExtTelnet(Telnet):
-
-    def __init__(self, output_callback, **kwargs):
-        super().__init__(**kwargs)
-        self._output_callback = output_callback
-
-    def interact(self):
-        """Interaction function, emulates a very dumb telnet client."""
-        with selectors.DefaultSelector() as selector:
-            selector.register(self, selectors.EVENT_READ)
-
-            while True:
-                for key, events in selector.select():
-                    if key.fileobj is self:
-                        try:
-                            text = self.read_very_eager()
-                        except EOFError as e:
-                            msg = "\n*** Connection closed by remote host ***\n"
-                            self._output_callback(msg)
-                            log(msg)
-                            raise e
-                        else:
-                            if text:
-                                self._output_callback(text)
-
-
-class TelnetDialog:
-    """ Dialog of very simple telnet client. """
-    _COLOR_PATTERN = re.compile("\x1b.*?m")  # Color info
-    _ERASING_PATTERN = re.compile("\x1b.*?K")  # Erase to right
-    _APP_MODE_PATTERN = re.compile("\x1b.*?(1h)|(1l)")  # h - on, l - off
-    _ALL_PATTERN = re.compile(r'(\x1b\[|\x9b)[0-?]*[@-~]')
-    _NOT_SUPPORTED = {"mc", "mcedit", "vi", "nano"}
-
-    def __init__(self, transient, settings):
-        self._handlers = {"on_profile_changed": self.on_profile_changed,
-                          "on_clear": self.on_clear,
-                          "on_text_view_realize": self.on_text_view_realize,
-                          "on_view_key_press": self.on_view_key_press,
-                          "on_info_bar_close": self.on_info_bar_close,
-                          "on_connect": self.on_connect,
-                          "on_disconnect": self.on_disconnect,
-                          "on_close": self.on_close}
-
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "telnet.glade")
-        builder.connect_signals(self._handlers)
-        self._dialog_window = builder.get_object("dialog_window")
-        self._dialog_window.set_transient_for(transient)
-        self._profile_combo_box = builder.get_object("profile_combo_box")
-        self._info_bar = builder.get_object("info_bar")
-        self._info_message_label = builder.get_object("info_bar_message_label")
-        self._text_view = builder.get_object("text_view")
-        self._buf = builder.get_object("text_buffer")
-        self._end_tag = builder.get_object("end_tag")
-        self._connect_button = builder.get_object("connect_button")
-        self._connect_button.bind_property("visible", builder.get_object("disconnect_button"), "visible", 4)
-        provider = Gtk.CssProvider()
-        provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        builder.get_object("main_box").get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
-
-        window_size = settings.get("telnet_dialog_window_size")
-        if window_size:
-            self._dialog_window.resize(*window_size)
-
-        self._ext_settings = settings
-        self._settings = Settings(settings.settings)
-        self._tn = None
-        self._app_mode = False
-        self._commands = deque(maxlen=10)
-
-    def show(self):
-        self._dialog_window.show()
-
-    def on_close(self, window, event):
-        """  Performs shutdown tasks """
-        self._ext_settings.add("telnet_dialog_window_size", window.get_size())
-        self.on_disconnect()
-
-    def on_info_bar_close(self, bar=None, resp=None):
-        self._info_bar.set_visible(False)
-
-    @run_idle
-    def show_info_message(self, text, message_type):
-        self._info_bar.set_visible(True)
-        self._info_bar.set_message_type(message_type)
-        self._info_message_label.set_text(text)
-
-    def on_text_view_realize(self, view):
-        self.init_profiles()
-        self.on_connect()
-
-    @run_idle
-    def init_profiles(self):
-        for p in self._settings.profiles:
-            self._profile_combo_box.append(p, p)
-        self._profile_combo_box.set_active_id(self._settings.current_profile)
-
-    @run_task
-    def on_connect(self, item=None):
-        try:
-            GLib.idle_add(self._connect_button.set_visible, False)
-            GLib.idle_add(self.on_info_bar_close)
-            user, password = self._settings.user, self._settings.password
-            timeout = self._settings.telnet_timeout
-
-            self._tn = ExtTelnet(self.append_output,
-                                 host=self._settings.host,
-                                 port=self._settings.telnet_port,
-                                 timeout=timeout)
-
-            if user != "":
-                self._tn.read_until(b"login: ")
-                self._tn.write(user.encode("utf-8") + b"\n")
-            if password != "":
-                self._tn.read_until(b"Password: ")
-                self._tn.write(password.encode("utf-8") + b"\n")
-
-            self._tn.interact()
-        except (OSError, EOFError, socket.timeout, ConnectionRefusedError) as e:
-            log("{}: {}".format(self.__class__.__name__, e))
-            self.show_info_message(str(e), Gtk.MessageType.ERROR)
-        finally:
-            GLib.idle_add(self._connect_button.set_visible, True)
-
-    @run_task
-    def on_disconnect(self, item=None):
-        if self._tn:
-            GLib.idle_add(self._connect_button.set_visible, True)
-            self._tn.close()
-
-    def on_profile_changed(self, button):
-        self._settings.current_profile = button.get_active_id()
-
-    def on_command_done(self, entry):
-        command = entry.get_text()
-        entry.set_text("")
-        if command and self._tn:
-            self._tn.write(command.encode("ascii") + b"\r")
-
-    def on_clear(self, item=None):
-        self._buf.delete(self._buf.get_start_iter(), self._buf.get_end_iter())
-
-    def on_view_key_press(self, view, event):
-        """  Handling  keystrokes on press """
-        if event.keyval == Gdk.KEY_Return:
-            self.do_command()
-            return True
-
-        key_code = event.hardware_keycode
-        if not KeyboardKey.value_exist(key_code):
-            return
-
-        key = KeyboardKey(key_code)
-        ctrl = event.state & MOD_MASK
-        if ctrl and key is KeyboardKey.C:
-            if self._tn and self._tn.sock:
-                self._tn.write(b"\x03")  # interrupt
-
-        # last commands navigation
-        if key is KeyboardKey.UP:
-            self.delete_last_command()
-            if self._commands:
-                cmd = self._commands.pop()
-                self._commands.appendleft(cmd)
-                self._buf.insert_at_cursor(cmd, -1)
-            return True
-        elif key is KeyboardKey.DOWN:
-            self.delete_last_command()
-            if self._commands:
-                cmd = self._commands.popleft()
-                self._commands.append(cmd)
-                self._buf.insert_at_cursor(cmd, -1)
-            return True
-
-    def delete_last_command(self):
-        end = self._buf.get_end_iter()
-        if end.ends_tag(self._end_tag):
-            return
-
-        if end.backward_to_tag_toggle(self._end_tag):
-            self._buf.delete(self._buf.get_end_iter(), end)
-
-    def do_command(self):
-        count = self._buf.get_line_count()
-        begin = self._buf.get_iter_at_line(count)
-        end = self._buf.get_end_iter()
-        command = []
-
-        while end.backward_to_tag_toggle(self._end_tag):
-            command.append(self._buf.get_text(end, begin, False))
-            break
-        else:  # if buf is empty
-            command.append(self._buf.get_text(begin, end, False))
-
-        # to preventing duplication of the command in the buf
-        self._buf.delete(end, begin)
-
-        if command and self._tn.sock:
-            cmd = command[0]
-            if cmd in self._NOT_SUPPORTED:
-                self.show_info_message("'{}' is not supported by this client.".format(cmd), Gtk.MessageType.ERROR)
-            else:
-                self._tn.write(cmd.encode("ascii") + b"\r")
-                self._commands.append(cmd)
-
-    @run_idle
-    def append_output(self, txt):
-        t = txt.decode("ascii", errors="ignore")
-
-        ap = re.search(self._APP_MODE_PATTERN, t)
-        if ap:
-            on, of = ap.group(1), ap.group(2)
-            if on:
-                self._app_mode = True
-            elif of:
-                self._app_mode = False
-                self.on_clear()
-
-        t = re.sub(self._ALL_PATTERN, "", t)  # removing [replacing] ascii escape sequences
-
-        if self._app_mode:
-            start, end = self._buf.get_start_iter(), self._buf.get_end_iter()
-            count = self._buf.get_line_count()
-            new_lines = t.split("\r\n")
-            ext_lines = self._buf.get_text(start, end, True).split("\r\n")
-            if count < len(new_lines):
-                self._buf.set_text(re.sub(self._ERASING_PATTERN, "", t))
-            else:
-                for i, line in enumerate(new_lines):
-                    if line:
-                        ext_lines[i] = re.sub(self._ERASING_PATTERN, "", line)
-                self._buf.set_text("\r\n".join(ext_lines))
-        else:
-            self._buf.insert_at_cursor(t, -1)
-
-        insert = self._buf.get_insert()
-        self._text_view.scroll_to_mark(insert, 0.0, True, 0.0, 1.0)
-        self._buf.apply_tag(self._end_tag, self._buf.get_start_iter(), self._buf.get_end_iter())
-
-
-if __name__ == "__main__":
-    pass
--- a/app/ui/transmitter.py
+++ b/app/ui/transmitter.py
@@ -6,15 +6,13 @@ from gi.repository import GLib

 from app.commons import log
 from app.connections import HttpAPI
-from app.settings import IS_DARWIN
 from app.tools.yt import YouTube
-from app.ui.dialogs import get_builder
 from app.ui.iptv import get_yt_icon
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH


 class LinksTransmitter:
-    """ The main media bar class for the "send to" function..
+    """ The main class for the "send to" function.

         It used for direct playback of media links by the enigma2 media player.
    """
@@ -36,7 +34,9 @@ class LinksTransmitter:
        self._app_window = app_window
        self._is_status_icon = True

-        builder = get_builder(UI_RESOURCES_PATH + "transmitter.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "transmitter.glade")
+        builder.connect_signals(handlers)

        self._main_window = builder.get_object("main_window")
        self._url_entry = builder.get_object("url_entry")
@@ -47,19 +47,16 @@ class LinksTransmitter:
        self._status_passive = None
        self._yt = YouTube.get_instance(settings)

-        if IS_DARWIN:
+        try:
+            gi.require_version("AppIndicator3", "0.1")
+            from gi.repository import AppIndicator3
+        except (ImportError, ValueError) as e:
+            log("{}: Load library error: {}".format(__class__.__name__, e))
            self._tray = builder.get_object("status_icon")
        else:
-            try:
-                gi.require_version("AppIndicator3", "0.1")
-                from gi.repository import AppIndicator3
-            except (ImportError, ValueError) as e:
-                log("{}: Load library error: {}".format(__class__.__name__, e))
-                self._tray = builder.get_object("status_icon")
-            else:
-                self._is_status_icon = False
-                self._status_active = AppIndicator3.IndicatorStatus.ACTIVE
-                self._status_passive = AppIndicator3.IndicatorStatus.PASSIVE
+            self._is_status_icon = False
+            self._status_active = AppIndicator3.IndicatorStatus.ACTIVE
+            self._status_passive = AppIndicator3.IndicatorStatus.PASSIVE

            category = AppIndicator3.IndicatorCategory.APPLICATION_STATUS
            path = Path(UI_RESOURCES_PATH + "/icons/hicolor/scalable/apps/demon-editor.svg")
--- a/app/ui/uicommons.py
+++ b/app/ui/uicommons.py
@@ -1,52 +1,25 @@
-# -*- 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
 from functools import lru_cache
-from app.settings import Settings, SettingsException, IS_DARWIN, GTK_PATH
+from app.settings import Settings, SettingsException, IS_DARWIN

 import gi

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

-# Setting mod mask for keyboard depending on platform
+# Init notify
+Notify.init("DemonEditor")
+# Setting mod mask for the keyboard depending on the platform.
 MOD_MASK = Gdk.ModifierType.MOD2_MASK if IS_DARWIN else Gdk.ModifierType.CONTROL_MASK
-# Path to *.glade files
-UI_RESOURCES_PATH = "app/ui/" if os.path.exists("app/ui/") else "ui/"
-LANG_PATH = UI_RESOURCES_PATH + "lang"
-NOTIFY_IS_INIT = False
+# Path to *.glade files.
+UI_RESOURCES_PATH = "app/ui/" if os.path.exists("app/ui/") else "/usr/share/demoneditor/app/ui/"
 IS_GNOME_SESSION = int(bool(os.environ.get("GNOME_DESKTOP_SESSION_ID")))
 # Translation.
 TEXT_DOMAIN = "demon-editor"
-APP_FONT = None

 try:
    settings = Settings.get_instance()
@@ -54,61 +27,27 @@ except SettingsException:
    pass
 else:
    os.environ["LANGUAGE"] = settings.language
-    st = Gtk.Settings().get_default()
-    APP_FONT = st.get_property("gtk-font-name")
-    st.set_property("gtk-application-prefer-dark-theme", settings.dark_mode)
+    if UI_RESOURCES_PATH == "app/ui/":
+        locale.bindtextdomain(TEXT_DOMAIN, UI_RESOURCES_PATH + "lang")

    if settings.is_themes_support:
+        st = Gtk.Settings().get_default()
        st.set_property("gtk-theme-name", settings.theme)
        st.set_property("gtk-icon-theme-name", settings.icon_theme)
-    else:
-        style_provider = Gtk.CssProvider()
-        s_path = "{}default_style.css".format(GTK_PATH + "/" + UI_RESOURCES_PATH if GTK_PATH else UI_RESOURCES_PATH)
-        style_provider.load_from_path(s_path)
-        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), style_provider,
-                                                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-
-if IS_DARWIN:
-    import gettext
-
-    if GTK_PATH:
-        LANG_PATH = GTK_PATH + "/share/locale"
-    gettext.bindtextdomain(TEXT_DOMAIN, LANG_PATH)
-    # For launching from the bundle.
-    if os.getcwd() == "/" and GTK_PATH:
-        os.chdir(GTK_PATH)
-else:
-    import locale
-
-    locale.bindtextdomain(TEXT_DOMAIN, LANG_PATH)
-    # Init notify
-    try:
-        gi.require_version("Notify", "0.7")
-        from gi.repository import Notify
-    except ImportError:
-        pass
-    else:
-        NOTIFY_IS_INIT = Notify.init("DemonEditor")

 theme = Gtk.IconTheme.get_default()
-theme.append_search_path(GTK_PATH + "/share/icons" if GTK_PATH else UI_RESOURCES_PATH + "icons")
+theme.append_search_path(UI_RESOURCES_PATH + "icons")

-
-def get_theme_icon(icon_theme, name, size):
-    try:
-        return icon_theme.load_icon(name, size, 0)
-    except GLib.Error:
-        pass
-
-
-_IMAGE_MISSING = get_theme_icon(theme, "image-missing", 16)
-CODED_ICON = get_theme_icon(theme, "emblem-readonly", 16) or _IMAGE_MISSING
-LOCKED_ICON = get_theme_icon(theme, "changes-prevent-symbolic", 16) or _IMAGE_MISSING
-HIDE_ICON = get_theme_icon(theme, "go-jump", 16) or _IMAGE_MISSING
-TV_ICON = get_theme_icon(theme, "tv-symbolic", 16) or _IMAGE_MISSING
-IPTV_ICON = get_theme_icon(theme, "emblem-shared", 16)
-EPG_ICON = get_theme_icon(theme, "gtk-index", 16)
-DEFAULT_ICON = get_theme_icon(theme, "emblem-default", 16)
+_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


@lru_cache(maxsize=1)
@@ -125,12 +64,11 @@ def get_yt_icon(icon_name, size=24):
    import glob

    for theme_name in map(os.path.basename, filter(os.path.isdir, glob.glob("/usr/share/icons/*"))):
-        theme.set_custom_theme(theme_name)
+        n_theme.set_custom_theme(theme_name)
        if n_theme.has_icon(icon_name):
            return n_theme.load_icon(icon_name, size, 0)

-    if default_theme.lookup_icon(Gtk.STOCK_APPLY, size, 0):
-        return default_theme.load_icon(Gtk.STOCK_APPLY, size, 0)
+    return default_theme.load_icon("info", size, 0)


 def show_notification(message, timeout=10000, urgency=1):
@@ -140,47 +78,41 @@ def show_notification(message, timeout=10000, urgency=1):
        @param timeout: milliseconds
        @param urgency: 0 - low, 1 - normal, 2 - critical
    """
-    if IS_DARWIN:
-        # Since NSUserNotification has been deprecated, osascript will be used.
-        os.system("""osascript -e 'display notification "{}" with title "DemonEditor"'""".format(message))
-    elif NOTIFY_IS_INIT:
-        notify = Notify.Notification.new("DemonEditor", message, "demon-editor")
-        notify.set_urgency(urgency)
-        notify.set_timeout(timeout)
-        notify.show()
+    notify = Notify.Notification.new("DemonEditor", message, "demon-editor")
+    notify.set_urgency(urgency)
+    notify.set_timeout(timeout)
+    notify.show()


 class KeyboardKey(Enum):
    """ The raw(hardware) codes of the keyboard keys. """
-    F = 3 if IS_DARWIN else 41
-    E = 14 if IS_DARWIN else 26
-    R = 15 if IS_DARWIN else 27
-    T = 17 if IS_DARWIN else 28
-    P = 35 if IS_DARWIN else 33
-    S = 1 if IS_DARWIN else 39
-    H = 4 if IS_DARWIN else 43
-    L = 37 if IS_DARWIN else 46
-    X = 7 if IS_DARWIN else 53
-    C = 8 if IS_DARWIN else 54
-    V = 9 if IS_DARWIN else 55
-    W = 13 if IS_DARWIN else 25
-    Z = 6 if IS_DARWIN else 52
-    INSERT = -1 if IS_DARWIN else 118
-    HOME = -1 if IS_DARWIN else 110
-    END = -1 if IS_DARWIN else 115
-    UP = 126 if IS_DARWIN else 111
-    DOWN = 125 if IS_DARWIN else 116
-    PAGE_UP = -1 if IS_DARWIN else 112
-    PAGE_DOWN = -1 if IS_DARWIN else 117
-    LEFT = 123 if IS_DARWIN else 113
-    RIGHT = 123 if IS_DARWIN else 114
-    F2 = 120 if IS_DARWIN else 68
-    F7 = 98 if IS_DARWIN else 73
-    SPACE = 49 if IS_DARWIN else 65
-    DELETE = 51 if IS_DARWIN else 119
-    BACK_SPACE = 76 if IS_DARWIN else 22
-    CTRL_L = 55 if IS_DARWIN else 37
-    CTRL_R = 55 if IS_DARWIN else 105
+    E = 26
+    R = 27
+    T = 28
+    P = 33
+    S = 39
+    F = 41
+    X = 53
+    C = 54
+    V = 55
+    W = 25
+    Z = 52
+    INSERT = 118
+    HOME = 110
+    END = 115
+    UP = 111
+    DOWN = 116
+    PAGE_UP = 112
+    PAGE_DOWN = 117
+    LEFT = 113
+    RIGHT = 114
+    F2 = 68
+    F7 = 73
+    SPACE = 65
+    DELETE = 119
+    BACK_SPACE = 22
+    CTRL_L = 37
+    CTRL_R = 105
    # Laptop codes
    HOME_KP = 79
    END_KP = 87
--- a/build-deb.sh
+++ b/build-deb.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+VER="1.0.4_Beta"
+B_PATH="dist/DemonEditor"
+DEB_PATH="$B_PATH/usr/share/demoneditor"
+
+mkdir -p $B_PATH
+cp -TRv deb $B_PATH
+rsync --exclude=app/ui/lang --exclude=app/ui/icons -arv app $DEB_PATH
+
+cd dist
+fakeroot dpkg-deb --build DemonEditor
+mv DemonEditor.deb DemonEditor_$VER.deb
+
+rm -R DemonEditor
+
+
+
+
--- a/deb/DEBIAN/README.source
+++ b/deb/DEBIAN/README.source
@@ -0,0 +1,58 @@
+demon-editor for Debian
+----------------------
+DemonEditor
+Enigma2 channel and satellites list editor for GNU/Linux.
+
+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).
+
+Main features of the program:
+   Editing bouquets, channels, satellites.
+   Import function.
+   Backup function.
+   Extended support of IPTV.
+   Support of picons.
+   Downloading of picons and updating of satellites (transponders) from the web.
+   Import to bouquet(Neutrino WEBTV) from m3u.
+   Export of bouquets with IPTV services in m3u.
+   Assignment of EPGs from DVB or XML for IPTV services (only Enigma2, experimental).
+   Preview (playback) of IPTV or other streams directly from the bouquet list (should be installed VLC).
+
+Keyboard shortcuts:
+    Ctrl + Insert - copies the selected channels from the main list to the the bouquet beginning or inserts (creates) a new bouquet.
+    Ctrl + BackSpace - copies the selected channels from the main list to the bouquet end.
+    Ctrl + X - only in bouquet list. Ctrl + C - only in services list.
+    Clipboard is "rubber". There is an accumulation before the insertion!
+    Ctrl + E - edit.
+    Ctrl + R, F2 - rename.
+    Ctrl + S, T in Satellites edit tool for create satellite or transponder.
+    Ctrl + L - parental lock.
+    Ctrl + H - hide/skip.
+    Ctrl + P - start play IPTV or other stream in the bouquet list.
+    Ctrl + Z - switch (zap) the channel (works when the HTTP API is enabled, Enigma2 only).
+    Ctrl + W - switch to the channel and watch in the program.
+    Space - select/deselect.
+    Left/Right - remove selection.
+    Ctrl + Up, Down, PageUp, PageDown, Home, End - move selected items in the list.
+    Ctrl + O - (re)load user data from current dir.
+    Ctrl + D - load data from receiver.
+    Ctrl + U/B upload data/bouquets to receiver.
+    Ctrl + F - show/hide search bar.
+    Ctrl + Shift + F - show/hide filter bar.
+
+    For multiple selection with the mouse, press and hold the Ctrl key!
+
+Minimum requirements:
+    Python >= 3.5.2 and GTK+ >= 3.16 with PyGObject bindings, python3-requests.
+
+Important:
+    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!** If you need full set of the data, including *[satellites, terrestrial, cables].xml* (current files will be overwritten),
+    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.
+
+
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -0,0 +1,9 @@
+Package: demon-editor
+Version: 1.0.4-Beta
+Section: utils
+Priority: optional
+Architecture: all
+Essential: no
+Depends: python3 (>= 3.5)
+Maintainer: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
+Description: Enigma2 channel and satellite list editor
--- a/deb/DEBIAN/copyright
+++ b/deb/DEBIAN/copyright
@@ -0,0 +1,26 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
+Source: https://github.com/DYefremov/DemonEditor
+
+Files: *
+MIT License
+
+Copyright (c) 2018-2020 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.
--- a/deb/DEBIAN/demon-editor-docs.docs
+++ b/deb/DEBIAN/demon-editor-docs.docs
@@ -0,0 +1 @@
+README.source
--- a/deb/usr/bin/demon-editor
+++ b/deb/usr/bin/demon-editor
@@ -0,0 +1,2 @@
+#!/bin/bash
+python3 /usr/share/demoneditor/start.py $1
--- a/deb/usr/share/applications/DemonEditor.desktop
+++ b/deb/usr/share/applications/DemonEditor.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=DemonEditor
+Comment=Channel and satellite list editor for Enigma2
+Comment[ru]=Редактор списка каналов и спутников для Enigma2
+Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
+Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
+Icon=demon-editor
+Exec=/usr/bin/demon-editor
+Terminal=false
+Type=Application
+Categories=Utility;Application;
+StartupNotify=false
--- a/deb/usr/share/demoneditor/start.py
+++ b/deb/usr/share/demoneditor/start.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python3
+from app.ui.main_app_window import start_app
+
+start_app()
--- a/deb/usr/share/icons/hicolor/96x96/apps/demon-editor.png
+++ b/deb/usr/share/icons/hicolor/96x96/apps/demon-editor.png
--- a/deb/usr/share/icons/hicolor/scalable/apps/demon-editor.svg
+++ b/deb/usr/share/icons/hicolor/scalable/apps/demon-editor.svg
@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1541"
+   version="1.1"
+   viewBox="0 0 16.743339 16.72816"
+   height="63.224556"
+   width="63.281971"
+   sodipodi:docname="demon-editor.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     id="namedview127"
+     showgrid="true"
+     fit-margin-left="0"
+     inkscape:zoom="6.1714295"
+     inkscape:cx="40.088627"
+     inkscape:cy="31.742631"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1541"
+     fit-margin-top="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid128"
+       originx="-10.604603"
+       originy="-1.1727724" />
+  </sodipodi:namedview>
+  <title
+     id="title1088">DeamonEditor Icons</title>
+  <defs
+     id="defs1535">
+    <linearGradient
+       id="linearGradient2198">
+      <stop
+         id="stop2194"
+         style="stop-color:#ffb320;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2196"
+         style="stop-color:#e7ff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2192">
+      <stop
+         offset="0"
+         style="stop-color:#ffb320;stop-opacity:1"
+         id="stop2188" />
+      <stop
+         offset="1"
+         style="stop-color:#b3c54c;stop-opacity:1"
+         id="stop2190" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3700-8">
+      <stop
+         offset="0"
+         style="stop-color:#2e4f84;stop-opacity:1"
+         id="stop2183" />
+      <stop
+         offset="1"
+         style="stop-color:#4c77c5;stop-opacity:1"
+         id="stop2185" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       spreadMethod="pad"
+       id="linearGradient1844">
+      <stop
+         style="stop-opacity:1;stop-color:#29282b"
+         offset="0"
+         id="stop1826" />
+      <stop
+         id="stop1828"
+         offset="0.13293758"
+         style="stop-color:#b5bdcf;stop-opacity:1" />
+      <stop
+         style="stop-opacity:1;stop-color:#92979f"
+         offset="0.21261224"
+         id="stop1832" />
+      <stop
+         style="stop-opacity:1;stop-color:#737881"
+         offset="0.29780689"
+         id="stop1834" />
+      <stop
+         style="stop-opacity:1;stop-color:#70757e"
+         offset="0.29780689"
+         id="stop1836" />
+      <stop
+         style="stop-opacity:1;stop-color:#e4e6e8"
+         offset="0.45395693"
+         id="stop1838" />
+      <stop
+         style="stop-opacity:1;stop-color:#696c76"
+         offset="0.71871042"
+         id="stop1840" />
+      <stop
+         style="stop-opacity:1;stop-color:#29282b"
+         offset="1"
+         id="stop1842" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1754"
+       spreadMethod="pad"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         id="stop1736"
+         offset="0"
+         style="stop-opacity:1;stop-color:#29282b" />
+      <stop
+         style="stop-color:#b5bdcf;stop-opacity:1"
+         offset="0.02582242"
+         id="stop1738" />
+      <stop
+         id="stop1740"
+         offset="0.14669065"
+         style="stop-opacity:1;stop-color:#868c95" />
+      <stop
+         id="stop1742"
+         offset="0.21261224"
+         style="stop-opacity:1;stop-color:#92979f" />
+      <stop
+         id="stop1744"
+         offset="0.29780689"
+         style="stop-opacity:1;stop-color:#737881" />
+      <stop
+         id="stop1746"
+         offset="0.29780689"
+         style="stop-opacity:1;stop-color:#70757e" />
+      <stop
+         id="stop1748"
+         offset="0.45395693"
+         style="stop-opacity:1;stop-color:#e4e6e8" />
+      <stop
+         id="stop1750"
+         offset="0.71871042"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1752"
+         offset="1"
+         style="stop-opacity:1;stop-color:#1d191a" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       spreadMethod="pad"
+       id="linearGradient1606">
+      <stop
+         style="stop-opacity:1;stop-color:#29282b"
+         offset="0"
+         id="stop1590" />
+      <stop
+         id="stop1608"
+         offset="0.03065561"
+         style="stop-color:#b5bdcf;stop-opacity:1" />
+      <stop
+         style="stop-opacity:1;stop-color:#868c95"
+         offset="0.1125849"
+         id="stop1592" />
+      <stop
+         style="stop-opacity:1;stop-color:#92979f"
+         offset="0.13955873"
+         id="stop1594" />
+      <stop
+         style="stop-opacity:1;stop-color:#737881"
+         offset="0.1915853"
+         id="stop1596" />
+      <stop
+         style="stop-opacity:1;stop-color:#70757e"
+         offset="0.25400829"
+         id="stop1598" />
+      <stop
+         style="stop-opacity:1;stop-color:#e4e6e8"
+         offset="0.45395693"
+         id="stop1600" />
+      <stop
+         style="stop-opacity:1;stop-color:#ffffff"
+         offset="0.71871042"
+         id="stop1602" />
+      <stop
+         style="stop-opacity:1;stop-color:#1d191a"
+         offset="1"
+         id="stop1604" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient886-0">
+      <stop
+         style="stop-color:#535353;stop-opacity:1"
+         offset="0"
+         id="stop888" />
+      <stop
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="1"
+         id="stop890" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1473">
+      <stop
+         id="stop1469"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         id="stop1471"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.96088022" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2447-35">
+      <stop
+         id="stop2449"
+         offset="0"
+         style="stop-color:#00c62e;stop-opacity:1" />
+      <stop
+         id="stop2451"
+         offset="1"
+         style="stop-color:#136100;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3795-1">
+      <stop
+         id="stop3797-1"
+         offset="0"
+         style="stop-color:#803400;stop-opacity:1" />
+      <stop
+         id="stop3799-3"
+         offset="1"
+         style="stop-color:#c87137;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2447-3">
+      <stop
+         style="stop-color:#c60300;stop-opacity:1"
+         offset="0"
+         id="stop2443" />
+      <stop
+         style="stop-color:#c40e00;stop-opacity:1"
+         offset="1"
+         id="stop2445" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2458">
+      <stop
+         id="stop2454"
+         offset="0"
+         style="stop-color:#c60300;stop-opacity:1" />
+      <stop
+         id="stop2456"
+         offset="1"
+         style="stop-color:#ee6000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3519">
+      <stop
+         id="stop3521"
+         offset="0"
+         style="stop-color:#1d2120;stop-opacity:1" />
+      <stop
+         id="stop3523"
+         offset="1"
+         style="stop-color:#545d5d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1446">
+      <stop
+         id="stop1442"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop1444"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1547"
+       spreadMethod="pad"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         id="stop1529"
+         offset="0"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1531"
+         offset="0.0263736"
+         style="stop-opacity:1;stop-color:#29282b" />
+      <stop
+         id="stop1533"
+         offset="0.263736"
+         style="stop-opacity:1;stop-color:#868c95" />
+      <stop
+         id="stop1535"
+         offset="0.395604"
+         style="stop-opacity:1;stop-color:#92979f" />
+      <stop
+         id="stop1537"
+         offset="0.39560401"
+         style="stop-opacity:1;stop-color:#737881" />
+      <stop
+         id="stop1539"
+         offset="0.42333773"
+         style="stop-opacity:1;stop-color:#70757e" />
+      <stop
+         id="stop1541"
+         offset="0.56268591"
+         style="stop-opacity:1;stop-color:#e4e6e8" />
+      <stop
+         id="stop1543"
+         offset="0.62400264"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1545"
+         offset="1"
+         style="stop-opacity:1;stop-color:#1d191a" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1527"
+       spreadMethod="pad"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         id="stop1509"
+         offset="0"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1511"
+         offset="0.0527472"
+         style="stop-opacity:1;stop-color:#29282b" />
+      <stop
+         id="stop1513"
+         offset="0.142147"
+         style="stop-opacity:1;stop-color:#868c95" />
+      <stop
+         id="stop1515"
+         offset="0.19700864"
+         style="stop-opacity:1;stop-color:#92979f" />
+      <stop
+         id="stop1517"
+         offset="0.25031137"
+         style="stop-opacity:1;stop-color:#737881" />
+      <stop
+         id="stop1519"
+         offset="0.3710371"
+         style="stop-opacity:1;stop-color:#70757e" />
+      <stop
+         id="stop1521"
+         offset="0.53961843"
+         style="stop-opacity:1;stop-color:#e4e6e8" />
+      <stop
+         id="stop1523"
+         offset="0.76283824"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1525"
+         offset="1"
+         style="stop-opacity:1;stop-color:#1d191a" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-5.8254634,-78.732754)"
+       y2="1179.7145"
+       x2="66.791626"
+       y1="1188.7661"
+       x1="99.044022"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1485"
+       xlink:href="#linearGradient1473" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.2733744,-70.526334)"
+       gradientUnits="userSpaceOnUse"
+       y2="1155.8046"
+       x2="67.311417"
+       y1="1161.6112"
+       x1="77.19442"
+       id="linearGradient1448"
+       xlink:href="#linearGradient1446" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-18.198747,-79.859424)"
+       gradientUnits="userSpaceOnUse"
+       y2="1186.8096"
+       x2="146.16808"
+       y1="1186.8096"
+       x1="131.86871"
+       id="linearGradient2180"
+       xlink:href="#linearGradient886-0" />
+    <linearGradient
+       gradientTransform="matrix(0.20863982,0,0,0.20863982,-0.63935937,-13.031239)"
+       gradientUnits="userSpaceOnUse"
+       y2="1184.73"
+       x2="101.19952"
+       y1="1184.73"
+       x1="83.066002"
+       id="linearGradient2160"
+       xlink:href="#linearGradient886-0" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-6.2370714,-102.12414)"
+       gradientUnits="userSpaceOnUse"
+       y2="1267.1335"
+       x2="117.99127"
+       y1="1267.1335"
+       x1="75.853806"
+       id="linearGradient2131"
+       xlink:href="#linearGradient886-0" />
+    <linearGradient
+       id="linearGradient3700-8-3">
+      <stop
+         id="stop3702-1"
+         style="stop-color:#2e4f84;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3704-8"
+         style="stop-color:#4c77c5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <defs
+       id="defs4922">
+      <filter
+         style="color-interpolation-filters:sRGB"
+         id="Adobe_OpacityMaskFilter"
+         filterUnits="userSpaceOnUse"
+         x="3.7850001"
+         y="4.6750002"
+         width="5.8829999"
+         height="73.013">
+        <feColorMatrix
+           type="matrix"
+           values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
+           id="feColorMatrix4925" />
+      </filter>
+    </defs>
+    <mask
+       maskUnits="userSpaceOnUse"
+       x="3.785"
+       y="4.675"
+       width="5.883"
+       height="73.013"
+       id="SVGID_2_">
+      <g
+         style="filter:url(#Adobe_OpacityMaskFilter)"
+         id="g4928">
+        <linearGradient
+           id="SVGID_3_"
+           gradientUnits="userSpaceOnUse"
+           x1="3.7852001"
+           y1="41.181198"
+           x2="9.6680002"
+           y2="41.181198">
+          <stop
+             offset="0"
+             style="stop-color:#FFFFFF"
+             id="stop4931" />
+          <stop
+             offset="0.0029"
+             style="stop-color:#FAFBFB"
+             id="stop4933" />
+          <stop
+             offset="0.0756"
+             style="stop-color:#BBBDBF"
+             id="stop4935" />
+          <stop
+             offset="0.1438"
+             style="stop-color:#898B8E"
+             id="stop4937" />
+          <stop
+             offset="0.2053"
+             style="stop-color:#646567"
+             id="stop4939" />
+          <stop
+             offset="0.259"
+             style="stop-color:#444446"
+             id="stop4941" />
+          <stop
+             offset="0.3028"
+             style="stop-color:#1D1C1D"
+             id="stop4943" />
+          <stop
+             offset="0.3313"
+             style="stop-color:#000000"
+             id="stop4945" />
+        </linearGradient>
+        <rect
+           style="fill:url(#SVGID_3_)"
+           x="3.7850001"
+           y="4.6750002"
+           width="5.8829999"
+           height="73.013"
+           id="rect4947" />
+      </g>
+    </mask>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter1268"
+       filterUnits="userSpaceOnUse"
+       x="3.7850001"
+       y="4.6750002"
+       width="5.8829999"
+       height="73.013">
+      <feColorMatrix
+         type="matrix"
+         values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
+         id="feColorMatrix1266" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="203.22046"
+       x2="23.551136"
+       y1="203.22046"
+       x1="13.487289"
+       id="linearGradient1160"
+       xlink:href="#linearGradient3519" />
+    <clipPath
+       id="clipPath1890"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         style="opacity:1;fill:#2d2d2d;fill-opacity:1;stroke:#434242;stroke-width:0.0575568;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle1892"
+         cx="78.548424"
+         cy="-31.019459"
+         r="6.4721422"
+         transform="scale(1,-1)" />
+    </clipPath>
+    <linearGradient
+       gradientTransform="translate(-0.24389927,14.877856)"
+       y2="27.314217"
+       x2="84.864914"
+       y1="27.314217"
+       x1="72.164909"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2134"
+       xlink:href="#linearGradient3700-8-3" />
+  </defs>
+  <metadata
+     id="metadata1538">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>DeamonEditor Icons</dc:title>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>mfgeg</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:date>7.1.2020</dc:date>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.1690805,0,0,1.1690805,-14.929261,-167.45253)"
+     id="layer1">
+    <g
+       transform="translate(0.86526724,-82.691658)"
+       id="g1351">
+      <path
+         d="m 13.715358,227.65981 h 2.97616 v 12.57332 h -2.97616 z m 5.79826,-1.73376 -0.327076,0.42227 c -0.179879,0.23226 -0.586303,0.67932 -0.903223,0.99412 -0.480677,0.47726 -0.640897,0.57235 -0.967777,0.57235 -0.223557,0 -0.380895,-0.0584 -0.624024,-0.25067 v 3.18307 c 0.172884,-0.0214 0.359647,-0.0333 0.575071,-0.0352 0.68403,-0.006 0.91815,0.0416 1.436333,0.29581 1.14586,0.56274 1.762492,1.5589 1.768251,2.8566 0.0094,2.10836 -1.870896,3.55161 -3.779655,3.16529 v 3.10345 c 4.345352,0.0758 4.093104,-2.37537 6.573781,-2.25837 1.486139,0.0748 1.333421,0.16555 1.796225,-1.064 l 0.259834,-0.6913 -0.803704,-0.66493 c -0.960855,-0.79478 -1.303983,-1.29079 -1.205013,-1.74132 0.06631,-0.30189 1.20818,-1.50093 1.779011,-1.86778 0.240181,-0.1543 0.244255,-0.17878 0.09575,-0.59661 -0.08522,-0.23979 -0.259522,-0.65746 -0.386789,-0.92744 l -0.23132,-0.49115 h -1.412666 c -1.868582,0 -1.802386,0.068 -1.805368,-1.82472 l -0.0021,-1.43582 -0.917745,-0.37171 z"
+         style="opacity:1;fill:#000000;fill-opacity:0.5372549;stroke:none;stroke-width:0.18460207;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         id="path2133"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2106"
+         style="opacity:1;fill:url(#linearGradient2131);fill-opacity:1;stroke:none;stroke-width:0.17733108;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         d="m 13.832581,227.93117 h 2.858936 v 12.07807 h -2.858936 z m 5.569881,-1.6655 -0.314194,0.40566 c -0.172793,0.22309 -0.563209,0.65257 -0.867647,0.95496 -0.46174,0.45847 -0.615654,0.5498 -0.929658,0.5498 -0.214752,0 -0.365893,-0.056 -0.599446,-0.24079 v 3.05768 c 0.166077,-0.0206 0.345483,-0.0319 0.55242,-0.0338 0.657089,-0.006 0.881987,0.0399 1.379764,0.28416 1.100724,0.54057 1.693073,1.49747 1.698606,2.74408 0.009,2.02535 -1.797211,3.41174 -3.63079,3.04061 v 2.98122 c 4.174205,0.0728 3.931888,-2.28179 6.314859,-2.1694 1.427604,0.0718 1.2809,0.15902 1.725477,-1.02213 l 0.249597,-0.66408 -0.772046,-0.63871 c -0.923009,-0.76345 -1.252622,-1.23996 -1.157552,-1.67277 0.0637,-0.29001 1.160592,-1.44177 1.708939,-1.79419 0.230721,-0.14825 0.234635,-0.17174 0.09198,-0.57312 -0.08187,-0.23032 -0.249296,-0.63156 -0.371555,-0.89088 l -0.222207,-0.4718 h -1.357022 c -1.794983,0 -1.731396,0.0653 -1.734262,-1.75284 l -0.0021,-1.3793 -0.881603,-0.35705 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2151"
+         d="m 17.266983,230.95755 c -0.215637,0.003 -0.402408,0.014 -0.575465,0.0354 v 6.28854 c 1.910653,0.38671 3.792716,-1.05815 3.783336,-3.16865 -0.0058,-1.29897 -0.623064,-2.29597 -1.770059,-2.85927 -0.518699,-0.25451 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482341,1.17002 c 0.433747,-0.004 0.582202,0.0265 0.910784,0.18761 0.726595,0.35682 1.117604,0.98848 1.121256,1.81134 0.0059,1.33694 -1.186343,2.25211 -2.396695,2.00715 v -3.98359 c 0.109628,-0.0135 0.228054,-0.0214 0.364655,-0.0225 z"
+         style="opacity:1;fill:url(#linearGradient2160);fill-opacity:1;stroke:none;stroke-width:0.18478528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient2180);stroke-width:0.18478528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         d="m 17.266981,230.95753 c -0.215636,0.003 -0.402408,0.014 -0.575464,0.0354 v 6.28853 c 1.910652,0.38672 3.792715,-1.05815 3.783336,-3.16865 -0.0057,-1.29897 -0.623065,-2.29597 -1.77006,-2.85927 -0.518697,-0.2545 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482343,1.17001 c 0.433747,-0.004 0.5822,0.0265 0.910783,0.18762 0.726594,0.35681 1.117605,0.98848 1.121257,1.81133 0.006,1.33694 -1.186344,2.25211 -2.396697,2.00716 v -3.98359 c 0.109628,-0.0135 0.228055,-0.0214 0.364657,-0.0225 z"
+         id="path2170"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1422"
+         d="m 17.266983,230.95755 c -0.215637,0.003 -0.402408,0.014 -0.575464,0.0354 v 6.28854 c 1.910652,0.38671 3.792715,-1.05815 3.783335,-3.16865 -0.0057,-1.29897 -0.623064,-2.29597 -1.770059,-2.85927 -0.518699,-0.25451 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482342,1.17002 c 0.433748,-0.004 0.582201,0.0265 0.910784,0.18761 0.726594,0.35682 1.117605,0.98848 1.121257,1.81134 0.006,1.33694 -1.186344,2.25211 -2.396697,2.00715 v -3.98359 c 0.109628,-0.0135 0.228054,-0.0214 0.364656,-0.0225 z"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient1448);stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1454"
+         d="m 19.402462,226.26149 -0.314194,0.40566 c -0.172793,0.22309 -0.563209,0.65259 -0.867644,0.95499 -0.461741,0.45847 -0.615657,0.54983 -0.929661,0.54983 -0.214752,0 -0.365893,-0.056 -0.599446,-0.2408 v -0.004 h -2.858741 v 12.0783 h 2.858741 c 4.174205,0.0728 3.931888,-2.28177 6.314861,-2.16937 1.427604,0.0718 1.280898,0.15899 1.725475,-1.02217 l 0.249597,-0.66402 -0.772046,-0.63873 c -0.923009,-0.76346 -1.252622,-1.23997 -1.157552,-1.67278 0.0637,-0.29001 1.160595,-1.44176 1.708939,-1.79419 0.230721,-0.14825 0.234635,-0.17171 0.09198,-0.57309 -0.08187,-0.23032 -0.249296,-0.63158 -0.371555,-0.8909 l -0.222207,-0.47181 h -1.357025 c -1.794983,0 -1.731393,0.0653 -1.734259,-1.75286 l -0.0021,-1.37925 -0.8816,-0.35708 z"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient1485);stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(63.49728,-55.136805)"
+       id="g1174" />
+    <g
+       transform="translate(50.48327,11.624037)"
+       id="g1812" />
+  </g>
+</svg>
--- a/deb/usr/share/locale/be/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/be/LC_MESSAGES/demon-editor.mo
--- a/deb/usr/share/locale/de/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/de/LC_MESSAGES/demon-editor.mo
--- a/deb/usr/share/locale/es/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/es/LC_MESSAGES/demon-editor.mo
--- a/deb/usr/share/locale/nl/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/nl/LC_MESSAGES/demon-editor.mo
--- a/deb/usr/share/locale/pl/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/pl/LC_MESSAGES/demon-editor.mo
--- a/deb/usr/share/locale/pt/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/pt/LC_MESSAGES/demon-editor.mo
--- a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo
--- a/deb/usr/share/locale/tr/LC_MESSAGES/demon-editor.mo
+++ b/deb/usr/share/locale/tr/LC_MESSAGES/demon-editor.mo
--- a/icon.icns
+++ b/icon.icns
--- a/po/be/demon-editor.po
+++ b/po/be/demon-editor.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 Dmitriy Yefremov
+# Copyright (C) 2018-2020 Dmitriy Yefremov
 # This file is distributed under the MIT license.
 #
 #
@@ -909,13 +909,13 @@ msgid "Sample rate (Hz):"
 msgstr "Частата дыскр. (Гц):"

 msgid "Play streams mode:"
-msgstr "Рэжым прайгравання патокаў:"
+msgstr "Рэжым прайгравання струменяў:"

 msgid "Built-in player"
 msgstr "Убудаваны плэер"

-msgid "In a separate window"
-msgstr "У асобным акне"
+msgid "VLC media player"
+msgstr "VLC медыяплэер"

 msgid "Only get m3u file"
 msgstr "Атрымаць файл *.m3u"
@@ -1201,42 +1201,3 @@ msgstr "Толькі DreamOS!"

 msgid "A similar service is already in this list!"
 msgstr "Падобны сэрвіс ужо ёсць у гэтым спісе!"
-
-msgid "Play mode has been changed!\nRestart the program to apply the settings."
-msgstr "Зменены рэжым прайгравання!\nПеразапусціце праграму для ўжывання налад."
-
-msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
-msgstr "Усталюйце значэнні TID, NID і пр. імёнаў для слушнага наймення пiконаў!"
-
-msgid "Streams detected:"
-msgstr "Выяўлена патокаў:"
-
-msgid "Download picons"
-msgstr "Загрузіць пiконы"
-
-msgid "Errors:"
-msgstr "Памылак:"
-
-msgid "Use to play streams:"
-msgstr "Скарыстаць для прайгравання патокаў:"
-
-msgid "Font in the lists:"
-msgstr "Шрыфт у спісах:"
-
-msgid "Picons size in the lists:"
-msgstr "Памер пiконаў у спісах:"
-
-msgid "Logo size in tooltips:"
-msgstr "Памер лагатыпа ва ўсплыўных падказках:"
-
-msgid "Save as"
-msgstr "Захаваць як"
-
-msgid "Mark duplicates"
-msgstr "Адзначыць дублікаты"
-
-msgid "Load only for selected bouquet"
-msgstr "Загрузіць толькі для абранага букета"
-
-msgid "The task is canceled!"
-msgstr "Заданне скасавана!"
--- a/po/de/demon-editor.po
+++ b/po/de/demon-editor.po
@@ -1,9 +1,8 @@
-# Copyright (C) 2018-2021 Dmitriy Yefremov
+# Copyright (C) 2018-2020 Dmitriy Yefremov
 # This file is distributed under the MIT license.
 #
 # Charly, 2019.
-# Dmitriy Yefremov, 2020-2021.
-# Thomas Schmidt, 2021
+# Dmitriy Yefremov, 2020.
 msgid ""
 msgstr ""
 "Last-Translator: Dmitriy Yefremov\n"
@@ -13,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 msgid "translator-credits"
-msgstr "Charly\nDmitriy Yefremov\nThomas Schmidt"
+msgstr "Charly\nDmitriy Yefremov"

 # Main
 msgid "Service"
@@ -32,7 +31,7 @@ msgid "Freq"
 msgstr "Freq"

 msgid "Rate"
-msgstr "SR"
+msgstr "Bewertung"

 msgid "Pol"
 msgstr "Pol."
@@ -667,16 +666,16 @@ msgid "Test connection"
 msgstr "Test Verbindung"

 msgid "Double click on the service in the bouquet list:"
-msgstr "Doppelklick auf das Service in der Bouquet-Liste:"
+msgstr "Doppelklicke auf das Service in der Bouquetliste:"

 msgid "Zap"
 msgstr "Zap"

 msgid "Play  stream"
-msgstr "Stream abspielen"
+msgstr "Play  Stream"

 msgid "Disabled"
-msgstr "Deaktiviert"
+msgstr "Ausgeschaltet"

 msgid "Enable lamedb ver. 5 support"
 msgstr "Lamedb ver. 5 Unterstützung aktivieren"
@@ -694,7 +693,7 @@ msgid "Play IPTV or other stream in the program(Ctrl + P)"
 msgstr "Wiedergabe von IPTV oder anderen Streams im Programm(Strg + P)"

 msgid "Export to m3u"
-msgstr "Exportieren nach m3u"
+msgstr "Export nach m3u"

 msgid "EPG configuration"
 msgstr "EPG Konfiguration"
@@ -721,13 +720,13 @@ msgid "Url to *.xml.gz file:"
 msgstr "Url zur *.xml.gz Datei:"

 msgid "Enable filtering"
-msgstr "Filter aktivieren"
+msgstr "Filterung einschalten"

 msgid "Filter by presence in the epg.dat file."
 msgstr "Filtern nach dem Vorhandensein in der epg.dat Datei."

 msgid "Paths to the epg.dat file:"
-msgstr "Pfad zur epg.dat Datei:"
+msgstr "Pfade zur epg.dat Datei:"

 msgid "Local path:"
 msgstr "Local path:"
@@ -751,7 +750,7 @@ msgid "Unsupported file type:"
 msgstr "Nicht unterstützter Dateityp:"

 msgid "Unpacking data error."
-msgstr "Fehler beim Entpacken der Daten."
+msgstr "Fehler beim Entpacken von Daten."

 msgid "XML parsing error:"
 msgstr "XML Parsing-Fehler:"
@@ -766,7 +765,7 @@ msgid "Use HTTP"
 msgstr "HTTP verwenden"

 msgid "Close playback"
-msgstr "Wiedergabe schließen"
+msgstr "Wiedergabe schliessen"

 msgid "Import YouTube playlist"
 msgstr "YouTube-Wiedergabeliste importieren"
@@ -775,8 +774,8 @@ msgid ""
 "Found a link to the YouTube resource!\n"
 "Try to get a direct link to the video?"
 msgstr ""
-"Link zur YouTube-Ressource gefunden!\n"
-"Soll versucht werden, einen Direkt-Link zum Video zu erzeugen?"
+"Ich habe einen Link zur YouTube-Ressource gefunden!\n"
+"Versuchen einen direkten Link zum Video zu bekommen?"

 msgid "Playlist import"
 msgstr "Playlist-Import"
@@ -785,7 +784,7 @@ msgid "Getting link error:"
 msgstr "Link-Fehler erhalten:"

 msgid "Extra"
-msgstr "Extras"
+msgstr "Extra"

 msgid "Apply profile settings"
 msgstr "Profileinstellungen anwenden"
@@ -794,7 +793,7 @@ msgid "Settings type:"
 msgstr "Art der Einstellungen:"

 msgid "Set default"
-msgstr "Standard wiederherstellen"
+msgstr "Standard setzen"

 msgid "Language:"
 msgstr "Sprache:"
@@ -806,16 +805,16 @@ msgid "Enable direct playback bar"
 msgstr "Aktivieren der direkten Wiedergabeleiste"

 msgid "Enables direct sending and playback of media links on the receiver"
-msgstr "Ermöglicht das direkte Senden und Abspielen von Medienlinks auf dem Receiver"
+msgstr "Ermöglicht das direkte Senden und Abspielen von Medienlinks auf dem Box"

 msgid "Watch the channel in the program"
-msgstr "Kanal im Programm ansehen"
+msgstr "Gucken den Kanal im Programm an"

 msgid "Zap and Play"
 msgstr "Zap und Abspielen"

 msgid "Drag  or paste the link here"
-msgstr "Link hineinziehen oder einfügen"
+msgstr "Ziehe den Link hierher oder füge ihn ein"

 msgid "Remove added links in the playlist"
 msgstr "Hinzugefügte Links in der Wiedergabeliste entfernen"
@@ -833,13 +832,13 @@ msgid "Reset"
 msgstr "Reset"

 msgid "File"
-msgstr "Datei"
+msgstr "Ablage"

 msgid "Picons manager"
 msgstr "Picons-Manager"

 msgid "Explorer"
-msgstr "Explorer"
+msgstr ""

 msgid "Satellite url:"
 msgstr "Satellit URL:"
@@ -917,40 +916,40 @@ msgid "Height (px):"
 msgstr "Höhe (px):"

 msgid "Channels:"
-msgstr "Kanäle:"
+msgstr "Kanälen:"

 msgid "Sample rate (Hz):"
-msgstr "Sample-Rate (Hz):"
+msgstr "Samplerate (Hz):"

 msgid "Play streams mode:"
-msgstr "Stream-Abspielmodus:"
+msgstr "Streams Abspielen-Modus:"

 msgid "Built-in player"
 msgstr "Integrierter Player"

-msgid "In a separate window"
-msgstr "In einem separaten Fenster"
+msgid "VLC media player"
+msgstr "VLC Media Player"

 msgid "Only get m3u file"
 msgstr "Nur m3u-Datei erhalten"

 msgid "Save and restart the program to apply the settings."
-msgstr "Änderungen speichern und anschließend das Programm neustarten, um die Einstellungen zu übernehmen."
+msgstr "Speicher und starte das Programm neu, um die Einstellungen zu übernehmen."

 msgid "Some images may have problems displaying the favorites list!"
-msgstr "Einige Bilder können Probleme in der Anzeige der Favoritenliste haben!"
+msgstr "Einige Images können Probleme mit der Anzeige der Favoritenliste haben!"

 msgid "Operates in standby mode or current active transponder!"
-msgstr "Arbeitet im Standby-Modus oder der Transponder ist bereits in Verwendung!"
+msgstr "Arbeitet im Standby-Modus oder auf dem aktuell aktiven Transponder!"

 msgid "No connection to the receiver!"
-msgstr "Keine Verbindung zum Receiver!"
+msgstr "Keine Verbindung zum Box!"

 msgid "Signal level"
 msgstr "Signalpegel"

 msgid "Receiver info"
-msgstr "Receiver-Info"
+msgstr "Box-Info"

 msgid "A profile with that name exists!"
 msgstr "Ein Profil mit diesem Namen existiert!"
@@ -959,10 +958,10 @@ msgid "Show short info as hints in the main services list"
 msgstr "Kurzinfos als Tooltips in der Hauptliste anzeigen"

 msgid "Show detailed info as hints in the bouquet list"
-msgstr "Detaillierte Informationen als Tooltips in der Bouquetliste anzeigen"
+msgstr "Detaillierteinfos als Tooltips in der Bouquetliste anzeigen"

 msgid "Enable alternate bouquet file naming"
-msgstr "Aktivieren der alternativen Benennung für Bouquet-Dateien"
+msgstr "Aktivieren der Alternativerbenennung für Bouquet-Dateien"

 msgid "Allows you to name bouquet files using their names."
 msgstr "Ermöglicht Bouquet-Dateien mit ihren Namen zu benennen."
@@ -971,7 +970,7 @@ msgid "Appearance"
 msgstr "Aussehen"

 msgid "Enable Themes support"
-msgstr "Theme Unterstützung aktivieren"
+msgstr "Unterstützung von Themen aktivieren"

 msgid "Gtk3 Theme:"
 msgstr "Gtk3-Theme:"
@@ -980,7 +979,7 @@ msgid "Icon Theme:"
 msgstr "Icon-Theme:"

 msgid "Gtk3 Themes and Icons:"
-msgstr "Gtk3 Themes und Icons:"
+msgstr "Gtk3 Themes and Icons:"

 msgid "Deleting data..."
 msgstr "Daten löschen..."
@@ -989,7 +988,7 @@ msgid "Download from the receiver"
 msgstr "Downloaden vom Receiver"

 msgid "Remove all picons from the receiver"
-msgstr "Alle Picons vom dem Receiver entfernen"
+msgstr "Alle Picons aus dem Receiver entfernen"

 msgid "Service reference"
 msgstr "Kanalreferenz"
@@ -1022,7 +1021,7 @@ msgid "Are you sure you want to change the order\n\t of services in this bouquet
 msgstr "Bist du sicher, dass du die Reihenfolge der Dienstleistungen\n\t in diesem Bouquet ändern willst?"

 msgid "Remove from the receiver"
-msgstr "Vom Receiver entfernen"
+msgstr "Aus dem Receiver entfernen"

 msgid "Screenshot"
 msgstr "Screenshot"
@@ -1040,7 +1039,7 @@ msgid "Can't Playback!"
 msgstr "Kann nicht abgespielt werden!"

 msgid "Enable Dark Mode"
-msgstr "Dunkler Modus aktivieren"
+msgstr "Dunkelmodus aktivieren"

 msgid "Extract..."
 msgstr "Entpacken..."
@@ -1052,7 +1051,7 @@ msgid "Combine with the current data?"
 msgstr "Mit den aktuellen Daten kombinieren?"

 msgid "Importing data done!"
-msgstr "Daten-Import abgeschlossen!"
+msgstr "Daten importieren erledigt!"

 msgid "Current service"
 msgstr "Aktueller Service"
@@ -1064,13 +1063,13 @@ msgid "Open archive"
 msgstr "Archiv öffnen"

 msgid "Import from Web"
-msgstr "Import aus dem Internet"
+msgstr "Import aus dem Web"

 msgid "Control"
 msgstr "Steuerung"

 msgid "Timers"
-msgstr "Timer"
+msgstr "Timers"

 msgid "Timer"
 msgstr "Timer"
@@ -1112,7 +1111,7 @@ msgid "Auto"
 msgstr "Auto"

 msgid "Grab screenshot"
-msgstr "Screenshot aufnehmen"
+msgstr "Screenshot schnappen"

 msgid "Enabled:"
 msgstr "Aktiviert:"
@@ -1139,7 +1138,7 @@ msgid "Ends:"
 msgstr "Endet:"

 msgid "Repeated:"
-msgstr "Wiederholt:"
+msgstr "Wiederhole:"

 msgid "Action:"
 msgstr "Aktion:"
@@ -1215,42 +1214,3 @@ msgstr "Nur DreamOS!"

 msgid "A similar service is already in this list!"
 msgstr "Ein ähnlicher Dienst ist bereits in dieser Liste enthalten!"
-
-msgid "Play mode has been changed!\nRestart the program to apply the settings."
-msgstr "Abspiel-Modus wurde geändert!\nStarte  das Programm neu, um die Einstellungen zu übernehmen."
-
-msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
-msgstr "Stelle die Werte für TID, NID und Namespace für die korrekte Benennung der Picons ein!"
-
-msgid "Streams detected:"
-msgstr "Streams gefunden:"
-
-msgid "Download picons"
-msgstr "Download picons"
-
-msgid "Errors:"
-msgstr "Fehler:"
-
-msgid "Use to play streams:"
-msgstr "Zum Abspielen von Streams verwenden:"
-
-msgid "Font in the lists:"
-msgstr "Schrift in den Listen:"
-
-msgid "Picons size in the lists:"
-msgstr "Picons Größe in den Listen:"
-
-msgid "Logo size in tooltips:"
-msgstr "Logo-Größe in Tooltips:"
-
-msgid "Save as"
-msgstr "Speichern als"
-
-msgid "Mark duplicates"
-msgstr "Duplikate markieren"
-
-msgid "Load only for selected bouquet"
-msgstr "Nur für ausgewähltes Bouquet laden"
-
-msgid "The task is canceled!"
-msgstr "Der Task wird abgebrochen!"
--- a/po/ru/demon-editor.po
+++ b/po/ru/demon-editor.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 Dmitriy Yefremov
+# Copyright (C) 2018-2020 Dmitriy Yefremov
 # This file is distributed under the MIT license.
 #
 #
@@ -914,8 +914,8 @@ msgstr "Режим воспроизведения потоков:"
 msgid "Built-in player"
 msgstr "Встроенный плеер"

-msgid "In a separate window"
-msgstr "В отдельном окне"
+msgid "VLC media player"
+msgstr "VLC медиаплеер"

 msgid "Only get m3u file"
 msgstr "Получить файл *.m3u"
@@ -1198,42 +1198,3 @@ msgstr "Только DreamOS!"

 msgid "A similar service is already in this list!"
 msgstr "Подобный сервис уже есть в этом списке!"
-
-msgid "Play mode has been changed!\nRestart the program to apply the settings."
-msgstr "Изменен режим воспроизведения!\nПерезапустите программу для применения настроек."
-
-msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
-msgstr "Установите значения TID, NID и пр. имен для правильного именования пиконов!"
-
-msgid "Streams detected:"
-msgstr "Обнаружено потоков:"
-
-msgid "Download picons"
-msgstr "Загрузить пиконы"
-
-msgid "Errors:"
-msgstr "Ошибок:"
-
-msgid "Use to play streams:"
-msgstr "Использовать для воспроизведения потоков:"
-
-msgid "Font in the lists:"
-msgstr "Шрифт в списках:"
-
-msgid "Picons size in the lists:"
-msgstr "Размер пиконов в списках:"
-
-msgid "Logo size in tooltips:"
-msgstr "Размер логотипа во всплывающих подсказках:"
-
-msgid "Save as"
-msgstr "Сохранить как"
-
-msgid "Mark duplicates"
-msgstr "Отметить дубликаты"
-
-msgid "Load only for selected bouquet"
-msgstr "Загрузить только для выбранного букета"
-
-msgid "The task is canceled!"
-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-02-22 23:53+0300\n"
+"PO-Revision-Date: 2020-06-08 21:53+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"
 "Language-Team: \n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: tr\n"

@@ -107,9 +107,6 @@ msgstr "Varsayılan adı ayarla"
 msgid "Insert marker"
 msgstr "İşaretçi ekle"

-msgid "Insert space"
-msgstr "Boşluk ekle"
-
 msgid "Locate in services"
 msgstr "Hizmetlerde bulun"

@@ -521,9 +518,6 @@ msgstr "Lütfen sadece bir ürün seçiniz!"
 msgid "No png file is selected!"
 msgstr "Hiçbir png dosyası seçilmedi!"

-msgid "No profile selected!"
-msgstr "Profil seçilmedi!"
-
 msgid "No reference is present!"
 msgstr "Referans yok!"

@@ -929,8 +923,8 @@ msgstr "Akışları oynatma modu:"
 msgid "Built-in player"
 msgstr "Dahili oynatıcı"

-msgid "In a separate window"
-msgstr "Ayrı bir pencerede"
+msgid "VLC media player"
+msgstr "VLC media player"

 msgid "Only get m3u file"
 msgstr "Sadece m3u dosyası al"
@@ -994,254 +988,3 @@ msgstr "Alıcıdaki tüm piconları kaldırın"

 msgid "Service reference"
 msgstr "Servis referansı"
-
-msgid "Enable support for"
-msgstr "Temalar için desteği etkinleştir"
-
-msgid "Auto-check for updates"
-msgstr "Güncellemeleri otomatik kontrol et"
-
-msgid "Filter services"
-msgstr "Services filtrele"
-
-msgid "Filter services in the main list."
-msgstr "Ana listedeki services filtreleyin."
-
-msgid "Destination:"
-msgstr "Hedef:"
-
-msgid "EXPERIMENTAL!"
-msgstr "EXPERIMENTAL!"
-
-msgid "Sorting data..."
-msgstr "Verilerin sıralanması..."
-
-msgid ""
-"There are unsaved changes.\n"
-"\n"
-"\t Save them now?"
-msgstr ""
-"Kaydedilmemiş değişiklikler var.\n"
-"\n"
-"\tŞimdi kaydedilsin mi?"
-
-msgid ""
-"Are you sure you want to change the order\n"
-"\t of services in this bouquet?"
-msgstr ""
-"Sırayı değiştirmek istediğinizden emin misiniz\n"
-"\t Bu buketdeki hizmetlerin sayısı?"
-
-msgid "Remove from the receiver"
-msgstr "Alıcıdaki tüm piconları kaldırın"
-
-msgid "Screenshot"
-msgstr "Ekran görüntüsü"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "The Neutrino has only experimental support. Not all features are supported!"
-msgstr "Neutrino'nun yalnızca experimental desteği var. Tüm özellikler desteklenmiyor!"
-
-msgid "Enable experimental features"
-msgstr "Experimental özellikleri etkinleştirin"
-
-msgid "Can't Playback!"
-msgstr "Oynatılamıyor!"
-
-msgid "Enable Dark Mode"
-msgstr "Koyu Modu Etkinleştir"
-
-msgid "Extract..."
-msgstr "Çıkart..."
-
-msgid "Unsupported format!"
-msgstr "Desteklenmeyen format!"
-
-msgid "Combine with the current data?"
-msgstr "Mevcut verilerle birleştirilsin mi?"
-
-msgid "Importing data done!"
-msgstr "Verilerin içe aktarılması tamamlandı!"
-
-msgid "Current service"
-msgstr "Mevcut service"
-
-msgid "Open folder"
-msgstr "Dosya aç"
-
-msgid "Open archive"
-msgstr "Arşiv aç"
-
-msgid "Import from Web"
-msgstr "Web'den içe aktar"
-
-msgid "Control"
-msgstr "Control"
-
-msgid "Timers"
-msgstr "Zamanlayıcılar"
-
-msgid "Timer"
-msgstr "Zamanlayıcı"
-
-msgid "Add timer"
-msgstr "Zamanlayıcı ekle"
-
-msgid "Hr."
-msgstr "Hr."
-
-msgid "Min."
-msgstr "Min."
-
-msgid "Power"
-msgstr "Power"
-
-msgid "Standby"
-msgstr "Standby"
-
-msgid "Wake Up"
-msgstr "Wake Up"
-
-msgid "Reboot"
-msgstr "Reboot"
-
-msgid "Restart GUI"
-msgstr "Restart GUI"
-
-msgid "Shutdown"
-msgstr "Shutdown"
-
-msgid "Shut down"
-msgstr "Kapat"
-
-msgid "Do Nothing"
-msgstr "Hiçbir şey yapma"
-
-msgid "Auto"
-msgstr "Auto"
-
-msgid "Grab screenshot"
-msgstr "Ekran görüntüsü al"
-
-msgid "Enabled:"
-msgstr "Etkin:"
-
-msgid "Name:"
-msgstr "Ad:"
-
-msgid "Description:"
-msgstr "Açıklama:"
-
-msgid "Service:"
-msgstr "Service:"
-
-msgid "Service reference:"
-msgstr "Servis referansı:"
-
-msgid "Event ID:"
-msgstr "Olay Kimliği:"
-
-msgid "Begins:"
-msgstr "Başlıyor:"
-
-msgid "Ends:"
-msgstr "Bitiş:"
-
-msgid "Repeated:"
-msgstr "Tekrar:"
-
-msgid "Action:"
-msgstr "Aksiyon:"
-
-msgid "After event:"
-msgstr "Olaydan sonra:"
-
-msgid "Location:"
-msgstr "Konum:"
-
-msgid "Mo"
-msgstr "Pzt"
-
-msgid "Tu"
-msgstr "Sal"
-
-msgid "We"
-msgstr "Çar"
-
-msgid "Th"
-msgstr "Per"
-
-msgid "Fr"
-msgstr "Cum"
-
-msgid "Sa"
-msgstr "Cmt"
-
-msgid "Su"
-msgstr "Paz"
-
-msgid "Set"
-msgstr "Yüklemek"
-
-msgid "Services update"
-msgstr "Servisleri güncelle"
-
-msgid "Create folder"
-msgstr "Klasör oluştur"
-
-msgid "FTP client"
-msgstr "FTP istemcisi"
-
-msgid "The file size is too large!"
-msgstr "Dosya boyutu çok büyük!"
-
-msgid "Connect"
-msgstr "Bağlan"
-
-msgid "Disconnect"
-msgstr "Bağlantıyı kes"
-
-msgid "Size"
-msgstr "Boyut"
-
-msgid "Date"
-msgstr "Saat"
-
-msgid "Attr."
-msgstr "Özellik."
-
-msgid "Toggle display position"
-msgstr "Görüntü konumunu değiştir"
-
-msgid "Alternatives"
-msgstr "Alternatifler"
-
-msgid "Add alternatives"
-msgstr "Alternatif ekleyin"
-
-msgid "DreamOS only!"
-msgstr "Sadece DreamOS!"
-
-msgid "A similar service is already in this list!"
-msgstr "Bu listede zaten benzer bir hizmet var!"
-
-msgid ""
-"Play mode has been changed!\n"
-"Restart the program to apply the settings."
-msgstr ""
-"Oynatma modu değiştirildi!\n"
-"Ayarları uygulamak için programı yeniden başlatın."
-
-msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
-msgstr "Piconların doğru isimlendirilmesi için TID, NID ve Namespace değerlerini ayarlayın!"
-
-msgid "Streams detected:"
-msgstr "Akışlar algılandı:"
-
-msgid "Download picons"
-msgstr "Picon'lar indirin"
-
-msgid "Errors:"
-msgstr "Hatalar:"
--- a/start.py
+++ b/start.py
@@ -1,19 +1,29 @@
 #!/usr/bin/env python3
+import os
+
+
+def update_icon():
+    need_update = False
+    icon_name = "DemonEditor.desktop"
+
+    with open(icon_name, "r") as f:
+        lines = f.readlines()
+        for i, line in enumerate(lines):
+            if line.startswith("Icon="):
+                icon_path = line.lstrip("Icon=")
+                current_path = "{}/app/ui/icons/hicolor/96x96/apps/demon-editor.png".format(os.getcwd())
+                if icon_path != current_path:
+                    need_update = True
+                    lines[i] = "Icon={}\n".format(current_path)
+                break
+
+    if need_update:
+        with open(icon_name, "w") as f:
+            f.writelines(lines)

-try:
-    from Cocoa import NSBundle
-except ImportError as e:
-    print(e)
-else:
-    ns_bundle = NSBundle.mainBundle()
-    if ns_bundle:
-        ns_bundle = ns_bundle.localizedInfoDictionary() or ns_bundle.infoDictionary()
-        if ns_bundle:
-            ns_bundle["CFBundleName"] = "DemonEditor"

 if __name__ == "__main__":
-    from multiprocessing import set_start_method
    from app.ui.main_app_window import start_app

-    set_start_method("fork")  # For compatibility [Python > 3.7]
+    update_icon()
    start_app()
Author	SHA1	Message	Date
DYefremov	d95ec0af17	Russian, Belarusian and German translations update	2021-01-12 11:53:00 +03:00
DYefremov	77c159fc1a	added separator to profile toolbar	2021-01-12 11:22:57 +03:00
DYefremov	95508c3015	changed alternatives naming	2021-01-11 17:15:39 +03:00
DYefremov	1f6e6b9812	added 8739 stream type	2021-01-11 12:30:44 +03:00
DYefremov	20697a08f2	naming alternatives fix	2021-01-10 22:42:16 +03:00
DYefremov	95c7213988	added moving alternatives in the list	2021-01-10 14:05:01 +03:00
DYefremov	a988ea6e68	added editing of alternatives	2021-01-08 23:01:16 +03:00
DYefremov	061e42a36e	set extra tools visible by default	2021-01-08 13:16:14 +03:00
DYefremov	3a5473ca03	removed bq position option	2021-01-07 10:34:10 +03:00
DYefremov	54a5be9c3d	added separate column for picon to fav list	2021-01-06 22:46:12 +03:00
DYefremov	858c64d531	added basic support for alternatives (#42 )	2021-01-05 23:07:15 +03:00
DYefremov	f05802841d	some streams detection fix	2021-01-02 23:17:22 +03:00
DYefremov	e4af45b0e0	redesigned network settings	2020-12-29 22:41:28 +03:00
DYefremov	0cad69cb00	bump version	2020-12-29 22:41:12 +03:00
DYefremov	071fffb303	_config.yml update	2020-12-27 23:19:29 +03:00
DYefremov	95d51d37e9	README update	2020-12-26 19:55:18 +03:00
DYefremov	f1935e4a56	added display option for bouquet details list	2020-12-24 23:30:29 +03:00
DYefremov	96aeb05dd1	minor compatibility [xenial] fix	2020-12-23 19:39:57 +03:00
DYefremov	af1c3c3ca6	README update	2020-12-23 09:10:03 +03:00
DYefremov	2ba37f1506	Russian, Belarusian and German translations update	2020-12-23 09:09:42 +03:00
DYefremov	8581de5a10	yt fix	2020-12-23 09:09:08 +03:00
DYefremov	155f3b254a	ftp client improvements	2020-12-22 14:18:16 +03:00
DYefremov	13e6c858d2	storing app window size on close	2020-12-19 12:36:42 +03:00
DYefremov	7fac48c44d	added alternate layout option	2020-12-18 22:13:15 +03:00
DYefremov	9aa2ec191e	added ftp client to main window	2020-12-16 23:28:00 +03:00
DYefremov	13e12165eb	added ftp client base class	2020-12-16 23:20:51 +03:00
DYefremov	ae37feebaa	added keyboard key	2020-12-16 00:32:32 +03:00
DYefremov	573bcba32f	ftp refactoring [func extension]	2020-12-13 15:19:38 +03:00
DYefremov	f4e5c56d39	allowed to add dir during path config	2020-12-13 15:19:01 +03:00
DYefremov	4dc0dffc1f	README update	2020-12-10 21:28:09 +03:00
DYefremov	ceb329700d	added encoding detection for *.m3u import	2020-12-07 09:30:03 +03:00
DYefremov	8cca2da48d	data load rework (#37 fix [can't decode byte])	2020-12-05 14:16:07 +03:00
DYefremov	e9bab4ebb7	bump version	2020-12-04 15:06:12 +03:00
DYefremov	3e7750e4ef	added playlist extraction via youtube-dl	2020-12-04 15:03:21 +03:00
DYefremov	184c1cbee5	upd. README	2020-12-02 01:02:25 +03:00
DYefremov	c9e8625ea5	added types to the service parser	2020-11-28 14:19:41 +03:00
DYefremov	fd72615a63	minor changes in control panel gui	2020-11-28 08:24:51 +03:00
DYefremov	f11a40e04d	added sorting reset when loading data	2020-11-25 16:27:48 +03:00
DYefremov	9522267dee	translations correction for app description	2020-11-25 15:14:24 +03:00
DYefremov	f538d609b9	added timeouts for telnet login	2020-11-25 13:27:53 +03:00
DYefremov	3edc699277	config.yml update	2020-11-25 11:30:16 +03:00
DYefremov	19562c7281	description update	2020-11-25 11:25:50 +03:00
DYefremov	5a104c1778	Russian, Belarusian and German translations update	2020-11-23 13:51:43 +03:00
DYefremov	09afc5b76a	fix update of sat positions after web import	2020-11-23 12:58:40 +03:00
DYefremov	6129c5ac23	some changes in the control panel	2020-11-22 15:40:19 +03:00
DYefremov	a552d13933	style correction	2020-11-21 15:09:32 +03:00
DYefremov	c4fa3b1eee	Russian, Belarusian and German translations update	2020-11-19 20:27:09 +03:00
DYefremov	795c708a61	added basic support for timers via http api	2020-11-19 18:05:40 +03:00
DYefremov	92721c65e4	added styles	2020-11-19 15:01:07 +03:00
DYefremov	b8470f7dfa	added transponder view popup menu	2020-11-16 13:48:05 +03:00
DYefremov	fd02ddedb7	small http api refactoring	2020-11-11 15:34:12 +03:00
DYefremov	f3beec141c	added epg display in control panel	2020-11-07 18:38:40 +03:00
DYefremov	8910b6d68b	control decoupling	2020-11-03 20:36:21 +03:00
DYefremov	2a4c4576cc	minor compatibility fix	2020-11-03 12:17:52 +03:00
DYefremov	4e8fd693a6	added web import for services (#16 )	2020-11-02 21:55:34 +03:00
DYefremov	7184642e68	small decoupling for lamedb parsing	2020-11-02 14:33:55 +03:00
DYefremov	10f4a461bd	added prototype of simple control panel (#38 )	2020-10-25 12:54:08 +03:00
DYefremov	bec7f35b17	added remote control requests	2020-10-24 15:46:59 +03:00
DYefremov	2a6dc3f167	bump version	2020-10-22 15:44:37 +03:00
DYefremov	e9e36c4a9c	added comments	2020-10-22 15:43:33 +03:00
DYefremov	0c49096733	upd README	2020-10-13 13:34:47 +03:00
DYefremov	e2aa21060b	minor fix for the picon parser	2020-10-10 15:19:00 +03:00
DYefremov	b15691207b	minor fix for yt	2020-10-06 11:25:26 +03:00
DYefremov	ab3ca134a7	Russian, Belarusian and German translations update	2020-10-04 14:53:42 +03:00
DYefremov	7f839f3fa0	data loading refactoring (prevent #37 )	2020-10-02 13:42:43 +03:00
DYefremov	c3e8eac4b9	changed getting of the drag icon	2020-09-30 20:54:03 +03:00
DYefremov	04f808843d	upd README	2020-09-25 18:02:32 +03:00
DYefremov	eea4a68993	Russian, Belarusian and German translations update	2020-09-25 18:01:36 +03:00
DYefremov	bfba5b5237	reworked and improved dnd for lists	2020-09-24 23:17:15 +03:00
DYefremov	e203a38966	added support for loading and importing data via dnd	2020-09-19 12:32:08 +03:00
DYefremov	a3b5609138	version update	2020-09-17 17:18:58 +03:00
DYefremov	b3c131b753	added support for opening archives	2020-09-17 17:16:00 +03:00
DYefremov	a8ea5ad974	minor rework of the chooser dialog	2020-09-17 10:00:02 +03:00
DYefremov	831184af2e	displaying sid value in uppercase for tooltips(#34 )	2020-09-12 14:11:42 +03:00
DYefremov	1f51766dea	Display the sid value in tooltips in hex and dec format(#34 ).	2020-09-12 11:33:17 +03:00
DYefremov	f8f1536213	copy es *.mo file	2020-09-11 16:36:03 +03:00
Víctor Pont	0accfbd3d1	Spanish translation update (#36 )	2020-09-11 16:24:59 +03:00
DYefremov	ee462b24f7	renaming bouquet fix [losing custom names](#33 )	2020-09-08 12:21:10 +03:00
DYefremov	17ee189db8	upd README	2020-09-07 20:05:24 +03:00
DYefremov	8389293b4b	copy pl *.mo file	2020-09-02 23:02:46 +03:00
Wieslaw Weglowski	99e0c79b6c	Polish translation corrections (#31 )	2020-09-02 19:16:21 +03:00
DYefremov	02cdbc4e56	Russian, Belarusian and German translations update	2020-09-02 14:16:48 +03:00
DYefremov	d57f0490d2	version update	2020-08-31 22:21:43 +03:00
DYefremov	9680347180	minor fix for picon assignment	2020-08-31 22:20:56 +03:00
DYefremov	7fbdc32f91	added Belarusian translation	2020-08-31 11:46:52 +03:00
DYefremov	a69f54435d	fix playback from the start screen	2020-08-30 16:25:10 +03:00
DYefremov	0d47433f80	small rework of picons manager header	2020-08-30 14:26:18 +03:00
DYefremov	d16a8e44f6	resize fix in satellite dialog	2020-08-30 14:16:28 +03:00
DYefremov	053a834d6d	telnet password visibility fix	2020-08-24 22:42:05 +03:00
DYefremov	62c1ef852c	Polish translation update	2020-08-24 22:17:20 +03:00
DYefremov	b5234c55e8	minor optimization	2020-08-24 22:06:30 +03:00
Wieslaw Weglowski	472ebba8e9	Update demon-editor.po (#30 )	2020-08-24 21:17:19 +03:00
DYefremov	d427cf66b0	rework of the picons resizing	2020-08-19 20:41:51 +03:00
DYefremov	9fe3d8077f	German and Russian translation update	2020-08-15 16:51:47 +03:00
DYefremov	2f12ef7bdd	minor yt fix	2020-08-15 16:50:34 +03:00
DYefremov	b6ad661e39	added dark mode option	2020-08-08 14:43:26 +03:00
DYefremov	6355e0d75a	minor fixes	2020-08-07 11:31:40 +03:00
DYefremov	29016056c2	skipping enigma2 stop during picons upload	2020-08-06 21:16:21 +03:00
DYefremov	23fe71e5cc	minor correction of translations	2020-08-04 12:45:10 +03:00
DYefremov	80e4edd084	version update	2020-08-03 22:47:44 +03:00
DYefremov	3d0bb6ad3c	added option for experimental features	2020-08-03 22:41:14 +03:00
DYefremov	a8937d0698	Spanish, Portuguese and Dutch translation update	2020-07-27 16:30:10 +03:00
DYefremov	b97997b7a0	update ref fix	2020-07-24 11:37:27 +03:00
DYefremov	0003c6c5d5	German and Russian translation update	2020-07-20 11:32:56 +03:00
DYefremov	13b9d64bd0	added keyboard[del] support	2020-07-20 11:11:10 +03:00
DYefremov	c68511b223	loading providers fix	2020-07-19 20:51:18 +03:00
DYefremov	c6ef61222e	fix display of cas	2020-07-19 14:59:37 +03:00
DYefremov	8309353784	version update	2020-07-18 21:08:52 +03:00
DYefremov	3f65975ac2	added lock support for iptv	2020-07-18 20:55:15 +03:00
DYefremov	4f6443e6e3	German translation update	2020-07-17 09:52:12 +03:00
DYefremov	d517b3b9d6	Russian translation update	2020-07-17 09:51:45 +03:00
DYefremov	faf228fa6f	added audio codec option	2020-07-16 20:45:27 +03:00
DYefremov	eaf5e39458	added notifications	2020-07-15 11:16:09 +03:00
DYefremov	8a2539d57b	minor fix	2020-07-12 22:28:49 +03:00
DYefremov	8c827b126f	added bouquets import via dnd	2020-07-12 11:11:32 +03:00
DYefremov	db1bfb0fb9	minor gui fix	2020-07-11 13:00:01 +03:00
DYefremov	8ba7751b97	added debug mode option	2020-07-11 12:58:03 +03:00
DYefremov	65b58c9d08	added sorting of bouquet services	2020-07-09 22:29:33 +03:00
DYefremov	72aed5ff6e	added download dialog options	2020-07-04 13:38:39 +03:00
DYefremov	ad07469c35	auto save profile settings	2020-07-02 17:24:21 +03:00
DYefremov	6f0de03b22	fix lock/hide in filter mode	2020-06-22 19:45:30 +03:00
DYefremov	1cec96d2b5	skip of marker counting (#27 )	2020-06-22 11:07:44 +03:00
DYefremov	a9935dd0a7	changed callback for screenshots	2020-06-15 17:00:28 +03:00
DYefremov	65dfd6c1c4	small yt refactoring	2020-06-13 20:57:37 +03:00
DYefremov	65c24a324a	get fav id fix	2020-06-13 01:01:20 +03:00
DYefremov	78b0cc1517	added space item to fav elements	2020-06-12 22:37:29 +03:00
DYefremov	d66d4e6402	added frame for info bar	2020-06-11 10:44:53 +03:00
DYefremov	7b11822664	small http api init fix	2020-06-10 18:35:49 +03:00
DYefremov	8c5f27cc8a	added basic youtube-dl support	2020-06-10 11:10:41 +03:00
DYefremov	b51c8a9aed	added eserviceuri (8193) stream type	2020-06-09 18:38:18 +03:00
DYefremov	2c4302f57d	copy tr *.mo file	2020-06-08 23:50:41 +03:00
audi06_19	bd0ac077f9	Turkish translation correction (#26 )	2020-06-08 23:50:17 +03:00
DYefremov	105b907392	small rework of screenshot mode	2020-06-08 19:32:18 +03:00
DYefremov	b4fb684af4	impl local removing for picons	2020-06-08 14:32:49 +03:00
DYefremov	20a1bac22e	logging extension on data downloading	2020-06-08 13:33:46 +03:00
DYefremov	9a9229f67c	added dnd for selective download/send	2020-06-08 13:16:50 +03:00
DYefremov	a941c96c61	added selective download/send of picons	2020-06-07 18:44:46 +03:00
DYefremov	05a6e36589	added update picons dest view	2020-06-06 09:36:11 +03:00
DYefremov	50a5cf6fc3	added accelerator for input dialog	2020-06-04 11:33:26 +03:00
DYefremov	6ef844157e	added check for unsaved changes	2020-06-04 11:32:53 +03:00
DYefremov	72583ba879	rm unavailable iptv fix	2020-06-03 11:25:53 +03:00
DYefremov	e7d96b0cbb	copy pl *.mo file	2020-06-02 10:01:32 +03:00
DYefremov	a7458494a3	Polish translation correction	2020-06-02 09:37:45 +03:00
Wieslaw Weglowski	747c1a9722	Polish translation update(#23 )	2020-06-02 09:15:54 +03:00
DYefremov	dac2fe17a6	improved functionality of the picons explorer	2020-06-01 21:36:56 +03:00
DYefremov	fb8cf6c882	added youtube-dl options	2020-05-29 16:43:23 +03:00
DYefremov	bcf69231a8	added app settings read exception	2020-05-29 13:24:55 +03:00
DYefremov	5352d87b82	zap mode fix	2020-05-28 11:30:32 +03:00
DYefremov	c978f5abab	added services filtering from picons manager	2020-05-25 18:25:36 +03:00
DYefremov	636442bcd3	adding picons to src via dnd	2020-05-25 11:42:41 +03:00
DYefremov	9e74f0f525	added basic screenshots support	2020-05-24 18:47:56 +03:00
DYefremov	b7028ae27d	modified cas values	2020-05-23 15:17:45 +03:00
DYefremov	4f3b05ede5	added space [hidden marker] support	2020-05-23 15:16:31 +03:00
DYefremov	e6e6d3510d	version update	2020-05-23 15:01:55 +03:00
DYefremov	1d1b4acdca	small bq parsing changes (prevent #12 )	2020-05-23 14:23:20 +03:00
DYefremov	0e50f1952d	drag on icon fix	2020-05-23 00:03:53 +03:00
DYefremov	8686e15446	German translation update	2020-05-19 14:28:36 +03:00
DYefremov	5fee00a150	Russian translation update	2020-05-19 14:27:44 +03:00
DYefremov	0ec9873940	minor log changes	2020-05-19 11:39:12 +03:00
DYefremov	0600737319	Dutch translation update	2020-05-18 16:28:10 +03:00
DYefremov	cf51a5bfd8	small dnd fix	2020-05-18 12:34:28 +03:00
DYefremov	533d8fae25	minor fixes	2020-05-17 13:08:02 +03:00
DYefremov	16167b1b13	scaling picons on loading	2020-05-12 20:44:37 +03:00
DYefremov	38f6c06292	copy tr *.mo file	2020-05-11 21:58:58 +03:00
audi06	4170864a74	Turkish translation update (#22 )	2020-05-11 21:48:43 +03:00
DYefremov	3171540bf2	minor optimization and fix	2020-05-10 21:17:24 +03:00
DYefremov	0ed4f6d7f9	German translation update	2020-05-10 18:31:27 +03:00
DYefremov	637becaa59	small fix to prevent (#12 )	2020-05-10 18:30:06 +03:00
DYefremov	fd5a0d23a8	added picons filter by service name	2020-05-10 13:22:13 +03:00
DYefremov	22626ea03d	Russian translation update	2020-05-09 14:02:19 +03:00
DYefremov	2e34568f74	fix to prevent #12	2020-05-08 17:13:17 +03:00
DYefremov	f42b2f3c75	added skip upload if file not found	2020-05-05 00:02:52 +03:00
DYefremov	f88b36cee7	fix use colors	2020-05-04 22:32:02 +03:00
DYefremov	4421f767e1	fix to prevent (#21 )	2020-05-04 19:17:16 +03:00
DYefremov	898b32ca5f	minor fixes for yt	2020-05-03 02:04:51 +03:00
DYefremov	7c2840c570	changed data dir creation	2020-05-03 00:22:16 +03:00
DYefremov	1c9c58d48a	added accelerators and tooltips	2020-04-28 22:08:30 +03:00
DYefremov	45a1c79808	added download/upload of [terrestrial, cable].xml	2020-04-28 14:49:10 +03:00
DYefremov	19fbc753c5	slight optimization of loading/deleting data	2020-04-28 11:23:22 +03:00
DYefremov	c8c424750b	setting text for wait dialog	2020-04-27 17:00:52 +03:00
DYefremov	3d769a5e18	path resolve fix	2020-04-27 12:51:10 +03:00
DYefremov	1b7d2f15b0	reworking of picons dialog	2020-04-26 19:26:36 +03:00
DYefremov	58cf299097	minor fixes for filter and search	2020-04-23 10:32:18 +03:00
DYefremov	af8fe227e0	added group style	2020-04-22 09:53:06 +03:00
DYefremov	3160ec2455	small refactoring of chooser dialog	2020-04-21 14:43:57 +03:00
DYefremov	04fd8b7182	upd README	2020-04-20 20:40:07 +03:00
DYefremov	ee90d11557	added picons assignment by drag on icon	2020-04-19 23:34:42 +03:00
DYefremov	b312816804	added hints support for the main list	2020-04-19 17:20:51 +03:00
DYefremov	39647cb811	minor refactoring	2020-04-19 13:23:18 +03:00
audi06	e64cd66977	added Turkish selection (#20 )	2020-04-16 21:02:57 +03:00
DYefremov	754c586fb1	copy tr *.mo file	2020-04-16 18:49:35 +03:00
audi06	d5a2b22819	added Turkish translation (#19 ) (cherry picked from commit `8d96f02e2e`)	2020-04-16 18:20:03 +03:00
DYefremov	b20bcce5fa	added bouquet file naming option	2020-04-16 11:55:48 +03:00
DYefremov	aba82c7120	added appearance settings	2020-04-13 13:46:02 +03:00
DYefremov	e0beeef2a3	top separator revert	2020-04-10 15:09:58 +03:00
DYefremov	c8a9d3f4a0	added basic hints support	2020-04-06 16:50:11 +03:00
DYefremov	9f7c713712	added option for hints	2020-04-05 18:19:12 +03:00
DYefremov	f89196041b	epg options fix	2020-04-02 16:50:58 +03:00
DYefremov	efa2d94239	changed some player args	2020-03-29 12:57:33 +03:00
DYefremov	f53f483dce	basic implementation of the play mode	2020-03-28 17:56:39 +03:00
DYefremov	ebcf0a90b5	small cleaning	2020-03-28 17:38:40 +03:00
DYefremov	2311b046e7	copy *.mo file	2020-03-24 15:36:08 +03:00
wwns	9544b6028f	Polish translation update (#18 )	2020-03-24 15:26:30 +03:00
DYefremov	e04144b10f	wrap m3u data	2020-03-22 23:26:01 +03:00
DYefremov	93f68a7fe2	added play streams mode options	2020-03-22 14:13:01 +03:00
DYefremov	947ea21ed1	copy .mo file	2020-03-21 16:45:19 +03:00
Víctor Pont	d20d40c19b	Spanish translation update and corrections (#17 )	2020-03-21 16:31:07 +03:00
DYefremov	bb349a3fe9	changed record button update	2020-03-13 14:36:16 +03:00
DYefremov	bb3ecf975b	added transcoding options	2020-03-09 14:53:03 +03:00
DYefremov	bbc693e5e6	added record of current service	2020-03-07 18:33:51 +03:00
DYefremov	cb29cf0155	added new paths settings	2020-03-06 11:55:34 +03:00
DYefremov	0c8592fb0d	fix service status info	2020-02-29 21:15:24 +03:00
DYefremov	66f067340d	version update	2020-02-28 21:10:13 +03:00
DYefremov	b0ec8e5483	added picons multiple assignment	2020-02-28 20:59:53 +03:00
DYefremov	aa4b31edfc	copy .mo file	2020-02-27 23:53:28 +03:00
DYefremov	3d627b57a4	German translation update	2020-02-27 23:50:54 +03:00
DYefremov	6b1bec500c	upd README	2020-02-24 12:48:17 +03:00
DYefremov	7444db7e21	small fix	2020-02-24 12:17:10 +03:00
DYefremov	8be92a9c7e	copy .mo file	2020-02-20 14:20:09 +03:00
DYefremov	7554f40c6a	Russian translation update	2020-02-20 14:07:35 +03:00
DYefremov	17ab321e44	gui changes for send to	2020-02-20 11:38:45 +03:00
DYefremov	ac345d4ef3	fix getting sats	2020-02-19 12:04:02 +03:00
DYefremov	e2a56a316d	.mo files update	2020-02-17 09:19:39 +03:00
wwns	9b79bf2b81	Polish translation update (#11 ) Polish translation update.	2020-02-17 08:54:17 +03:00
DYefremov	ee2a9bda90	added appindicator support	2020-02-15 12:51:16 +03:00
DYefremov	da0c5fa8a6	updated .mo files	2020-02-14 22:50:35 +03:00
wwns	e202ec6abe	Polish translation update (#10 )	2020-02-14 22:28:15 +03:00
DYefremov	e87be79f42	minor fix	2020-02-13 20:15:18 +03:00
DYefremov	6372ac474c	toolbar changes	2020-02-13 01:09:40 +03:00
DYefremov	c6b0f70c8e	update of data path	2020-02-12 13:51:40 +03:00
DYefremov	6a921ad394	added Polish selection	2020-02-12 12:39:12 +03:00
DYefremov	4c8743517f	copy .mo file	2020-02-11 22:02:20 +03:00
wwns	74ec0fe956	added a Polish translation (#5 ) * added a Polish translation * added a Polish translation * name change	2020-02-11 21:52:54 +03:00
DYefremov	041f717a01	hotkey refactoring	2020-02-11 13:18:14 +03:00
DYefremov	67dbdb19d7	fix bq deletion	2020-02-10 19:24:48 +03:00
DYefremov	de49179dd2	changing profile on data download	2020-02-10 17:00:46 +03:00
DYefremov	2723d255fe	fix profile edit	2020-02-10 14:45:05 +03:00
DYefremov	4515b2538b	moved get yt icon	2020-02-07 16:56:01 +03:00
DYefremov	88e3a22cf0	auto rename bouquets with duplicate names	2020-01-31 15:09:56 +03:00
DYefremov	7ac63b81c0	added checking for bouquet names duplicate	2020-01-29 14:50:02 +03:00
DYefremov	234611b686	added controls to the transmitter	2020-01-28 15:08:57 +03:00
DYefremov	fdb2691430	added player requests	2020-01-28 14:51:23 +03:00
DYefremov	d81700c30c	minor gui changes	2020-01-24 00:53:42 +03:00
DYefremov	e91c4c33a5	added reset button hiding	2020-01-24 00:04:43 +03:00
DYefremov	40bf54e94f	fix size of picons	2020-01-23 23:42:28 +03:00
DYefremov	4a50c36ab4	added remove and download to picons	2020-01-23 00:47:01 +03:00