From cbec74c2a4d13d636071412be1a412d5fa7974cd Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Fri, 4 Nov 2022 01:06:18 +0300
Subject: [PATCH] added multiple hosts option

---
 app/settings.py              |    8 +
 app/ui/settings_dialog.glade | 2407 ++++++++++++++++++----------------
 app/ui/settings_dialog.py    |   64 +-
 3 files changed, 1315 insertions(+), 1164 deletions(-)

diff --git a/app/settings.py b/app/settings.py
index 143910a2..80059ae5 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -281,6 +281,14 @@ class Settings:
     def host(self, value):
         self._cp_settings["host"] = value
 
+    @property
+    def hosts(self):
+        return self._cp_settings.get("hosts", [self.host,])
+
+    @hosts.setter
+    def hosts(self, value):
+        self._cp_settings["hosts"] = value
+
     @property
     def port(self):
         return self._cp_settings.get("port", self.get_default("port"))
diff --git a/app/ui/settings_dialog.glade b/app/ui/settings_dialog.glade
index 16a3592b..66546e32 100644
--- a/app/ui/settings_dialog.glade
+++ b/app/ui/settings_dialog.glade
@@ -1,44 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2
+<!-- Generated with glade 3.38.2 
 
-The MIT License (MIT)
+Copyright (C)  2018-2022 Dmitriy Yefremov
 
-Copyright (c)  2018-2022 Dmitriy Yefremov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-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.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without any warranty.
 
 Author: Dmitriy Yefremov
 
 -->
 <interface domain="demon-editor">
-  <requires lib="gtk+" version="3.18"/>
+  <requires lib="gtk+" version="3.20"/>
   <!-- interface-css-provider-path style.css -->
-  <!-- interface-license-type mit -->
+  <!-- interface-license-type all_permissive -->
   <!-- interface-name DemonEditor -->
   <!-- interface-description Enigma2 channel and satellites list editor. -->
-  <!-- interface-copyright  2018-2021 Dmitriy Yefremov -->
+  <!-- interface-copyright  2018-2022 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkAdjustment" id="font_size_adjustment">
     <property name="lower">8</property>
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkListStore" id="profile_lists_tore">
     <columns>
@@ -52,19 +37,19 @@ Author: Dmitriy Yefremov
   </object>
   <object class="GtkImage" id="set_default_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">emblem-default</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">emblem-default</property>
   </object>
   <object class="GtkMenu" id="profiles_popup_menu">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkImageMenuItem" id="add_profile_menu_item">
         <property name="label">gtk-add</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">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_profile_add" swapped="no"/>
         <accelerator key="Insert" signal="activate"/>
       </object>
@@ -73,9 +58,9 @@ Author: Dmitriy Yefremov
       <object class="GtkImageMenuItem" id="edit_menu_item">
         <property name="label">gtk-edit</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="can-focus">False</property>
+        <property name="use-underline">True</property>
+        <property name="use-stock">True</property>
         <signal name="activate" handler="on_profile_edit" swapped="no"/>
         <accelerator key="F2" signal="activate"/>
       </object>
@@ -83,16 +68,16 @@ Author: Dmitriy Yefremov
     <child>
       <object class="GtkSeparatorMenuItem">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkImageMenuItem" id="set_default_menu_item">
         <property name="label" translatable="yes">Set default</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="image">set_default_image</property>
-        <property name="use_stock">False</property>
+        <property name="use-stock">False</property>
         <signal name="activate" handler="on_profile_set_default" swapped="no"/>
         <accelerator key="d" signal="activate"/>
       </object>
@@ -100,16 +85,16 @@ Author: Dmitriy Yefremov
     <child>
       <object class="GtkSeparatorMenuItem">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkImageMenuItem" id="remove_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>
+        <property name="can-focus">False</property>
+        <property name="use-underline">True</property>
+        <property name="use-stock">True</property>
         <signal name="activate" handler="on_profile_remove" swapped="no"/>
         <accelerator key="Delete" signal="activate"/>
       </object>
@@ -118,47 +103,160 @@ Author: Dmitriy Yefremov
   <object class="GtkAdjustment" id="telnet_timeout_adjustment">
     <property name="lower">1</property>
     <property name="upper">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkImage" id="test_button_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-connect</property>
   </object>
   <object class="GtkDialog" id="settings_dialog">
-    <property name="width_request">680</property>
-    <property name="can_focus">False</property>
+    <property name="width-request">680</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes">Options</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
+    <property name="window-position">center-on-parent</property>
+    <property name="destroy-with-parent">True</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="skip-pager-hint">True</property>
     <signal name="response" handler="on_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="main_box">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="main_button_box">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="valign">center</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="layout_style">start</property>
+            <property name="margin-start">10</property>
+            <property name="margin-end">10</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
+            <property name="layout-style">start</property>
+            <child type="center">
+              <object class="GtkBox" id="test_box">
+                <property name="visible" bind-source="reset_button" bind-property="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="valign">center</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkButton" id="test_connection_button">
+                    <property name="label" translatable="yes">Test</property>
+                    <property name="width-request">120</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="tooltip-text" translatable="yes">Test connection</property>
+                    <property name="image">test_button_image</property>
+                    <property name="always-show-image">True</property>
+                    <signal name="clicked" handler="on_connection_test" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="test_spinner_alignment">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="xscale">0.30000001192092896</property>
+                    <property name="yscale">0.30000001192092896</property>
+                    <child>
+                      <object class="GtkSpinner" id="test_spinner">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButtonBox" id="test_button_box">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="homogeneous">True</property>
+                    <property name="layout-style">expand</property>
+                    <child>
+                      <object class="GtkRadioButton" id="ftp_radio_button">
+                        <property name="label" translatable="yes">FTP</property>
+                        <property name="width-request">75</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="draw-indicator">False</property>
+                        <property name="group">telnet_radio_button</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="http_radio_button">
+                        <property name="label" translatable="yes">HTTP</property>
+                        <property name="width-request">75</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="draw-indicator">False</property>
+                        <property name="group">telnet_radio_button</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="telnet_radio_button">
+                        <property name="label" translatable="yes">Telnet</property>
+                        <property name="width-request">75</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="draw-indicator">False</property>
+                        <property name="group">ftp_radio_button</property>
+                      </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="pack-type">end</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack-type">end</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="reset_button">
                 <property name="label" translatable="yes">Reset</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Reset profile</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Reset profile</property>
                 <property name="valign">center</property>
                 <signal name="clicked" handler="on_reset" swapped="no"/>
               </object>
@@ -172,9 +270,9 @@ Author: Dmitriy Yefremov
               <object class="GtkButton" id="apply_presets_button">
                 <property name="label" translatable="yes">Apply</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Apply</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Apply</property>
                 <property name="valign">center</property>
                 <signal name="clicked" handler="on_apply_presets" swapped="no"/>
               </object>
@@ -189,11 +287,11 @@ Author: Dmitriy Yefremov
               <object class="GtkButton" id="save_button">
                 <property name="label" translatable="yes">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</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Save</property>
                 <property name="valign">center</property>
-                <accelerator key="s" signal="clicked" modifiers="Primary"/>
+                <accelerator key="s" signal="clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -202,120 +300,6 @@ Author: Dmitriy Yefremov
                 <property name="secondary">True</property>
               </packing>
             </child>
-            <child type="center">
-              <object class="GtkBox" id="test_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="spacing">5</property>
-                <property name="visible" bind-source="reset_button" bind-property="visible"/>
-                <child>
-                  <object class="GtkButton" id="test_connection_button">
-                    <property name="label" translatable="yes">Test</property>
-                    <property name="width_request">120</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Test connection</property>
-                    <property name="image">test_button_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_connection_test" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="test_spinner_alignment">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xscale">0.30000001192092896</property>
-                    <property name="yscale">0.30000001192092896</property>
-                    <child>
-                      <object class="GtkSpinner" id="test_spinner">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButtonBox" id="test_button_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="homogeneous">True</property>
-                    <property name="layout_style">expand</property>
-                    <child>
-                      <object class="GtkRadioButton" id="ftp_radio_button">
-                        <property name="label" translatable="yes">FTP</property>
-                        <property name="width_request">75</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">False</property>
-                        <property name="group">telnet_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="http_radio_button">
-                        <property name="label" translatable="yes">HTTP</property>
-                        <property name="width_request">75</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">False</property>
-                        <property name="group">telnet_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="telnet_radio_button">
-                        <property name="label" translatable="yes">Telnet</property>
-                        <property name="width_request">75</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">False</property>
-                        <property name="group">ftp_radio_button</property>
-                      </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="pack_type">end</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -326,12 +310,12 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkStackSwitcher" id="main_stack_switcher">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="halign">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="margin-start">15</property>
+            <property name="margin-end">15</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
             <property name="stack">main_stack</property>
           </object>
           <packing>
