diff --git a/data/ui/album-headerbar.ui b/data/ui/album-headerbar.ui
index a384338..76ade01 100644
--- a/data/ui/album-headerbar.ui
+++ b/data/ui/album-headerbar.ui
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="McgAlbumHeaderbar" parent="GtkHeaderBar">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child type="title">
       <object class="GtkBox">
         <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="GtkLabel" id="standalone_title">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes">Title</property>
             <property name="selectable">True</property>
             <attributes>
@@ -30,7 +30,7 @@
         <child>
           <object class="GtkLabel" id="standalone_artist">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes">Artist</property>
             <property name="selectable">True</property>
           </object>
@@ -45,14 +45,14 @@
     <child>
       <object class="GtkButton">
         <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_close_clicked" swapped="no"/>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">go-previous-symbolic</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">go-previous-symbolic</property>
           </object>
         </child>
       </object>
diff --git a/data/ui/connection-panel.ui b/data/ui/connection-panel.ui
index 7f8000e..f388d43 100644
--- a/data/ui/connection-panel.ui
+++ b/data/ui/connection-panel.ui
@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkAdjustment" id="server-port-adjustment">
     <property name="lower">1024</property>
     <property name="upper">9999</property>
     <property name="value">6600</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">100</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">100</property>
   </object>
   <template class="McgConnectionPanel" parent="GtkBox">
     <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">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <child>
+          <!-- n-columns=3 n-rows=6 -->
           <object class="GtkGrid">
-            <property name="width_request">500</property>
+            <property name="width-request">500</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="column_spacing">5</property>
-            <property name="row_homogeneous">True</property>
-            <property name="column_homogeneous">True</property>
+            <property name="can-focus">False</property>
+            <property name="column-spacing">5</property>
+            <property name="row-homogeneous">True</property>
+            <property name="column-homogeneous">True</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="GtkTreeView" id="zeroconf_list">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <signal name="focus-out-event" handler="on_zeroconf_list_outfocused" swapped="no"/>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection">
@@ -49,102 +50,120 @@
                 <child>
                   <object class="GtkSeparator">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_start">5</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">5</property>
                     <property name="orientation">vertical</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </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>
                 <property name="height">6</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="host_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="text">localhost</property>
-                <property name="placeholder_text" translatable="yes">Enter hostname or IP address</property>
+                <property name="placeholder-text" translatable="yes">Enter hostname or IP address</property>
                 <signal name="focus-out-event" handler="on_host_entry_outfocused" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="password_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="visibility">False</property>
-                <property name="placeholder_text" translatable="yes">Enter password or leave blank</property>
-                <property name="input_purpose">password</property>
+                <property name="placeholder-text" translatable="yes">Enter password or leave blank</property>
+                <property name="input-purpose">password</property>
                 <signal name="focus-out-event" handler="on_password_entry_outfocused" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">5</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">5</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="port_spinner">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="text">6600</property>
-                <property name="input_purpose">number</property>
+                <property name="input-purpose">number</property>
                 <property name="adjustment">server-port-adjustment</property>
                 <property name="value">6600</property>
                 <signal name="value-changed" handler="on_port_spinner_value_changed" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Host:</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Port:</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
                 <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">Password:</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/data/ui/cover-panel.ui b/data/ui/cover-panel.ui
index aca3b61..304d9d0 100644
--- a/data/ui/cover-panel.ui
+++ b/data/ui/cover-panel.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <template class="McgCoverPanel" parent="GtkOverlay">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkStack" id="cover_stack">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <child>
           <object class="GtkSpinner" id="cover_spinner">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
           </object>
           <packing>
             <property name="name">cover-spinner</property>
@@ -21,23 +21,23 @@
         <child>
           <object class="GtkScrolledWindow" id="cover_scroll">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="kinetic_scrolling">False</property>
