diff --git a/app/ui/iptv.glade b/app/ui/iptv.glade
index 9a04a043..f1a57454 100644
--- a/app/ui/iptv.glade
+++ b/app/ui/iptv.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2
+<!-- Generated with glade 3.38.2 
 
 The MIT License (MIT)
 
@@ -28,6 +28,7 @@ Author: Dmitriy Yefremov
 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
+  <!-- interface-css-provider-path style.css -->
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
   <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
@@ -35,19 +36,19 @@ Author: Dmitriy Yefremov
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkImage" id="remove_selection_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-undo</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">edit-undo</property>
   </object>
   <object class="GtkMenu" id="yt_popup_menu">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkImageMenuItem" id="select_all_popup_item">
         <property name="label">gtk-select-all</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_select_all" object="yt_list_view" swapped="no"/>
       </object>
     </child>
@@ -55,34 +56,34 @@ Author: Dmitriy Yefremov
       <object class="GtkImageMenuItem" id="unselect_all_popup_item">
         <property name="label" translatable="yes">Remove selection</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="image">remove_selection_image</property>
-        <property name="use_stock">False</property>
+        <property name="use-stock">False</property>
         <signal name="activate" handler="on_unselect_all" object="yt_list_view" swapped="no"/>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="search_unavailable_streams_dialog">
     <property name="use-header-bar">1</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes">   </property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center</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</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="decorated">False</property>
     <signal name="response" handler="on_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="search_unavailable_dialog_box">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">1</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -93,37 +94,38 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkFrame" id="search_unavailable_box_frame">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="label_xalign">0</property>
-            <property name="label_yalign">1</property>
-            <property name="shadow_type">in</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="label-xalign">0</property>
+            <property name="label-yalign">1</property>
+            <property name="shadow-type">in</property>
             <child>
               <object class="GtkBox" id="search_unavailable_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">10</property>
-                <property name="margin_right">10</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
+                <property name="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="spacing">10</property>
                 <child>
+                  <!-- n-columns=1 n-rows=3 -->
                   <object class="GtkGrid" id="search_unavailable_grid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkBox" id="found_state_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="halign">center</property>
                         <property name="spacing">2</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">Found</property>
                           </object>
                           <packing>
@@ -135,7 +137,7 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkLabel" id="streams_rows_counter_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">0</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -150,7 +152,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">unavailable streams.</property>
                           </object>
                           <packing>
@@ -161,32 +163,32 @@ Author: Dmitriy Yefremov
                         </child>
                       </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="GtkLevelBar" id="unavailable_streams_level_bar">
-                        <property name="height_request">10</property>
+                        <property name="height-request">10</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">center</property>
                         <property name="inverted">True</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">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Please wait,  streams testing  in progress...</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>
                   </object>
@@ -199,14 +201,14 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkButton" id="search_unavailable_cancel_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Cancel</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="tooltip-text" translatable="yes">Cancel</property>
                     <property name="valign">center</property>
                     <child>
                       <object class="GtkImage" id="cancel_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="stock">gtk-close</property>
                       </object>
                     </child>
@@ -214,7 +216,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>
@@ -264,16 +266,16 @@ Author: Dmitriy Yefremov
   </object>
   <object class="GtkDialog" id="iptv_list_configuration_dialog">
     <property name="use-header-bar">{use_header}</property>
-    <property name="width_request">400</property>
-    <property name="can_focus">False</property>
+    <property name="width-request">400</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes">IPTV streams list configuration</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center</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</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 type="action">
       <object class="GtkButton" id="cancel_config_list_button">
@@ -304,14 +306,14 @@ Author: Dmitriy Yefremov
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="iptv_list_configuration_dialog_box">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="valign">center</property>
-            <property name="layout_style">end</property>
+            <property name="layout-style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -322,32 +324,31 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkBox" id="iptv_list_data_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">2</property>
+            <property name="can-focus">False</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkFrame" id="list_configuration_reference_frame">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">5</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
+                <property name="can-focus">False</property>
+                <property name="margin-top">5</property>
+                <property name="label-xalign">0</property>
+                <property name="shadow-type">in</property>
                 <child>
                   <object class="GtkBox">
                     <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="spacing">1</property>
                     <child>
                       <object class="GtkLabel" id="ref_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-left">5</property>
                         <property name="label" translatable="yes">Reference</property>
                       </object>
                       <packing>
@@ -359,8 +360,8 @@ Author: Dmitriy Yefremov
                     <child>
                       <object class="GtkLabel" id="colon_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_right">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-right">5</property>
                         <property name="label" translatable="yes">:</property>
                       </object>
                       <packing>