@@ -343,48 +327,48 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkStack" id="main_stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
+            <property name="can-focus">False</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
             <signal name="notify::visible-child" handler="on_main_settings_visible" swapped="no"/>
             <child>
               <object class="GtkBox" id="profiles_net_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkFrame" id="profile_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.05000000074505806</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.05000000074505806</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="profile_box">
-                        <property name="width_request">220</property>
+                        <property name="width-request">220</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</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="GtkScrolledWindow" id="profile_tree_view_scrolled">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="shadow_type">in</property>
+                            <property name="can-focus">True</property>
+                            <property name="shadow-type">in</property>
                             <child>
                               <object class="GtkTreeView" id="profile_tree_view">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="margin_left">1</property>
-                                <property name="margin_right">1</property>
+                                <property name="can-focus">True</property>
+                                <property name="margin-start">1</property>
+                                <property name="margin-end">1</property>
                                 <property name="model">profile_lists_tore</property>
-                                <property name="headers_visible">False</property>
-                                <property name="search_column">0</property>
+                                <property name="headers-visible">False</property>
+                                <property name="search-column">0</property>
                                 <signal name="button-press-event" handler="on_view_popup_menu" object="profiles_popup_menu" swapped="no"/>
                                 <signal name="cursor-changed" handler="on_profile_selected" swapped="no"/>
                                 <child internal-child="selection">
@@ -393,12 +377,12 @@ Author: Dmitriy Yefremov
                                 <child>
                                   <object class="GtkTreeViewColumn" id="prifile_column">
                                     <property name="sizing">autosize</property>
-                                    <property name="min_width">70</property>
+                                    <property name="min-width">70</property>
                                     <property name="title" translatable="yes">Profile</property>
                                     <property name="expand">True</property>
                                     <property name="clickable">True</property>
                                     <property name="reorderable">True</property>
-                                    <property name="sort_column_id">0</property>
+                                    <property name="sort-column-id">0</property>
                                     <child>
                                       <object class="GtkCellRendererText" id="profile_renderer">
                                         <property name="editable">True</property>
@@ -437,22 +421,22 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkButtonBox" id="profile_button_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="valign">center</property>
-                            <property name="layout_style">expand</property>
+                            <property name="layout-style">expand</property>
                             <child>
                               <object class="GtkButton" id="profile_add_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Add</property>
+                                <property name="can-focus">False</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Add</property>
                                 <property name="valign">center</property>
                                 <signal name="clicked" handler="on_profile_add" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="profile_add_button_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">list-add-symbolic</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">list-add-symbolic</property>
                                   </object>
                                 </child>
                                 <accelerator key="Insert" signal="clicked"/>
@@ -466,16 +450,16 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkButton" id="profile_edit_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Rename</property>
+                                <property name="can-focus">False</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Rename</property>
                                 <property name="valign">center</property>
                                 <signal name="clicked" handler="on_profile_edit" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="profile_edit_button_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">document-edit-symbolic</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">document-edit-symbolic</property>
                                   </object>
                                 </child>
                                 <accelerator key="F2" signal="clicked"/>
@@ -489,16 +473,16 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkButton" id="profile_remove_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Remove</property>
+                                <property name="can-focus">False</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Remove</property>
                                 <property name="valign">center</property>
                                 <signal name="clicked" handler="on_profile_remove" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="profile_remove_button_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">list-remove-symbolic</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">list-remove-symbolic</property>
                                   </object>
                                 </child>
                                 <accelerator key="Delete" signal="clicked"/>
@@ -512,24 +496,24 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkButton" id="profile_set_default_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Set default</property>
+                                <property name="can-focus">False</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Set default</property>
                                 <property name="valign">center</property>
                                 <signal name="clicked" handler="on_profile_set_default" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="profile_set_default_button_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">emblem-default</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">emblem-default</property>
                                   </object>
                                 </child>
-                                <accelerator key="d" signal="clicked" modifiers="Primary"/>
+                                <accelerator key="d" signal="clicked"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">3</property>
                                 <property name="secondary">True</property>
                               </packing>
@@ -546,7 +530,7 @@ Author: Dmitriy Yefremov
                     <child type="label">
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Profile:</property>
                       </object>
                     </child>
@@ -560,13 +544,13 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="network_settings_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child type="label">
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Network settings:</property>
                       </object>
                     </child>
@@ -586,38 +570,38 @@ Author: Dmitriy Yefremov
             <child>
               <object class="GtkBox" id="paths_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkFrame" id="local_file_paths_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.05000000074505806</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.05000000074505806</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="local_paths_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">5</property>
-                        <property name="margin_end">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkBox" id="default_data_paths_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Sets the profile folder as default to store picons, backups, etc.</property>
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes">Sets the profile folder as default to store picons, backups, etc.</property>
                             <property name="valign">center</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <child>
                               <object class="GtkLabel" id="default_data_paths_label">
                                 <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="can-focus">False</property>
+                                <property name="margin-top">5</property>
+                                <property name="margin-bottom">5</property>
                                 <property name="label" translatable="yes">Make profile folder as default for the additional data</property>
                                 <property name="xalign">0</property>
                               </object>
@@ -630,7 +614,7 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="default_data_paths_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <property name="halign">end</property>
                                 <property name="valign">center</property>
                                 <signal name="state-set" handler="on_default_path_mode_switch" swapped="no"/>
@@ -652,58 +636,58 @@ Author: Dmitriy Yefremov
                           <!-- n-columns=2 n-rows=3 -->
                           <object class="GtkGrid" id="local_paths_grid">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="row_spacing">5</property>
-                            <property name="column_spacing">10</property>
-                            <property name="column_homogeneous">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="row-spacing">5</property>
+                            <property name="column-spacing">10</property>
+                            <property name="column-homogeneous">True</property>
                             <child>
                               <object class="GtkLabel" id="data_path_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Data path:</property>
                                 <property name="lines">0</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkLabel" id="picons_path_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Picons path:</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkLabel" id="backup_path_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Backup path:</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="data_path_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <child>
                                   <object class="GtkEntry" id="data_path_field">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="can-focus">True</property>
                                     <property name="hexpand">True</property>
-                                    <property name="primary_icon_name">document-edit-symbolic</property>
-                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="primary-icon-name">document-edit-symbolic</property>
+                                    <property name="primary-icon-activatable">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -714,110 +698,14 @@ Author: Dmitriy Yefremov
                                 <child>
                                   <object class="GtkButton" id="data_path_button">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Select</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Select</property>
                                     <signal name="clicked" handler="on_field_button_press" object="data_path_field" swapped="no"/>
                                     <child>
                                       <object class="GtkImage" id="data_path_image">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="icon_name">folder-open-symbolic</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <style>
-                                  <class name="group"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="picons_path_box">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkEntry" id="picons_path_field">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="primary_icon_name">document-edit-symbolic</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="picons_path_button">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Select</property>
-                                    <signal name="clicked" handler="on_field_button_press" object="picons_path_field" swapped="no"/>
-                                    <child>
-                                      <object class="GtkImage" id="picons_path_image">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="icon_name">folder-open-symbolic</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <style>
-                                  <class name="group"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="backup_path_box">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkEntry" id="backup_path_field">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="primary_icon_name">document-edit-symbolic</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="backup_path_button">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives-default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Select</property>
-                                    <signal name="clicked" handler="on_field_button_press" object="backup_path_field" swapped="no"/>
-                                    <child>
-                                      <object class="GtkImage" id="backup_path_image">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
+                                        <property name="can-focus">False</property>
                                         <property name="icon-name">folder-open-symbolic</property>
                                       </object>
                                     </child>
@@ -833,8 +721,104 @@ Author: Dmitriy Yefremov
                                 </style>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="picons_path_box">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <child>