-            <property name="overlay_scrolling">False</property>
+            <property name="can-focus">True</property>
+            <property name="kinetic-scrolling">False</property>
+            <property name="overlay-scrolling">False</property>
             <signal name="size-allocate" handler="on_cover_size_allocate" swapped="no"/>
             <child>
               <object class="GtkViewport">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkEventBox" id="cover_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <signal name="button-press-event" handler="on_cover_box_pressed" swapped="no"/>
                     <child>
                       <object class="GtkImage" id="cover_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="icon_size">0</property>
                       </object>
                     </child>
@@ -59,82 +59,101 @@
     <child type="overlay">
       <object class="GtkRevealer" id="info_revealer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">end</property>
-        <property name="transition_type">slide-right</property>
+        <property name="transition-type">slide-right</property>
         <child>
           <object class="GtkScrolledWindow" id="cover_info_scroll">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="halign">start</property>
-            <property name="vscrollbar_policy">never</property>
-            <property name="max_content_width">200</property>
-            <property name="propagate_natural_width">True</property>
+            <property name="vscrollbar-policy">never</property>
+            <property name="max-content-width">200</property>
+            <property name="propagate-natural-width">True</property>
             <child>
               <object class="GtkViewport">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="shadow_type">none</property>
+                <property name="can-focus">False</property>
+                <property name="shadow-type">none</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin_start">5</property>
-                    <property name="margin_end">5</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
                     <property name="orientation">vertical</property>
                     <child>
+                      <!-- n-columns=3 n-rows=3 -->
                       <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="row_spacing">5</property>
-                        <property name="column_homogeneous">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-bottom">5</property>
+                        <property name="row-spacing">5</property>
+                        <property name="column-homogeneous">True</property>
                         <child>
                           <object class="GtkLabel" id="album_title_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">Album</property>
                             <property name="wrap">True</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="album_date_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">Date</property>
                             <property name="wrap">True</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="album_artist_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">Artist</property>
                             <property name="wrap">True</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                         <style>
                           <class name="cover-labels"/>
                         </style>
@@ -149,18 +168,18 @@
                     <child>
                       <object class="GtkScale" id="songs_scale">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
                         <property name="orientation">vertical</property>
-                        <property name="restrict_to_fill_level">False</property>
+                        <property name="restrict-to-fill-level">False</property>
                         <property name="digits">0</property>
-                        <property name="draw_value">False</property>
+                        <property name="draw-value">False</property>
                         <signal name="button-press-event" handler="on_songs_start_change" swapped="no"/>
                         <signal name="button-release-event" handler="on_songs_change" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="pack_type">end</property>
+                        <property name="pack-type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
diff --git a/data/ui/cover-toolbar.ui b/data/ui/cover-toolbar.ui
index 338cee3..7d3fcdd 100644
--- a/data/ui/cover-toolbar.ui
+++ b/data/ui/cover-toolbar.ui
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="McgCoverToolbar" parent="GtkButtonBox">
     <property name="visible">True</property>
-    <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>
     <child>
       <object class="GtkButton" id="fullscreen_button">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Show the cover in fullscreen mode</property>
-        <property name="action_name">win.toggle-fullscreen</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">True</property>
+        <property name="tooltip-text" translatable="yes">Show the cover in fullscreen mode</property>
+        <property name="action-name">win.toggle-fullscreen</property>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">view-fullscreen-symbolic</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">view-fullscreen-symbolic</property>
           </object>
         </child>
       </object>
@@ -26,7 +26,7 @@
         <property name="expand">False</property>
         <property name="fill">False</property>
         <property name="position">0</property>
-        <property name="non_homogeneous">True</property>
+        <property name="non-homogeneous">True</property>
       </packing>
     </child>
   </template>
diff --git a/data/ui/info-dialog.ui b/data/ui/info-dialog.ui
index be9a804..d03c21c 100644
--- a/data/ui/info-dialog.ui
+++ b/data/ui/info-dialog.ui
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="McgInfoDialog" parent="GtkAboutDialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center</property>
+    <property name="type-hint">dialog</property>
     <property name="gravity">center</property>