@@ -372,7 +373,7 @@ Author: Dmitriy Yefremov
                     <child>
                       <object class="GtkLabel" id="reference_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">4097:0:1:0:0:0:0:0:0:0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -388,14 +389,14 @@ Author: Dmitriy Yefremov
                       <object class="GtkButton" id="reset_list_to_default_button">
                         <property name="label" translatable="yes">Reset to default</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>
                         <signal name="clicked" handler="on_reset_to_default" 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>
@@ -411,28 +412,29 @@ Author: Dmitriy Yefremov
             <child>
               <object class="GtkFrame" id="start_values_frame">
                 <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="label_xalign">0.019999999552965164</property>
-                <property name="shadow_type">in</property>
+                <property name="can-focus">False</property>
+                <property name="margin-top">5</property>
+                <property name="margin-bottom">5</property>
+                <property name="label-xalign">0.019999999552965164</property>
+                <property name="shadow-type">in</property>
                 <child>
+                  <!-- n-columns=7 n-rows=3 -->
                   <object class="GtkGrid" id="start_values_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">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-bottom">5</property>
+                    <property name="row-spacing">2</property>
+                    <property name="column-spacing">5</property>
                     <child>
                       <object class="GtkComboBox" id="stream_type_list_combobox">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="model">stream_type_liststore</property>
                         <property name="active">1</property>
-                        <property name="id_column">0</property>
+                        <property name="id-column">0</property>
                         <signal name="changed" handler="on_stream_type_changed" swapped="no"/>
                         <child>
                           <object class="GtkCellRendererText" id="iptv_sream_type_cellrenderertext1"/>
@@ -442,298 +444,298 @@ Author: Dmitriy Yefremov
                         </child>
                       </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="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Type</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="GtkCheckButton" id="stream_type_default_check_button">
                         <property name="label" translatable="yes">Default</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="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_stream_type_default_togged" swapped="no"/>
                       </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="GtkCheckButton" id="namespace_default_check_button">
                         <property name="label" translatable="yes">Default</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">center</property>
                         <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_default_namespace_toggled" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">6</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">6</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="list_namespace_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Namespace</property>
                       </object>
                       <packing>
-                        <property name="left_attach">6</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">6</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="list_namespace_entry">
-                        <property name="width_request">120</property>
+                        <property name="width-request">120</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_chars">5</property>
-                        <property name="max_width_chars">5</property>
+                        <property name="can-focus">True</property>
+                        <property name="width-chars">5</property>
+                        <property name="max-width-chars">5</property>
                         <property name="text">0</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary-icon-name">document-edit-symbolic</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">6</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">6</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="nid_default_check_button">
                         <property name="label" translatable="yes">Default</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">center</property>
                         <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_default_nid_toggled" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">5</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">5</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="list_nid_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">NID</property>
                       </object>
                       <packing>
-                        <property name="left_attach">5</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">5</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="list_nid_entry">
-                        <property name="width_request">75</property>
+                        <property name="width-request">75</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_chars">5</property>
-                        <property name="max_width_chars">5</property>
+                        <property name="can-focus">True</property>
+                        <property name="width-chars">5</property>
+                        <property name="max-width-chars">5</property>
                         <property name="text">0</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary-icon-name">document-edit-symbolic</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">5</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">5</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="tid_default_check_button">
                         <property name="label" translatable="yes">Default</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">center</property>
                         <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_default_tid_toggled" swapped="no"/>
                       </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="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">TID</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="GtkEntry" id="list_tid_entry">
-                        <property name="width_request">75</property>
+                        <property name="width-request">75</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_chars">5</property>
-                        <property name="max_width_chars">5</property>
+                        <property name="can-focus">True</property>
+                        <property name="width-chars">5</property>
+                        <property name="max-width-chars">5</property>
                         <property name="text">0</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary-icon-name">document-edit-symbolic</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">4</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">4</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="sid_auto_check_button">
                         <property name="label" translatable="yes">Auto</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">center</property>
                         <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_auto_sid_toggled" swapped="no"/>
                       </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="GtkLabel" id="list_sid_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">SID</property>
                       </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="GtkEntry" id="list_sid_entry">