+                                  <object class="GtkEntry" id="picons_path_field">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="primary-icon-name">document-edit-symbolic</property>
+                                    <property name="primary-icon-activatable">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="picons_path_button">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Select</property>
+                                    <signal name="clicked" handler="on_field_button_press" object="picons_path_field" swapped="no"/>
+                                    <child>
+                                      <object class="GtkImage" id="picons_path_image">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">folder-open-symbolic</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <style>
+                                  <class name="group"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="backup_path_box">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <child>
+                                  <object class="GtkEntry" id="backup_path_field">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="primary-icon-name">document-edit-symbolic</property>
+                                    <property name="primary-icon-activatable">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="backup_path_button">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Select</property>
+                                    <signal name="clicked" handler="on_field_button_press" object="backup_path_field" swapped="no"/>
+                                    <child>
+                                      <object class="GtkImage" id="backup_path_image">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">folder-open-symbolic</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <style>
+                                  <class name="group"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">2</property>
                               </packing>
                             </child>
                           </object>
@@ -849,7 +833,7 @@ Author: Dmitriy Yefremov
                     <child type="label">
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Local file paths:</property>
                       </object>
                     </child>
@@ -863,43 +847,43 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="recordings_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <!-- n-columns=2 n-rows=1 -->
                       <object class="GtkGrid" id="recordings_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">5</property>
-                        <property name="margin_end">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="column_spacing">10</property>
-                        <property name="column_homogeneous">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
+                        <property name="column-spacing">10</property>
+                        <property name="column-homogeneous">True</property>
                         <child>
                           <object class="GtkLabel" id="recordings_path_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Streams record path:</property>
                             <property name="xalign">0.019999999552965164</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="recordings_path_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <child>
                               <object class="GtkEntry" id="recordings_path_field">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <property name="hexpand">True</property>
-                                <property name="primary_icon_name">document-edit-symbolic</property>
-                                <property name="primary_icon_activatable">False</property>
+                                <property name="primary-icon-name">document-edit-symbolic</property>
+                                <property name="primary-icon-activatable">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -910,15 +894,15 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkButton" id="recordings_path_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <property name="receives-default">True</property>
-                                <property name="tooltip_text" translatable="yes">Select</property>
+                                <property name="tooltip-text" translatable="yes">Select</property>
                                 <signal name="clicked" handler="on_field_button_press" object="recordings_path_field" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="recordings_path_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">folder-open-symbolic</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">folder-open-symbolic</property>
                                   </object>
                                 </child>
                               </object>
@@ -942,7 +926,7 @@ Author: Dmitriy Yefremov
                     <child type="label">
                       <object class="GtkLabel" id="recordings_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Recordings:</property>
                       </object>
                     </child>
@@ -963,34 +947,34 @@ Author: Dmitriy Yefremov
             <child>
               <object class="GtkBox" id="streaming_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkFrame" id="streaming_box_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="playback_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkBox" id="streams_lib_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkLabel" id="streams_lib_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Use to play streams:</property>
                               </object>
                               <packing>
@@ -1001,11 +985,11 @@ Author: Dmitriy Yefremov
                             </child>
                             <child>
                               <object class="GtkComboBoxText" id="stream_lib_combo_box">
-                                <property name="width_request">185</property>
+                                <property name="width-request">185</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="active">0</property>
-                                <property name="active_id">vlc</property>
+                                <property name="active-id">vlc</property>
                                 <items>
                                   <item id="vlc" translatable="yes">VLC Player</item>
                                   <item id="gst" translatable="yes">GStreamer</item>
@@ -1016,7 +1000,7 @@ Author: Dmitriy Yefremov
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">4</property>
                               </packing>
                             </child>
@@ -1030,12 +1014,12 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkBox" id="play_streams_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkLabel" id="play_streams_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Play streams mode:</property>
                               </object>
                               <packing>
@@ -1046,11 +1030,11 @@ Author: Dmitriy Yefremov
                             </child>
                             <child>
                               <object class="GtkComboBoxText" id="play_streams_combo_box">
-                                <property name="width_request">185</property>
+                                <property name="width-request">185</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="active">0</property>
-                                <property name="active_id">Built-in player</property>
+                                <property name="active-id">Built-in player</property>
                                 <items>
                                   <item id="0" translatable="yes">Built-in player</item>
                                   <item id="1" translatable="yes">In a separate window</item>
@@ -1061,7 +1045,7 @@ Author: Dmitriy Yefremov
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">4</property>
                               </packing>
                             </child>
@@ -1075,12 +1059,12 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkBox" id="double_click_mode_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkLabel" id="double_click_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Double click on the service in the bouquet list:</property>
                               </object>
                               <packing>
@@ -1091,11 +1075,11 @@ Author: Dmitriy Yefremov
                             </child>
                             <child>
                               <object class="GtkComboBoxText" id="double_click_combo_box">
-                                <property name="width_request">185</property>
+                                <property name="width-request">185</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="active">0</property>
-                                <property name="active_id">0</property>
+                                <property name="active-id">0</property>
                                 <items>
                                   <item id="0" translatable="yes">Disabled</item>
                                   <item id="1" translatable="yes">Play  stream</item>
@@ -1108,7 +1092,7 @@ Author: Dmitriy Yefremov
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1122,12 +1106,12 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkBox" id="allow_double_click_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkLabel" id="allow_double_click_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Playback from the main list</property>
                               </object>
                               <packing>
@@ -1139,12 +1123,12 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="allow_main_list_playback_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1160,7 +1144,7 @@ Author: Dmitriy Yefremov
                     <child type="label">
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Playback:</property>
                       </object>
                     </child>
@@ -1174,29 +1158,29 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="record_to_disk_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="main_record_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkBox" id="enable_transcoding_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_bottom">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-bottom">5</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkLabel" id="enable_transcoding_labe">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Activate transcoding</property>
                               </object>
                               <packing>
@@ -1208,12 +1192,12 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="transcoding_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1228,18 +1212,18 @@ Author: Dmitriy Yefremov
                           <object class="GtkBox" id="record_box">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkBox" id="presets_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkLabel" id="presets_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="label" translatable="yes">Presets:</property>
                                   </object>
@@ -1252,15 +1236,15 @@ Author: Dmitriy Yefremov
                                 <child>
                                   <object class="GtkBox" id="edit_preset_box">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes">Edit</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="tooltip-text" translatable="yes">Edit</property>
                                     <property name="halign">end</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkImage" id="edit_preset_switch_image">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="icon_name">document-edit-symbolic</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">document-edit-symbolic</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1271,13 +1255,13 @@ Author: Dmitriy Yefremov
                                     <child>
                                       <object class="GtkSwitch" id="edit_preset_switch">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
+                                        <property name="can-focus">True</property>
                                         <property name="valign">center</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">True</property>
-                                        <property name="pack_type">end</property>
+                                        <property name="pack-type">end</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -1290,10 +1274,10 @@ Author: Dmitriy Yefremov
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="presets_combo_box">
-                                    <property name="width_request">185</property>
+                                    <property name="width-request">185</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="active_id">720p TV/device</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="active-id">720p TV/device</property>
                                     <items>
                                       <item id="720p TV/device" translatable="yes">720p TV/device</item>
                                       <item id="1080p TV/device" translatable="yes">1080p TV/device</item>
@@ -1314,123 +1298,132 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkGrid" id="video_options_grid">
+                              <!-- n-columns=5 n-rows=2 -->
+                              <object class="GtkGrid" id="audio_options_grid">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="can_focus">False</property>
-                                <property name="margin_left">5</property>
-                                <property name="margin_right">5</property>
-                                <property name="margin_top">5</property>
-                                <property name="margin_bottom">5</property>
-                                <property name="row_spacing">2</property>
-                                <property name="column_spacing">5</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-top">5</property>
+                                <property name="margin-bottom">5</property>
+                                <property name="row-spacing">2</property>
+                                <property name="column-spacing">5</property>
                                 <child>