-    <property name="program_name">CoverGrid</property>
+    <property name="program-name">CoverGrid</property>
     <property name="version">2.1.2</property>
     <property name="comments" translatable="yes">CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.</property>
     <property name="website">http://www.suruatoel.xyz/codes/mcg</property>
-    <property name="logo_icon_name">mcg</property>
-    <property name="license_type">gpl-3-0</property>
+    <property name="logo-icon-name">mcg</property>
+    <property name="license-type">gpl-3-0</property>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <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="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <placeholder/>
             </child>
@@ -42,8 +42,5 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </template>
 </interface>
diff --git a/data/ui/library-panel.ui b/data/ui/library-panel.ui
index de06df0..0e499d9 100644
--- a/data/ui/library-panel.ui
+++ b/data/ui/library-panel.ui
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <template class="McgLibraryPanel" parent="GtkStack">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="transition_type">slide-left-right</property>
+    <property name="can-focus">False</property>
+    <property name="transition-type">slide-left-right</property>
     <child>
       <object class="GtkBox" id="panel_normal">
         <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="GtkSearchBar" id="filter_bar">
             <property name="visible">True</property>
-            <property name="app_paintable">True</property>
-            <property name="can_focus">False</property>
+            <property name="app-paintable">True</property>
+            <property name="can-focus">False</property>
             <signal name="notify" handler="on_filter_bar_notify" swapped="no"/>
             <child>
               <object class="GtkSearchEntry" id="filter_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="primary_icon_name">edit-find-symbolic</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="primary_icon_sensitive">False</property>
-                <property name="placeholder_text" translatable="yes">search library</property>
+                <property name="can-focus">True</property>
+                <property name="primary-icon-name">edit-find-symbolic</property>
+                <property name="primary-icon-activatable">False</property>
+                <property name="primary-icon-sensitive">False</property>
+                <property name="placeholder-text" translatable="yes">search library</property>
                 <signal name="search-changed" handler="on_filter_entry_changed" swapped="no"/>
               </object>
             </child>
@@ -41,29 +41,29 @@
         <child>
           <object class="GtkStack" id="stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_type">crossfade</property>
+            <property name="can-focus">False</property>
+            <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkBox" id="progress_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child type="center">
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="orientation">vertical</property>
                     <child type="center">
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="halign">center</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkImage" id="progress_image">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="icon_size">6</property>
                           </object>
                           <packing>
@@ -74,11 +74,11 @@
                         </child>
                         <child>
                           <object class="GtkProgressBar" id="progress_bar">
-                            <property name="width_request">200</property>
+                            <property name="width-request">200</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="pulse_step">0</property>
-                            <property name="show_text">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="pulse-step">0</property>
+                            <property name="show-text">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -115,18 +115,18 @@
             <child>
               <object class="GtkScrolledWindow" id="scroll">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <child>
                   <object class="GtkIconView" id="library_grid">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="margin">0</property>
-                    <property name="item_orientation">horizontal</property>
-                    <property name="row_spacing">0</property>
-                    <property name="column_spacing">0</property>
-                    <property name="tooltip_column">1</property>
-                    <property name="item_padding">0</property>
-                    <property name="activate_on_single_click">True</property>
+                    <property name="item-orientation">horizontal</property>
+                    <property name="row-spacing">0</property>
+                    <property name="column-spacing">0</property>
+                    <property name="tooltip-column">1</property>
+                    <property name="item-padding">0</property>
+                    <property name="activate-on-single-click">True</property>
                     <signal name="item-activated" handler="on_library_grid_clicked" swapped="no"/>
                     <signal name="selection-changed" handler="on_library_grid_selection_changed" swapped="no"/>
                     <signal name="size-allocate" handler="on_resize" swapped="no"/>