-                        <property name="width_request">75</property>
+                        <property name="width-request">75</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_chars">5</property>
-                        <property name="max_width_chars">5</property>
+                        <property name="can-focus">True</property>
+                        <property name="width-chars">5</property>
+                        <property name="max-width-chars">5</property>
                         <property name="text">0</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary-icon-name">document-edit-symbolic</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">3</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">3</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="id_default_check_button">
                         <property name="label" translatable="yes">Default</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">center</property>
                         <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_default_id_toggled" swapped="no"/>
                       </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="list_id_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">ID</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="GtkEntry" id="list_srv_id_entry">
-                        <property name="width_request">75</property>
+                        <property name="width-request">75</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_chars">5</property>
-                        <property name="max_width_chars">5</property>
+                        <property name="can-focus">True</property>
+                        <property name="width-chars">5</property>
+                        <property name="max-width-chars">5</property>
                         <property name="text">0</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary-icon-name">document-edit-symbolic</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
                       </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="GtkCheckButton" id="type_default_check_button">
                         <property name="label" translatable="yes">Default</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">center</property>
                         <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_default_type_toggled" swapped="no"/>
                       </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="GtkLabel" id="list_type_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Type</property>
                       </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="GtkEntry" id="list_srv_type_entry">
-                        <property name="width_request">75</property>
+                        <property name="width-request">75</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_chars">5</property>
-                        <property name="max_width_chars">5</property>
+                        <property name="can-focus">True</property>
+                        <property name="width-chars">5</property>
+                        <property name="max-width-chars">5</property>
                         <property name="text">1</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary-icon-name">document-edit-symbolic</property>
                         <signal name="changed" handler="on_entry_changed" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">2</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                   </object>
@@ -741,7 +743,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">Starting values</property>
                   </object>
                 </child>
@@ -761,20 +763,15 @@ Author: Dmitriy Yefremov
         </child>
         <child>
           <object class="GtkInfoBar" id="list_configuration_info_bar">
-            <property name="can_focus">False</property>
-            <property name="margin_left">1</property>
-            <property name="margin_right">1</property>
-            <property name="margin_bottom">1</property>
-            <property name="show_close_button">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-bottom">1</property>
+            <property name="show-close-button">True</property>
             <signal name="response" handler="on_info_bar_close" swapped="no"/>
             <child internal-child="action_area">
               <object class="GtkButtonBox">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="spacing">6</property>
-                <property name="layout_style">end</property>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="layout-style">end</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -784,12 +781,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="list_configuration_message_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">5</property>
                     <property name="label" translatable="yes">Done!</property>
                     <property name="ellipsize">end</property>
                   </object>
@@ -823,8 +821,8 @@ Author: Dmitriy Yefremov
   </object>
   <object class="GtkImage" id="yt_import_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-revert-symbolic-rtl</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">document-revert-symbolic-rtl</property>
   </object>
   <object class="GtkListStore" id="yt_liststore">
     <columns>
@@ -857,19 +855,16 @@ Author: Dmitriy Yefremov
   </object>
   <object class="GtkDialog" id="iptv_dialog">
     <property name="use-header-bar">{use_header}</property>
-    <property name="width_request">480</property>
-    <property name="can_focus">False</property>
+    <property name="width-request">480</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes">Stream data</property>
     <property name="resizable">False</property>
     <property name="modal">True</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="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 type="titlebar">
-      <placeholder/>
-    </child>
     <child type="action">
       <object class="GtkButton" id="iptv_dialog_cancel_button">
         <property name="label" translatable="yes">Cancel</property>
@@ -900,13 +895,13 @@ Author: Dmitriy Yefremov
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="iptv_dialog_box">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="valign">center</property>
-            <property name="layout_style">end</property>
+            <property name="layout-style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -917,93 +912,94 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkBox" id="iptv_dialog_main_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
+            <property name="can-focus">False</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkFrame" id="iptv_dialog_service_data_frame">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">2</property>
-                <property name="label_xalign">0.019999999552965164</property>
-                <property name="shadow_type">in</property>
+                <property name="can-focus">False</property>
+                <property name="margin-bottom">2</property>
+                <property name="label-xalign">0.019999999552965164</property>
+                <property name="shadow-type">in</property>
                 <child>
+                  <!-- n-columns=4 n-rows=2 -->
                   <object class="GtkGrid" id="iptv_dialog_main_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">2</property>
-                    <property name="column_spacing">2</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">2</property>
+                    <property name="column-spacing">5</property>
                     <child>
                       <object class="GtkLabel" id="label23">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Name</property>