-                                  <object class="GtkLabel" id="coding_format_label">
+                                  <object class="GtkLabel" id="coding_format_label1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="label" translatable="yes">Codec:</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">4</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">4</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="h246_radio_button">
-                                    <property name="label">h264</property>
+                                  <object class="GtkComboBoxText" id="audio_codec_combo_box">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="halign">center</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="active-id">mp3</property>
+                                    <items>
+                                      <item id="mp3" translatable="yes">mp3</item>
+                                      <item id="a52" translatable="yes">AC3</item>
+                                    </items>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">4</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">4</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="video_height_label">
+                                  <object class="GtkLabel" id="sample_rate_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Height (px):</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Sample rate (Hz):</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">3</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkEntry" id="video_height_field">
+                                  <object class="GtkComboBoxText" id="audio_sample_rate_combo_box">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="input_purpose">number</property>
-                                    <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
+                                    <property name="can-focus">False</property>
+                                    <property name="active-id">44100</property>
+                                    <items>
+                                      <item id="8000" translatable="yes">8000</item>
+                                      <item id="11025" translatable="yes">11025</item>
+                                      <item id="22050" translatable="yes">22050</item>
+                                      <item id="44100" translatable="yes">44100</item>
+                                      <item id="48000" translatable="yes">48000</item>
+                                    </items>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">3</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="video_width_label">
+                                  <object class="GtkLabel" id="audio_channels_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Width (px):</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Channels:</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkEntry" id="video_width_field">
+                                  <object class="GtkComboBoxText" id="audio_channels_combo_box">
+                                    <property name="width-request">75</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">
-                                        </property>
-                                    <property name="input_purpose">number</property>
-                                    <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
+                                    <property name="can-focus">False</property>
+                                    <property name="active-id">2</property>
+                                    <items>
+                                      <item id="1" translatable="yes">1</item>
+                                      <item id="2" translatable="yes">2</item>
+                                    </items>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="video_bitrate_label">
+                                  <object class="GtkLabel" id="audio_bitrate_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="label" translatable="yes">Bitrate (kb/s):</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkEntry" id="video_bitrate_field">
+                                  <object class="GtkEntry" id="audio_bitrate_field">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="input_purpose">number</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="input-purpose">number</property>
                                     <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkLabel" id="audio_options_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Video options:</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Audio options:</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1444,131 +1437,124 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkGrid" id="audio_options_grid">
+                              <!-- n-columns=5 n-rows=2 -->
+                              <object class="GtkGrid" id="video_options_grid">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="can_focus">False</property>
-                                <property name="margin_left">5</property>
-                                <property name="margin_right">5</property>
-                                <property name="margin_top">5</property>
-                                <property name="margin_bottom">5</property>
-                                <property name="row_spacing">2</property>
-                                <property name="column_spacing">5</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-top">5</property>
+                                <property name="margin-bottom">5</property>
+                                <property name="row-spacing">2</property>
+                                <property name="column-spacing">5</property>
                                 <child>
-                                  <object class="GtkLabel" id="coding_format_label1">
+                                  <object class="GtkLabel" id="coding_format_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="label" translatable="yes">Codec:</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">4</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">4</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkComboBoxText" id="audio_codec_combo_box">
+                                  <object class="GtkRadioButton" id="h246_radio_button">
+                                    <property name="label">h264</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="active_id">mp3</property>
-                                    <items>
-                                      <item id="mp3" translatable="yes">mp3</item>
-                                      <item id="a52" translatable="yes">AC3</item>
-                                    </items>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">False</property>
+                                    <property name="halign">center</property>
+                                    <property name="active">True</property>
+                                    <property name="draw-indicator">True</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">4</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">4</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="sample_rate_label">
+                                  <object class="GtkLabel" id="video_height_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Sample rate (Hz):</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Height (px):</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left-attach">3</property>
+                                    <property name="top-attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkComboBoxText" id="audio_sample_rate_combo_box">
+                                  <object class="GtkEntry" id="video_height_field">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="active_id">44100</property>
-                                    <items>
-                                      <item id="8000" translatable="yes">8000</item>
-                                      <item id="11025" translatable="yes">11025</item>
-                                      <item id="22050" translatable="yes">22050</item>
-                                      <item id="44100" translatable="yes">44100</item>
-                                      <item id="48000" translatable="yes">48000</item>
-                                    </items>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="audio_channels_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Channels:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBoxText" id="audio_channels_combo_box">
-                                    <property name="width_request">75</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="active_id">2</property>
-                                    <items>
-                                      <item id="1" translatable="yes">1</item>
-                                      <item id="2" translatable="yes">2</item>
-                                    </items>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="audio_bitrate_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Bitrate (kb/s):</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="audio_bitrate_field">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="input_purpose">number</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="input-purpose">number</property>
                                     <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">3</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="audio_options_label">
+                                  <object class="GtkLabel" id="video_width_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Audio options:</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Width (px):</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="video_width_field">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="tooltip-text" translatable="yes">
+                                        </property>
+                                    <property name="input-purpose">number</property>
+                                    <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="video_bitrate_label">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Bitrate (kb/s):</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="video_bitrate_field">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="input-purpose">number</property>
+                                    <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Video options:</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1593,7 +1579,7 @@ Author: Dmitriy Yefremov
                     <child type="label">
                       <object class="GtkLabel" id="record_to_disk_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Record to disk:</property>
                       </object>
                     </child>
@@ -1614,27 +1600,27 @@ Author: Dmitriy Yefremov
             <child>
               <object class="GtkBox" id="program_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkFrame" id="load_startup_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="lang_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <child>
                           <object class="GtkLabel" id="lang_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Language:</property>
                           </object>
                           <packing>
@@ -1645,10 +1631,10 @@ Author: Dmitriy Yefremov
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="lang_combo_box">
-                            <property name="width_request">175</property>
+                            <property name="width-request">175</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="focus_on_click">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="focus-on-click">False</property>
                             <property name="active">0</property>
                             <items>
                               <item id="en_US">English</item>
@@ -1668,7 +1654,7 @@ Author: Dmitriy Yefremov
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack_type">end</property>
+                            <property name="pack-type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1687,24 +1673,24 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="load_on_startup_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="load_on_startup_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <child>
                           <object class="GtkLabel" id="load_on_startup_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="label" translatable="yes">Load the last open configuration at program startup</property>
                           </object>
                           <packing>
@@ -1716,13 +1702,13 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkSwitch" id="load_on_startup_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="valign">center</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack_type">end</property>
+                            <property name="pack-type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1741,66 +1727,67 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="hints_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
+                      <!-- n-columns=2 n-rows=2 -->
                       <object class="GtkGrid" id="hints_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="row_spacing">5</property>
-                        <property name="column_spacing">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
+                        <property name="row-spacing">5</property>
+                        <property name="column-spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="fav_hints_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes">Show detailed info as hints in the bouquet list</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="bouquet_hints_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="services_hints_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes">Show short info as hints in the main services list</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="services_hints_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                       </object>
@@ -1818,64 +1805,65 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="backup_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
+                      <!-- n-columns=2 n-rows=2 -->
                       <object class="GtkGrid" id="backup_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="row_spacing">5</property>
-                        <property name="column_spacing">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-bottom">5</property>
+                        <property name="row-spacing">5</property>
+                        <property name="column-spacing">5</property>
                         <child>
                           <object class="GtkSwitch" id="before_save_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="before_downloading_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_bottom">1</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-bottom">1</property>
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes">Before saving</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Before downloading from the receiver</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                       </object>
@@ -1883,7 +1871,7 @@ Author: Dmitriy Yefremov
                     <child type="label">
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Backup:</property>
                       </object>
                     </child>
@@ -1897,21 +1885,21 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="http_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="enable_http_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <child>
                           <object class="GtkLabel" id="enable_http_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes">Enable HTTP API</property>
@@ -1925,7 +1913,7 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkSwitch" id="support_http_api_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <signal name="state-set" handler="on_http_mode_switch" swapped="no"/>
                           </object>
@@ -1957,33 +1945,33 @@ Author: Dmitriy Yefremov
             <child>
               <object class="GtkBox" id="appearance_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkFrame" id="app_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="app_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkBox" id="font_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <child>
                               <object class="GtkLabel" id="list_font_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="hexpand">True</property>
                                 <property name="label" translatable="yes">Font in the lists:</property>
@@ -1997,20 +1985,20 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkBox" id="font_buttons_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <child>
                                   <object class="GtkButton" id="reset_font_button">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Reset</property>
-                                    <property name="always_show_image">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Reset</property>
+                                    <property name="always-show-image">True</property>
                                     <signal name="clicked" handler="on_list_font_reset" swapped="no"/>
                                     <child>
                                       <object class="GtkImage" id="set_default_font_image">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="icon_name">document-revert-symbolic</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">document-revert-symbolic</property>
                                       </object>
                                     </child>
                                   </object>