@@ -155,22 +155,22 @@
         <child>
           <object class="GtkRevealer" id="actionbar_revealer">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="transition-type">none</property>
             <child>
               <object class="GtkActionBar" id="library-actionbar">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkButton">
                     <property name="label" translatable="yes">cancel</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -178,12 +178,12 @@
                   <object class="GtkButton">
                     <property name="label" translatable="yes">queue</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_selection_add_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -205,17 +205,17 @@
     <child>
       <object class="GtkBox" id="panel_standalone">
         <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="GtkStack" id="standalone_stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_type">crossfade</property>
+            <property name="can-focus">False</property>
+            <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkSpinner" id="standalone_spinner">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="name">standalone-spinne</property>
@@ -224,19 +224,19 @@
             <child>
               <object class="GtkScrolledWindow" id="standalone_scroll">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="kinetic_scrolling">False</property>
-                <property name="overlay_scrolling">False</property>
+                <property name="can-focus">True</property>
+                <property name="kinetic-scrolling">False</property>
+                <property name="overlay-scrolling">False</property>
                 <signal name="size-allocate" handler="on_standalone_scroll_size_allocate" swapped="no"/>
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkImage" id="standalone_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">gtk-missing-image</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">gtk-missing-image</property>
                         <property name="icon_size">6</property>
                       </object>
                     </child>
@@ -258,17 +258,17 @@
         <child>
           <object class="GtkActionBar" id="library-standalone-actionbar">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton">
                 <property name="label" translatable="yes">queue</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_standalone_queue_clicked" swapped="no"/>
               </object>
               <packing>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -276,12 +276,12 @@
               <object class="GtkButton">
                 <property name="label" translatable="yes">play</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_standalone_play_clicked" swapped="no"/>
               </object>
               <packing>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">0</property>
               </packing>
             </child>
diff --git a/data/ui/library-toolbar.ui b/data/ui/library-toolbar.ui
index dc63149..97cad01 100644
--- a/data/ui/library-toolbar.ui
+++ b/data/ui/library-toolbar.ui
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="grid_adjustment">
     <property name="lower">100</property>
     <property name="upper">1000</property>
     <property name="value">150</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkPopover" id="toolbar_popover">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkBox">
         <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="GtkScale" id="grid_scale">
-            <property name="width_request">350</property>
+            <property name="width-request">350</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="adjustment">grid_adjustment</property>
-            <property name="restrict_to_fill_level">False</property>
-            <property name="fill_level">-1</property>
-            <property name="round_digits">0</property>
+            <property name="restrict-to-fill-level">False</property>
+            <property name="fill-level">-1</property>
+            <property name="round-digits">0</property>
             <property name="digits">0</property>
-            <property name="has_origin">False</property>
+            <property name="has-origin">False</property>
             <signal name="button-release-event" handler="on_grid_scale_changed" swapped="no"/>
             <signal name="change-value" handler="on_grid_scale_change" swapped="no"/>
           </object>
@@ -40,10 +40,10 @@
           <object class="GtkButton" id="library-toolbar-update">
             <property name="label">gtk-refresh</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
             <property name="relief">none</property>
-            <property name="use_stock">True</property>
+            <property name="use-stock">True</property>
             <signal name="clicked" handler="on_update_clicked" swapped="no"/>
           </object>
           <packing>
@@ -55,12 +55,12 @@
         <child>
           <object class="GtkBox" id="library-toolbar-sort">
             <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="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
               <packing>
@@ -72,7 +72,7 @@
             <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">Sort</property>
               </object>
               <packing>
@@ -85,9 +85,9 @@
               <object class="GtkRadioButton" id="sort_artist">
                 <property name="label" translatable="yes">sort by artist</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="draw-indicator">True</property>
                 <property name="group">sort_year</property>
                 <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
               </object>
@@ -101,9 +101,9 @@
               <object class="GtkRadioButton" id="sort_title">
                 <property name="label" translatable="yes">sort by title</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="draw-indicator">True</property>
                 <property name="group">sort_year</property>
                 <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
               </object>