-                        <property name="width_chars">7</property>
-                        <property name="max_width_chars">7</property>
+                        <property name="width-chars">7</property>
+                        <property name="max-width-chars">7</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="GtkEntry" id="name_entry">
-                        <property name="width_request">-1</property>
+                        <property name="width-request">-1</property>
                         <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-name">document-edit-symbolic</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="iptv_description_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Description</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="description_entry">
                         <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-name">document-edit-symbolic</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="iptv_type_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Type</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="GtkComboBox" id="stream_type_combobox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="model">stream_type_liststore</property>
                         <property name="active">0</property>
-                        <property name="id_column">0</property>
+                        <property name="id-column">0</property>
                         <signal name="changed" handler="on_stream_type_changed" swapped="no"/>
                         <child>
                           <object class="GtkCellRendererText" id="iptv_sream_type_cellrenderertext"/>
@@ -1013,31 +1009,31 @@ Author: Dmitriy Yefremov
                         </child>
                       </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="iptv_reference_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Reference</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="reference_entry">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="editable">False</property>
                       </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>
                   </object>
@@ -1045,7 +1041,7 @@ Author: Dmitriy Yefremov
                 <child type="label">
                   <object class="GtkLabel" id="iptv_dialog_service_data_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Service data:</property>
                   </object>
                 </child>
@@ -1057,32 +1053,33 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=2 -->
               <object class="GtkGrid" id="iptv_url_grid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="column_homogeneous">True</property>
+                <property name="can-focus">False</property>
+                <property name="column-homogeneous">True</property>
                 <child>
                   <object class="GtkFrame" id="iptv_dialog_url_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_bottom">2</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-bottom">2</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <child>
                           <object class="GtkEntry" id="url_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="margin_left">5</property>
-                            <property name="margin_right">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
-                            <property name="secondary_icon_tooltip_text" translatable="yes">Link to YouTube resource.</property>
+                            <property name="can-focus">True</property>
+                            <property name="margin-left">5</property>
+                            <property name="margin-right">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="primary-icon-name">document-edit-symbolic</property>
+                            <property name="secondary-icon-tooltip-text" translatable="yes">Link to YouTube resource.</property>
                             <signal name="changed" handler="on_url_changed" swapped="no"/>
-                            <signal name="paste_clipboard" handler="on_url_paste" swapped="no"/>
+                            <signal name="paste-clipboard" handler="on_url_paste" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1092,13 +1089,13 @@ Author: Dmitriy Yefremov
                         </child>
                         <child>
                           <object class="GtkComboBox" id="yt_iptv_quality_combobox">
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Desired video quality</property>
-                            <property name="margin_right">5</property>
-                            <property name="margin_bottom">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes">Desired video quality</property>
+                            <property name="margin-right">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="model">yt_quality_liststore</property>
                             <property name="active">0</property>
-                            <property name="id_column">0</property>
+                            <property name="id-column">0</property>
                             <signal name="changed" handler="on_yt_quality_changed" swapped="no"/>
                             <child>
                               <object class="GtkCellRendererText" id="yt_quality_renderer"/>
@@ -1118,187 +1115,188 @@ 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">Url:</property>
                       </object>
                     </child>
                   </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="GtkFrame" id="iptv_dialog_ts_data_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="label_xalign">0.019999999552965164</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-bottom">5</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
                     <child>
+                      <!-- n-columns=6 n-rows=2 -->
                       <object class="GtkGrid" id="ts_data_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">2</property>
-                        <property name="column_spacing">5</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-bottom">5</property>
+                        <property name="row-spacing">2</property>
+                        <property name="column-spacing">5</property>
+                        <property name="column-homogeneous">True</property>
                         <child>
                           <object class="GtkLabel" id="label32">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Namespace</property>
                           </object>
                           <packing>
-                            <property name="left_attach">5</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">5</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="namespace_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">10</property>
-                            <property name="max_width_chars">5</property>
+                            <property name="can-focus">True</property>
+                            <property name="width-chars">10</property>
+                            <property name="max-width-chars">5</property>
                             <property name="text">0</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary-icon-name">document-edit-symbolic</property>
                             <signal name="changed" handler="on_entry_changed" swapped="no"/>
                           </object>
                           <packing>
-                            <property name="left_attach">5</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">5</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label31">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">NID</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="GtkEntry" id="net_id_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">5</property>
-                            <property name="max_width_chars">5</property>
+                            <property name="can-focus">True</property>
+                            <property name="width-chars">5</property>
+                            <property name="max-width-chars">5</property>
                             <property name="text">0</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary-icon-name">document-edit-symbolic</property>
                             <signal name="changed" handler="on_entry_changed" swapped="no"/>
                           </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="label30">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">TID</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="tr_id_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">5</property>