@@ -2023,17 +2011,17 @@ Author: Dmitriy Yefremov
                                 <child>
                                   <object class="GtkFontButton" id="list_font_button">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">False</property>
                                     <property name="font">Sans 12</property>
-                                    <property name="preview_text"/>
-                                    <property name="use_size">True</property>
-                                    <property name="show_style">False</property>
+                                    <property name="preview-text"/>
+                                    <property name="use-size">True</property>
+                                    <property name="show-style">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
                                     <property name="fill">True</property>
-                                    <property name="pack_type">end</property>
+                                    <property name="pack-type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -2055,40 +2043,41 @@ Author: Dmitriy Yefremov
                           </packing>
                         </child>
                         <child>
+                          <!-- n-columns=2 n-rows=2 -->
                           <object class="GtkGrid" id="app_grid">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="row_spacing">5</property>
-                            <property name="column_spacing">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="row-spacing">5</property>
+                            <property name="column-spacing">5</property>
                             <child>
                               <object class="GtkLabel" id="picons_size_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="hexpand">True</property>
                                 <property name="label" translatable="yes">Picons size in the lists:</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkLabel" id="tooltips_logo_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Logo size in tooltips:</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBoxText" id="tooltip_logo_size_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="active">0</property>
                                 <items>
                                   <item id="96">96</item>
@@ -2097,15 +2086,15 @@ Author: Dmitriy Yefremov
                                 </items>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBoxText" id="picons_size_button">
-                                <property name="width_request">85</property>
+                                <property name="width-request">85</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="active">0</property>
                                 <items>
                                   <item id="32">32</item>
@@ -2116,8 +2105,8 @@ Author: Dmitriy Yefremov
                                 </items>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                           </object>
@@ -2142,27 +2131,27 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="program_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="parogram_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkBox" id="set_color_switch_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkLabel">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Set background color for the services</property>
                                 <property name="xalign">0</property>
                               </object>
@@ -2175,13 +2164,13 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="set_color_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <signal name="state-set" handler="on_set_color_switch" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -2193,63 +2182,64 @@ Author: Dmitriy Yefremov
                           </packing>
                         </child>
                         <child>
+                          <!-- n-columns=2 n-rows=2 -->
                           <object class="GtkGrid" id="colors_grid">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="row_spacing">5</property>
-                            <property name="column_spacing">20</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-top">5</property>
+                            <property name="row-spacing">5</property>
+                            <property name="column-spacing">20</property>
                             <child>
                               <object class="GtkLabel">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Marked as new:</property>
                                 <property name="xalign">0</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkColorButton" id="new_color_button">
-                                <property name="width_request">250</property>
+                                <property name="width-request">250</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
                                 <property name="halign">end</property>
                                 <property name="hexpand">True</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkLabel">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">With an extra name in the bouquet:</property>
                                 <property name="xalign">0</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkColorButton" id="extra_color_button">
-                                <property name="width_request">250</property>
+                                <property name="width-request">250</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
                                 <property name="halign">end</property>
                                 <property name="hexpand">True</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                           </object>
@@ -2273,27 +2263,27 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkFrame" id="style_frame">
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="style_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkBox" id="dark_mode_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <child>
                               <object class="GtkLabel" id="dark_mode_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Enable Dark Mode</property>
                               </object>
                               <packing>
@@ -2305,13 +2295,13 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="dark_mode_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <signal name="state-set" handler="on_appearance_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2324,12 +2314,12 @@ Author: Dmitriy Yefremov
                         </child>
                         <child>
                           <object class="GtkBox" id="layout_box">
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Enables an alternate layout of the main window elements.</property>
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes">Enables an alternate layout of the main window elements.</property>
                             <child>
                               <object class="GtkLabel" id="layout_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Enable alternate layout</property>
                               </object>
                               <packing>
@@ -2341,13 +2331,13 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="layout_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <signal name="state-set" handler="on_appearance_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2372,33 +2362,21 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkFrame" id="themes_support_frame">
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="themes_support_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
-                        <child>
-                          <object class="GtkLabel" id="hemes_support_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Enable Themes support</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <child type="center">
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">EXPERIMENTAL!</property>
                           </object>
                           <packing>
@@ -2407,16 +2385,28 @@ Author: Dmitriy Yefremov
                             <property name="position">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="hemes_support_label">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes">Enable Themes support</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkSwitch" id="themes_support_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <signal name="state-set" handler="on_appearance_changed" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack_type">end</property>
+                            <property name="pack-type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -2435,29 +2425,30 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="theme_frame">
                     <property name="sensitive">False</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="gtk_theme_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkBox" id="gtk_theme_selection_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">5</property>
-                            <property name="margin_right">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="spacing">1</property>
                             <child>
                               <object class="GtkLabel" id="theme_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Gtk3 Theme:</property>
                               </object>
                               <packing>
@@ -2469,58 +2460,71 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkComboBoxText" id="theme_combo_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <signal name="changed" handler="on_theme_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="theme_add_button">
+                              <object class="GtkButtonBox" id="themes_button_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Add</property>
-                                <signal name="clicked" handler="on_theme_add" swapped="no"/>
+                                <property name="can-focus">False</property>
+                                <property name="layout-style">expand</property>
                                 <child>
-                                  <object class="GtkImage" id="theme_add_button_image">
+                                  <object class="GtkButton" id="theme_add_button">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="stock">gtk-add</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Add</property>
+                                    <signal name="clicked" handler="on_theme_add" swapped="no"/>
+                                    <child>
+                                      <object class="GtkImage" id="theme_add_button_image">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">list-add-symbolic</property>
+                                      </object>
+                                    </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="theme_remove_button">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Remove</property>
+                                    <signal name="clicked" handler="on_theme_remove" swapped="no"/>
+                                    <child>
+                                      <object class="GtkImage" id="theme_remove_button_image">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">list-remove-symbolic</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="pack_type">end</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="theme_remove_button">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Remove</property>
-                                <signal name="clicked" handler="on_theme_remove" swapped="no"/>
-                                <child>
-                                  <object class="GtkImage" id="theme_remove_button_image">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="stock">gtk-remove</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">3</property>
+                                <property name="pack-type">end</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                           </object>
@@ -2533,21 +2537,21 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkFrame" id="theme_thumbnail_frame">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">center</property>
                             <property name="valign">center</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="label-xalign">0</property>
+                            <property name="shadow-type">in</property>
                             <child>
                               <object class="GtkImage" id="theme_thumbnail_image">
-                                <property name="width_request">120</property>
-                                <property name="height_request">32</property>
+                                <property name="width-request">120</property>
+                                <property name="height-request">32</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="tooltip_text" translatable="yes">Preview</property>
+                                <property name="can-focus">False</property>
+                                <property name="tooltip-text" translatable="yes">Preview</property>
                                 <property name="halign">center</property>
-                                <property name="margin_top">2</property>
-                                <property name="margin_bottom">2</property>
+                                <property name="margin-top">2</property>
+                                <property name="margin-bottom">2</property>
                                 <property name="icon_size">0</property>
                               </object>
                             </child>
@@ -2564,13 +2568,27 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkBox" id="icons_theme_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">5</property>
-                            <property name="margin_right">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="spacing">1</property>
+                            <child>
+                              <object class="GtkComboBoxText" id="icon_theme_combo_box">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <signal name="changed" handler="on_appearance_changed" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="pack-type">end</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkLabel" id="icon_theme_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Icon Theme:</property>
                               </object>
                               <packing>
@@ -2580,62 +2598,62 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBoxText" id="icon_theme_combo_box">
+                              <object class="GtkButtonBox" id="icons_button_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <signal name="changed" handler="on_appearance_changed" swapped="no"/>
-                              </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="GtkButton" id="icon_theme_add_button">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Add</property>
-                                <signal name="clicked" handler="on_icon_theme_add" swapped="no"/>
+                                <property name="can-focus">False</property>
+                                <property name="layout-style">expand</property>
                                 <child>