@@ -117,10 +117,10 @@
               <object class="GtkRadioButton" id="sort_year">
                 <property name="label" translatable="yes">sort by year</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_sort_toggled" swapped="no"/>
               </object>
               <packing>
@@ -133,11 +133,11 @@
               <object class="GtkCheckButton" id="toolbar_sort_order_button">
                 <property name="label">gtk-sort-descending</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
                 <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <signal name="toggled" handler="on_sort_order_toggled" swapped="no"/>
               </object>
               <packing>
@@ -158,21 +158,21 @@
   </object>
   <template class="McgLibraryToolbar" parent="GtkButtonBox">
     <property name="visible">True</property>
-    <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>
     <child>
       <object class="GtkToggleButton" id="toolbar_search_bar">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Search the library</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">True</property>
+        <property name="tooltip-text" translatable="yes">Search the library</property>
         <signal name="toggled" handler="on_search_toggled" swapped="no"/>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">system-search-symbolic</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">system-search-symbolic</property>
           </object>
         </child>
         <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -181,21 +181,21 @@
         <property name="expand">False</property>
         <property name="fill">False</property>
         <property name="position">0</property>
-        <property name="non_homogeneous">True</property>
+        <property name="non-homogeneous">True</property>
       </packing>
     </child>
     <child>
       <object class="GtkToggleButton" id="select_button">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Select multiple albums</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">True</property>
+        <property name="tooltip-text" translatable="yes">Select multiple albums</property>
         <signal name="toggled" handler="on_select_toggled" swapped="no"/>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">object-select-symbolic</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">object-select-symbolic</property>
           </object>
         </child>
       </object>
@@ -203,21 +203,21 @@
         <property name="expand">False</property>
         <property name="fill">False</property>
         <property name="position">1</property>
-        <property name="non_homogeneous">True</property>
+        <property name="non-homogeneous">True</property>
       </packing>
     </child>
     <child>
       <object class="GtkMenuButton">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Settings and actions</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">True</property>
+        <property name="tooltip-text" translatable="yes">Settings and actions</property>
         <property name="popover">toolbar_popover</property>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">open-menu-symbolic</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">open-menu-symbolic</property>
           </object>
         </child>
       </object>
@@ -225,7 +225,7 @@
         <property name="expand">False</property>
         <property name="fill">False</property>
         <property name="position">2</property>
-        <property name="non_homogeneous">True</property>
+        <property name="non-homogeneous">True</property>
       </packing>
     </child>
   </template>
diff --git a/data/ui/playlist-panel.ui b/data/ui/playlist-panel.ui
index a2a31ce..9ee8b7a 100644
--- a/data/ui/playlist-panel.ui
+++ b/data/ui/playlist-panel.ui
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <template class="McgPlaylistPanel" parent="GtkStack">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="transition_type">slide-left-right</property>
+    <property name="can-focus">False</property>
+    <property name="transition-type">slide-left-right</property>
     <child>
       <object class="GtkBox" id="panel_normal">
         <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="GtkScrolledWindow">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <child>
               <object class="GtkIconView" id="playlist_grid">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="margin">0</property>
-                <property name="item_orientation">horizontal</property>
-                <property name="row_spacing">0</property>
-                <property name="column_spacing">0</property>
-                <property name="tooltip_column">1</property>
-                <property name="item_padding">0</property>
-                <property name="activate_on_single_click">True</property>
+                <property name="item-orientation">horizontal</property>
+                <property name="row-spacing">0</property>
+                <property name="column-spacing">0</property>
+                <property name="tooltip-column">1</property>
+                <property name="item-padding">0</property>
+                <property name="activate-on-single-click">True</property>
                 <signal name="item-activated" handler="on_playlist_grid_clicked" swapped="no"/>
                 <signal name="selection-changed" handler="on_playlist_grid_selection_changed" swapped="no"/>
                 <style>