-                            <property name="max_width_chars">5</property>
+                            <property name="can-focus">True</property>
+                            <property name="width-chars">5</property>
+                            <property name="max-width-chars">5</property>
                             <property name="text">0</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary-icon-name">document-edit-symbolic</property>
                             <signal name="changed" handler="on_entry_changed" swapped="no"/>
                           </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="sid_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">SID</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="sid_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">5</property>
-                            <property name="max_width_chars">5</property>
+                            <property name="can-focus">True</property>
+                            <property name="width-chars">5</property>
+                            <property name="max-width-chars">5</property>
                             <property name="text">0</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary-icon-name">document-edit-symbolic</property>
                             <signal name="changed" handler="on_entry_changed" swapped="no"/>
                           </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="id_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">ID</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="GtkEntry" id="srv_id_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">5</property>
-                            <property name="max_width_chars">4</property>
+                            <property name="can-focus">True</property>
+                            <property name="width-chars">5</property>
+                            <property name="max-width-chars">4</property>
                             <property name="text">0</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary-icon-name">document-edit-symbolic</property>
                             <signal name="changed" handler="on_entry_changed" swapped="no"/>
                           </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="type_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Type</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="srv_type_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">5</property>
-                            <property name="max_width_chars">5</property>
+                            <property name="can-focus">True</property>
+                            <property name="width-chars">5</property>
+                            <property name="max-width-chars">5</property>
                             <property name="text">1</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary-icon-name">document-edit-symbolic</property>
                             <signal name="changed" handler="on_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>
                       </object>
@@ -1306,14 +1304,14 @@ 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">DVB/TS data:</property>
                       </object>
                     </child>
                   </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>
@@ -1332,14 +1330,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="spacing">6</property>
-                <property name="layout_style">end</property>
+                <property name="layout-style">end</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1349,18 +1347,19 @@ Author: Dmitriy Yefremov
             </child>
             <child internal-child="content_area">
               <object class="GtkBox">
-                <property name="can_focus">False</property>
-                <property name="spacing">16</property>
+                <property name="can-focus">False</property>
+                <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel" id="info_bar_message_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">5</property>
                     <property name="label" translatable="yes">label</property>
                     <property name="ellipsize">end</property>
+                    <property name="max-width-chars">65</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
@@ -1387,67 +1386,44 @@ Author: Dmitriy Yefremov
   </object>
   <object class="GtkImage" id="yt_receive_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">network-receive-symbolic</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">network-receive-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkWindow" id="yt_import_dialog_window">
-    <property name="width_request">480</property>
-    <property name="can_focus">False</property>
+    <property name="width-request">480</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes">YouTube</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">480</property>
-    <property name="destroy_with_parent">True</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="default-width">480</property>
+    <property name="destroy-with-parent">True</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="skip-pager-hint">True</property>
     <signal name="delete-event" handler="on_close" swapped="no"/>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkBox" id="yt_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox" id="yt_import_header_box">
             <property name="name">yt_import_header_box</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkBox" id="yt_actions_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">15</property>
-                <property name="margin_right">15</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">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="spacing">5</property>
-                <child>
-                  <object class="GtkButton" id="yt_receive_button">
-                    <property name="label" translatable="yes">Receive</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Receive</property>
-                    <property name="valign">center</property>
-                    <property name="image">yt_receive_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_receive" swapped="no"/>
-                    <accelerator key="d" signal="clicked" modifiers="Primary"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child type="center">
                   <object class="GtkLabel" id="playlist_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Playlist import</property>
                   </object>
                   <packing>
@@ -1456,19 +1432,39 @@ Author: Dmitriy Yefremov
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkButton" id="yt_receive_button">
+                    <property name="label" translatable="yes">Receive</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="tooltip-text" translatable="yes">Receive</property>
+                    <property name="valign">center</property>
+                    <property name="image">yt_receive_image</property>
+                    <property name="always-show-image">True</property>
+                    <signal name="clicked" handler="on_receive" swapped="no"/>
+                    <accelerator key="d" signal="clicked"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkButtonBox" id="yt_import_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="yt_import_button">
                         <property name="label" translatable="yes">Import</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Import</property>
+                        <property name="can-focus">False</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Import</property>
                         <property name="image">yt_import_image</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                         <signal name="clicked" handler="on_import" swapped="no"/>
                         <accelerator key="i" signal="clicked"/>
                       </object>