-                                  <object class="GtkImage" id="icon_theme_add_button_image">
+                                  <object class="GtkButton" id="icon_theme_add_button">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="stock">gtk-add</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Add</property>
+                                    <signal name="clicked" handler="on_icon_theme_add" swapped="no"/>
+                                    <child>
+                                      <object class="GtkImage" id="icon_theme_add_button_image">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">list-add-symbolic</property>
+                                      </object>
+                                    </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="icon_theme_remove_button">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Remove</property>
+                                    <signal name="clicked" handler="on_icon_theme_remove" swapped="no"/>
+                                    <child>
+                                      <object class="GtkImage" id="icon_theme_remove_button_image">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">list-remove-symbolic</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="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkButton" id="icon_theme_remove_button">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Remove</property>
-                                <signal name="clicked" handler="on_icon_theme_remove" swapped="no"/>
-                                <child>
-                                  <object class="GtkImage" id="icon_theme_remove_button_image">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="stock">gtk-remove</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -2646,12 +2664,12 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkBox" id="themes_source_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">center</property>
                             <child>
                               <object class="GtkLabel" id="themes_source_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes">Gtk3 Themes and Icons:</property>
                               </object>
                               <packing>
@@ -2664,8 +2682,8 @@ Author: Dmitriy Yefremov
                               <object class="GtkLinkButton" id="themes_source_link_button">
                                 <property name="label" translatable="yes">www.gnome-look.org</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
                                 <property name="relief">none</property>
                                 <property name="uri">https://www.gnome-look.org/</property>
                               </object>
@@ -2679,7 +2697,7 @@ Author: Dmitriy Yefremov
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack_type">end</property>
+                            <property name="pack-type">end</property>
                             <property name="position">4</property>
                           </packing>
                         </child>
@@ -2705,124 +2723,125 @@ Author: Dmitriy Yefremov
             <child>
               <object class="GtkBox" id="extra_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkFrame" id="bq_naming_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
+                      <!-- n-columns=2 n-rows=4 -->
                       <object class="GtkGrid" id="bq_naming_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="row_spacing">5</property>
-                        <property name="column_spacing">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
+                        <property name="row-spacing">5</property>
+                        <property name="column-spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="bq_naming_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Allows you to name bouquet files using their names.</property>
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes">Allows you to name bouquet files using their names.</property>
                             <property name="halign">start</property>
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes">Enable alternate bouquet file naming</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="force_bq_name_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Allows you to name bouquet files using their names.</property>
+                            <property name="can-focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Allows you to name bouquet files using their names.</property>
                             <property name="halign">end</property>
                             <signal name="state-set" handler="on_force_bq_name" swapped="no"/>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="use_http_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="active">True</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="use_http_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Use HTTP to reload data in the receiver</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="remove_unused_bouquets_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Remove unused bouquets</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="remove_unused_bq_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="halign">end</property>
                             <property name="active">True</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="compress_picons_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Enables upload as an archive if a large number of picon (&gt; 1000) is selected.
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes">Enables upload as an archive if a large number of picon (&gt; 1000) is selected.
                           Recommended only if you have external storage.</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Enable picons compression</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="compress_picons_switch">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Enables upload as an archive if a large number of picon (&gt; 1000) is selected.
+                            <property name="can-focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Enables upload as an archive if a large number of picon (&gt; 1000) is selected.
                           Recommended only if you have external storage.</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                       </object>
@@ -2830,7 +2849,7 @@ Author: Dmitriy Yefremov
                     <child type="label">
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">FTP-transfer</property>
                       </object>
                     </child>
@@ -2844,7 +2863,7 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">EXPERIMENTAL!</property>
                   </object>
                   <packing>
@@ -2856,13 +2875,13 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkBox" id="experimental_features_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
                     <child>
                       <object class="GtkLabel" id="enable_experimental_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="halign">start</property>
                         <property name="label" translatable="yes">Enable experimental features</property>
                       </object>
@@ -2875,7 +2894,7 @@ Author: Dmitriy Yefremov
                     <child>
                       <object class="GtkSwitch" id="enable_experimental_switch">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
                         <signal name="state-set" handler="on_experimental_switch" swapped="no"/>
@@ -2883,7 +2902,7 @@ Author: Dmitriy Yefremov
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="pack_type">end</property>
+                        <property name="pack-type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2897,28 +2916,28 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkFrame" id="enable_experimental_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0.5</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="label-xalign">0.5</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox" id="experimental_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkBox" id="v5_support_box">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <child>
                               <object class="GtkLabel">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="hexpand">True</property>
                                 <property name="label" translatable="yes">Enable lamedb ver. 5 support</property>
@@ -2932,13 +2951,13 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="support_ver5_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <property name="halign">end</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2953,20 +2972,20 @@ Author: Dmitriy Yefremov
                           <object class="GtkBox" id="yt_dl_box">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">10</property>
-                            <property name="margin_bottom">10</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkBox" id="enable_yt_dl_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="tooltip_text" translatable="yes">Enables URL parsing using youtube-dl to get direct links to media.</property>
+                                <property name="can-focus">False</property>
+                                <property name="tooltip-text" translatable="yes">Enables URL parsing using youtube-dl to get direct links to media.</property>
                                 <child>
                                   <object class="GtkLabel" id="enable_yt_dl_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="label" translatable="yes">Enable support for</property>
                                   </object>
@@ -2979,14 +2998,14 @@ Author: Dmitriy Yefremov
                                 <child>
                                   <object class="GtkSwitch" id="enable_yt_dl_switch">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="can-focus">True</property>
                                     <property name="halign">end</property>
                                     <property name="valign">center</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="pack_type">end</property>
+                                    <property name="pack-type">end</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -2995,8 +3014,8 @@ Author: Dmitriy Yefremov
                                     <property name="label">youtube-dl</property>
                                     <property name="name">status-bar-button</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="receives_default">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="receives-default">True</property>
                                     <property name="halign">start</property>
                                     <property name="valign">center</property>
                                     <property name="relief">none</property>
@@ -3019,11 +3038,11 @@ Author: Dmitriy Yefremov
                               <object class="GtkBox" id="yt_dl_update_box">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <child>
                                   <object class="GtkLabel" id="auto_update_yt_dl_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="label" translatable="yes">Auto-check for updates</property>
                                   </object>
@@ -3036,14 +3055,14 @@ Author: Dmitriy Yefremov
                                 <child>
                                   <object class="GtkSwitch" id="enable_update_yt_dl_switch">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="can-focus">True</property>
                                     <property name="halign">end</property>
                                     <property name="valign">center</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="pack_type">end</property>
+                                    <property name="pack-type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -3065,12 +3084,12 @@ Author: Dmitriy Yefremov
                           <object class="GtkBox" id="enable_direct_playback_box">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Enables direct sending and playback of media links on the receiver</property>
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes">Enables direct sending and playback of media links on the receiver</property>
                             <child>
                               <object class="GtkLabel" id="enable_send_to_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="hexpand">True</property>
                                 <property name="label" translatable="yes">Enable direct playback bar</property>
@@ -3084,13 +3103,13 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkSwitch" id="enable_send_to_switch">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can-focus">True</property>
                                 <property name="halign">end</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -3129,14 +3148,14 @@ Author: Dmitriy Yefremov
         </child>
         <child>
           <object class="GtkInfoBar" id="info_bar">
-            <property name="can_focus">False</property>
-            <property name="show_close_button">True</property>
+            <property name="can-focus">False</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="can-focus">False</property>
                 <property name="homogeneous">True</property>
-                <property name="layout_style">expand</property>
+                <property name="layout-style">expand</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -3149,13 +3168,13 @@ Author: Dmitriy Yefremov
             </child>
             <child internal-child="content_area">
               <object class="GtkBox">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="spacing">16</property>
                 <child>
                   <object class="GtkLabel" id="info_bar_message_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">5</property>
                     <property name="label" translatable="yes">Info</property>
                   </object>
                   <packing>
@@ -3178,7 +3197,7 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -3188,128 +3207,129 @@ Author: Dmitriy Yefremov
       <action-widget response="-3">save_button</action-widget>
     </action-widgets>
   </object>
+   <!-- n-columns=2 n-rows=14 -->
   <object class="GtkGrid" id="network_grid">
     <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="row_spacing">5</property>
-    <property name="column_spacing">5</property>
+    <property name="can-focus">False</property>
+    <property name="margin-start">10</property>
+    <property name="margin-end">10</property>
+    <property name="margin-top">5</property>
+    <property name="margin-bottom">5</property>
+    <property name="row-spacing">5</property>
+    <property name="column-spacing">5</property>
     <child>
       <object class="GtkLabel" id="satellites_xml_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Satellites.xml file:</property>
         <property name="xalign">0.019999999552965164</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">11</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">11</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="satellites_xml_field">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
         <property name="halign">start</property>
         <property name="text">/etc/tuxbox/</property>