@@ -46,22 +46,22 @@
         <child>
           <object class="GtkRevealer" id="actionbar_revealer">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_type">slide-up</property>
+            <property name="can-focus">False</property>
+            <property name="transition-type">slide-up</property>
             <child>
               <object class="GtkActionBar" id="actionbar">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkButton">
                     <property name="label" translatable="yes">cancel</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -69,12 +69,12 @@
                   <object class="GtkButton">
                     <property name="label" translatable="yes">remove</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <signal name="clicked" handler="on_selection_remove_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="pack_type">end</property>
+                    <property name="pack-type">end</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -84,7 +84,7 @@
           <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>
@@ -97,16 +97,16 @@
     <child>
       <object class="GtkBox" id="panel_standalone">
         <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="GtkStack" id="standalone_stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkSpinner" id="standalone_spinner">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="name">standalone-spinne</property>
@@ -115,19 +115,19 @@
             <child>
               <object class="GtkScrolledWindow" id="standalone_scroll">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="kinetic_scrolling">False</property>
-                <property name="overlay_scrolling">False</property>
+                <property name="can-focus">True</property>
+                <property name="kinetic-scrolling">False</property>
+                <property name="overlay-scrolling">False</property>
                 <signal name="size-allocate" handler="on_standalone_scroll_size_allocate" swapped="no"/>
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkImage" id="standalone_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">gtk-missing-image</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">gtk-missing-image</property>
                         <property name="icon_size">6</property>
                       </object>
                     </child>
@@ -149,17 +149,17 @@
         <child>
           <object class="GtkActionBar" id="actionbar_standalone">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton">
                 <property name="label" translatable="yes">remove</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <signal name="clicked" handler="on_standalone_remove_clicked" swapped="no"/>
               </object>
               <packing>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -167,12 +167,12 @@
               <object class="GtkButton">
                 <property name="label" translatable="yes">play</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_standalone_play_clicked" swapped="no"/>
               </object>
               <packing>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">0</property>
               </packing>
             </child>
diff --git a/data/ui/playlist-toolbar.ui b/data/ui/playlist-toolbar.ui
index c061395..843625c 100644
--- a/data/ui/playlist-toolbar.ui
+++ b/data/ui/playlist-toolbar.ui
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="McgPlaylistToolbar" parent="GtkButtonBox">
     <property name="visible">True</property>
-    <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>
     <child>
       <object class="GtkToggleButton" id="select_button">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Select multiple albums</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">True</property>
+        <property name="tooltip-text" translatable="yes">Select multiple albums</property>
         <signal name="toggled" handler="on_select_toggled" swapped="no"/>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">object-select-symbolic</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">object-select-symbolic</property>
           </object>
         </child>
       </object>
@@ -26,21 +26,21 @@
         <property name="expand">False</property>
         <property name="fill">False</property>
         <property name="position">0</property>
-        <property name="non_homogeneous">True</property>
+        <property name="non-homogeneous">True</property>
       </packing>
     </child>
     <child>
       <object class="GtkButton" id="playlist_clear_button">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Clear the playlist</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">True</property>
+        <property name="tooltip-text" translatable="yes">Clear the playlist</property>
         <signal name="clicked" handler="on_clear_clicked" swapped="no"/>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">edit-clear</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">edit-clear</property>
           </object>
         </child>
       </object>
@@ -48,7 +48,7 @@
         <property name="expand">False</property>
         <property name="fill">False</property>
         <property name="position">1</property>
-        <property name="non_homogeneous">True</property>
+        <property name="non-homogeneous">True</property>
       </packing>
     </child>
   </template>
diff --git a/data/ui/server-panel.ui b/data/ui/server-panel.ui
index 568648d..333919d 100644
--- a/data/ui/server-panel.ui
+++ b/data/ui/server-panel.ui
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <template class="McgServerPanel" parent="GtkBox">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkStackSidebar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="stack">stack</property>
       </object>
       <packing>