@@ -1480,11 +1476,11 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkComboBox" id="yt_quality_combobox">
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Desired video quality</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Desired video quality</property>
                         <property name="model">yt_quality_liststore</property>
                         <property name="active">0</property>
-                        <property name="id_column">0</property>
+                        <property name="id-column">0</property>
                         <child>
                           <object class="GtkCellRendererText" id="yt_quality_renderer1"/>
                           <attributes>
@@ -1502,7 +1498,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>
@@ -1526,14 +1522,14 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkEntry" id="yt_url_entry">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="primary_icon_name">document-edit-symbolic</property>
-            <property name="secondary_icon_tooltip_text" translatable="yes">Link to YouTube resource.</property>
-            <property name="placeholder_text" translatable="yes">YouTube playlist URL:</property>
+            <property name="can-focus">True</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="primary-icon-name">document-edit-symbolic</property>
+            <property name="secondary-icon-tooltip-text" translatable="yes">Link to YouTube resource.</property>
+            <property name="placeholder-text" translatable="yes">YouTube playlist URL:</property>
             <signal name="changed" handler="on_yt_url_entry_changed" swapped="no"/>
           </object>
           <packing>
@@ -1545,19 +1541,19 @@ Author: Dmitriy Yefremov
         <child>
           <object class="GtkScrolledWindow" id="yt_list_view_scrolled_window">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="shadow_type">in</property>
-            <property name="min_content_height">150</property>
+            <property name="can-focus">True</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="shadow-type">in</property>
+            <property name="min-content-height">150</property>
             <child>
               <object class="GtkTreeView" id="yt_list_view">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="model">yt_liststore</property>
-                <property name="search_column">0</property>
-                <property name="enable_grid_lines">horizontal</property>
-                <property name="tooltip_column">3</property>
+                <property name="search-column">0</property>
+                <property name="enable-grid-lines">horizontal</property>
+                <property name="tooltip-column">3</property>
                 <signal name="button-press-event" handler="on_popup_menu" object="yt_popup_menu" swapped="no"/>
                 <signal name="key-press-event" handler="on_key_press" swapped="no"/>
                 <signal name="select-all" handler="on_select_all" swapped="no"/>
@@ -1567,13 +1563,13 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkTreeViewColumn" id="yt_title_column">
                     <property name="resizable">True</property>
-                    <property name="min_width">100</property>
+                    <property name="min-width">100</property>
                     <property name="title" translatable="yes">Title</property>
                     <property name="expand">True</property>
                     <property name="clickable">True</property>
                     <property name="alignment">0.5</property>
                     <property name="reorderable">True</property>
-                    <property name="sort_column_id">0</property>
+                    <property name="sort-column-id">0</property>
                     <child>
                       <object class="GtkCellRendererText" id="yt_title_renderer">
                         <property name="xpad">5</property>
@@ -1598,12 +1594,12 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="yt_selected_column">
-                    <property name="min_width">100</property>
+                    <property name="min-width">100</property>
                     <property name="title" translatable="yes">Selected</property>
                     <property name="clickable">True</property>
                     <property name="alignment">0.5</property>
                     <property name="reorderable">True</property>
-                    <property name="sort_column_id">2</property>
+                    <property name="sort-column-id">2</property>
                     <child>
                       <object class="GtkCellRendererToggle" id="yt_selected_renderer">
                         <property name="width">50</property>
@@ -1638,25 +1634,25 @@ Author: Dmitriy Yefremov
         </child>
         <child>
           <object class="GtkBox" id="yt_info_bar_box">
-            <property name="height_request">26</property>
+            <property name="height-request">26</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="spacing">2</property>
             <child>
               <object class="GtkBox" id="yt_cout_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="GtkImage" id="yt_count_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
-                    <property name="icon_name">document-properties-symbolic</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-left">5</property>
+                    <property name="icon-name">document-properties-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1667,7 +1663,7 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkLabel" id="yt_count_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label">0</property>
                   </object>
                   <packing>
@@ -1685,10 +1681,10 @@ Author: Dmitriy Yefremov
             </child>
             <child>
               <object class="GtkProgressBar" id="yt_progress_bar">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pulse_step">0.01</property>
+                <property name="pulse-step">0.01</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -1705,17 +1701,14 @@ Author: Dmitriy Yefremov
         </child>
         <child>
           <object class="GtkInfoBar" id="yt_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_yt_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="spacing">6</property>
-                <property name="layout_style">end</property>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="layout-style">end</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1725,18 +1718,18 @@ 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="yt_info_bar_message_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">info</property>
                     <property name="ellipsize">end</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>