-        <property name="primary_icon_name">document-edit-symbolic</property>
+        <property name="primary-icon-name">document-edit-symbolic</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">11</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">11</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="user_bouquet_label">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">User bouquet files:</property>
         <property name="xalign">2.2351741291171123e-10</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">10</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">10</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="user_bouquet_field">
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
         <property name="halign">start</property>
         <property name="text">/etc/enigma2/</property>
-        <property name="primary_icon_name">document-edit-symbolic</property>
+        <property name="primary-icon-name">document-edit-symbolic</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">10</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">10</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="services_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Services and Bouquets files:</property>
         <property name="xalign">0</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">9</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">9</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="services_field">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
         <property name="halign">start</property>
         <property name="text">/etc/enigma2/</property>
-        <property name="primary_icon_name">document-edit-symbolic</property>
+        <property name="primary-icon-name">document-edit-symbolic</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">9</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">9</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="stb_paths_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">start</property>
         <property name="label" translatable="yes">STB file paths:</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">8</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">8</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="telnet_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">start</property>
         <property name="label" translatable="yes">Telnet:</property>
         <property name="xalign">1</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">7</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">7</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="telnet_port_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkEntry" id="telnet_port_field">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">Default 23</property>
+            <property name="can-focus">True</property>
+            <property name="tooltip-text" translatable="yes">Default 23</property>
             <property name="halign">start</property>
-            <property name="width_chars">6</property>
-            <property name="max_width_chars">6</property>
+            <property name="width-chars">6</property>
+            <property name="max-width-chars">6</property>
             <property name="text" translatable="yes">23</property>
-            <property name="primary_icon_name">network-workgroup-symbolic</property>
+            <property name="primary-icon-name">network-workgroup-symbolic</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -3320,8 +3340,8 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkLabel" id="timeout_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
+            <property name="can-focus">False</property>
+            <property name="margin-start">5</property>
             <property name="label" translatable="yes">Timeout:</property>
           </object>
           <packing>
@@ -3333,16 +3353,16 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkSpinButton" id="telnet_timeout_spin_button">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">Timeout between commands in seconds</property>
+            <property name="can-focus">True</property>
+            <property name="tooltip-text" translatable="yes">Timeout between commands in seconds</property>
             <property name="halign">start</property>
             <property name="valign">center</property>
-            <property name="max_length">2</property>
-            <property name="width_chars">6</property>
-            <property name="max_width_chars">6</property>
+            <property name="max-length">2</property>
+            <property name="width-chars">6</property>
+            <property name="max-width-chars">6</property>
             <property name="text" translatable="yes">1</property>
-            <property name="primary_icon_name">alarm-symbolic</property>
-            <property name="input_purpose">number</property>
+            <property name="primary-icon-name">alarm-symbolic</property>
+            <property name="input-purpose">number</property>
             <property name="adjustment">telnet_timeout_adjustment</property>
             <property name="numeric">True</property>
             <property name="value">1</property>
@@ -3355,39 +3375,39 @@ Author: Dmitriy Yefremov
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">7</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">7</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="http_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">start</property>
         <property name="label" translatable="yes">HTTP:</property>
         <property name="xalign">1</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">6</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">6</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="http_port_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkEntry" id="http_port_field">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">Default 80</property>
+            <property name="can-focus">True</property>
+            <property name="tooltip-text" translatable="yes">Default 80</property>
             <property name="halign">start</property>
-            <property name="max_length">5</property>
-            <property name="width_chars">6</property>
-            <property name="max_width_chars">6</property>
+            <property name="max-length">5</property>
+            <property name="width-chars">6</property>
+            <property name="max-width-chars">6</property>
             <property name="text" translatable="yes">80</property>
-            <property name="primary_icon_name">network-workgroup-symbolic</property>
+            <property name="primary-icon-name">network-workgroup-symbolic</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -3399,11 +3419,11 @@ Author: Dmitriy Yefremov
           <object class="GtkCheckButton" id="http_use_ssl_check_button">
             <property name="label" translatable="yes">SSL/TSL</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
             <property name="halign">start</property>
             <property name="valign">center</property>
-            <property name="draw_indicator">True</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="on_http_use_ssl_toggled" swapped="no"/>
           </object>
           <packing>
@@ -3412,152 +3432,135 @@ Author: Dmitriy Yefremov
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">6</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">6</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="ftp_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">start</property>
         <property name="label" translatable="yes">FTP:</property>
         <property name="xalign">1</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">5</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="port_field">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="tooltip_text" translatable="yes">Default 21</property>
+        <property name="can-focus">True</property>
+        <property name="tooltip-text" translatable="yes">Default 21</property>
         <property name="halign">start</property>
-        <property name="width_chars">6</property>
-        <property name="max_width_chars">6</property>
+        <property name="width-chars">6</property>
+        <property name="max-width-chars">6</property>
         <property name="text">21</property>
-        <property name="primary_icon_name">network-workgroup-symbolic</property>
+        <property name="primary-icon-name">network-workgroup-symbolic</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">5</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">5</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="port_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">start</property>
         <property name="label" translatable="yes">Port:</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">4</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">4</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label14">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Password:</property>
         <property name="xalign">0.019999999552965164</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">3</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="password_field">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
         <property name="halign">start</property>
         <property name="valign">center</property>
         <property name="hexpand">False</property>
         <property name="visibility">False</property>
-        <property name="invisible_char">●</property>
+        <property name="invisible-char">●</property>
         <property name="text">root</property>
-        <property name="primary_icon_name">emblem-readonly</property>
-        <property name="primary_icon_activatable">False</property>
-        <property name="input_purpose">password</property>
+        <property name="primary-icon-name">emblem-readonly</property>
+        <property name="primary-icon-activatable">False</property>
+        <property name="input-purpose">password</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">3</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">3</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label13">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Login:</property>
         <property name="xalign">0.019999999552965164</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="login_field">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
         <property name="halign">start</property>
         <property name="valign">center</property>
         <property name="text">root</property>
-        <property name="primary_icon_name">avatar-default-symbolic</property>
-        <property name="primary_icon_activatable">False</property>
+        <property name="primary-icon-name">avatar-default-symbolic</property>
+        <property name="primary-icon-activatable">False</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">2</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label4">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Host:</property>
         <property name="xalign">0.019999999552965164</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="host_field">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="halign">start</property>
-        <property name="valign">center</property>
-        <property name="text">127.0.0.1</property>
-        <property name="primary_icon_name">network-transmit-receive-symbolic</property>
-      </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">1</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="settings_type_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkRadioButton" id="enigma_radio_button">
             <property name="label">Enigma2 </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="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <property name="group">neutrino_radio_button</property>
             <signal name="toggled" handler="on_settings_type_changed" swapped="no"/>
           </object>
@@ -3571,9 +3574,9 @@ Author: Dmitriy Yefremov
           <object class="GtkRadioButton" id="neutrino_radio_button">
             <property name="label">Neutrino-MP</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="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <property name="group">enigma_radio_button</property>
           </object>
           <packing>
@@ -3584,49 +3587,49 @@ Author: Dmitriy Yefremov
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Settings type:</property>
         <property name="xalign">0</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="picons_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Picons:</property>
         <property name="xalign">2.2351741291171123e-10</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">13</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">13</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="picon_paths_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkComboBoxText" id="picons_paths_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="halign">start</property>
             <property name="active">0</property>
-            <property name="has_entry">True</property>
+            <property name="has-entry">True</property>
             <child internal-child="entry">
               <object class="GtkEntry">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
             </child>
           </object>