@@ -20,31 +20,31 @@
     <child>
       <object class="GtkStack" id="stack">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child type="center">
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child type="center">
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_start">5</property>
-                    <property name="margin_end">5</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-top">5</property>
+                    <property name="margin-bottom">5</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">dialog-information-symbolic</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">dialog-information-symbolic</property>
                         <property name="icon_size">6</property>
                       </object>
                       <packing>
@@ -54,127 +54,140 @@
                       </packing>
                     </child>
                     <child>
+                      <!-- n-columns=3 n-rows=4 -->
                       <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="row_spacing">2</property>
-                        <property name="column_spacing">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="row-spacing">2</property>
+                        <property name="column-spacing">5</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">File:</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">Audio:</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="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">Bitrate:</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">Error:</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="status_bitrate">
                             <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">&lt;i&gt;none&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="use-markup">True</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="status_audio">
                             <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">&lt;i&gt;none&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="use-markup">True</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</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="status_file">
                             <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">&lt;i&gt;none&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="use-markup">True</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="status_error">
                             <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">&lt;i&gt;none&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="use-markup">True</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -211,23 +224,23 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child type="center">
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child type="center">
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">starred-symbolic</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">starred-symbolic</property>
                         <property name="icon_size">6</property>
                       </object>
                       <packing>
@@ -237,166 +250,188 @@
                       </packing>
                     </child>
                     <child>
+                      <!-- n-columns=3 n-rows=7 -->
                       <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="row_spacing">2</property>
-                        <property name="column_spacing">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="row-spacing">2</property>
+                        <property name="column-spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="stats_artists">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="justify">right</property>
                             <property name="selectable">True</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="stats_albums">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="justify">right</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="stats_songs">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="justify">right</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Albums</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Songs</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <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">Artists</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="stats_dbplaytime">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="justify">right</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Seconds</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="stats_uptime">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="justify">right</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">6</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">6</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="stats_playtime">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="justify">right</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">5</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">4</property>
                             <property name="width">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="halign">start</property>
                             <property name="label" translatable="yes">Seconds played</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">5</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Seconds running</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">6</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">6</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -434,23 +469,23 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child type="center">
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child type="center">
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">audio-speakers-symbolic</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">audio-speakers-symbolic</property>
                         <property name="icon_size">6</property>
                       </object>
                       <packing>
@@ -462,8 +497,8 @@
                     <child>
                       <object class="GtkListBox" id="output_devices">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="selection_mode">none</property>
+                        <property name="can-focus">False</property>
+                        <property name="selection-mode">none</property>
                         <style>
                           <class name="no-bg"/>
                         </style>
diff --git a/data/ui/server-toolbar.ui b/data/ui/server-toolbar.ui
index c7561c1..c1857a4 100644
--- a/data/ui/server-toolbar.ui
+++ b/data/ui/server-toolbar.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="McgServerToolbar" parent="GtkButtonBox">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
-    <property name="layout_style">start</property>
+    <property name="layout-style">start</property>
     <child>
       <placeholder/>
     </child>
diff --git a/data/ui/shortcuts-dialog.ui b/data/ui/shortcuts-dialog.ui
index 97dbc66..8109201 100644
--- a/data/ui/shortcuts-dialog.ui
+++ b/data/ui/shortcuts-dialog.ui
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.18"/>
   <template class="McgShortcutsDialog" parent="GtkShortcutsWindow">
diff --git a/data/ui/window.ui b/data/ui/window.ui
index 0acc759..c1fea7f 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <template class="McgAppWindow" parent="GtkApplicationWindow">
-    <property name="can_focus">False</property>
-    <property name="icon_name">mcg</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">mcg</property>
     <signal name="size-allocate" handler="on_resize" swapped="no"/>
     <signal name="window-state-event" handler="on_state" swapped="no"/>
     <child>
       <object class="GtkOverlay">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <child>
           <object class="GtkStack" id="content_stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_duration">100</property>
-            <property name="transition_type">crossfade</property>
+            <property name="can-focus">False</property>
+            <property name="transition-duration">100</property>
+            <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkStack" id="panel_stack">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -38,22 +38,22 @@
         <child type="overlay">
           <object class="GtkRevealer" id="info_revealer">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="valign">start</property>
             <child>
               <object class="GtkInfoBar" id="info_bar">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="valign">start</property>
-                <property name="margin_start">10</property>
-                <property name="margin_end">10</property>
+                <property name="margin-start">10</property>
+                <property name="margin-end">10</property>
                 <property name="orientation">vertical</property>
-                <property name="baseline_position">top</property>
-                <property name="show_close_button">True</property>
+                <property name="baseline-position">top</property>
+                <property name="show-close-button">True</property>
                 <signal name="close" handler="on_info_bar_close" swapped="no"/>
                 <signal name="response" handler="on_info_bar_response" swapped="no"/>
                 <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>
@@ -63,11 +63,11 @@
                 </child>
                 <child internal-child="content_area">
                   <object class="GtkBox">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkLabel" id="info_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -92,19 +92,19 @@
       <object class="GtkHeaderBar" id="headerbar">
         <property name="name">headerbar</property>
         <property name="visible">True</property>
-        <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>
         <child type="title">
           <object class="GtkStack" id="headerbar_title_stack">
             <property name="name">headerbar-connection</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_duration">100</property>
-            <property name="transition_type">crossfade</property>
+            <property name="can-focus">False</property>
+            <property name="transition-duration">100</property>
+            <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkLabel" id="headerbar_connection_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">Connect to MPD</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -118,7 +118,7 @@
             <child>
               <object class="GtkStackSwitcher" id="headerbar_panel_switcher">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="stack">panel_stack</property>
               </object>
               <packing>
@@ -135,8 +135,8 @@
         <child>
           <object class="GtkSwitch" id="headerbar_button_connect">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">Connect or disconnect</property>
+            <property name="can-focus">True</property>
+            <property name="tooltip-text" translatable="yes">Connect or disconnect</property>
             <signal name="notify::active" handler="on_headerbar_connection_active_notify" swapped="no"/>
             <signal name="state-set" handler="on_headerbar_connection_state_set" swapped="no"/>
           </object>
@@ -147,7 +147,7 @@
         <child>
           <object class="GtkSeparator">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
           </object>
           <packing>
             <property name="position">2</property>
@@ -156,15 +156,15 @@
         <child>
           <object class="GtkToggleButton" id="headerbar_button_playpause">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Switch between play and pause</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Switch between play and pause</property>
             <signal name="toggled" handler="on_headerbar_playpause_toggled" swapped="no"/>
             <child>
               <object class="GtkImage">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">media-playback-start</property>
+                <property name="can-focus">False</property>
+                <property name="icon-name">media-playback-start</property>
               </object>
             </child>
           </object>
@@ -175,10 +175,10 @@
         <child>
           <object class="GtkVolumeButton" id="headerbar_button_volume">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="focus_on_click">False</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Adjust the volume</property>
+            <property name="can-focus">True</property>
+            <property name="focus-on-click">False</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Adjust the volume</property>
             <property name="relief">none</property>
             <property name="orientation">vertical</property>
             <property name="icons">audio-volume-muted
@@ -190,8 +190,8 @@
             <signal name="value-changed" handler="on_headerbar_volume_changed" swapped="no"/>
             <child internal-child="plus_button">
               <object class="GtkButton">
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="relief">none</property>
@@ -199,8 +199,8 @@
             </child>
             <child internal-child="minus_button">
               <object class="GtkButton">
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="relief">none</property>
@@ -214,13 +214,13 @@
         <child>
           <object class="GtkStack" id="toolbar_stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <placeholder/>
             </child>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">4</property>
           </packing>
         </child>