@@ -3639,20 +3642,20 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkButtonBox" id="action_picon_paths_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">expand</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">expand</property>
             <child>
               <object class="GtkButton" id="remove_picon_path_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Remove</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Remove</property>
                 <signal name="clicked" handler="on_remove_picon_path" swapped="no"/>
                 <child>
                   <object class="GtkImage" id="remove_picon_path_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">list-remove-symbolic</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">list-remove-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -3665,15 +3668,15 @@ Author: Dmitriy Yefremov
             <child>
               <object class="GtkButton" id="add_picon_path_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Add</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Add</property>
                 <signal name="clicked" handler="on_add_picon_path" swapped="no"/>
                 <child>
                   <object class="GtkImage" id="add_picon_path_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">list-add-symbolic</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">list-add-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -3692,31 +3695,31 @@ Author: Dmitriy Yefremov
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">13</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">13</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="epg_dat_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="sensitive" bind-source="enigma_radio_button" bind-property="active">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">EPG *.dat file:</property>
-        <property name="xalign">0.02</property>
-        <property name="sensitive" bind-source="enigma_radio_button" bind-property="active"/>
+        <property name="xalign">0.019999999552965164</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">12</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">12</property>
       </packing>
     </child>
     <child>
       <object class="GtkComboBoxText" id="epg_dat_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="sensitive" bind-source="enigma_radio_button" bind-property="active">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">start</property>
         <property name="active">0</property>
-        <property name="has_entry">True</property>
-        <property name="sensitive" bind-source="enigma_radio_button" bind-property="active"/>
+        <property name="has-entry">True</property>
         <items>
           <item id="/etc/enigma2/">/etc/enigma2/</item>
           <item id="/media/hdd/">/media/hdd/</item>
@@ -3726,13 +3729,103 @@ Author: Dmitriy Yefremov
         </items>
         <child internal-child="entry">
           <object class="GtkEntry">
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
           </object>
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">12</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">12</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="host_box">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkComboBoxText" id="hosts_box">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="tooltip-text" translatable="yes">Default selection</property>
+            <property name="has-entry">True</property>
+            <child internal-child="entry">
+              <object class="GtkEntry" id="host_field">
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes">Specify hostname or IP address</property>
+                <property name="primary-icon-name">network-transmit-receive-symbolic</property>
+                <signal name="activate" handler="on_host_focus_out" swapped="no"/>
+                <signal name="focus-in-event" handler="on_host_focus_in" swapped="no"/>
+                <signal name="focus-out-event" handler="on_host_focus_out" swapped="no"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="action_host_box">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="homogeneous">True</property>
+            <property name="layout-style">expand</property>
+            <child>
+              <object class="GtkButton" id="remove_host_button">
+                <property name="visible">True</property>
+                <property name="sensitive">False</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_host" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="remove_host_image">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">list-remove-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="add_host_button">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Add</property>
+                <signal name="clicked" handler="on_add_host" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="add_host_image">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">list-add-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left-attach">1</property>
+        <property name="top-attach">1</property>
       </packing>
     </child>
     <child>
diff --git a/app/ui/settings_dialog.py b/app/ui/settings_dialog.py
index ffd86946..685ca4d1 100644
--- a/app/ui/settings_dialog.py
+++ b/app/ui/settings_dialog.py
@@ -28,6 +28,7 @@
 
 import os
 import re
+from collections import Counter
 
 from app.commons import run_task, run_idle, log
 from app.connections import test_telnet, test_ftp, TestException, test_http, HttpApiException
@@ -62,6 +63,10 @@ class SettingsDialog:
                     "on_profile_edited": self.on_profile_edited,
                     "on_profile_selected": self.on_profile_selected,
                     "on_profile_set_default": self.on_profile_set_default,
+                    "on_host_focus_in": self.on_host_focus_in,
+                    "on_host_focus_out": self.on_host_focus_out,
+                    "on_add_host": self.on_add_host,
+                    "on_remove_host": self.on_remove_host,
                     "on_add_picon_path": self.on_add_picon_path,
                     "on_remove_picon_path": self.on_remove_picon_path,
                     "on_lang_changed": self.on_lang_changed,
@@ -96,7 +101,10 @@ class SettingsDialog:
         self._dialog.set_margin_left(0)
         self._main_stack = builder.get_object("main_stack")
         # Network.
+        self._host_iter = None
         self._host_field = builder.get_object("host_field")
+        self._hosts_box = builder.get_object("hosts_box")
+        self._remove_host_button = builder.get_object("remove_host_button")
         self._port_field = builder.get_object("port_field")
         self._login_field = builder.get_object("login_field")
         self._password_field = builder.get_object("password_field")
@@ -194,13 +202,13 @@ class SettingsDialog:
         # Separated due to a bug with response (presumably in the builder) in ubuntu 18.04 and derivatives.
         builder.get_object("network_settings_frame").add(builder.get_object("network_grid"))
         # Style.
-        self._style_provider = Gtk.CssProvider()
-        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
+        style_provider = Gtk.CssProvider()
+        style_provider.load_from_path(f"{UI_RESOURCES_PATH}style.css")
+        screen = Gdk.Screen.get_default()
         self._digit_elems = (self._port_field, self._http_port_field, self._telnet_port_field, self._video_width_field,
                              self._video_bitrate_field, self._video_height_field, self._audio_bitrate_field)
-        for el in self._digit_elems:
-            el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
-                                                           Gtk.STYLE_PROVIDER_PRIORITY_USER)
+        [self.init_element_style(el, screen, style_provider) for el in self._digit_elems]
+        self.init_element_style(self._host_field, screen, style_provider)
 
         if IS_GNOME_SESSION:
             switcher = builder.get_object("main_stack_switcher")
@@ -251,6 +259,9 @@ class SettingsDialog:
                 self.on_profile_selected(self._profile_view, False)
         self._profile_remove_button.set_sensitive(len(self._profile_view.get_model()) > 1)
 
+    def init_element_style(self, elem, screen, provider):
+        elem.get_style_context().add_provider_for_screen(screen, provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
+
     def update_title(self):
         title = "{} [{}]"
         if self._s_type is SettingsType.ENIGMA_2:
@@ -295,7 +306,9 @@ class SettingsDialog:
 
     def set_settings(self):
         self._s_type = self._settings.setting_type
-        self._host_field.set_text(self._settings.host)
+        self._hosts_box.remove_all()
+        self._remove_host_button.set_sensitive(len([self._hosts_box.append(h, h) for h in self._settings.hosts]) > 1)
+        self._hosts_box.set_active_id(self._settings.host)
         self._port_field.set_text(self._settings.port)
         self._login_field.set_text(self._settings.user)
         self._password_field.set_text(self._settings.password)
@@ -360,7 +373,8 @@ class SettingsDialog:
 
         self._s_type = SettingsType.ENIGMA_2 if self._enigma_radio_button.get_active() else SettingsType.NEUTRINO_MP
         self._settings.setting_type = self._s_type
-        self._settings.host = self._host_field.get_text()
+        self._settings.host = self._hosts_box.get_active_id()
+        self._settings.hosts = [h[1] for h in self._hosts_box.get_model()]
         self._settings.port = self._port_field.get_text()
         self._settings.user = self._login_field.get_text()
         self._settings.password = self._password_field.get_text()
@@ -587,6 +601,42 @@ class SettingsDialog:
     def on_profile_inserted(self, model, path, itr):
         self._profile_remove_button.set_sensitive(len(model) > 1)
 
+    def on_host_focus_in(self, entry, event):
+        self._host_iter = self._hosts_box.get_active_iter()
+
+    def on_host_focus_out(self, entry, event=None):
+        if self._host_iter:
+            model = self._hosts_box.get_model()
+            host = entry.get_text()
+            model.set_value(self._host_iter, 0, host)
+            model.set_value(self._host_iter, 1, host)
+
+            if Counter(r[0] for r in model).get(host, 0) > 1:
+                self._host_field.set_name(self._DIGIT_ENTRY_NAME)
+                self.show_info_message("The host already exists!", Gtk.MessageType.WARNING)
+            else:
+                self._host_field.set_name("GtkEntry")
+                self.on_info_bar_close()
+
+    def on_add_host(self, button):
+        model = self._hosts_box.get_model()
+        count = 1
+        host = "127.0.0.1"
+        hosts = {r[0] for r in model}
+
+        while host in hosts:
+            count += 1
+            host = f"127.0.0.{count}"
+
+        self._hosts_box.append(host, host)
+        self._hosts_box.set_active_id(host)
+        self._remove_host_button.set_sensitive(len(model) > 1)
+
+    def on_remove_host(self, button):
+        self._hosts_box.remove(self._hosts_box.get_active())
+        self._hosts_box.set_active(0)
+        self._remove_host_button.set_sensitive(len(self._hosts_box.get_model()) > 1)
+
     def on_add_picon_path(self, button):
         response = show_dialog(DialogType.INPUT, self._dialog, self._settings.picons_path)
         if response is Gtk.ResponseType.CANCEL: