From 21bd0f58321bd7b620c4ee385836bf051c761190 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Tue, 28 Feb 2023 12:55:26 +0100
Subject: [PATCH 01/33] Fix setting sort type on Library panel at startup
 (close #95)

---
 src/librarypanel.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/librarypanel.py b/src/librarypanel.py
index 7d325dd..938d0fe 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -120,6 +120,13 @@ class LibraryToolbar(Gtk.ButtonBox):
             button.set_active(True)
 
 
+    def set_sort_type(self, sort_type):
+        if sort_type:
+            self.toolbar_sort_order_button.set_active(True)
+        else:
+            self.toolbar_sort_order_button.set_active(False)
+
+
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui')
@@ -406,12 +413,11 @@ class LibraryPanel(Gtk.Stack):
 
     def set_sort_type(self, sort_type):
         if self._sort_type != sort_type:
+            self._toolbar.set_sort_type(sort_type)
             if sort_type:
                 sort_type_gtk = Gtk.SortType.DESCENDING
-                self.toolbar_sort_order_button.set_active(True)
             else:
                 sort_type_gtk = Gtk.SortType.ASCENDING
-                self.toolbar_sort_order_button.set_active(False)
             if self._sort_type != sort_type_gtk:
                 self._sort_type = sort_type_gtk
                 self._library_grid_model.set_sort_column_id(2, sort_type)

From 6ba8bc550fe1f406db610e02d448271734788d6e Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Tue, 28 Feb 2023 13:18:07 +0100
Subject: [PATCH 02/33] Bump version to 3.2.1

---
 data/ui/info-dialog.ui | 2 +-
 meson.build            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/ui/info-dialog.ui b/data/ui/info-dialog.ui
index d6c0ed8..bdd14f2 100644
--- a/data/ui/info-dialog.ui
+++ b/data/ui/info-dialog.ui
@@ -10,7 +10,7 @@
     <property name="type-hint">dialog</property>
     <property name="gravity">center</property>
     <property name="program-name">CoverGrid</property>
-    <property name="version">3.2</property>
+    <property name="version">3.2.1</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">xyz.suruatoel.mcg</property>
diff --git a/meson.build b/meson.build
index 1ce0af4..5a6d445 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('mcg',
-    version: '3.2',
+    version: '3.2.1',
     meson_version: '>= 0.59.0',
     default_options: [
         'warning_level=2',

From 75b99e5820f0f28f5cfb52507c9fb20f15b454fb Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 8 Jan 2023 18:20:30 +0100
Subject: [PATCH 03/33] =?UTF-8?q?Port=20UI=20to=20GTK=E2=80=AF4=20(close?=
 =?UTF-8?q?=20#85)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/gtk.css                         |  53 +--
 data/ui/album-headerbar.ui           |  82 ++--
 data/ui/connection-panel.ui          | 213 +++-------
 data/ui/cover-panel.ui               | 176 ++++----
 data/ui/cover-toolbar.ui             |  33 --
 data/ui/gtk.menu.ui                  |  75 ----
 data/ui/info-dialog.ui               |  46 ---
 data/ui/library-panel.ui             | 549 +++++++++++++------------
 data/ui/library-toolbar.ui           | 248 ------------
 data/ui/playlist-panel.ui            | 306 +++++++-------
 data/ui/playlist-toolbar.ui          |  55 ---
 data/ui/server-panel.ui              | 581 +++++++++------------------
 data/ui/server-toolbar.ui            |  14 -
 data/ui/shortcuts-dialog.ui          |  22 +-
 data/ui/window.ui                    | 275 +++----------
 data/xyz.suruatoel.mcg.gresource.xml |   6 -
 po/POTFILES                          |   8 -
 po/de.mo                             | Bin 4246 -> 3448 bytes
 po/de.po                             | 431 ++++++++------------
 po/en.mo                             | Bin 4042 -> 3284 bytes
 po/en.po                             | 431 ++++++++------------
 po/mcg.pot                           | 346 +++++-----------
 src/albumheaderbar.py                |   7 +-
 src/application.py                   |  64 ++-
 src/client.py                        |  23 +-
 src/connectionpanel.py               |  71 ++--
 src/coverpanel.py                    | 117 +++---
 src/infodialog.py                    |  15 -
 src/librarypanel.py                  | 526 +++++++++---------------
 src/main.py                          |   2 -
 src/meson.build                      |   1 -
 src/playlistpanel.py                 | 189 ++++-----
 src/serverpanel.py                   |  29 +-
 src/shortcutsdialog.py               |   4 +-
 src/utils.py                         |  48 ++-
 src/window.py                        | 205 ++++------
 36 files changed, 1848 insertions(+), 3403 deletions(-)
 delete mode 100644 data/ui/cover-toolbar.ui
 delete mode 100644 data/ui/gtk.menu.ui
 delete mode 100644 data/ui/info-dialog.ui
 delete mode 100644 data/ui/library-toolbar.ui
 delete mode 100644 data/ui/playlist-toolbar.ui
 delete mode 100644 data/ui/server-toolbar.ui
 delete mode 100644 src/infodialog.py

diff --git a/data/gtk.css b/data/gtk.css
index 469b262..1b361de 100644
--- a/data/gtk.css
+++ b/data/gtk.css
@@ -1,8 +1,20 @@
-.bg-texture {
+#content_stack {
     box-shadow:inset 4px 4px 10px rgba(0,0,0,0.3);
     background-image:url('noise-texture.png');
 }
 
+#port_spinner {
+    background:none;
+    margin-top:-13px;
+}
+#port_spinner text {
+    padding-left: 0;
+}
+
+#server_stack_sidebar {
+    background-color:alpha(@theme_bg_color, 1);
+}
+
 .no-bg {
     background:none;
 }
@@ -18,13 +30,17 @@
     font-weight:bold;
 }
 
-revealer.sidebar > * {
-    background-color:alpha(@theme_bg_color, 0.8);
-    box-shadow:0 0 10px @theme_bg_color;
-    margin-left:20px
+window.fullscreen #cover_box {
+    background: black;
 }
 
-revealer.sidebar scale mark indicator {
+#cover_info_revealer {
+    background-color:alpha(@theme_bg_color, 0.8);
+    box-shadow:0 0 10px @theme_bg_color;
+    margin-left:20px;
+}
+
+#cover_info_revealer scale mark indicator {
     margin-right:5px;
 }
 
@@ -32,24 +48,13 @@ actionbar {
     background-color:@theme_unfocused_bg_color;
 }
 
-/* Icon View in regular mode */
-iconview.view:selected,
-iconview.view:selected:focus {
-    background-color:@theme_selected_bg_color;
+gridview child {
+    padding: 1px;
 }
-iconview.view:hover {
-    -gtk-icon-effect:highlight;
+gridview.selection child {
+    opacity: 0.5;
 }
-
-/* Icon View in selection mode */
-iconview.view.selection {
-    -gtk-icon-effect:dim;
-}
-iconview.view.selection:selected,
-iconview.view.selection:selected:focus {
-    background-color:@theme_selected_bg_color;
-    -gtk-icon-effect:highlight;
-}
-iconview.view.selection:hover {
-    -gtk-icon-effect:none;
+gridview.selection child:hover,
+gridview.selection child:selected {
+    opacity: 1;
 }
diff --git a/data/ui/album-headerbar.ui b/data/ui/album-headerbar.ui
index 76ade01..bda26a8 100644
--- a/data/ui/album-headerbar.ui
+++ b/data/ui/album-headerbar.ui
@@ -1,58 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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>
-    <child type="title">
-      <object class="GtkBox">
-        <property name="visible">True</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="label" translatable="yes">Title</property>
-            <property name="selectable">True</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-              <attribute name="scale" value="1"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="standalone_artist">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Artist</property>
-            <property name="selectable">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
+  <template class="McgAlbumHeaderbar" parent="AdwBin">
     <child>
-      <object class="GtkButton">
-        <property name="visible">True</property>
-        <property name="can-focus">True</property>
-        <property name="receives-default">True</property>
-        <signal name="clicked" handler="on_close_clicked" swapped="no"/>
+      <object class="GtkHeaderBar">
+        <child type="title">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel" id="standalone_title">
+                <property name="selectable">True</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                  <attribute name="scale" value="1"/>
+                </attributes>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="standalone_artist">
+                <property name="selectable">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
         <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="icon-name">go-previous-symbolic</property>
+          <object class="GtkButton">
+            <property name="receives-default">True</property>
+            <signal name="clicked" handler="on_close_clicked" swapped="no"/>
+            <child>
+              <object class="GtkImage">
+                <property name="icon-name">go-previous-symbolic</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
diff --git a/data/ui/connection-panel.ui b/data/ui/connection-panel.ui
index f388d43..d9e7364 100644
--- a/data/ui/connection-panel.ui
+++ b/data/ui/connection-panel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
   <object class="GtkAdjustment" id="server-port-adjustment">
     <property name="lower">1024</property>
     <property name="upper">9999</property>
@@ -9,174 +9,79 @@
     <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="orientation">vertical</property>
+  <object class="GtkBox" id="toolbar">
+    <property name="orientation">horizontal</property>
+    <property name="spacing">6</property>
+  </object>
+  <template class="McgConnectionPanel" parent="AdwBin">
     <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
+      <object class="AdwStatusPage">
+        <property name="title">Connect to MPD</property>
         <child>
-          <!-- n-columns=3 n-rows=6 -->
-          <object class="GtkGrid">
-            <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>
+          <object class="GtkBox">
+            <property name="hexpand">false</property>
+            <property name="halign">center</property>
             <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+              <object class="GtkListBox" id="zeroconf_list">
+                <property name="hexpand">true</property>
+                <child type="placeholder">
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">No service found</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkListBox">
+                <property name="hexpand">true</property>
+                <property name="selection-mode">none</property>
+                <style>
+                  <class name="boxed-list"/>
+                </style>
                 <child>
-                  <object class="GtkTreeView" id="zeroconf_list">
-                    <property name="visible">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">
-                        <signal name="changed" handler="on_service_selected" swapped="no"/>
+                  <object class="AdwEntryRow" id="host_row">
+                    <property name="title" translatable="yes">Host</property>
+                    <property name="show-apply-button">true</property>
+                    <signal name="apply" handler="on_host_entry_apply"/>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <style>
+                      <class name="header"/>
+                    </style>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Port</property>
+                        <property name="halign">start</property>
+                        <property name="hexpand">false</property>
+                        <style>
+                          <class name="subtitle"/>
+                        </style>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="port_spinner">
+                        <property name="name">port_spinner</property>
+                        <property name="value">6600</property>
+                        <property name="adjustment">server-port-adjustment</property>
+                        <signal name="value-changed" handler="on_port_spinner_value_changed"/>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-start">5</property>
-                    <property name="orientation">vertical</property>
+                  <object class="AdwPasswordEntryRow" id="password_row">
+                    <property name="title" translatable="yes">Password</property>
+                    <property name="show-apply-button">true</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="pack-type">end</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <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="text">localhost</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>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="password_entry">
-                <property name="visible">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>
-                <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>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="port_spinner">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="text">6600</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>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</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>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</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>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</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>
-              </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>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/data/ui/cover-panel.ui b/data/ui/cover-panel.ui
index 304d9d0..75c8530 100644
--- a/data/ui/cover-panel.ui
+++ b/data/ui/cover-panel.ui
@@ -1,187 +1,152 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
+  <object class="GtkBox" id="toolbar">
+    <property name="orientation">horizontal</property>
+    <property name="halign">end</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkButton" id="fullscreen_button">
+        <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="icon-name">view-fullscreen-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
   <template class="McgCoverPanel" parent="GtkOverlay">
-    <property name="visible">True</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="visible-child">cover_default</property>
         <child>
           <object class="GtkSpinner" id="cover_spinner">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
           </object>
-          <packing>
-            <property name="name">cover-spinner</property>
-          </packing>
+        </child>
+        <child>
+          <object class="GtkImage" id="cover_default">
+            <property name="icon-name">image-x-generic-symbolic</property>
+            <property name="icon-size">large</property>
+          </object>
         </child>
         <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>
-            <signal name="size-allocate" handler="on_cover_size_allocate" swapped="no"/>
+            <property name="hexpand">true</property>
+            <property name="halign">fill</property>
+            <property name="vexpand">true</property>
+            <property name="valign">fill</property>
             <child>
-              <object class="GtkViewport">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+              <object class="GtkViewport" id="cover_box">
+                <property name="name">cover_box</property>
+                <property name="hexpand">true</property>
+                <property name="halign">fill</property>
+                <property name="vexpand">true</property>
+                <property name="valign">fill</property>
                 <child>
-                  <object class="GtkEventBox" id="cover_box">
-                    <property name="visible">True</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="icon_size">0</property>
-                      </object>
-                    </child>
+                  <object class="GtkImage" id="cover_image">
+                    <property name="hexpand">true</property>
+                    <property name="halign">fill</property>
+                    <property name="vexpand">true</property>
+                    <property name="valign">fill</property>
+                    <property name="icon-name">image-x-generic-symbolic</property>
+                    <property name="icon-size">large</property>
                   </object>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="name">cover-scroll</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="index">-1</property>
-      </packing>
     </child>
     <child type="overlay">
       <object class="GtkRevealer" id="info_revealer">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
         <property name="halign">end</property>
         <property name="transition-type">slide-right</property>
+        <property name="name">cover_info_revealer</property>
+        <style>
+          <class name="background"/>
+        </style>
         <child>
           <object class="GtkScrolledWindow" id="cover_info_scroll">
-            <property name="visible">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="name">cover_info_scroll</property>
             <child>
               <object class="GtkViewport">
-                <property name="visible">True</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="orientation">vertical</property>
                     <property name="halign">start</property>
+                    <property name="valign">fill</property>
+                    <property name="vexpand">true</property>
                     <property name="margin-start">5</property>
                     <property name="margin-end">5</property>
                     <property name="margin-top">5</property>
                     <property name="margin-bottom">5</property>
-                    <property name="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>
+                        <style>
+                          <class name="cover-labels"/>
+                        </style>
                         <child>
                           <object class="GtkLabel" id="album_title_label">
-                            <property name="visible">True</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>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="label">Date</property>
                             <property name="wrap">True</property>
                             <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="label">Artist</property>
                             <property name="wrap">True</property>
                             <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="padding">10</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkScale" id="songs_scale">
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
                         <property name="orientation">vertical</property>
+                        <property name="valign">fill</property>
+                        <property name="vexpand">true</property>
                         <property name="restrict-to-fill-level">False</property>
                         <property name="digits">0</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="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
@@ -189,11 +154,8 @@
             </child>
           </object>
         </child>
-        <style>
-          <class name="sidebar"/>
-          <class name="background"/>
-        </style>
       </object>
     </child>
   </template>
 </interface>
+
diff --git a/data/ui/cover-toolbar.ui b/data/ui/cover-toolbar.ui
deleted file mode 100644
index 7d3fcdd..0000000
--- a/data/ui/cover-toolbar.ui
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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="spacing">6</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>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="icon-name">view-fullscreen-symbolic</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-        <property name="non-homogeneous">True</property>
-      </packing>
-    </child>
-  </template>
-</interface>
diff --git a/data/ui/gtk.menu.ui b/data/ui/gtk.menu.ui
deleted file mode 100644
index b944502..0000000
--- a/data/ui/gtk.menu.ui
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <menu id="app-menu">
-        <section>
-            <item>
-                <attribute name="action">win.connect</attribute>
-                <attribute name="label" translatable="yes">Connect</attribute>
-                <attribute name="accel">&lt;Primary&gt;c</attribute>
-            </item>
-            <item>
-                <attribute name="action">win.play</attribute>
-                <attribute name="label" translatable="yes">Play</attribute>
-                <attribute name="accel">&lt;Primary&gt;p</attribute>
-            </item>
-            <item>
-                <attribute name="action">win.clear-playlist</attribute>
-                <attribute name="label" translatable="yes">Clear Playlist</attribute>
-                <attribute name="accel">&lt;Primary&gt;r</attribute>
-            </item>
-            <item>
-                <attribute name="action">win.toggle-fullscreen</attribute>
-                <attribute name="label" translatable="yes">Toggle Fullscreen</attribute>
-                <attribute name="accel">F11</attribute>
-            </item>
-            <item>
-                <attribute name="action">win.search-library</attribute>
-                <attribute name="label" translatable="yes">Search Library</attribute>
-                <attribute name="accel">&lt;Primary&gt;f</attribute>
-            </item>
-        </section>
-        <section>
-            <item>
-                <attribute name="action">win.panel</attribute>
-                <attribute name="label" translatable="yes">Connection</attribute>
-                <attribute name="target">0</attribute>
-                <attribute name="accel">&lt;Primary&gt;KP_1</attribute>
-            </item>
-            <item>
-                <attribute name="action">win.panel</attribute>
-                <attribute name="label" translatable="yes">Cover</attribute>
-                <attribute name="target">1</attribute>
-                <attribute name="accel">&lt;Primary&gt;KP_2</attribute>
-            </item>
-            <item>
-                <attribute name="action">win.panel</attribute>
-                <attribute name="label" translatable="yes">Playlist</attribute>
-                <attribute name="target">2</attribute>
-                <attribute name="accel">&lt;Primary&gt;KP_3</attribute>
-            </item>
-            <item>
-                <attribute name="action">win.panel</attribute>
-                <attribute name="label" translatable="yes">Library</attribute>
-                <attribute name="target">3</attribute>
-                <attribute name="accel">&lt;Primary&gt;KP_4</attribute>
-            </item>
-        </section>
-        <section>
-            <item>
-                <attribute name="action">win.show-help-overlay</attribute>
-                <attribute name="label" translatable="yes">Keyboard Shortcuts</attribute>
-                <attribute name="accel">&lt;Primary&gt;k</attribute>
-            </item>
-            <item>
-                <attribute name="action">app.info</attribute>
-                <attribute name="label" translatable="yes">Info</attribute>
-                <attribute name="accel">&lt;Primary&gt;i</attribute>
-            </item>
-            <item>
-                <attribute name="action">app.quit</attribute>
-                <attribute name="label" translatable="yes">Quit</attribute>
-                <attribute name="accel">&lt;Primary&gt;q</attribute>
-            </item>
-        </section>
-    </menu>
-</interface>
diff --git a/data/ui/info-dialog.ui b/data/ui/info-dialog.ui
deleted file mode 100644
index bdd14f2..0000000
--- a/data/ui/info-dialog.ui
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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="resizable">False</property>
-    <property name="modal">True</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="version">3.2.1</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">xyz.suruatoel.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="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>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/data/ui/library-panel.ui b/data/ui/library-panel.ui
index 0e499d9..b5512e3 100644
--- a/data/ui/library-panel.ui
+++ b/data/ui/library-panel.ui
@@ -1,303 +1,340 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.16"/>
-  <template class="McgLibraryPanel" parent="GtkStack">
-    <property name="visible">True</property>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
+  <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>
+  </object>
+  <object class="GtkPopover" id="toolbar_popover">
     <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>
+      <object class="GtkBox">
         <property name="orientation">vertical</property>
+        <property name="halign">end</property>
         <child>
-          <object class="GtkSearchBar" id="filter_bar">
+          <object class="GtkScale" id="grid_scale">
+            <property name="width-request">350</property>
             <property name="visible">True</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>
-                <signal name="search-changed" handler="on_filter_entry_changed" swapped="no"/>
-              </object>
-            </child>
+            <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="digits">0</property>
+            <property name="has-origin">False</property>
+            <signal name="value-changed" handler="on_grid_scale_changed" swapped="no"/>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkButton" id="library-toolbar-update">
+            <property name="label" translatable="yes">update library</property>
+            <signal name="clicked" handler="on_update_clicked" swapped="no"/>
+          </object>
         </child>
         <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="transition-type">crossfade</property>
+          <object class="GtkBox" id="library-toolbar-sort">
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkBox" id="progress_box">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+              <object class="GtkSeparator">
                 <property name="orientation">vertical</property>
-                <child type="center">
-                  <object class="GtkBox">
-                    <property name="visible">True</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="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="icon_size">6</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkProgressBar" id="progress_bar">
-                            <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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title">page1</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scroll">
+              <object class="GtkLabel">
+                <property name="label" translatable="yes">Sort</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="sort_artist">
+                <property name="label" translatable="yes">sort by artist</property>
+                <property name="receives-default">False</property>
+                <property name="group">sort_year</property>
+                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="sort_title">
+                <property name="label" translatable="yes">sort by title</property>
+                <property name="receives-default">False</property>
+                <property name="group">sort_year</property>
+                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="sort_year">
+                <property name="label" translatable="yes">sort by year</property>
+                <property name="receives-default">False</property>
+                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="sort_modified">
+                <property name="label" translatable="yes">sort by modification</property>
+                <property name="receives-default">False</property>
+                <property name="group">sort_year</property>
+                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="toolbar_sort_order_button">
+                <property name="label" translatable="yes">sort library descending</property>
                 <property name="visible">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="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>
-                    <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"/>
-                    <style>
-                      <class name="no-bg"/>
-                    </style>
-                  </object>
-                </child>
-                <style>
-                  <class name="no-bg"/>
-                </style>
-              </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title">page0</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="actionbar_revealer">
-            <property name="visible">True</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>
-                <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>
-                    <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <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>
-                    <signal name="clicked" handler="on_selection_add_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="receives-default">False</property>
+                <property name="active">True</property>
+                <signal name="toggled" handler="on_sort_order_toggled" swapped="no"/>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="name">page0</property>
-        <property name="title">page0</property>
-      </packing>
+    </child>
+  </object>
+
+  <object class="GtkBox" id="toolbar">
+    <property name="orientation">horizontal</property>
+    <property name="halign">end</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkToggleButton" id="toolbar_search_bar">
+        <property name="receives-default">True</property>
+        <property name="tooltip-text" translatable="yes">Search the library</property>
+        <child>
+          <object class="GtkImage">
+            <property name="icon-name">system-search-symbolic</property>
+          </object>
+        </child>
+        <!--
+        <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        -->
+      </object>
     </child>
     <child>
-      <object class="GtkBox" id="panel_standalone">
+      <object class="GtkToggleButton" id="select_button">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</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="GtkStack" id="standalone_stack">
+          <object class="GtkImage">
+            <property name="icon-name">object-select-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </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="popover">toolbar_popover</property>
+        <child>
+          <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="transition-type">crossfade</property>
+            <property name="icon-name">open-menu-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+
+  <template class="McgLibraryPanel" parent="AdwBin">
+    <child>
+      <object class="GtkStack" id="library_stack">
+        <property name="transition-type">slide-left-right</property>
+        <child>
+          <object class="GtkBox" id="panel_normal">
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkSpinner" id="standalone_spinner">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+              <object class="GtkSearchBar" id="filter_bar">
+                <property name="search-mode-enabled" bind-source="toolbar_search_bar" bind-property="active" bind-flags="sync-create"/>
+                <child>
+                  <object class="GtkSearchEntry" id="filter_entry">
+                    <property name="placeholder-text" translatable="yes">search library</property>
+                    <signal name="search-changed" handler="on_filter_entry_changed" swapped="no"/>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="name">standalone-spinne</property>
-              </packing>
             </child>
             <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>
-                <signal name="size-allocate" handler="on_standalone_scroll_size_allocate" swapped="no"/>
+              <object class="GtkStack" id="stack">
+                <property name="transition-type">crossfade</property>
                 <child>
-                  <object class="GtkViewport">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
+                  <object class="GtkBox" id="progress_box">
+                    <property name="orientation">vertical</property>
+                    <property name="valign">center</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="icon_size">6</property>
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="halign">center</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
+                            <child>
+                              <object class="GtkImage" id="progress_image">
+                                <property name="icon-size">large</property>
+                                <property name="icon-name">image-x-generic-symbolic</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkProgressBar" id="progress_bar">
+                                <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>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
-              </object>
-              <packing>
-                <property name="name">standalone-scroll</property>
-                <property name="position">1</property>
-              </packing>
+                <child>
+                <object class="GtkScrolledWindow" id="scroll">
+                  <property name="vexpand">true</property>
+                  <child>
+                    <object class="GtkGridView" id="library_grid">
+                      <property name="orientation">vertical</property>
+                      <property name="single_click_activate">true</property>
+                      <signal name="activate" handler="on_library_grid_clicked"/>
+                      <style>
+                        <class name="no-bg"/>
+                      </style>
+                      <property name="factory">
+                        <object class="GtkBuilderListItemFactory">
+                          <property name="bytes">
+<![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+  <interface>
+    <template class="GtkListItem">
+      <property name="activatable">true</property>
+      <property name="child">
+        <object class="GtkBox">
+          <property name="orientation">vertical</property>
+          <child>
+            <object class="GtkPicture">
+              <property name="content-fit">contain</property>
+              <property name="can-shrink">false</property>
+              <binding name="tooltip-markup">
+                <lookup name="tooltip" type="GridItem">
+                  <lookup name="item">GtkListItem</lookup>
+                </lookup>
+              </binding>
+              <binding name="paintable">
+                <lookup name="cover" type="GridItem">
+                  <lookup name="item">GtkListItem</lookup>
+                </lookup>
+              </binding>
+            </object>
+          </child>
+        </object>
+      </property>
+    </template>
+  </interface>
+]]>
+                          </property>
+                        </object>
+                      </property>
+                    </object>
+                  </child>
+                  <style>
+                    <class name="no-bg"/>
+                  </style>
+                </object>
+              </child>
+            </object>
+          </child>
+          <child>
+            <object class="GtkRevealer" id="actionbar_revealer">
+              <property name="transition-type">slide-up</property>
+              <child>
+                <object class="GtkActionBar" id="actionbar">
+                  <child type="end">
+                    <object class="GtkButton">
+                      <property name="label" translatable="yes">cancel</property>
+                      <property name="receives-default">True</property>
+                      <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
+                    </object>
+                  </child>
+                  <child type="end">
+                    <object class="GtkButton">
+                      <property name="label" translatable="yes">queue</property>
+                      <property name="receives-default">True</property>
+                      <signal name="clicked" handler="on_selection_add_clicked" swapped="no"/>
+                    </object>
+                  </child>
+                </object>
+              </child>
+            </object>
+          </child>
+        </object>
+      </child>
+      <child>
+        <object class="GtkBox" id="panel_standalone">
+          <property name="orientation">vertical</property>
+          <child>
+            <object class="GtkStack" id="standalone_stack">
+              <property name="vexpand">true</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>
+                </object>
+              </child>
+              <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>
+                  <child>
+                    <object class="GtkViewport">
+                      <property name="visible">True</property>
+                      <property name="can-focus">False</property>
+                      <child>
+                        <object class="GtkImage" id="standalone_image">
+                          <property name="icon-name">gtk-missing-image</property>
+                          <property name="icon-size">large</property>
+                        </object>
+                      </child>
+                    </object>
+                  </child>
+                </object>
+              </child>
+            </object>
+          </child>
+          <child>
+            <object class="GtkActionBar" id="actionbar_standalone">
+              <child type="end">
+                <object class="GtkButton">
+                  <property name="label" translatable="yes">play</property>
+                  <property name="receives-default">True</property>
+                  <signal name="clicked" handler="on_standalone_play_clicked" swapped="no"/>
+                </object>
+              </child>
+              <child type="end">
+                <object class="GtkButton">
+                  <property name="label" translatable="yes">queue</property>
+                  <property name="receives-default">True</property>
+                  <signal name="clicked" handler="on_standalone_queue_clicked" swapped="no"/>
+                </object>
+              </child>
+            </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkActionBar" id="library-standalone-actionbar">
-            <property name="visible">True</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>
-                <signal name="clicked" handler="on_standalone_queue_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="pack-type">end</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <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>
-                <signal name="clicked" handler="on_standalone_play_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="pack-type">end</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="name">page1</property>
-        <property name="title">page1</property>
-        <property name="position">1</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/data/ui/library-toolbar.ui b/data/ui/library-toolbar.ui
deleted file mode 100644
index aabcc8f..0000000
--- a/data/ui/library-toolbar.ui
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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>
-  </object>
-  <object class="GtkPopover" id="toolbar_popover">
-    <property name="can-focus">False</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</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="visible">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="digits">0</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>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <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="relief">none</property>
-            <property name="use-stock">True</property>
-            <signal name="clicked" handler="on_update_clicked" swapped="no"/>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="library-toolbar-sort">
-            <property name="visible">True</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="orientation">vertical</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Sort</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="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="group">sort_year</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <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="group">sort_year</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <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="active">True</property>
-                <property name="draw-indicator">True</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="sort_modified">
-                <property name="label" translatable="yes">sort by modification</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
-                <property name="draw-indicator">True</property>
-                <property name="group">sort_year</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <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="active">True</property>
-                <property name="draw-indicator">True</property>
-                <signal name="toggled" handler="on_sort_order_toggled" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <template class="McgLibraryToolbar" parent="GtkButtonBox">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="spacing">6</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>
-        <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>
-          </object>
-        </child>
-        <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</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>
-        <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>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</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="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>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">2</property>
-        <property name="non-homogeneous">True</property>
-      </packing>
-    </child>
-  </template>
-</interface>
diff --git a/data/ui/playlist-panel.ui b/data/ui/playlist-panel.ui
index 9ee8b7a..d29c0c9 100644
--- a/data/ui/playlist-panel.ui
+++ b/data/ui/playlist-panel.ui
@@ -1,194 +1,182 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
+  <object class="GtkBox" id="toolbar">
+    <property name="orientation">horizontal</property>
+    <property name="halign">end</property>
+    <property name="spacing">6</property>
     <child>
-      <object class="GtkBox" id="panel_normal">
+      <object class="GtkToggleButton" id="select_button">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</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="GtkScrolledWindow">
+          <object class="GtkImage">
+            <property name="icon-name">object-select-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </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>
+        <signal name="clicked" handler="on_clear_clicked" swapped="no"/>
+        <child>
+          <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">edit-clear</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+  <template class="McgPlaylistPanel" parent="AdwBin">
+    <child>
+      <object class="GtkStack" id="playlist_stack">
+        <property name="transition-type">slide-left-right</property>
+        <child>
+          <object class="GtkBox" id="panel_normal">
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkIconView" id="playlist_grid">
-                <property name="visible">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>
-                <signal name="item-activated" handler="on_playlist_grid_clicked" swapped="no"/>
-                <signal name="selection-changed" handler="on_playlist_grid_selection_changed" swapped="no"/>
+              <object class="GtkScrolledWindow">
+                <property name="vexpand">true</property>
+                <child>
+                  <object class="GtkGridView" id="playlist_grid">
+                    <property name="orientation">vertical</property>
+                    <property name="single-click-activate">true</property>
+                    <signal name="activate" handler="on_playlist_grid_clicked"/>
+                    <style>
+                      <class name="no-bg"/>
+                    </style>
+                    <property name="factory">
+                      <object class="GtkBuilderListItemFactory">
+                        <property name="bytes">
+<![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+  <interface>
+    <template class="GtkListItem">
+      <property name="activatable">true</property>
+      <property name="child">
+        <object class="GtkBox">
+          <property name="orientation">vertical</property>
+          <child>
+            <object class="GtkPicture">
+              <property name="content-fit">contain</property>
+              <property name="can-shrink">false</property>
+              <binding name="tooltip-markup">
+                <lookup name="tooltip" type="GridItem">
+                  <lookup name="item">GtkListItem</lookup>
+                </lookup>
+              </binding>
+              <binding name="paintable">
+                <lookup name="cover" type="GridItem">
+                  <lookup name="item">GtkListItem</lookup>
+                </lookup>
+              </binding>
+            </object>
+          </child>
+        </object>
+      </property>
+    </template>
+  </interface>
+]]>
+                        </property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
                 <style>
                   <class name="no-bg"/>
                 </style>
               </object>
             </child>
-            <style>
-              <class name="no-bg"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <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>
             <child>
-              <object class="GtkActionBar" id="actionbar">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+              <object class="GtkRevealer" id="actionbar_revealer">
+                <property name="transition-type">slide-up</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>
-                    <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <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>
-                    <signal name="clicked" handler="on_selection_remove_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack-type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="name">page2</property>
-        <property name="title">page2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="panel_standalone">
-        <property name="visible">True</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>
-            <child>
-              <object class="GtkSpinner" id="standalone_spinner">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-              </object>
-              <packing>
-                <property name="name">standalone-spinne</property>
-              </packing>
-            </child>
-            <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>
-                <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>
-                    <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="icon_size">6</property>
+                  <object class="GtkActionBar" id="actionbar">
+                    <child type="end">
+                      <object class="GtkButton">
+                        <property name="label" translatable="yes">cancel</property>
+                        <property name="receives-default">True</property>
+                        <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
+                      </object>
+                    </child>
+                    <child type="end">
+                      <object class="GtkButton">
+                        <property name="label" translatable="yes">remove</property>
+                        <property name="receives-default">True</property>
+                        <signal name="clicked" handler="on_selection_remove_clicked" swapped="no"/>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="name">standalone-scroll</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkActionBar" id="actionbar_standalone">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
+          <object class="GtkBox" id="panel_standalone">
+            <property name="orientation">vertical</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>
-                <signal name="clicked" handler="on_standalone_remove_clicked" swapped="no"/>
+              <object class="GtkStack" id="standalone_stack">
+                <property name="vexpand">true</property>
+                <child>
+                  <object class="GtkSpinner" id="standalone_spinner">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                  </object>
+                </child>
+                <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>
+                    <child>
+                      <object class="GtkViewport">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <child>
+                          <object class="GtkImage" id="standalone_image">
+                            <property name="icon-name">gtk-missing-image</property>
+                            <property name="icon-size">large</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
-              <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>
-                <signal name="clicked" handler="on_standalone_play_clicked" swapped="no"/>
+              <object class="GtkActionBar" id="actionbar_standalone">
+                <child type="end">
+                  <object class="GtkButton">
+                    <property name="label" translatable="yes">play</property>
+                    <property name="receives-default">True</property>
+                    <signal name="clicked" handler="on_standalone_play_clicked" swapped="no"/>
+                  </object>
+                </child>
+                <child type="end">
+                  <object class="GtkButton">
+                    <property name="label" translatable="yes">remove</property>
+                    <property name="receives-default">True</property>
+                    <signal name="clicked" handler="on_standalone_remove_clicked" swapped="no"/>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-                <property name="position">0</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="name">page1</property>
-        <property name="title">page1</property>
-        <property name="position">1</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/data/ui/playlist-toolbar.ui b/data/ui/playlist-toolbar.ui
deleted file mode 100644
index 843625c..0000000
--- a/data/ui/playlist-toolbar.ui
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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="spacing">6</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>
-        <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>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</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>
-        <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>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-        <property name="non-homogeneous">True</property>
-      </packing>
-    </child>
-  </template>
-</interface>
diff --git a/data/ui/server-panel.ui b/data/ui/server-panel.ui
index 333919d..3907f50 100644
--- a/data/ui/server-panel.ui
+++ b/data/ui/server-panel.ui
@@ -1,547 +1,326 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
+  <object class="GtkBox" id="toolbar">
+    <property name="orientation">horizontal</property>
+    <property name="halign">end</property>
     <child>
-      <object class="GtkStackSidebar">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="stack">stack</property>
+      <object class="GtkToggleButton" id="sidebar_switcher">
+        <property name="icon-name">sidebar-show-symbolic</property>
+        <property name="active">true</property>
+        <property name="visible" bind-source="server_flap" bind-property="folded" bind-flags="sync-create"/>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
     </child>
+  </object>
+  <template class="McgServerPanel" parent="AdwBin">
     <child>
-      <object class="GtkStack" id="stack">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</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="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="orientation">vertical</property>
-                    <property name="spacing">10</property>
+      <object class="AdwFlap" id="server_flap">
+        <property name="flap-position">end</property>
+        <property name="reveal-flap" bind-source="sidebar_switcher" bind-property="active" bind-flags="sync-create|bidirectional" />
+        <property name="flap">
+          <object class="GtkStackSidebar">
+            <property name="stack">stack</property>
+            <property name="name">server_stack_sidebar</property>
+          </object>
+        </property>
+        <property name="separator">
+          <object class="GtkSeparator"/>
+        </property>
+        <property name="content">
+          <object class="GtkStack" id="stack">
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">status</property>
+                <property name="title" translatable="yes">Status</property>
+                <property name="child">
+                  <object class="AdwStatusPage">
+                    <property name="icon-name">dialog-information-symbolic</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="icon_size">6</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </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="hexpand">false</property>
+                        <property name="halign">center</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">File:</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">Audio:</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">Bitrate:</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">Error:</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">3</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
-                            <property name="label" translatable="yes">&lt;i&gt;none&lt;/i&gt;</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>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="status_audio">
-                            <property name="visible">True</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="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>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="status_file">
-                            <property name="visible">True</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="wrap">True</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="status_audio">
+                            <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="wrap">True</property>
+                            <property name="selectable">True</property>
+                            <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="status_bitrate">
+                            <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="wrap">True</property>
+                            <property name="selectable">True</property>
+                            <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="label" translatable="yes">&lt;i&gt;none&lt;/i&gt;</property>
                             <property name="use-markup">True</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">3</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="name">page0</property>
-            <property name="title" translatable="yes">Status</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</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="orientation">vertical</property>
-                <child type="center">
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">10</property>
+              <object class="GtkStackPage">
+                <property name="name">stats</property>
+                <property name="title" translatable="yes">Statistics</property>
+                <property name="child">
+                  <object class="AdwStatusPage">
+                    <property name="icon-name">starred-symbolic</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="icon_size">6</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </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="column-homogeneous">true</property>
+                        <property name="hexpand">false</property>
+                        <property name="halign">center</property>
                         <child>
                           <object class="GtkLabel" id="stats_artists">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="justify">right</property>
-                            <property name="selectable">True</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Artists</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">end</property>
                             <property name="justify">right</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Albums</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">1</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">end</property>
                             <property name="justify">right</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
-                            <property name="label" translatable="yes">Albums</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Songs</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
-                            <property name="label" translatable="yes">Artists</property>
-                          </object>
-                          <packing>
-                            <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="halign">end</property>
                             <property name="justify">right</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">3</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="label" translatable="yes">Seconds</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">3</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">end</property>
-                            <property name="justify">right</property>
+                          <object class="GtkLabel">
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">4</property>
+                              <property name="column-span">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">end</property>
                             <property name="justify">right</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">5</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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>
-                          </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="label" translatable="yes">Seconds played</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">5</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="stats_uptime">
+                            <property name="halign">end</property>
+                            <property name="justify">right</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">6</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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="halign">start</property>
                             <property name="label" translatable="yes">Seconds running</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">6</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <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>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="name">page1</property>
-            <property name="title" translatable="yes">Statistics</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</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="orientation">vertical</property>
-                <child type="center">
-                  <object class="GtkBox">
-                    <property name="visible">True</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="icon_size">6</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+              <object class="GtkStackPage">
+                <property name="name">devices</property>
+                <property name="title" translatable="yes">Audio Devices</property>
+                <property name="child">
+                  <object class="AdwStatusPage">
+                    <property name="icon-name">audio-speakers-symbolic</property>
                     <child>
                       <object class="GtkListBox" id="output_devices">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="hexpand">false</property>
+                        <property name="halign">center</property>
                         <property name="selection-mode">none</property>
                         <style>
                           <class name="no-bg"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
             </child>
           </object>
-          <packing>
-            <property name="name">page2</property>
-            <property name="title" translatable="yes">Audio Devices</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
+        </property>
       </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/data/ui/server-toolbar.ui b/data/ui/server-toolbar.ui
deleted file mode 100644
index c1857a4..0000000
--- a/data/ui/server-toolbar.ui
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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="orientation">vertical</property>
-    <property name="layout-style">start</property>
-    <child>
-      <placeholder/>
-    </child>
-  </template>
-</interface>
diff --git a/data/ui/shortcuts-dialog.ui b/data/ui/shortcuts-dialog.ui
index 8109201..e3dc1d9 100644
--- a/data/ui/shortcuts-dialog.ui
+++ b/data/ui/shortcuts-dialog.ui
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.18"/>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
   <template class="McgShortcutsDialog" parent="GtkShortcutsWindow">
-    <property name="modal">True</property>
+    <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
         <property name="visible">1</property>
@@ -11,53 +11,45 @@
         <property name="max-height">10</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_1</property>
                 <property name="title" translatable="yes">Switch to the Connection panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_2</property>
                 <property name="title" translatable="yes">Switch to the Cover panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_3</property>
                 <property name="title" translatable="yes">Switch to the Playlist panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_4</property>
                 <property name="title" translatable="yes">Switch to the Library panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;k</property>
                 <property name="title" translatable="yes">Show the keyboard shortcuts</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;i</property>
                 <property name="title" translatable="yes">Open the info dialog</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;q</property>
                 <property name="title" translatable="yes">Quit the application</property>
               </object>
@@ -66,25 +58,21 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Player</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;c</property>
                 <property name="title" translatable="yes">Connect or disconnect</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;p</property>
                 <property name="title" translatable="yes">Switch between play and pause</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;r</property>
                 <property name="title" translatable="yes">Clear the playlist</property>
               </object>
@@ -93,11 +81,9 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Cover Panel</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F11</property>
                 <property name="title" translatable="yes">Show the cover in fullscreen mode</property>
               </object>
@@ -106,11 +92,9 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Library Panel</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;f</property>
                 <property name="title" translatable="yes">Search the library</property>
               </object>
diff --git a/data/ui/window.ui b/data/ui/window.ui
index 5e24217..aa73ed1 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -1,229 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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">xyz.suruatoel.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>
-        <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>
-            <child>
-              <object class="GtkStack" id="panel_stack">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title">page0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="index">-1</property>
-          </packing>
-        </child>
-        <child type="overlay">
-          <object class="GtkRevealer" id="info_revealer">
-            <property name="visible">True</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="valign">start</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>
-                <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>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child internal-child="content_area">
-                  <object class="GtkBox">
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="info_label">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-      <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>
-        <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>
-            <child>
-              <object class="GtkLabel" id="headerbar_connection_label">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Connect to MPD</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title">page1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkStackSwitcher" id="headerbar_panel_switcher">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+  <requires lib="gtk+" version="4.8" />
+  <requires lib="adw" version="1.2" />
+  <template class="McgAppWindow" parent="AdwApplicationWindow">
+    <property name="content">
+      <object class="AdwToolbarView" id="toolbar_view">
+        <child type="top">
+          <object class="AdwHeaderBar" id="headerbar">
+            <property name="centering-policy">strict</property>
+            <property name="show_end_title_buttons">true</property>
+            <property name="title-widget">
+              <object class="AdwViewSwitcherTitle" id="headerbar_panel_switcher">
+                <property name="title">CoverGrid</property>
                 <property name="stack">panel_stack</property>
               </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title">page0</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <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>
-            <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>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <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>
-            <signal name="toggled" handler="on_headerbar_playpause_toggled" swapped="no"/>
+            </property>
             <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="icon-name">media-playback-start</property>
+              <object class="GtkSwitch" id="headerbar_button_connect">
+                <signal name="state-set" handler="on_headerbar_connection_state_set" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="headerbar_button_playpause">
+                <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="can-focus">False</property>
+                    <property name="icon-name">media-playback-start</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkVolumeButton" id="headerbar_button_volume">
+                <signal name="value-changed" handler="on_headerbar_volume_changed" swapped="no"/>
+              </object>
+            </child>
+            <child type="end">
+              <object class="GtkStack" id="toolbar_stack">
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
         </child>
-        <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="relief">none</property>
+        <property name="content">
+          <object class="GtkBox" id="content_box">
             <property name="orientation">vertical</property>
-            <signal name="button-press-event" handler="on_headerbar_volume_press" swapped="no"/>
-            <signal name="button-release-event" handler="on_headerbar_volume_release" swapped="no"/>
-            <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="halign">center</property>
-                <property name="valign">center</property>
-                <property name="relief">none</property>
-              </object>
-            </child>
-            <child internal-child="minus_button">
-              <object class="GtkButton">
-                <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>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="toolbar_stack">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <child>
-              <placeholder/>
+              <object class="AdwToastOverlay" id="info_toast">
+                <child>
+                  <object class="GtkStack" id="content_stack">
+                    <property name="name">content_stack</property>
+                    <property name="vexpand">true</property>
+                    <child>
+                      <object class="AdwViewStack" id="panel_stack">
+                        <property name="vexpand">true</property>
+                        <signal name="notify::visible-child" handler="on_stack_switched" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="AdwViewSwitcherBar">
+                <property name="stack">panel_stack</property>
+                <binding name="reveal">
+                  <lookup name="title-visible">headerbar_panel_switcher</lookup>
+                </binding>
+              </object>
             </child>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
+        </property>
       </object>
-    </child>
-    <style>
-      <class name="bg-texture"/>
-    </style>
+    </property>
   </template>
 </interface>
diff --git a/data/xyz.suruatoel.mcg.gresource.xml b/data/xyz.suruatoel.mcg.gresource.xml
index 9ebd10e..02141b3 100644
--- a/data/xyz.suruatoel.mcg.gresource.xml
+++ b/data/xyz.suruatoel.mcg.gresource.xml
@@ -4,18 +4,12 @@
         <file>gtk.css</file>
         <file>noise-texture.png</file>
         <file>ui/window.ui</file>
-        <file>ui/gtk.menu.ui</file>
-        <file>ui/info-dialog.ui</file>
         <file>ui/shortcuts-dialog.ui</file>
         <file>ui/connection-panel.ui</file>
         <file>ui/album-headerbar.ui</file>
-        <file>ui/server-toolbar.ui</file>
         <file>ui/server-panel.ui</file>
-        <file>ui/cover-toolbar.ui</file>
         <file>ui/cover-panel.ui</file>
-        <file>ui/playlist-toolbar.ui</file>
         <file>ui/playlist-panel.ui</file>
-        <file>ui/library-toolbar.ui</file>
         <file>ui/library-panel.ui</file>
     </gresource>
 </gresources>
diff --git a/po/POTFILES b/po/POTFILES
index 30a190f..0263b63 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,16 +1,9 @@
-data/xyz.suruatoel.mcg.gschema.xml
 data/ui/album-headerbar.ui
 data/ui/connection-panel.ui
 data/ui/cover-panel.ui
-data/ui/cover-toolbar.ui
-data/ui/gtk.menu.ui
-data/ui/info-dialog.ui
 data/ui/library-panel.ui
-data/ui/library-toolbar.ui
 data/ui/playlist-panel.ui
-data/ui/playlist-toolbar.ui
 data/ui/server-panel.ui
-data/ui/server-toolbar.ui
 data/ui/shortcuts-dialog.ui
 data/ui/window.ui
 src/albumheaderbar.py
@@ -18,7 +11,6 @@ src/application.py
 src/client.py
 src/connectionpanel.py
 src/coverpanel.py
-src/infodialog.py
 src/librarypanel.py
 src/main.py
 src/playlistpanel.py
diff --git a/po/de.mo b/po/de.mo
index abfee53fda80f21b12bf31bcc5049bc16bef6d96..0977fc7f942005a8edfb232bdcba04bee1f0235e 100644
GIT binary patch
delta 1660
zcmbQH_(Q7xo)F7a1_lNOD+UGz83qQ1H;fDn{tOHZdze9@3=BV57#O%27#M!CFfgz&
zFfg#PGBB_+Ffj12GBEHmFffR)Ld2C=85lSi7#K8J85o2Z7#NIL85l$v7#Lhx85md@
z7#N~iA?74P)#pOQ>lsR*23D~$Ft9K%Ff>8=?NAH)Ss57k7#JAlLg_WE3=9Gc3=F$j
z85l$u7#Pk#Eq(|!_!X4@5o+EqsJj19hl#L3JfO}7GPj<AL7$C*fuDha!H$iAL5zWc
z!H*5%qf|DC1vzXC42ld442^6I4AKk?42#(yKHAR)aqv+#1_mw$28L5meOK8S7-Sh3
z81Aq!Fvu}5F#KX;V31^BV31^o=r?AEgtR|90|Q$<0|P@2JH()3c8I|hAPEKrhB|hT
z3mF(%q4X4Xh=UfhLxO$>I|Bm`0|Ub`b_ND<1_p-9P<5}_85lsZ_lq48<o}@Rxi}aY
zx)~W5Bsd`YmvAyL)Pv$?6DI=$Cj$e+4o--Hhd3c2aGnzqr`I?c7^D~&818d2FsOli
z#0hbzA{RuxIu|5JO}HTXY`7riIdefg=F0^Mp&%{>20;b}hFC6$NAkHC>cNSmg$ok&
zv!L`wE{Me^xFCt?A{Qizo<I%!!UaiOKe-?d<L8E`*W!j)V9X6kBd**G3=#|s3}M_5
zhvjoa)R%EHFeo!HFihmGXJ9a3U|`tF4e`-4Ziq|Ya6^LbJ5(bx4+DcL0|NsW4<t?v
zcp!1=59Md_Kn(2Qf%tq4l->rV4?yWtJP?mw;ekZ$>v|qYQ2gS7Sj^80F+hqJBCf&<
zNi3F7@h~Wzzzd1PEM5i%Mo3O&V1m-1#0p9mCJYcYpb!8ByD$R-gC0~3D7$MhFfi1s
zFhE=a%DW&rQ2d&M7|`+nl-IQx7#NHhAVCO{0%cPWZ3H41AU+4BA5b{~64C{g3k(bl
zmLLuT1A_(wB>F5s<p%=;gAM~Ehj1}4fYLuy6$1l<Ap<0sVIpP>3=H}VkkkxHfS`O2
zk^>bipcD_vULd{_sNi9MM5Q_dB+Y=tL0Alw^%xi!<Ut$;NES3@U|>)H^Fb!rWZLEB
z=cU@{XWB71<|LKo7Ejh;)192bCNjB&O;EEewTQtvzbv&#As{g?HHX2qs3^b4ioq>2
zC)J9<JvA@2C^3h@Bfq$0au2(yfM32sacWUnW^$@RT7GF>%H#v=av}@?If<32MPMo?
zv$%vIAirqxKX$pz+8lw5lc#W|YZd1gl_=z7CKV+XRVt*U7AL3XrDW!%Gn5vjB$lMY
zWEe_|Qz!r8%oZ@wH89mRGEy)!u`;&QHZYo8%Jr7fWO6dM536HNQfl7h>)aZX`FW%#
zoA9U$fgKO=f-cAlsX3F~dF3Y8^Lh$<r)K7*D!62(<`tKuDx{~TmF7)8!mB*_6R(B{
zgG*+rf@5BJYF<idUb;e3YHD7}W<S0KjFZ^}Dy$Qeic3;6(^K<O6hLmzOf5>y1M6_g
jOv=g3FUd&FR!Gb)DNW4DEQUyyr51tAO3j;GD<BB~dTH1`

delta 2419
zcmew%HBGVpo)F7a1_lNOHwFd<83qOhA0`HdL<R<i8WxZ!0|Nsa0|Pe$0|O%)1A`y~
z0|PG`ScpL$N~^IkFt9T)FzB)|Fz_-kFqlHco!J-|I2afhyx15R_!t-%g4q}tgcukY
zlA!8K*%%l^85rsrYM}}yvoSDmF)%PJVq;)nWnf@f3$=JN8v{c;0|Uc;Hi!e|*%=sQ
z85kIB*dY#yVuz?tWQRB;9m>yVXJ7#Np_CnBaTQd)mmT8Jsq7$!)iW?G1~V8KHnB4>
zh%hiP9Asx;;ACK6xCS-g0o0<W><}Nlfm-ktD*qd*59D2tPenN(7OHSS9AwS`vWS7f
zo`ZpbpMinFkAs0hjDdk6j)Q@Lt)78_p_Bt+aSaCpgCYY1!$b}S25ANchRqxhpPlD`
z_~a@FB!q5(G%_$SJmr9d#2XF<1~~=>1};tp21y1622D<gerHZdh{bb4%&FmoL}3#r
zB;=-WGBDJGf@n5W!2+nnGERt#*Fxz%oDc_|=7a>@15O489tH-6cbt&4@f#}6&c(pc
z&B(wY$^}ukkeh))f`NfyJvYPwC%7RYdk#w9;AW@?8}x`9;-dH5kRblX4GF6M+zbp-
z3=9nXJP?gqJPZtK3=9k=JPZs13=9m>JdhB{;el9C&I55+Ee``jIRgVj7Y_r25(5JR
z6EB2T<%L9v2QS3F0N#3t!Qs3R0}^>5L7mRaz#z=Pz>vcWv7mt$5_H|XkdT<m3r@WZ
zn|L8{d4d;W&V4BTk{6N&KJ!96!o~+NUyKjp02w}rewBJYhyhl75T6F}K|&yh4`N{{
zAH=8ae2}1=!3S~qMyUE7d<+cA3=9mH`4|`s7#JA7LoL$ahd5l19}-2D{1APv{0t1L
zplr?$Ni+3D{E$R55h}2nA7bDseu#_T@k1Q)g&*QWHUS7N0Hvj%w2A=4BYFamwBsrO
z38@ePh(j`=>Pnz=od7tE)H8GlFfcGe%NkIs2Ne>aIMZN&L;)zi<rx?lbQmD19h6|j
zK&c$6$CLpQl=@IUG6f0|5Z{r3fx(J_fx#KXfs|?BGRBFao`J!R0pe0nDP{&$fKGu*
zK2X*KiG#A5A+*E<@j+OHfq}uC0TR>-(2~>zR4Ot+qEDQGfq|I;60#1UQj`G_&0L`T
z4>G`>0TM6T43KyRWiJy31_o=8Bm*SKwLmGEfq}t@0TRR(P&pU{%KIQTD93<kV+IBW
zO9lo8TTp4qz`&r+z`)=Nl0d?&dZ6qz`6G*{TuN4Hafw1nMyf(teokp_DuZKAQfY26
zgJV%iW^u`6ZdP56fSkn291zElRl1(RIX^EiHMv9~zeph^vp5;TgNv5rEBFSuz_^+D
zc?{0^WvN9FQXwEQFEt0kb}!0IQOGP-NK{D9$xO{FQAo=#0z1REv^X<a0c2-tk%CKN
zYHog>jzU^~a%pj9Ub;eDex5=i*o6w2dBr8Ei75*CX$l~zoK%I9qQvCvVm$`eypq%+
zg^c{-lDx#+RFF$O0~8WdQi@WGi=mPQiN(d``9&!p$(+>0vQ&knoW#8B$vLc2l2#0!
zd1?6!-l>&I`H4j-3c(rqMJ36lCB>85SWPFNVU<;|VgR`hOr#cpDNy(@1mqW$STO{a
zW={UgD#z}VnN*ZmRJmE0Es{|@B(o$Zl_4ZQJv}E?!L2kWr#QJNH8pQ?Hhae8f9zQT
z#<~WEx&{^shL%<a=Gq2^lPfshG8#=z<Mh#R$xK!7Nh~cXE;+oUC_7alF%RVU)I3m3
zrRFhsAKsH!T#}PoG<iFx20zGMAh#&wq^1_7=1soGDZ?I?T9lNTmooV~r<Qb7DJXsv
z${<3ic??j=(!BJ^3S1)f;Mju3O^HHkW*!(jL!;>Mo+5>m)I0^Oag>r;q)?ohoS~3d
znx^2Gla!jLkO+#RoSf7=g|d9GNmZ#id8v5{!TEXV#R_Tp*`>wBnW;r3dJG<r$f{4x
zQ^*Gy<Qbsr2#&8*kOR_FlTz~-0w8e)b{1F!q7>v)g`C9V;?z6_x73WB)FLYem&B6P
zOe+S*oSgL3+|<lGu=&t<4M{96NzKd7&rQnAODxIE&r8i?aLP=|$;>awm>k9BFnJ@F
zJhv5tV^VQJW@=7q-sB5h8nRXlPN}JRDXDo3py+VSD^JZ!Da}h)NCJsYzQ`lBnV)+u
cBVR~nNoo#5Sbk1UQf5xd<V8G9lM{F)07b`}RsaA1

diff --git a/po/de.po b/po/de.po
index 58ecec7..753eb6b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CoverGrid (mcg)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-08 19:06+0100\n"
-"PO-Revision-Date: 2023-01-08 19:07+0100\n"
+"POT-Creation-Date: 2024-05-22 14:39+0200\n"
+"PO-Revision-Date: 2024-05-22 14:39+0200\n"
 "Last-Translator: coderkun <olli@suruatoel.xyz>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -11,357 +11,212 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4.2\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: data/xyz.suruatoel.mcg.gschema.xml:11
-msgid "MPD host"
-msgstr ""
+#: data/ui/connection-panel.ui:29
+msgid "No service found"
+msgstr "Keine Dienste gefunden"
 
-#: data/xyz.suruatoel.mcg.gschema.xml:12
-msgid "MPD host to connect to"
-msgstr ""
+#: data/ui/connection-panel.ui:43
+msgid "Host"
+msgstr "Host"
 
-#: data/xyz.suruatoel.mcg.gschema.xml:16
-msgid "MPD port"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:17
-msgid "MPD port to connect to"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:21
-#, fuzzy
-msgid "Connection state"
-msgstr "Verbindung"
-
-#: data/xyz.suruatoel.mcg.gschema.xml:22
-msgid "State of last connection"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:26
-msgid "Window width"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:27
-msgid "The window width in pixels."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:31
-msgid "Window height"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:32
-msgid "The window height in pixels."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:36
-msgid "Window maximized"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:37
-msgid "Whether or not the window is in maximized state."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:42
-msgid "Last selected panel"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:43
-msgid "The index of the last selected panel."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:48
-msgid "Size of library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:49
-msgid "The size of items displayed in the library."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:53
-msgid "Sort criterium for library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:54
-msgid "The sort criterium of items displayed in the library."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:58
-msgid "Sort type for library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:59
-msgid "The sort type of items displayed in the library."
-msgstr ""
-
-#: data/ui/album-headerbar.ui:17
-msgid "Title"
-msgstr "Titel"
-
-#: data/ui/album-headerbar.ui:34
-msgid "Artist"
-msgstr "Künstler"
+#: data/ui/connection-panel.ui:56
+msgid "Port"
+msgstr "Port"
 
 #: data/ui/connection-panel.ui:76
-msgid "Enter hostname or IP address"
-msgstr "Hostnamen oder IP-Adresse eingeben"
+msgid "Password"
+msgstr "Passwort"
 
-#: data/ui/connection-panel.ui:89
-msgid "Enter password or leave blank"
-msgstr "Passwort eingeben oder leer lassen"
-
-#: data/ui/connection-panel.ui:118
-msgid "Host:"
-msgstr "Host:"
-
-#: data/ui/connection-panel.ui:130
-msgid "Port:"
-msgstr "Port:"
-
-#: data/ui/connection-panel.ui:142
-msgid "Password:"
-msgstr "Passwort:"
-
-#: data/ui/cover-toolbar.ui:15 data/ui/shortcuts-dialog.ui:102
+#: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88
 msgid "Show the cover in fullscreen mode"
 msgstr "Das Cover im Vollbildmodus anzeigen"
 
-#: data/ui/gtk.menu.ui:7
-msgid "Connect"
-msgstr "Verbinden"
+#: data/ui/library-panel.ui:34
+msgid "update library"
+msgstr "Die Bibliothek aktualisieren"
 
-#: data/ui/gtk.menu.ui:12
-msgid "Play"
-msgstr "Abspielen"
-
-#: data/ui/gtk.menu.ui:17
-msgid "Clear Playlist"
-msgstr "Playlist leeren"
-
-#: data/ui/gtk.menu.ui:22
-msgid "Toggle Fullscreen"
-msgstr "Vollbild wechseln"
-
-#: data/ui/gtk.menu.ui:27
-msgid "Search Library"
-msgstr "Bibliothek durchsuchen"
-
-#: data/ui/gtk.menu.ui:34
-msgid "Connection"
-msgstr "Verbindung"
-
-#: data/ui/gtk.menu.ui:40 src/window.py:113
-msgid "Cover"
-msgstr "Cover"
-
-#: data/ui/gtk.menu.ui:46 src/window.py:114
-msgid "Playlist"
-msgstr "Wiedergabeliste"
-
-#: data/ui/gtk.menu.ui:52 src/window.py:115
-msgid "Library"
-msgstr "Bibliothek"
-
-#: data/ui/gtk.menu.ui:60
-msgid "Keyboard Shortcuts"
-msgstr "Tastenkombinationen"
-
-#: data/ui/gtk.menu.ui:65
-msgid "Info"
-msgstr "Info"
-
-#: data/ui/gtk.menu.ui:70
-msgid "Quit"
-msgstr "Beenden"
-
-#: data/ui/info-dialog.ui:14
-msgid ""
-"CoverGrid is a client for the Music Player Daemon, focusing on albums "
-"instead of single tracks."
-msgstr ""
-"CoverGrid ist ein ein Client für den Music Player Daemon, der sich auf Alben "
-"anstellen von einzelnen Songs fokussiert."
-
-#: data/ui/library-panel.ui:27
-msgid "search library"
-msgstr "Bibliothek durchsuchen"
-
-#: data/ui/library-panel.ui:166 data/ui/playlist-panel.ui:57
-msgid "cancel"
-msgstr "abbrechen"
-
-#: data/ui/library-panel.ui:179 data/ui/library-panel.ui:264
-msgid "queue"
-msgstr "einreihen"
-
-#: data/ui/library-panel.ui:277 data/ui/playlist-panel.ui:168
-msgid "play"
-msgstr "abspielen"
-
-#: data/ui/library-toolbar.ui:76
+#: data/ui/library-panel.ui:48
 msgid "Sort"
 msgstr "Sortierung"
 
-#: data/ui/library-toolbar.ui:86
+#: data/ui/library-panel.ui:53
 msgid "sort by artist"
 msgstr "nach Künstler"
 
-#: data/ui/library-toolbar.ui:102
+#: data/ui/library-panel.ui:61
 msgid "sort by title"
 msgstr "nach Titel"
 
-#: data/ui/library-toolbar.ui:118
+#: data/ui/library-panel.ui:69
 msgid "sort by year"
 msgstr "nach Jahr"
 
-#: data/ui/library-toolbar.ui:134
+#: data/ui/library-panel.ui:76
 msgid "sort by modification"
 msgstr "nach Änderungsdatum"
 
-#: data/ui/library-toolbar.ui:185 data/ui/shortcuts-dialog.ui:115
+#: data/ui/library-panel.ui:84
+msgid "sort library descending"
+msgstr "absteigend sortieren"
+
+#: data/ui/library-panel.ui:105 data/ui/shortcuts-dialog.ui:99
 msgid "Search the library"
 msgstr "Die Bibliothek durchsuchen"
 
-#: data/ui/library-toolbar.ui:208 data/ui/playlist-toolbar.ui:15
+#: data/ui/library-panel.ui:121 data/ui/playlist-panel.ui:14
 msgid "Select multiple albums"
 msgstr "Mehrere Alben auswählen"
 
-#: data/ui/library-toolbar.ui:230
+#: data/ui/library-panel.ui:135
 msgid "Settings and actions"
 msgstr "Einstellungen und Aktionen"
 
-#: data/ui/playlist-panel.ui:70 data/ui/playlist-panel.ui:155
-msgid "remove"
-msgstr "entfernen"
+#: data/ui/library-panel.ui:160
+msgid "search library"
+msgstr "Bibliothek durchsuchen"
 
-#: data/ui/playlist-toolbar.ui:37 data/ui/shortcuts-dialog.ui:89
+#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107
+msgid "cancel"
+msgstr "abbrechen"
+
+#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327
+msgid "queue"
+msgstr "einreihen"
+
+#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163
+msgid "play"
+msgstr "abspielen"
+
+#: data/ui/playlist-panel.ui:28 data/ui/shortcuts-dialog.ui:77
 msgid "Clear the playlist"
 msgstr "Die Wiedergabeliste leeren"
 
-#: data/ui/server-panel.ui:69
-msgid "File:"
-msgstr "Datei:"
+#: data/ui/playlist-panel.ui:114 data/ui/playlist-panel.ui:170
+msgid "remove"
+msgstr "entfernen"
 
-#: data/ui/server-panel.ui:82
-msgid "Audio:"
-msgstr "Audio:"
-
-#: data/ui/server-panel.ui:95
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: data/ui/server-panel.ui:108
-msgid "Error:"
-msgstr "Fehler:"
-
-#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:136
-#: data/ui/server-panel.ui:152 data/ui/server-panel.ui:168
-msgid "<i>none</i>"
-msgstr "<i>nichts</i>"
-
-#: data/ui/server-panel.ui:221
+#: data/ui/server-panel.ui:35
 msgid "Status"
 msgstr "Status"
 
-#: data/ui/server-panel.ui:301
-msgid "Albums"
-msgstr "Alben"
+#: data/ui/server-panel.ui:49
+msgid "File:"
+msgstr "Datei:"
 
-#: data/ui/server-panel.ui:313
-msgid "Songs"
-msgstr "Songs"
+#: data/ui/server-panel.ui:60
+msgid "Audio:"
+msgstr "Audio:"
 
-#: data/ui/server-panel.ui:325
-msgid "Artists"
-msgstr "Künstler"
+#: data/ui/server-panel.ui:71
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: data/ui/server-panel.ui:349
-msgid "Seconds"
-msgstr "Sekunden"
+#: data/ui/server-panel.ui:82
+msgid "Error:"
+msgstr "Fehler:"
 
-#: data/ui/server-panel.ui:396
-msgid "Seconds played"
-msgstr "Sekunden gespielt"
+#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106
+#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134
+msgid "<i>none</i>"
+msgstr "<i>nichts</i>"
 
-#: data/ui/server-panel.ui:407
-msgid "Seconds running"
-msgstr "Sekunden laufend"
-
-#: data/ui/server-panel.ui:465
+#: data/ui/server-panel.ui:154
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: data/ui/server-panel.ui:535
+#: data/ui/server-panel.ui:178
+msgid "Artists"
+msgstr "Künstler"
+
+#: data/ui/server-panel.ui:198
+msgid "Albums"
+msgstr "Alben"
+
+#: data/ui/server-panel.ui:218
+msgid "Songs"
+msgstr "Songs"
+
+#: data/ui/server-panel.ui:238
+msgid "Seconds"
+msgstr "Sekunden"
+
+#: data/ui/server-panel.ui:267
+msgid "Seconds played"
+msgstr "Sekunden gespielt"
+
+#: data/ui/server-panel.ui:287
+msgid "Seconds running"
+msgstr "Sekunden laufend"
+
+#: data/ui/server-panel.ui:303
 msgid "Audio Devices"
 msgstr "Audiogeräte"
 
-#: data/ui/shortcuts-dialog.ui:15
+#: data/ui/shortcuts-dialog.ui:14
 msgid "General"
 msgstr "Allgemein"
 
-#: data/ui/shortcuts-dialog.ui:20
+#: data/ui/shortcuts-dialog.ui:18
 msgid "Switch to the Connection panel"
 msgstr "Zum Verbindungspaneel wechseln"
 
-#: data/ui/shortcuts-dialog.ui:27
+#: data/ui/shortcuts-dialog.ui:24
 msgid "Switch to the Cover panel"
 msgstr "Zum Cover-Paneel wechseln"
 
-#: data/ui/shortcuts-dialog.ui:34
+#: data/ui/shortcuts-dialog.ui:30
 msgid "Switch to the Playlist panel"
 msgstr "Zum Wiedergabelistenpaneel wechseln"
 
-#: data/ui/shortcuts-dialog.ui:41
+#: data/ui/shortcuts-dialog.ui:36
 msgid "Switch to the Library panel"
 msgstr "Zum Bibliothekspaneel wechseln"
 
-#: data/ui/shortcuts-dialog.ui:48
+#: data/ui/shortcuts-dialog.ui:42
 msgid "Show the keyboard shortcuts"
 msgstr "Die Tastenkombinationen anzeigen (dieser Dialog)"
 
-#: data/ui/shortcuts-dialog.ui:55
+#: data/ui/shortcuts-dialog.ui:48
 msgid "Open the info dialog"
 msgstr "Den Infodialog öffnen"
 
-#: data/ui/shortcuts-dialog.ui:62
+#: data/ui/shortcuts-dialog.ui:54
 msgid "Quit the application"
 msgstr "Die Anwendung beenden"
 
-#: data/ui/shortcuts-dialog.ui:70
+#: data/ui/shortcuts-dialog.ui:61
 msgid "Player"
 msgstr "Wiedergabeprogramm"
 
-#: data/ui/shortcuts-dialog.ui:75 data/ui/window.ui:139
+#: data/ui/shortcuts-dialog.ui:65
 msgid "Connect or disconnect"
 msgstr "Die Verbindung herstellen oder trennen"
 
-#: data/ui/shortcuts-dialog.ui:82 data/ui/window.ui:161
+#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:25
 msgid "Switch between play and pause"
 msgstr "Zwischen Abspielen und Pause wechseln"
 
-#: data/ui/shortcuts-dialog.ui:97
+#: data/ui/shortcuts-dialog.ui:84
 msgid "Cover Panel"
 msgstr "Cover-Paneel"
 
-#: data/ui/shortcuts-dialog.ui:110
+#: data/ui/shortcuts-dialog.ui:95
 msgid "Library Panel"
 msgstr "Bibliothekspaneel"
 
-#: data/ui/window.ui:108
-msgid "Connect to MPD"
-msgstr "Zu MPD verbinden"
+#: src/connectionpanel.py:51
+msgid "use"
+msgstr "verwenden"
 
-#: data/ui/window.ui:181
-msgid "Adjust the volume"
-msgstr "Die Lautstärke anpassen"
-
-#: src/librarypanel.py:421
+#: src/librarypanel.py:291
 msgid "Loading albums"
 msgstr "Alben werden geladen"
 
-#: src/librarypanel.py:521
+#: src/librarypanel.py:379
 msgid "Loading images"
 msgstr "Bilder werden geladen"
 
@@ -373,10 +228,74 @@ msgstr "{} mit {}"
 msgid "{}:{} minutes"
 msgstr "{}:{} Minuten"
 
-#: src/window.py:112
+#: src/window.py:114
 msgid "Server"
 msgstr "Server"
 
+#: src/window.py:115
+msgid "Cover"
+msgstr "Cover"
+
+#: src/window.py:116
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
+#: src/window.py:117
+msgid "Library"
+msgstr "Bibliothek"
+
+#, fuzzy
+#~ msgid "Connection state"
+#~ msgstr "Verbindung"
+
+#~ msgid "Title"
+#~ msgstr "Titel"
+
+#~ msgid "Artist"
+#~ msgstr "Künstler"
+
+#~ msgid "Enter hostname or IP address"
+#~ msgstr "Hostnamen oder IP-Adresse eingeben"
+
+#~ msgid "Enter password or leave blank"
+#~ msgstr "Passwort eingeben oder leer lassen"
+
+#~ msgid "Connect"
+#~ msgstr "Verbinden"
+
+#~ msgid "Play"
+#~ msgstr "Abspielen"
+
+#~ msgid "Clear Playlist"
+#~ msgstr "Playlist leeren"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Vollbild wechseln"
+
+#~ msgid "Search Library"
+#~ msgstr "Bibliothek durchsuchen"
+
+#~ msgid "Connection"
+#~ msgstr "Verbindung"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Tastenkombinationen"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Quit"
+#~ msgstr "Beenden"
+
+#~ msgid "CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks."
+#~ msgstr "CoverGrid ist ein ein Client für den Music Player Daemon, der sich auf Alben anstellen von einzelnen Songs fokussiert."
+
+#~ msgid "Connect to MPD"
+#~ msgstr "Zu MPD verbinden"
+
+#~ msgid "Adjust the volume"
+#~ msgstr "Die Lautstärke anpassen"
+
 #~ msgid "Enter URL or local path"
 #~ msgstr "URL oder lokalen Pfad eingeben"
 
diff --git a/po/en.mo b/po/en.mo
index 8fa584c622e4f01f211e77efe784de52feb62f08..96e0ea4d54bdd476340ae5c8a189bcaf9578de95 100644
GIT binary patch
delta 1667
zcmX>le?_wXo)F7a1_lNOD+UGz83qQ1H;fDn{tOHZdze9@3=BV57#O%27#M!CFfgz&
zFfg#PGBB_+Ffj12GBEHmFffR)Ld2C=85lSi7#K8J85o2Z7#NIL85l$v7#Lhx85md@
z7#N~iA?74P)#pOQ>lsR*23D~$Ft9K%Ff>8=?NAH)Ss57k7#JAlLg_WE3=9Gc3=F$j
z85l$u7#Pk#Eq(|!_!X4@5o+EqsJj19hl#L3JfO}7GPj<AL7$C*fuDha!H$iAL5zWc
z!H*5%qf|DC1vzXC42ld442^6I4AKk?42#(yKHAR)aqv+#1_mw$28L5meOK8S7-Sh3
z81Aq!Fvu}5F#KX;V31^BV31^o=r?AEgtR|90|Q$<0|P@2JH()3c8I|hAPEKrhB|hT
z3mF(%q4X4Xh=UfhLxO$>I|Bm`0|Ub`b_ND<1_p-9P<5}_85lsZ_lq48<o}@Rxi}aY
zmM}6fNN_;J_i{2Y)Pv&mBqt<DE^tB&zQG9zfoGhMIDN|riPLYKkT~V!f;d#33u2He
z7eu`wRNR6KVxAor#A9wyzBd=d{9rDK#}c_1>cMeazy*oZdM=0$CvZV5UJ5mM9hAQn
zYT!Poy2D%$huwf$@ES^g=7L1&Z!Soba&to*sKgC1Uy~aWrFPu)3=EnK3=9d}5Fd4M
zL*jA*l%5UMxQrVTr)#+(aeA5?5~r`AGz$+TPUUzY7FqK^eD1^pG1na`?#l!5c?b^!
z11AFmLvlS2#6`J05Fa=3K!UED2jYXtJP;o)=7GfNHXcZj@8W?3<uM)x21ZCuWnhBR
zpu`GF7bXl4H4+RA41x>{48jZy40=#CpzN;2z`#(i!T@m*DDQ&g)EF2T%s~ujc>v1m
z+6)W~#taajfuum$6hs?=2nGfQWd?|EK;;BTNEcKtFfcG!f;bEe3>pj&&sc!U4+aJX
z9R^5faxpM~(mzxc0|SF00|SF9g3DmWz`&r-0P(pL10;=rq(KD>D8+-a7l^L}DtH(e
z7z`K~7}OacAqEl$VNjL^Wj}ckhXIlWO&J&%6u^9tNj8~wdHH#%Hu{-%430TTrMbnE
zb=Y(#XRwJ(ZebJDEK4n7aLzAFEm8<b%uCH-a4jmzFS25A%gjl&VsKB*OD#&wVerT=
zE}7iJZYtoHuTY#?RF;{Xs*sjnnwK*90K1$BLqJYqWoi+a%E>G)VF<`Cn*5JlZt@de
z>CJ8&W{i^~_%$Z);k4H(&Mzua$jMA9N-U~WNJ%YDPR&cn%u8n|El5c$NrlNUloqE>
zUe7N*S(Gb4z(m);RM*Hz!O+CY*izfTXmTmnD@K#a3Eb(dboI>UC%iErk3^_}J%Q=?
Jk_-$F0088L*a`pu

literal 4042
zcmca7#4?qEfq}t|fq_AWfq}t?iGd-Jfq|ih1tiMAz`(}9z|FwGz{tkHAjrVLz{>^}
zVvvW@YHSP)><kPHx@-&#ybKHsrciNbHU<U`1_lN%HU<Vh1_p*;HU<VE1_p*CsQOYi
z1_n_E28LRw{A4x;1}+8$hDB@)46F<c3~QnGZf0X(h-YA6*v|%WpFBGQgDe9BgAF^x
z9Z~EM^@;2dccer4`Roh~ATN}%L+q`B%J;HE+&PsU;;zL|dJ{VXg9rly!$Eci22KVB
zhHFs$51{ruWrz6Z4b=RvQ2F0beIU<*{3*%-u}_5q;vRDjh&}ck3=I4X3=Do83=Con
z3=DA`5cijIK<usIU|>*WU|^WY!N4HRz`(GX1LCjq91wq8<$#3GEvUYy9FTB$!@<BH
z$H2hA#mT@R$-uy%$qCW#%n1pvcut5pHJp(6YvP31JB1Ts?rf<10;u>hPKbNgLg_u6
z5ci$tgoN7zP6h@Z1_p+AoRD<!8!FDu#lWzHk%2*!3nIRY8)DxvZisz1p!9uiNVq)X
zhM4ybD*lHX628nl5c_#}AmJ#@15vNX14%DtP<bC7NO(l^K>U}+1F<)U2a;YYcp(12
z!2=1WuRIWU2=hYJOYuU?Re<s}cp>4T#|yF77%K0^3vs6(FT`CjP&%6z5-wG|ko3|I
z)jyLLV$VEYh<}zs&0hzV-vZUQ6Kc*msC{>#_I-fTKX@VO1(bO}=|zAKVy-$L#9lo<
zNP2PRV_?u^U|>k)gZQhT4-zg@q4WZ%zSVq?aM;8LNiP@pAnD~jl;-4zgqJcu#2g2H
zNc_3+L+p*<hlEc&R6YeNp2ZIdmqLC>I5hA>+}Fhq@&9~&NI0+Hhs4hYen@!k;b&lA
zgcdQN^bRT;lo%KoG#D5dgc%qZ)EF2T<QW(kbQmD+2IXZ?IDq^L(q_s4Ne}uU4jMLq
z@*No%7_1l=7@VPeHU@~_oER7w>=+>K1eIN8P<eC;RNjH|BuE^T#|)w6B!~~fDhvz^
z<_r*jDL~6l7f@Nqz`!8Dz`!8Rz`(%Fz`&r)z`)=DDmxh<VFD`WK>F<&7#LI;7#Oq}
z7#JiNAo<FKfq}sqB*_2?Pb~%p1||ju1|tSYI9ovFU=%3NgV<6af`Ng-n1O-8l7WH2
z7F0$uFfgbyFfh16<zSQ^12k=c1Z*<x^78XiZS*tk7#vfwN{dSrN-|Ov%JOqcb5j`{
zbCODPiy0h?N-~Q}pj0t~V`)lezJg0?S!Qx7lxM}@lvz@gSdwbR;GC11Sfmh;lUSJp
z(gfjx%q)Nl<>%$4CYLZcLuiHkB88O9;$#R9E?SbW;2Yoq<7VdPF*xU!r4~U*g@DAo
z)Eo%gy(lw9A+uN^Q6V`eGc~V7AuYcM><Qn};>={QOHzvzToO}r^Ye5R((;o_i!<}m
z74q{G62ab6$jmD)Nli>q$WK!M$>gLeloTZ<XBX=+xaO6l7Aa)p7nkHE=B9!i>KUMr
zn37VIT3ig3EJ!RaF3&GY0ZHbhCYGftB;_RLWiz-I73CLMF}P*sq*^h!r{<*=CFU@A
z<QJD%F?i;s<uiDvRwm^q7NsZzXXF=^B$t*HGx%gC6(tr`!f2=;eex4iK<<S&mI21i
z%uP&BEoSg9NX-L#HZw0RUm+zkF(*HrApq(oD+W+BfQi&1Fa?g1fc&BoD~7<*%n~pG
z)}B~Ukdv95SON;?;MByT<O~IvbD&&M6y`u(7@V4%pO;e10HqZ`QJb0q=N6Ub<z?oj
zGX$sRq$Zar<d)`?WESM4Lc^OOIJF2Ak-@1YC7F5Y#R`deDGG_nAghZRf-~~V!466W
zMYcj_o<dq_PEK)hQEF<QLT-LaDndmzECh?;AsC#WmtM>eoL^MJ5L}W7O0=2D#b9P>
zF+*^9W=V2}LQ-l;Imj@Oo55BWB$gJZ!emSG!L~z_W@dh#LIF6XK{dmr%TkN5%0L4R
zs~jjYKoJ0y49P6XNo5GhPfyQDRd9p*k|8-UFF7@b0pvc0!qU{zREDC|-2AdshGIy(
zz#^eIzo<kZsZt>kk~?AC-29ZxG+0!^1WUkn!FZLaiA4<6wF+sei6wdp)wK-OwN}-&
z3b~nir6sAw3;{*?S*gh-x}GVzVW~yMnfZBE3gEm4&S@IC$?2M0L8%4#MJ2kv#p#(T
zx=y9(#kwK+Rtj7J{<=Y_Wtkv7x-OvNK*7ks$XM6FP}jgh!O+smz+BtF(7=GpC$YFh
zH>4;ruQ(^MB)`Z?Avr%KwJ5tZPr)WXCnwXPxU{G=u_Qk=N3Wu?%8tt?F)zI|F+Ei`
zBsDSDN&(KdQb^6?^7Zs}ML5(@&w$H0Kd&S;uS7SbvLMw;p(M4UM86;>F*DCvAvq(l
zs5rI6HZ;Ud*8-sq<dC$~B3;+K<a|(Ovr@1~$}Hgu$SEyK%+YnrFUl>pQphU+bBk?_
ztQ8<kTa7#gMOy_!O>3?QT}U1WdnO=1H6^n|!C22o&xk8R7sAzbN-Rz-NG!>)Qqa@W
z2P1?WB##9omSpG}SSjQtr(=~ev{Fb(EJ@Ta&E#SjEx3zE3+{|m1&Rvp0WYx?G)giu
zi=p+FCIh1UR>&_(Ni6~w-I>KD^e)B0r5&`GMlJdAmEnk*is&*tsZs&jxJs&2@I@-Q
W6+opYLsF#zq?SmkREWf1XafKfPR!i^

diff --git a/po/en.po b/po/en.po
index ae94e2b..00593af 100644
--- a/po/en.po
+++ b/po/en.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CoverGrid (mcg)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-08 19:06+0100\n"
-"PO-Revision-Date: 2023-01-08 19:07+0100\n"
+"POT-Creation-Date: 2024-05-22 14:39+0200\n"
+"PO-Revision-Date: 2024-05-22 14:39+0200\n"
 "Last-Translator: coderkun <olli@suruatoel.xyz>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -11,358 +11,213 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4.2\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-SearchPath-0: mcg\n"
 "X-Poedit-SearchPath-1: data/ui\n"
 
-#: data/xyz.suruatoel.mcg.gschema.xml:11
-msgid "MPD host"
-msgstr ""
+#: data/ui/connection-panel.ui:29
+msgid "No service found"
+msgstr "No service found"
 
-#: data/xyz.suruatoel.mcg.gschema.xml:12
-msgid "MPD host to connect to"
-msgstr ""
+#: data/ui/connection-panel.ui:43
+msgid "Host"
+msgstr "Host"
 
-#: data/xyz.suruatoel.mcg.gschema.xml:16
-msgid "MPD port"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:17
-msgid "MPD port to connect to"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:21
-#, fuzzy
-msgid "Connection state"
-msgstr "Connection"
-
-#: data/xyz.suruatoel.mcg.gschema.xml:22
-msgid "State of last connection"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:26
-msgid "Window width"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:27
-msgid "The window width in pixels."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:31
-msgid "Window height"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:32
-msgid "The window height in pixels."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:36
-msgid "Window maximized"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:37
-msgid "Whether or not the window is in maximized state."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:42
-msgid "Last selected panel"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:43
-msgid "The index of the last selected panel."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:48
-msgid "Size of library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:49
-msgid "The size of items displayed in the library."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:53
-msgid "Sort criterium for library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:54
-msgid "The sort criterium of items displayed in the library."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:58
-msgid "Sort type for library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:59
-msgid "The sort type of items displayed in the library."
-msgstr ""
-
-#: data/ui/album-headerbar.ui:17
-msgid "Title"
-msgstr "Title"
-
-#: data/ui/album-headerbar.ui:34
-msgid "Artist"
-msgstr "Artist"
+#: data/ui/connection-panel.ui:56
+msgid "Port"
+msgstr "Port"
 
 #: data/ui/connection-panel.ui:76
-msgid "Enter hostname or IP address"
-msgstr "Enter hostname or IP address"
+msgid "Password"
+msgstr "Password"
 
-#: data/ui/connection-panel.ui:89
-msgid "Enter password or leave blank"
-msgstr "Enter password or leave blank"
-
-#: data/ui/connection-panel.ui:118
-msgid "Host:"
-msgstr "Host:"
-
-#: data/ui/connection-panel.ui:130
-msgid "Port:"
-msgstr "Port:"
-
-#: data/ui/connection-panel.ui:142
-msgid "Password:"
-msgstr "Password:"
-
-#: data/ui/cover-toolbar.ui:15 data/ui/shortcuts-dialog.ui:102
+#: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88
 msgid "Show the cover in fullscreen mode"
 msgstr "Show the cover in fullscreen mode"
 
-#: data/ui/gtk.menu.ui:7
-msgid "Connect"
-msgstr "Connect"
+#: data/ui/library-panel.ui:34
+msgid "update library"
+msgstr "update the library"
 
-#: data/ui/gtk.menu.ui:12
-msgid "Play"
-msgstr "Play"
-
-#: data/ui/gtk.menu.ui:17
-msgid "Clear Playlist"
-msgstr "Clear Playlist"
-
-#: data/ui/gtk.menu.ui:22
-msgid "Toggle Fullscreen"
-msgstr "Toggle fullscreen"
-
-#: data/ui/gtk.menu.ui:27
-msgid "Search Library"
-msgstr "Search Library"
-
-#: data/ui/gtk.menu.ui:34
-msgid "Connection"
-msgstr "Connection"
-
-#: data/ui/gtk.menu.ui:40 src/window.py:113
-msgid "Cover"
-msgstr "Cover"
-
-#: data/ui/gtk.menu.ui:46 src/window.py:114
-msgid "Playlist"
-msgstr "Playlist"
-
-#: data/ui/gtk.menu.ui:52 src/window.py:115
-msgid "Library"
-msgstr "Library"
-
-#: data/ui/gtk.menu.ui:60
-msgid "Keyboard Shortcuts"
-msgstr "Keyboard Shortcuts"
-
-#: data/ui/gtk.menu.ui:65
-msgid "Info"
-msgstr "Info"
-
-#: data/ui/gtk.menu.ui:70
-msgid "Quit"
-msgstr "Quit"
-
-#: data/ui/info-dialog.ui:14
-msgid ""
-"CoverGrid is a client for the Music Player Daemon, focusing on albums "
-"instead of single tracks."
-msgstr ""
-"CoverGrid is a client for the Music Player Daemon, focusing on albums "
-"instead of single tracks."
-
-#: data/ui/library-panel.ui:27
-msgid "search library"
-msgstr "search library"
-
-#: data/ui/library-panel.ui:166 data/ui/playlist-panel.ui:57
-msgid "cancel"
-msgstr "cancel"
-
-#: data/ui/library-panel.ui:179 data/ui/library-panel.ui:264
-msgid "queue"
-msgstr "queue"
-
-#: data/ui/library-panel.ui:277 data/ui/playlist-panel.ui:168
-msgid "play"
-msgstr "play"
-
-#: data/ui/library-toolbar.ui:76
+#: data/ui/library-panel.ui:48
 msgid "Sort"
 msgstr "Sort order"
 
-#: data/ui/library-toolbar.ui:86
+#: data/ui/library-panel.ui:53
 msgid "sort by artist"
 msgstr "by Artist"
 
-#: data/ui/library-toolbar.ui:102
+#: data/ui/library-panel.ui:61
 msgid "sort by title"
 msgstr "by Title"
 
-#: data/ui/library-toolbar.ui:118
+#: data/ui/library-panel.ui:69
 msgid "sort by year"
 msgstr "by Year"
 
-#: data/ui/library-toolbar.ui:134
+#: data/ui/library-panel.ui:76
 msgid "sort by modification"
 msgstr "by Modification Date"
 
-#: data/ui/library-toolbar.ui:185 data/ui/shortcuts-dialog.ui:115
+#: data/ui/library-panel.ui:84
+msgid "sort library descending"
+msgstr "sort descending"
+
+#: data/ui/library-panel.ui:105 data/ui/shortcuts-dialog.ui:99
 msgid "Search the library"
 msgstr "Search the library"
 
-#: data/ui/library-toolbar.ui:208 data/ui/playlist-toolbar.ui:15
+#: data/ui/library-panel.ui:121 data/ui/playlist-panel.ui:14
 msgid "Select multiple albums"
 msgstr "Select multiple albums"
 
-#: data/ui/library-toolbar.ui:230
+#: data/ui/library-panel.ui:135
 msgid "Settings and actions"
 msgstr "Settings and actions"
 
-#: data/ui/playlist-panel.ui:70 data/ui/playlist-panel.ui:155
-msgid "remove"
-msgstr "remove"
+#: data/ui/library-panel.ui:160
+msgid "search library"
+msgstr "search library"
 
-#: data/ui/playlist-toolbar.ui:37 data/ui/shortcuts-dialog.ui:89
+#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107
+msgid "cancel"
+msgstr "cancel"
+
+#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327
+msgid "queue"
+msgstr "queue"
+
+#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163
+msgid "play"
+msgstr "play"
+
+#: data/ui/playlist-panel.ui:28 data/ui/shortcuts-dialog.ui:77
 msgid "Clear the playlist"
 msgstr "Clear the playlist"
 
-#: data/ui/server-panel.ui:69
-msgid "File:"
-msgstr "File:"
+#: data/ui/playlist-panel.ui:114 data/ui/playlist-panel.ui:170
+msgid "remove"
+msgstr "remove"
 
-#: data/ui/server-panel.ui:82
-msgid "Audio:"
-msgstr "Audio:"
-
-#: data/ui/server-panel.ui:95
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: data/ui/server-panel.ui:108
-msgid "Error:"
-msgstr "Error:"
-
-#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:136
-#: data/ui/server-panel.ui:152 data/ui/server-panel.ui:168
-msgid "<i>none</i>"
-msgstr "<i>none</i>"
-
-#: data/ui/server-panel.ui:221
+#: data/ui/server-panel.ui:35
 msgid "Status"
 msgstr "Status"
 
-#: data/ui/server-panel.ui:301
-msgid "Albums"
-msgstr "Albums"
+#: data/ui/server-panel.ui:49
+msgid "File:"
+msgstr "File:"
 
-#: data/ui/server-panel.ui:313
-msgid "Songs"
-msgstr "Songs"
+#: data/ui/server-panel.ui:60
+msgid "Audio:"
+msgstr "Audio:"
 
-#: data/ui/server-panel.ui:325
-msgid "Artists"
-msgstr "Artists"
+#: data/ui/server-panel.ui:71
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: data/ui/server-panel.ui:349
-msgid "Seconds"
-msgstr "Seconds"
+#: data/ui/server-panel.ui:82
+msgid "Error:"
+msgstr "Error:"
 
-#: data/ui/server-panel.ui:396
-msgid "Seconds played"
-msgstr "Seconds"
+#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106
+#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134
+msgid "<i>none</i>"
+msgstr "<i>none</i>"
 
-#: data/ui/server-panel.ui:407
-msgid "Seconds running"
-msgstr "Seconds running"
-
-#: data/ui/server-panel.ui:465
+#: data/ui/server-panel.ui:154
 msgid "Statistics"
 msgstr "Statistics"
 
-#: data/ui/server-panel.ui:535
+#: data/ui/server-panel.ui:178
+msgid "Artists"
+msgstr "Artists"
+
+#: data/ui/server-panel.ui:198
+msgid "Albums"
+msgstr "Albums"
+
+#: data/ui/server-panel.ui:218
+msgid "Songs"
+msgstr "Songs"
+
+#: data/ui/server-panel.ui:238
+msgid "Seconds"
+msgstr "Seconds"
+
+#: data/ui/server-panel.ui:267
+msgid "Seconds played"
+msgstr "Seconds"
+
+#: data/ui/server-panel.ui:287
+msgid "Seconds running"
+msgstr "Seconds running"
+
+#: data/ui/server-panel.ui:303
 msgid "Audio Devices"
 msgstr "Audio Devices"
 
-#: data/ui/shortcuts-dialog.ui:15
+#: data/ui/shortcuts-dialog.ui:14
 msgid "General"
 msgstr "General"
 
-#: data/ui/shortcuts-dialog.ui:20
+#: data/ui/shortcuts-dialog.ui:18
 msgid "Switch to the Connection panel"
 msgstr "Switch to the Connection panel"
 
-#: data/ui/shortcuts-dialog.ui:27
+#: data/ui/shortcuts-dialog.ui:24
 msgid "Switch to the Cover panel"
 msgstr "Switch to the Cover panel"
 
-#: data/ui/shortcuts-dialog.ui:34
+#: data/ui/shortcuts-dialog.ui:30
 msgid "Switch to the Playlist panel"
 msgstr "Switch to the Playlist panel"
 
-#: data/ui/shortcuts-dialog.ui:41
+#: data/ui/shortcuts-dialog.ui:36
 msgid "Switch to the Library panel"
 msgstr "Switch to the Cover panel"
 
-#: data/ui/shortcuts-dialog.ui:48
+#: data/ui/shortcuts-dialog.ui:42
 msgid "Show the keyboard shortcuts"
 msgstr "Show the keyboard shortcuts (this dialog)"
 
-#: data/ui/shortcuts-dialog.ui:55
+#: data/ui/shortcuts-dialog.ui:48
 msgid "Open the info dialog"
 msgstr "Open the info dialog"
 
-#: data/ui/shortcuts-dialog.ui:62
+#: data/ui/shortcuts-dialog.ui:54
 msgid "Quit the application"
 msgstr "Quit the application"
 
-#: data/ui/shortcuts-dialog.ui:70
+#: data/ui/shortcuts-dialog.ui:61
 msgid "Player"
 msgstr "Player"
 
-#: data/ui/shortcuts-dialog.ui:75 data/ui/window.ui:139
+#: data/ui/shortcuts-dialog.ui:65
 msgid "Connect or disconnect"
 msgstr "Connect or disconnect"
 
-#: data/ui/shortcuts-dialog.ui:82 data/ui/window.ui:161
+#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:25
 msgid "Switch between play and pause"
 msgstr "Switch between play and pause"
 
-#: data/ui/shortcuts-dialog.ui:97
+#: data/ui/shortcuts-dialog.ui:84
 msgid "Cover Panel"
 msgstr "Cover Panel"
 
-#: data/ui/shortcuts-dialog.ui:110
+#: data/ui/shortcuts-dialog.ui:95
 msgid "Library Panel"
 msgstr "Library Panel"
 
-#: data/ui/window.ui:108
-msgid "Connect to MPD"
-msgstr "Connect to MPD"
+#: src/connectionpanel.py:51
+msgid "use"
+msgstr "use"
 
-#: data/ui/window.ui:181
-msgid "Adjust the volume"
-msgstr "Adjust the volume"
-
-#: src/librarypanel.py:421
+#: src/librarypanel.py:291
 msgid "Loading albums"
 msgstr "Loading albums"
 
-#: src/librarypanel.py:521
+#: src/librarypanel.py:379
 msgid "Loading images"
 msgstr "Loading images"
 
@@ -374,10 +229,74 @@ msgstr "{} feat. {}"
 msgid "{}:{} minutes"
 msgstr "{}:{} minutes"
 
-#: src/window.py:112
+#: src/window.py:114
 msgid "Server"
 msgstr "Server"
 
+#: src/window.py:115
+msgid "Cover"
+msgstr "Cover"
+
+#: src/window.py:116
+msgid "Playlist"
+msgstr "Playlist"
+
+#: src/window.py:117
+msgid "Library"
+msgstr "Library"
+
+#, fuzzy
+#~ msgid "Connection state"
+#~ msgstr "Connection"
+
+#~ msgid "Title"
+#~ msgstr "Title"
+
+#~ msgid "Artist"
+#~ msgstr "Artist"
+
+#~ msgid "Enter hostname or IP address"
+#~ msgstr "Enter hostname or IP address"
+
+#~ msgid "Enter password or leave blank"
+#~ msgstr "Enter password or leave blank"
+
+#~ msgid "Connect"
+#~ msgstr "Connect"
+
+#~ msgid "Play"
+#~ msgstr "Play"
+
+#~ msgid "Clear Playlist"
+#~ msgstr "Clear Playlist"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Toggle fullscreen"
+
+#~ msgid "Search Library"
+#~ msgstr "Search Library"
+
+#~ msgid "Connection"
+#~ msgstr "Connection"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Keyboard Shortcuts"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Quit"
+#~ msgstr "Quit"
+
+#~ msgid "CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks."
+#~ msgstr "CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks."
+
+#~ msgid "Connect to MPD"
+#~ msgstr "Connect to MPD"
+
+#~ msgid "Adjust the volume"
+#~ msgstr "Adjust the volume"
+
 #~ msgid "Enter URL or local path"
 #~ msgstr "Enter URL or local path"
 
diff --git a/po/mcg.pot b/po/mcg.pot
index c409fd6..451e0a8 100644
--- a/po/mcg.pot
+++ b/po/mcg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mcg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-08 19:06+0100\n"
+"POT-Creation-Date: 2024-05-22 14:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,350 +17,208 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/xyz.suruatoel.mcg.gschema.xml:11
-msgid "MPD host"
+#: data/ui/connection-panel.ui:29
+msgid "No service found"
 msgstr ""
 
-#: data/xyz.suruatoel.mcg.gschema.xml:12
-msgid "MPD host to connect to"
+#: data/ui/connection-panel.ui:43
+msgid "Host"
 msgstr ""
 
-#: data/xyz.suruatoel.mcg.gschema.xml:16
-msgid "MPD port"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:17
-msgid "MPD port to connect to"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:21
-msgid "Connection state"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:22
-msgid "State of last connection"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:26
-msgid "Window width"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:27
-msgid "The window width in pixels."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:31
-msgid "Window height"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:32
-msgid "The window height in pixels."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:36
-msgid "Window maximized"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:37
-msgid "Whether or not the window is in maximized state."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:42
-msgid "Last selected panel"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:43
-msgid "The index of the last selected panel."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:48
-msgid "Size of library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:49
-msgid "The size of items displayed in the library."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:53
-msgid "Sort criterium for library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:54
-msgid "The sort criterium of items displayed in the library."
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:58
-msgid "Sort type for library items"
-msgstr ""
-
-#: data/xyz.suruatoel.mcg.gschema.xml:59
-msgid "The sort type of items displayed in the library."
-msgstr ""
-
-#: data/ui/album-headerbar.ui:17
-msgid "Title"
-msgstr ""
-
-#: data/ui/album-headerbar.ui:34
-msgid "Artist"
+#: data/ui/connection-panel.ui:56
+msgid "Port"
 msgstr ""
 
 #: data/ui/connection-panel.ui:76
-msgid "Enter hostname or IP address"
+msgid "Password"
 msgstr ""
 
-#: data/ui/connection-panel.ui:89
-msgid "Enter password or leave blank"
-msgstr ""
-
-#: data/ui/connection-panel.ui:118
-msgid "Host:"
-msgstr ""
-
-#: data/ui/connection-panel.ui:130
-msgid "Port:"
-msgstr ""
-
-#: data/ui/connection-panel.ui:142
-msgid "Password:"
-msgstr ""
-
-#: data/ui/cover-toolbar.ui:15 data/ui/shortcuts-dialog.ui:102
+#: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88
 msgid "Show the cover in fullscreen mode"
 msgstr ""
 
-#: data/ui/gtk.menu.ui:7
-msgid "Connect"
+#: data/ui/library-panel.ui:34
+msgid "update library"
 msgstr ""
 
-#: data/ui/gtk.menu.ui:12
-msgid "Play"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:17
-msgid "Clear Playlist"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:22
-msgid "Toggle Fullscreen"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:27
-msgid "Search Library"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:34
-msgid "Connection"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:40 src/window.py:113
-msgid "Cover"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:46 src/window.py:114
-msgid "Playlist"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:52 src/window.py:115
-msgid "Library"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:60
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:65
-msgid "Info"
-msgstr ""
-
-#: data/ui/gtk.menu.ui:70
-msgid "Quit"
-msgstr ""
-
-#: data/ui/info-dialog.ui:14
-msgid ""
-"CoverGrid is a client for the Music Player Daemon, focusing on albums "
-"instead of single tracks."
-msgstr ""
-
-#: data/ui/library-panel.ui:27
-msgid "search library"
-msgstr ""
-
-#: data/ui/library-panel.ui:166 data/ui/playlist-panel.ui:57
-msgid "cancel"
-msgstr ""
-
-#: data/ui/library-panel.ui:179 data/ui/library-panel.ui:264
-msgid "queue"
-msgstr ""
-
-#: data/ui/library-panel.ui:277 data/ui/playlist-panel.ui:168
-msgid "play"
-msgstr ""
-
-#: data/ui/library-toolbar.ui:76
+#: data/ui/library-panel.ui:48
 msgid "Sort"
 msgstr ""
 
-#: data/ui/library-toolbar.ui:86
+#: data/ui/library-panel.ui:53
 msgid "sort by artist"
 msgstr ""
 
-#: data/ui/library-toolbar.ui:102
+#: data/ui/library-panel.ui:61
 msgid "sort by title"
 msgstr ""
 
-#: data/ui/library-toolbar.ui:118
+#: data/ui/library-panel.ui:69
 msgid "sort by year"
 msgstr ""
 
-#: data/ui/library-toolbar.ui:134
+#: data/ui/library-panel.ui:76
 msgid "sort by modification"
 msgstr ""
 
-#: data/ui/library-toolbar.ui:185 data/ui/shortcuts-dialog.ui:115
+#: data/ui/library-panel.ui:84
+msgid "sort library descending"
+msgstr ""
+
+#: data/ui/library-panel.ui:105 data/ui/shortcuts-dialog.ui:99
 msgid "Search the library"
 msgstr ""
 
-#: data/ui/library-toolbar.ui:208 data/ui/playlist-toolbar.ui:15
+#: data/ui/library-panel.ui:121 data/ui/playlist-panel.ui:14
 msgid "Select multiple albums"
 msgstr ""
 
-#: data/ui/library-toolbar.ui:230
+#: data/ui/library-panel.ui:135
 msgid "Settings and actions"
 msgstr ""
 
-#: data/ui/playlist-panel.ui:70 data/ui/playlist-panel.ui:155
-msgid "remove"
+#: data/ui/library-panel.ui:160
+msgid "search library"
 msgstr ""
 
-#: data/ui/playlist-toolbar.ui:37 data/ui/shortcuts-dialog.ui:89
+#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107
+msgid "cancel"
+msgstr ""
+
+#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327
+msgid "queue"
+msgstr ""
+
+#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163
+msgid "play"
+msgstr ""
+
+#: data/ui/playlist-panel.ui:28 data/ui/shortcuts-dialog.ui:77
 msgid "Clear the playlist"
 msgstr ""
 
-#: data/ui/server-panel.ui:69
-msgid "File:"
+#: data/ui/playlist-panel.ui:114 data/ui/playlist-panel.ui:170
+msgid "remove"
 msgstr ""
 
-#: data/ui/server-panel.ui:82
-msgid "Audio:"
-msgstr ""
-
-#: data/ui/server-panel.ui:95
-msgid "Bitrate:"
-msgstr ""
-
-#: data/ui/server-panel.ui:108
-msgid "Error:"
-msgstr ""
-
-#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:136
-#: data/ui/server-panel.ui:152 data/ui/server-panel.ui:168
-msgid "<i>none</i>"
-msgstr ""
-
-#: data/ui/server-panel.ui:221
+#: data/ui/server-panel.ui:35
 msgid "Status"
 msgstr ""
 
-#: data/ui/server-panel.ui:301
-msgid "Albums"
+#: data/ui/server-panel.ui:49
+msgid "File:"
 msgstr ""
 
-#: data/ui/server-panel.ui:313
-msgid "Songs"
+#: data/ui/server-panel.ui:60
+msgid "Audio:"
 msgstr ""
 
-#: data/ui/server-panel.ui:325
-msgid "Artists"
+#: data/ui/server-panel.ui:71
+msgid "Bitrate:"
 msgstr ""
 
-#: data/ui/server-panel.ui:349
-msgid "Seconds"
+#: data/ui/server-panel.ui:82
+msgid "Error:"
 msgstr ""
 
-#: data/ui/server-panel.ui:396
-msgid "Seconds played"
+#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106
+#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134
+msgid "<i>none</i>"
 msgstr ""
 
-#: data/ui/server-panel.ui:407
-msgid "Seconds running"
-msgstr ""
-
-#: data/ui/server-panel.ui:465
+#: data/ui/server-panel.ui:154
 msgid "Statistics"
 msgstr ""
 
-#: data/ui/server-panel.ui:535
+#: data/ui/server-panel.ui:178
+msgid "Artists"
+msgstr ""
+
+#: data/ui/server-panel.ui:198
+msgid "Albums"
+msgstr ""
+
+#: data/ui/server-panel.ui:218
+msgid "Songs"
+msgstr ""
+
+#: data/ui/server-panel.ui:238
+msgid "Seconds"
+msgstr ""
+
+#: data/ui/server-panel.ui:267
+msgid "Seconds played"
+msgstr ""
+
+#: data/ui/server-panel.ui:287
+msgid "Seconds running"
+msgstr ""
+
+#: data/ui/server-panel.ui:303
 msgid "Audio Devices"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:15
+#: data/ui/shortcuts-dialog.ui:14
 msgid "General"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:20
+#: data/ui/shortcuts-dialog.ui:18
 msgid "Switch to the Connection panel"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:27
+#: data/ui/shortcuts-dialog.ui:24
 msgid "Switch to the Cover panel"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:34
+#: data/ui/shortcuts-dialog.ui:30
 msgid "Switch to the Playlist panel"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:41
+#: data/ui/shortcuts-dialog.ui:36
 msgid "Switch to the Library panel"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:48
+#: data/ui/shortcuts-dialog.ui:42
 msgid "Show the keyboard shortcuts"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:55
+#: data/ui/shortcuts-dialog.ui:48
 msgid "Open the info dialog"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:62
+#: data/ui/shortcuts-dialog.ui:54
 msgid "Quit the application"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:70
+#: data/ui/shortcuts-dialog.ui:61
 msgid "Player"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:75 data/ui/window.ui:139
+#: data/ui/shortcuts-dialog.ui:65
 msgid "Connect or disconnect"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:82 data/ui/window.ui:161
+#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:25
 msgid "Switch between play and pause"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:97
+#: data/ui/shortcuts-dialog.ui:84
 msgid "Cover Panel"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:110
+#: data/ui/shortcuts-dialog.ui:95
 msgid "Library Panel"
 msgstr ""
 
-#: data/ui/window.ui:108
-msgid "Connect to MPD"
+#: src/connectionpanel.py:51
+msgid "use"
 msgstr ""
 
-#: data/ui/window.ui:181
-msgid "Adjust the volume"
-msgstr ""
-
-#: src/librarypanel.py:421
+#: src/librarypanel.py:291
 msgid "Loading albums"
 msgstr ""
 
-#: src/librarypanel.py:521
+#: src/librarypanel.py:379
 msgid "Loading images"
 msgstr ""
 
@@ -372,6 +230,18 @@ msgstr ""
 msgid "{}:{} minutes"
 msgstr ""
 
-#: src/window.py:112
+#: src/window.py:114
 msgid "Server"
 msgstr ""
+
+#: src/window.py:115
+msgid "Cover"
+msgstr ""
+
+#: src/window.py:116
+msgid "Playlist"
+msgstr ""
+
+#: src/window.py:117
+msgid "Library"
+msgstr ""
diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py
index 1c3e892..ab6607a 100644
--- a/src/albumheaderbar.py
+++ b/src/albumheaderbar.py
@@ -2,15 +2,16 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 
-from gi.repository import Gtk, GObject
+from gi.repository import Gtk, GObject, Adw
 
 
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/album-headerbar.ui')
-class AlbumHeaderbar(Gtk.HeaderBar):
+class AlbumHeaderbar(Adw.Bin):
     __gtype_name__ = 'McgAlbumHeaderbar'
     __gsignals__ = {
         'close': (GObject.SIGNAL_RUN_FIRST, None, ())
diff --git a/src/application.py b/src/application.py
index c9f18e6..7bbde2b 100644
--- a/src/application.py
+++ b/src/application.py
@@ -5,11 +5,11 @@ import logging
 import urllib
 
 import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gio, Gtk, Gdk, GLib
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
+from gi.repository import Gio, Gtk, Gdk, GLib, Adw
 
 from .window import Window
-from .infodialog import InfoDialog
 
 
 
@@ -25,9 +25,18 @@ class Application(Gtk.Application):
         self._window = None
         self._info_dialog = None
         self._verbosity = logging.WARNING
-        #self.create_action('quit', self.quit, ['<primary>q'])
-        #self.create_action('about', self.on_about_action)
-        #self.create_action('preferences', self.on_preferences_action)
+        self.set_accels_for_action('window.close', ['<primary>q'])
+        self.set_accels_for_action('win.show-help-overlay', ['<primary>k'])
+        self.set_accels_for_action('app.info', ['<primary>i'])
+        self.set_accels_for_action('win.connect', ['<primary>c'])
+        self.set_accels_for_action('win.play', ['<primary>p'])
+        self.set_accels_for_action('win.clear-playlist', ['<primary>r'])
+        self.set_accels_for_action('win.toggle-fullscreen', ['F11'])
+        self.set_accels_for_action('win.search-library', ['<primary>f'])
+        self.set_accels_for_action('win.panel("0")', ['<primary>KP_1'])
+        self.set_accels_for_action('win.panel("1")', ['<primary>KP_2'])
+        self.set_accels_for_action('win.panel("2")', ['<primary>KP_3'])
+        self.set_accels_for_action('win.panel("3")', ['<primary>KP_4'])
 
 
     def do_startup(self):
@@ -37,7 +46,7 @@ class Application(Gtk.Application):
         self._set_default_settings()
         self._load_css()
         self._setup_actions()
-        self._load_appmenu()
+        self._setup_adw()
 
 
     def do_activate(self):
@@ -48,10 +57,15 @@ class Application(Gtk.Application):
 
 
     def on_menu_info(self, action, value):
-        if not self._info_dialog:
-            self._info_dialog = InfoDialog()
-        self._info_dialog.run()
-        self._info_dialog.hide()
+        self._info_dialog = Adw.AboutDialog()
+        self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
+        self._info_dialog.set_application_name("CoverGrid")
+        self._info_dialog.set_version("3.2.1")
+        self._info_dialog.set_comments("CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.")
+        self._info_dialog.set_website("https://www.suruatoel.xyz/codes/mcg")
+        self._info_dialog.set_license_type(Gtk.License.GPL_3_0)
+        self._info_dialog.set_issue_url("https://git.suruatoel.xyz/coderkun/mcg")
+        self._info_dialog.present()
 
 
     def on_menu_quit(self, action, value):
@@ -70,15 +84,15 @@ class Application(Gtk.Application):
 
 
     def _set_default_settings(self):
-        settings = Gtk.Settings.get_default()
-        settings.set_property('gtk-application-prefer-dark-theme', True)
+        style_manager = Adw.StyleManager.get_default()
+        style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK)
 
 
     def _load_css(self):
         styleProvider = Gtk.CssProvider()
         styleProvider.load_from_resource(self._get_resource_path('gtk.css'))
-        Gtk.StyleContext.add_provider_for_screen(
-            Gdk.Screen.get_default(),
+        Gtk.StyleContext.add_provider_for_display(
+            Gdk.Display.get_default(),
             styleProvider,
             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
         )
@@ -93,12 +107,18 @@ class Application(Gtk.Application):
         self.add_action(action)
 
 
-    def _load_appmenu(self):
-        builder = Gtk.Builder()
-        builder.set_translation_domain(Application.DOMAIN)
-        builder.add_from_resource(self._get_resource_path('ui/gtk.menu.ui'))
-        self.set_app_menu(builder.get_object('app-menu'))
-
-
     def _get_resource_path(self, path):
         return "/{}/{}".format(Application.ID.replace('.', '/'), path)
+
+
+    def _setup_adw(self):
+        Adw.HeaderBar()
+        Adw.ToolbarView()
+        Adw.ViewSwitcherTitle()
+        Adw.ViewSwitcherBar()
+        Adw.ViewStackPage()
+        Adw.ToastOverlay()
+        Adw.StatusPage()
+        Adw.Flap()
+        Adw.EntryRow()
+        Adw.PasswordEntryRow()
diff --git a/src/client.py b/src/client.py
index 5cc0b11..551f524 100644
--- a/src/client.py
+++ b/src/client.py
@@ -143,8 +143,6 @@ class Client(Base):
     SIGNAL_LOAD_OUTPUT_DEVICES = 'load-output-devices'
     # Signal: load albumart
     SIGNAL_LOAD_ALBUMART = 'albumart'
-    # Signal: custom (dummy) event to trigger callback
-    SIGNAL_CUSTOM = 'custom'
     # Signal: error
     SIGNAL_ERROR = 'error'
     # Buffer size for reading from socket
@@ -319,11 +317,6 @@ class Client(Base):
         return albumart
 
 
-    def get_custom(self, name):
-        self._logger.info("get custom \"%s\"", name)
-        self._add_action_signal(Client.SIGNAL_CUSTOM, self._get_custom, name)
-
-
     # Private methods
 
     def _connect(self, host, port, password):
@@ -671,10 +664,6 @@ class Client(Base):
         return (album, None)
 
 
-    def _get_custom(self, name):
-        return (name, )
-
-
     def _start_worker(self):
         """Start the worker thread which waits for action to be performed."""
         self._logger.debug("start worker")
@@ -1121,7 +1110,7 @@ class MCGAlbum:
         return True
 
 
-    def compare(album1, album2, criterion=None):
+    def compare(album1, album2, criterion=None, reverse=False):
         if criterion == None:
             criterion = SortOrder.TITLE
         if criterion == SortOrder.ARTIST:
@@ -1133,20 +1122,22 @@ class MCGAlbum:
         elif criterion == SortOrder.MODIFIED:
             value_function = "get_last_modified"
 
+        reverseMultiplier = -1 if reverse else 1
+
         value1 = getattr(album1, value_function)()
         value2 = getattr(album2, value_function)()
         if value1 is None and value2 is None:
             return 0
         elif value1 is None:
-            return -1
+            return -1 * reverseMultiplier
         elif value2 is None:
-            return 1
+            return 1 * reverseMultiplier
         if value1 < value2:
-            return -1
+            return -1 * reverseMultiplier
         elif value1 == value2:
             return 0
         else:
-            return 1
+            return 1 * reverseMultiplier
 
 
 
diff --git a/src/connectionpanel.py b/src/connectionpanel.py
index 1ba5f7e..5cfd4ad 100644
--- a/src/connectionpanel.py
+++ b/src/connectionpanel.py
@@ -2,9 +2,11 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
+import locale
 
-from gi.repository import Gtk, GObject
+from gi.repository import Gtk, Gio, GObject, Adw
 
 from mcg.zeroconf import ZeroconfProvider
 
@@ -12,29 +14,22 @@ from mcg.zeroconf import ZeroconfProvider
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui')
-class ConnectionPanel(Gtk.Box):
+class ConnectionPanel(Adw.Bin):
     __gtype_name__ = 'McgConnectionPanel'
     __gsignals__ = {
         'connection-changed': (GObject.SIGNAL_RUN_FIRST, None, (str, int, str))
     }
 
     # Widgets
+    toolbar = Gtk.Template.Child()
     zeroconf_list = Gtk.Template.Child()
-    host_entry = Gtk.Template.Child()
+    host_row = Gtk.Template.Child()
     port_spinner = Gtk.Template.Child()
-    password_entry = Gtk.Template.Child()
+    password_row = Gtk.Template.Child()
 
 
-    def __init__(self):
-        super().__init__()
-        self._services = Gtk.ListStore(str, str, int)
-        self._profile = None
-
-        # Zeroconf
-        self.zeroconf_list.set_model(self._services)
-        renderer = Gtk.CellRendererText()
-        column = Gtk.TreeViewColumn("Zeroconf", renderer, text=0)
-        self.zeroconf_list.append_column(column)
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
 
         # Zeroconf provider
         self._zeroconf_provider = ZeroconfProvider()
@@ -43,25 +38,26 @@ class ConnectionPanel(Gtk.Box):
 
     def on_new_service(self, service):
         name, host, port = service
-        self._services.append([name, host, port])
+
+        row_button = Gtk.Button()
+        row_button.set_label(locale.gettext("use"))
+        row_button.connect("clicked", self.on_service_selected, host, port)
+
+        row = Adw.ActionRow()
+        row.set_title(name)
+        row.set_subtitle("{} ({})".format(host, port))
+        row.add_suffix(row_button)
+
+        self.zeroconf_list.insert(row, -1)
+
+
+    def on_service_selected(self, widget, host, port):
+        self.set_host(host)
+        self.set_port(port)
 
 
     @Gtk.Template.Callback()
-    def on_service_selected(self, selection):
-        model, treeiter = selection.get_selected()
-        if treeiter != None:
-            service = model[treeiter]
-            self.set_host(service[1])
-            self.set_port(service[2])
-
-
-    @Gtk.Template.Callback()
-    def on_zeroconf_list_outfocused(self, widget, event):
-        self.zeroconf_list.get_selection().unselect_all()
-
-
-    @Gtk.Template.Callback()
-    def on_host_entry_outfocused(self, widget, event):
+    def on_host_entry_apply(self, widget):
         self._call_back()
 
 
@@ -70,17 +66,12 @@ class ConnectionPanel(Gtk.Box):
         self._call_back()
 
 
-    @Gtk.Template.Callback()
-    def on_password_entry_outfocused(self, widget, event):
-        self._call_back()
-
-
     def set_host(self, host):
-        self.host_entry.set_text(host)
+        self.host_row.set_text(host)
 
 
     def get_host(self):
-        return self.host_entry.get_text()
+        return self.host_row.get_text()
 
 
     def set_port(self, port):
@@ -94,11 +85,11 @@ class ConnectionPanel(Gtk.Box):
     def set_password(self, password):
         if password is None:
             password = ""
-        self.password_entry.set_text(password)
+        self.password_row.set_text(password)
 
 
     def get_password(self):
-        if self.password_entry.get_text() == "":
+        if self.password_row.get_text() == "":
             return None
         else:
             return self.password_entry.get_text()
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 102b69c..59c75a3 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -2,7 +2,7 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
 import logging
 import math
 
@@ -13,27 +13,6 @@ from mcg.utils import Utils
 
 
 
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-toolbar.ui')
-class CoverToolbar(Gtk.ButtonBox):
-    __gtype_name__ = 'McgCoverToolbar'
-    __gsignals__ = {
-        'fullscreen': (GObject.SIGNAL_RUN_FIRST, None, ())
-    }
-
-    # Widgets
-    fullscreen_button = Gtk.Template.Child()
-
-
-    def __init__(self):
-        super().__init__()
-
-
-    def set_fullscreen_sensitive(self, sensitive):
-        self.fullscreen_button.set_sensitive(sensitive)
-
-
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-panel.ui')
 class CoverPanel(Gtk.Overlay):
     __gtype_name__ = 'McgCoverPanel'
@@ -44,9 +23,13 @@ class CoverPanel(Gtk.Overlay):
     }
 
     # Widgets
+    # Toolbar
+    toolbar = Gtk.Template.Child()
+    fullscreen_button = Gtk.Template.Child()
     # Cover
     cover_stack = Gtk.Template.Child()
     cover_spinner = Gtk.Template.Child()
+    cover_default = Gtk.Template.Child()
     cover_scroll = Gtk.Template.Child()
     cover_box = Gtk.Template.Child()
     cover_image = Gtk.Template.Child()
@@ -61,57 +44,57 @@ class CoverPanel(Gtk.Overlay):
 
 
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
 
         self._current_album = None
         self._current_cover_album = None
         self._cover_pixbuf = None
         self._timer = None
         self._properties = {}
-        self._icon_theme = Gtk.IconTheme.get_default()
+        self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
         self._fullscreened = False
-        self._is_selected = False
         self._current_size = None
-        self._cover_pixbuf = self._get_default_image()
-
-        # Widgets
-        self._toolbar = CoverToolbar()
-        self.cover_stack.set_visible_child(self.cover_scroll)
 
         # Initial actions
         GObject.idle_add(self._enable_tracklist)
 
+        # Click handler for image
+        clickController = Gtk.GestureClick()
+        clickController.connect('pressed', self.on_cover_box_pressed)
+        self.cover_box.add_controller(clickController)
+
+        # Button controller for songs scale
+        buttonController = Gtk.GestureClick()
+        buttonController.connect('pressed', self.on_songs_scale_pressed)
+        buttonController.connect('unpaired-release', self.on_songs_scale_released)
+        self.songs_scale.add_controller(buttonController)
+
 
     def get_toolbar(self):
-        return self._toolbar
+        return self.toolbar
 
 
     def set_selected(self, selected):
-        self._is_selected = selected
+        pass
 
 
-    @Gtk.Template.Callback()
-    def on_cover_box_pressed(self, widget, event):
-        if self._current_album and event.type == Gdk.EventType._2BUTTON_PRESS:
+    def on_cover_box_pressed(self, widget, npress, x, y):
+        if self._current_album and npress == 2:
             self.emit('toggle-fullscreen')
 
 
-    @Gtk.Template.Callback()
-    def on_cover_size_allocate(self, widget, allocation):
+    def set_width(self, width):
         GObject.idle_add(self._resize_image)
-        self.cover_info_scroll.set_max_content_width(allocation.width // 2)
+        self.cover_info_scroll.set_max_content_width(width // 2)
 
 
-    @Gtk.Template.Callback()
-    def on_songs_start_change(self, widget, event):
+    def on_songs_scale_pressed(self, widget, npress, x, y):
         if self._timer:
             GObject.source_remove(self._timer)
             self._timer = None
 
-
-    @Gtk.Template.Callback()
-    def on_songs_change(self, widget, event):
+    def on_songs_scale_released(self, widget, x, y, npress, sequence):
         value = int(self.songs_scale.get_value())
         time = self._current_album.get_length()
         tracks = self._current_album.get_tracks()
@@ -144,7 +127,7 @@ class CoverPanel(Gtk.Overlay):
         # Set current album
         self._current_album = album
         self._enable_tracklist()
-        self._toolbar.set_fullscreen_sensitive(self._current_album is not None)
+        self.fullscreen_button.set_sensitive(self._current_album is not None)
 
 
     def set_play(self, pos, time):
@@ -168,13 +151,12 @@ class CoverPanel(Gtk.Overlay):
     def set_fullscreen(self, active):
         if active:
             self.info_revealer.set_reveal_child(False)
-            self.cover_box.override_background_color(Gtk.StateFlags.NORMAL, Gdk.RGBA(0, 0, 0, 1))
             GObject.idle_add(self._resize_image)
             self._fullscreened = True
         else:
             self._fullscreened = False
-            self.info_revealer.set_reveal_child(True)
-            self.cover_box.override_background_color(Gtk.StateFlags.NORMAL, Gdk.RGBA(0, 0, 0, 0))
+            if self._current_album:
+                self.info_revealer.set_reveal_child(True)
             GObject.idle_add(self._resize_image)
 
 
@@ -186,10 +168,10 @@ class CoverPanel(Gtk.Overlay):
                     self._cover_pixbuf = Utils.load_pixbuf(data)
                 except Exception as e:
                     self._logger.exception("Failed to set albumart")
-                    self._cover_pixbuf = self._get_default_image()
+                    self._cover_pixbuf = None
             else:
                 # Reset image
-                self._cover_pixbuf = self._get_default_image()
+                self._cover_pixbuf = None
             self._current_size = None
             self._current_cover_album = album
             # Show image
@@ -222,7 +204,8 @@ class CoverPanel(Gtk.Overlay):
     def _enable_tracklist(self):
         if self._current_album:
             # enable
-            self.info_revealer.set_reveal_child(True)
+            if not self._fullscreened:
+                self.info_revealer.set_reveal_child(True)
         else:
             # disable
             self.info_revealer.set_reveal_child(False)
@@ -236,8 +219,11 @@ class CoverPanel(Gtk.Overlay):
 
 
     def _show_image(self):
-        self._resize_image()
-        self.cover_stack.set_visible_child(self.cover_scroll)
+        if self._cover_pixbuf:
+            self._resize_image()
+            self.cover_stack.set_visible_child(self.cover_scroll)
+        else:
+            self.cover_stack.set_visible_child(self.cover_default)
         self.cover_spinner.stop()
 
 
@@ -246,11 +232,14 @@ class CoverPanel(Gtk.Overlay):
         auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
         """
         # Get size
-        size = self.cover_scroll.get_allocation()
+        size_width = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL)
+        size_height = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL)
         # Abort if size is the same
-        if self._current_size and size.width == self._current_size.width and size.height == self._current_size.height:
-            return
-        self._current_size = size
+        if self._current_size:
+            current_width, current_height = self._current_size
+            if size_width == current_width and size_height == current_height:
+                return
+        self._current_size = (size_width, size_height,)
 
         # Get pixelbuffer
         pixbuf = self._cover_pixbuf
@@ -259,8 +248,8 @@ class CoverPanel(Gtk.Overlay):
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
-        ratioW = float(size.width) / float(pixbuf.get_width())
-        ratioH = float(size.height) / float(pixbuf.get_height())
+        ratioW = float(size_width) / float(pixbuf.get_width())
+        ratioH = float(size_height) / float(pixbuf.get_height())
         # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
         ratio = min(ratioW, ratioH)
         ratio = min(ratio, 1)
@@ -269,15 +258,5 @@ class CoverPanel(Gtk.Overlay):
         height = int(math.floor(pixbuf.get_height()*ratio))
         if width <= 0 or height <= 0:
             return
-        # Pixelpuffer auf Oberfläche zeichnen
-        self.cover_image.set_allocation(self.cover_scroll.get_allocation())
         self.cover_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.cover_image.show()
-
-
-    def _get_default_image(self):
-        return self._icon_theme.load_icon(
-            Utils.STOCK_ICON_DEFAULT,
-            512,
-            Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE
-        )
diff --git a/src/infodialog.py b/src/infodialog.py
deleted file mode 100644
index f6421e6..0000000
--- a/src/infodialog.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-
-import gi
-gi.require_version('Gtk', '3.0')
-import logging
-
-from gi.repository import Gtk, GdkPixbuf
-
-
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/info-dialog.ui')
-class InfoDialog(Gtk.AboutDialog):
-    __gtype_name__ = 'McgInfoDialog'
diff --git a/src/librarypanel.py b/src/librarypanel.py
index 938d0fe..aee5fcc 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -2,135 +2,27 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 import locale
 import logging
 import math
 import threading
 
-from gi.repository import Gtk, GObject, GdkPixbuf
+from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw
 
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
 from mcg.utils import SortOrder
 from mcg.utils import Utils
-
-
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-toolbar.ui')
-class LibraryToolbar(Gtk.ButtonBox):
-    __gtype_name__ = 'McgLibraryToolbar'
-    __gsignals__ = {
-        'select': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
-        'toggle-search': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
-        'update': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'start-scale': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
-        'end-scale': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
-        'sort': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
-        'sort-type': (GObject.SIGNAL_RUN_FIRST, None, (Gtk.SortType,))
-    }
-
-    # Widgets
-    select_button = Gtk.Template.Child()
-    toolbar_search_bar = Gtk.Template.Child()
-    toolbar_popover = Gtk.Template.Child()
-    toolbar_sort_order_button = Gtk.Template.Child()
-    sort_artist = Gtk.Template.Child()
-    sort_title = Gtk.Template.Child()
-    sort_year = Gtk.Template.Child()
-    sort_modified = Gtk.Template.Child()
-    grid_scale = Gtk.Template.Child()
-
-
-    def __init__(self, item_size):
-        super().__init__()
-
-        # Toolbar menu
-        self.grid_scale.set_value(item_size)
-        self._toolbar_sort_buttons = {
-            SortOrder.ARTIST: self.sort_artist,
-            SortOrder.TITLE: self.sort_title,
-            SortOrder.YEAR: self.sort_year,
-            SortOrder.MODIFIED: self.sort_modified
-        }
-
-
-    @Gtk.Template.Callback()
-    def on_select_toggled(self, widget):
-        self.emit('select', widget.get_active())
-
-
-    @Gtk.Template.Callback()
-    def on_search_toggled(self, widget):
-        self.emit('toggle-search', widget.get_active())
-
-
-    @Gtk.Template.Callback()
-    def on_update_clicked(self, widget):
-        self.emit('update')
-
-
-    @Gtk.Template.Callback()
-    def on_grid_scale_change(self, widget, scroll, value):
-        self.emit('start-scale', value)
-
-
-    @Gtk.Template.Callback()
-    def on_grid_scale_changed(self, widget, event):
-        self.emit('end-scale', self.grid_scale.get_value())
-        self.toolbar_popover.popdown()
-
-
-    @Gtk.Template.Callback()
-    def on_sort_toggled(self, widget):
-        if widget.get_active():
-            sort = [key for key, value in self._toolbar_sort_buttons.items() if value is widget][0]
-            self.emit('sort', sort)
-
-
-    @Gtk.Template.Callback()
-    def on_sort_order_toggled(self, button):
-        if button.get_active():
-            sort_type = Gtk.SortType.DESCENDING
-        else:
-            sort_type = Gtk.SortType.ASCENDING
-        self.emit('sort-type', sort_type)
-
-
-    def get_grid_scale(self):
-        return self.grid_scale
-
-
-    def is_search_active(self):
-        return self.toolbar_search_bar.get_active()
-
-
-    def set_search_active(self, active):
-        self.toolbar_search_bar.set_active(active)
-
-
-    def exit_selection(self):
-        self.select_button.set_active(False)
-
-
-    def set_sort_order(self, sort):
-        button = self._toolbar_sort_buttons[sort]
-        if button and not button.get_active():
-            button.set_active(True)
-
-
-    def set_sort_type(self, sort_type):
-        if sort_type:
-            self.toolbar_sort_order_button.set_active(True)
-        else:
-            self.toolbar_sort_order_button.set_active(False)
+from mcg.utils import GridItem
+from mcg.utils import SearchFilter
 
 
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui')
-class LibraryPanel(Gtk.Stack):
+class LibraryPanel(Adw.Bin):
     __gtype_name__ = 'McgLibraryPanel'
     __gsignals__ = {
         'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
@@ -141,14 +33,27 @@ class LibraryPanel(Gtk.Stack):
         'queue-multiple': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
         'item-size-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
         'sort-order-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
-        'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (Gtk.SortType,)),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,))
+        'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
+        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
     }
 
 
     # Widgets
+    library_stack = Gtk.Template.Child()
+    panel_normal = Gtk.Template.Child()
     panel_standalone = Gtk.Template.Child()
     actionbar_revealer = Gtk.Template.Child()
+    # Toolbar
+    toolbar = Gtk.Template.Child()
+    select_button = Gtk.Template.Child()
+    toolbar_search_bar = Gtk.Template.Child()
+    toolbar_popover = Gtk.Template.Child()
+    toolbar_sort_order_button = Gtk.Template.Child()
+    sort_artist = Gtk.Template.Child()
+    sort_title = Gtk.Template.Child()
+    sort_year = Gtk.Template.Child()
+    sort_modified = Gtk.Template.Child()
+    grid_scale = Gtk.Template.Child()
     # Filter/search bar
     filter_bar = Gtk.Template.Child()
     filter_entry = Gtk.Template.Child()
@@ -160,6 +65,9 @@ class LibraryPanel(Gtk.Stack):
     scroll = Gtk.Template.Child()
     # Library Grid
     library_grid = Gtk.Template.Child()
+    # Action bar (normal)
+    actionbar = Gtk.Template.Child()
+    actionbar_standalone = Gtk.Template.Child()
     # Standalone Image
     standalone_stack = Gtk.Template.Child()
     standalone_spinner = Gtk.Template.Child()
@@ -167,52 +75,51 @@ class LibraryPanel(Gtk.Stack):
     standalone_image = Gtk.Template.Child()
 
 
-    def __init__(self, client):
-        super().__init__()
+    def __init__(self, client, **kwargs):
+        super().__init__(**kwargs)
         self._logger = logging.getLogger(__name__)
         self._client = client
         self._buttons = {}
         self._albums = None
         self._host = "localhost"
-        self._filter_string = ""
         self._item_size = 150
         self._sort_order = SortOrder.YEAR
         self._sort_type = Gtk.SortType.DESCENDING
         self._grid_pixbufs = {}
+        self._grid_width = 0
         self._old_ranges = {}
         self._library_lock = threading.Lock()
         self._library_stop = threading.Event()
-        self._icon_theme = Gtk.IconTheme.get_default()
+        self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
         self._standalone_pixbuf = None
         self._selected_albums = []
-        self._allocation = (0, 0)
         self._is_selected = False
 
         # Widgets
-        self._toolbar = LibraryToolbar(self._item_size)
-        self._toolbar.connect('select', self.on_toolbar_select)
-        self._toolbar.connect('toggle-search', self.on_toolbar_toggle_search)
-        self._toolbar.connect('update', self.on_toolbar_update)
-        self._toolbar.connect('start-scale', self.on_toolbar_scale)
-        self._toolbar.connect('end-scale', self.on_toolbar_scaled)
-        self._toolbar.connect('sort', self.on_toolbar_sort)
-        self._toolbar.connect('sort-type', self.on_toolbar_sort_type)
         # Header bar
         self._headerbar_standalone = AlbumHeaderbar()
         self._headerbar_standalone.connect('close', self.on_standalone_close_clicked)
-        # Progress Bar
-        self.progress_image.set_from_pixbuf(self._get_default_image())
         # Library Grid: Model
-        self._library_grid_model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str)
-        self._library_grid_model.set_sort_func(2, self.compare_albums, self._sort_order)
-        self._library_grid_model.set_sort_column_id(2, self._sort_type)
-        self._library_grid_filter = self._library_grid_model.filter_new()
-        self._library_grid_filter.set_visible_func(self.on_filter_visible)
+        self._library_grid_model = Gio.ListStore()
+        self._library_grid_filter = Gtk.FilterListModel()
+        self._library_grid_filter.set_model(self._library_grid_model)
+        self._library_grid_selection_multi = Gtk.MultiSelection.new(self._library_grid_filter)
+        self._library_grid_selection_single = Gtk.SingleSelection.new(self._library_grid_filter)
         # Library Grid
-        self.library_grid.set_model(self._library_grid_filter)
-        self.library_grid.set_pixbuf_column(0)
-        self.library_grid.set_text_column(-1)
-        self.library_grid.set_tooltip_column(1)
+        self.library_grid.set_model(self._library_grid_selection_single)
+        # Toolbar menu
+        self.grid_scale.set_value(self._item_size)
+        self._toolbar_sort_buttons = {
+            SortOrder.ARTIST: self.sort_artist,
+            SortOrder.TITLE: self.sort_title,
+            SortOrder.YEAR: self.sort_year,
+            SortOrder.MODIFIED: self.sort_modified
+        }
+
+        # Button controller for grid scale
+        buttonController = Gtk.GestureClick()
+        buttonController.connect('unpaired-release', self.on_grid_scale_released)
+        self.grid_scale.add_controller(buttonController)
 
 
     def get_headerbar_standalone(self):
@@ -220,7 +127,7 @@ class LibraryPanel(Gtk.Stack):
 
 
     def get_toolbar(self):
-        return self._toolbar
+        return self.toolbar
 
 
     def set_selected(self, selected):
@@ -228,101 +135,83 @@ class LibraryPanel(Gtk.Stack):
 
 
     @Gtk.Template.Callback()
-    def on_resize(self, widget, event):
-        new_allocation = (widget.get_allocation().width, widget.get_allocation().height)
-        if new_allocation == self._allocation:
-            return
-        self._allocation = new_allocation
-        self._toolbar.get_grid_scale().clear_marks()
-        width = widget.get_allocation().width
-
-        lower = int(self._toolbar.get_grid_scale().get_adjustment().get_lower())
-        upper = int(self._toolbar.get_grid_scale().get_adjustment().get_upper())
-        countMin = max(int(width / upper), 1)
-        countMax = max(int(width / lower), 1)
-        for index in range(countMin, countMax):
-            pixel = int(width / index)
-            pixel = pixel - (2 * int(pixel / 100))
-            self._toolbar.get_grid_scale().add_mark(
-                pixel,
-                Gtk.PositionType.BOTTOM,
-                None
-            )
-
-
-    def on_toolbar_toggle_search(self, widget, active):
-        self.filter_bar.set_search_mode(active)
-
-
-    def on_toolbar_select(self, widget, active):
-        if active:
+    def on_select_toggled(self, widget):
+        if self.select_button.get_active():
             self.actionbar_revealer.set_reveal_child(True)
-            self.library_grid.set_selection_mode(Gtk.SelectionMode.MULTIPLE)
+            self.library_grid.set_model(self._library_grid_selection_multi)
+            self.library_grid.set_single_click_activate(False)
             self.library_grid.get_style_context().add_class(Utils.CSS_SELECTION)
         else:
             self.actionbar_revealer.set_reveal_child(False)
-            self.library_grid.set_selection_mode(Gtk.SelectionMode.SINGLE)
+            self.library_grid.set_model(self._library_grid_selection_single)
+            self.library_grid.set_single_click_activate(True)
             self.library_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
 
 
-    def on_toolbar_update(self, widget):
+    @Gtk.Template.Callback()
+    def on_update_clicked(self, widget):
         self.emit('update')
 
 
-    def on_toolbar_scale(self, widget, value):
-        size = math.floor(value)
-        range =  self._toolbar.get_grid_scale().get_adjustment()
+    def on_grid_scale_released(self, widget, x, y, npress, sequence):
+        size = math.floor(self.grid_scale.get_value())
+        range = self.grid_scale.get_adjustment()
         if size < range.get_lower() or size > range.get_upper():
             return
         self._item_size = size
-        GObject.idle_add(self.library_grid.set_item_padding, size / 100)
-        GObject.idle_add(self._set_widget_grid_size, self.library_grid, size, True)
-
-
-    def on_toolbar_scaled(self, widget, value):
-        size = round(value)
-        range =  self._toolbar.get_grid_scale().get_adjustment()
-        if size < range.get_lower() or size > range.get_upper():
-            return False
         self.emit('item-size-changed', size)
         self._redraw()
-        return False
-
-
-    def on_toolbar_sort(self, widget, sort):
-        self._change_sort(sort)
-
-
-    def on_toolbar_sort_type(self, widget, sort_type):
-        self._sort_type = sort_type
-        self._library_grid_model.set_sort_column_id(2, sort_type)
-        self.emit('sort-type-changed', sort_type)
+        GObject.idle_add(self.toolbar_popover.popdown)
 
 
     @Gtk.Template.Callback()
-    def on_filter_bar_notify(self, widget, value):
-        if self._toolbar.is_search_active() is not self.filter_bar.get_search_mode():
-            self._toolbar.set_search_active(self.filter_bar.get_search_mode())
+    def on_grid_scale_changed(self, widget):
+        size = math.floor(self.grid_scale.get_value())
+        range = widget.get_adjustment()
+        if size < range.get_lower() or size > range.get_upper():
+            return
+        self._set_widget_grid_size(self.library_grid, size, True)
+
+
+    @Gtk.Template.Callback()
+    def on_sort_toggled(self, widget):
+        if widget.get_active():
+            self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is widget][0]
+            self._sort_grid_model()
+            self.emit('sort-order-changed', self._sort_order)
+
+
+    @Gtk.Template.Callback()
+    def on_sort_order_toggled(self, button):
+        if button.get_active():
+            self._sort_type = Gtk.SortType.DESCENDING
+        else:
+            self._sort_type = Gtk.SortType.ASCENDING
+        self._sort_grid_model()
+        self.emit('sort-type-changed', button.get_active())
+
+
+    def set_size(self, width, height):
+        self._set_marks()
+        self._resize_standalone_image()
 
 
     @Gtk.Template.Callback()
     def on_filter_entry_changed(self, widget):
-        self._filter_string = self.filter_entry.get_text()
-        GObject.idle_add(self._library_grid_filter.refilter)
+        self._library_grid_filter.set_filter(SearchFilter(self.filter_entry.get_text()))
 
 
     @Gtk.Template.Callback()
-    def on_library_grid_clicked(self, widget, path):
+    def on_library_grid_clicked(self, widget, position):
         # Get selected album
-        path = self._library_grid_filter.convert_path_to_child_path(path)
-        iter = self._library_grid_model.get_iter(path)
-        id = self._library_grid_model.get_value(iter, 2)
-        album = self._albums[id]
+        item = self._library_grid_filter.get_item(position)
+        album = item.get_album()
+        id = album.get_id()
         self._selected_albums = [album]
         self.emit('albumart', id)
 
         # Show standalone album
-        if widget.get_selection_mode() == Gtk.SelectionMode.SINGLE:
+        if widget.get_model() == self._library_grid_selection_single:
             # Set labels
             self._headerbar_standalone.set_album(album)
 
@@ -334,39 +223,15 @@ class LibraryPanel(Gtk.Stack):
             self.standalone_spinner.start()
 
 
-    @Gtk.Template.Callback()
-    def on_library_grid_selection_changed(self, widget):
-        self._selected_albums = []
-        for path in widget.get_selected_items():
-            path = self._library_grid_filter.convert_path_to_child_path(path)
-            iter = self._library_grid_model.get_iter(path)
-            id = self._library_grid_model.get_value(iter, 2)
-            self._selected_albums.insert(0, self._albums[id])
-
-
-    def on_filter_visible(self, model, iter, data):
-        id = model.get_value(iter, 2)
-        if not id in self._albums.keys():
-            return
-        album = self._albums[id]
-        return album.filter(self._filter_string)
-
-
     @Gtk.Template.Callback()
     def on_selection_cancel_clicked(self, widget):
-        self._toolbar.exit_selection()
+        self.select_button.set_active(False)
 
 
     @Gtk.Template.Callback()
     def on_selection_add_clicked(self, widget):
-        ids = [album.get_id() for album in self._selected_albums]
-        self.emit('queue-multiple', ids)
-        self._toolbar.exit_selection()
-
-
-    @Gtk.Template.Callback()
-    def on_standalone_scroll_size_allocate(self, widget, allocation):
-        self._resize_standalone_image()
+        self.emit('queue-multiple', self._get_selected_albums())
+        self.select_button.set_active(False)
 
 
     @Gtk.Template.Callback()
@@ -392,7 +257,7 @@ class LibraryPanel(Gtk.Stack):
     def set_item_size(self, item_size):
         if self._item_size != item_size:
             self._item_size = item_size
-            self._toolbar.get_grid_scale().set_value(item_size)
+            self.grid_scale.set_value(item_size)
             self._redraw()
 
 
@@ -401,26 +266,21 @@ class LibraryPanel(Gtk.Stack):
 
 
     def set_sort_order(self, sort):
-        if self._sort_order != sort:
-            self._toolbar.set_sort_order(sort)
-            self._sort_order = sort
-            self._library_grid_model.set_sort_func(2, self.compare_albums, self._sort_order)
-
-
-    def get_sort_order(self):
-        return self._sort_order
+        button = self._toolbar_sort_buttons[sort]
+        if button:
+            self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is button][0]
+            if not button.get_active():
+                button.set_active(True)
+            self._sort_grid_model()
 
 
     def set_sort_type(self, sort_type):
-        if self._sort_type != sort_type:
-            self._toolbar.set_sort_type(sort_type)
-            if sort_type:
-                sort_type_gtk = Gtk.SortType.DESCENDING
-            else:
-                sort_type_gtk = Gtk.SortType.ASCENDING
-            if self._sort_type != sort_type_gtk:
-                self._sort_type = sort_type_gtk
-                self._library_grid_model.set_sort_column_id(2, sort_type)
+        sort_type_gtk = Gtk.SortType.DESCENDING if sort_type else Gtk.SortType.ASCENDING
+
+        if sort_type_gtk != self._sort_type:
+            self._sort_type = sort_type_gtk
+            self.toolbar_sort_order_button.set_active(sort_type)
+            self._sort_grid_model()
 
 
     def get_sort_type(self):
@@ -456,42 +316,27 @@ class LibraryPanel(Gtk.Stack):
             GObject.idle_add(self._show_image)
 
 
-    def compare_albums(self, model, row1, row2, criterion):
-        id1 = model.get_value(row1, 2)
-        id2 = model.get_value(row2, 2)
+    def _sort_grid_model(self):
+        GObject.idle_add(self._library_grid_model.sort, self._grid_model_compare_func, self._sort_order, self._sort_type)
 
-        if not id1 or not id2:
-            return
-        return client.MCGAlbum.compare(self._albums[id1], self._albums[id2], criterion)
+
+    def _grid_model_compare_func(self, item1, item2, criterion, order):
+        return client.MCGAlbum.compare(item1.get_album(), item2.get_album(), criterion, (order == Gtk.SortType.DESCENDING))
 
 
     def stop_threads(self):
         self._library_stop.set()
 
 
-    def _change_sort(self, sort):
-        self._sort_order = sort
-        self._library_grid_model.set_sort_func(2, self.compare_albums, sort)
-        self.emit('sort-order-changed', sort)
-
-
     def _set_albums(self, host, albums, size):
-        if not self._is_selected and albums != self._albums:
-            GObject.idle_add(
-                self.get_parent().child_set_property,
-                self,
-                'needs-attention',
-                True
-            )
         self._library_lock.acquire()
-        self._library_stop.clear()
         self._albums = albums
+        stack_transition_type = self.stack.get_transition_type()
+        GObject.idle_add(self.stack.set_transition_type, Gtk.StackTransitionType.NONE)
         GObject.idle_add(self.stack.set_visible_child, self.progress_box)
         GObject.idle_add(self.progress_bar.set_fraction, 0.0)
-        GObject.idle_add(self.library_grid.set_item_padding, size / 100)
-        self.library_grid.set_model(None)
-        self.library_grid.freeze_child_notify()
-        self._library_grid_model.clear()
+        GObject.idle_add(self.stack.set_transition_type, stack_transition_type)
+        GObject.idle_add(self._library_grid_model.remove_all)
 
         i = 0
         n = len(albums)
@@ -506,38 +351,27 @@ class LibraryPanel(Gtk.Stack):
                 # Exception is handled by client
                 pass
             except Exception as e:
-                self._logger.exception("Failed to load albumart")
+                self._logger.exception("Failed to load albumart", e)
             if pixbuf is None:
-                pixbuf = self._icon_theme.load_icon(
+                pixbuf = self._icon_theme.lookup_icon(
                     Utils.STOCK_ICON_DEFAULT,
+                    None,
                     self._item_size,
-                    Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE
+                    self._item_size,
+                    Gtk.TextDirection.LTR,
+                    Gtk.IconLookupFlags.FORCE_SYMBOLIC
                 )
             if pixbuf is not None:
                 self._grid_pixbufs[album.get_id()] = pixbuf
-                self._library_grid_model.append([
-                    pixbuf,
-                    GObject.markup_escape_text("\n".join([
-                        album.get_title(),
-                        ', '.join(album.get_dates()),
-                        Utils.create_artists_label(album),
-                        Utils.create_length_label(album)
-                    ])),
-                    album_id
-                ])
+                GObject.idle_add(self._library_grid_model.append, GridItem(album, pixbuf))
 
             i += 1
             GObject.idle_add(self.progress_bar.set_fraction, i/n)
             GObject.idle_add(self.progress_bar.set_text, locale.gettext("Loading images"))
-            if self._library_stop.is_set():
-                self._library_lock.release()
-                return
 
-        self.library_grid.set_model(self._library_grid_filter)
-        self.library_grid.thaw_child_notify()
-        self.library_grid.set_item_width(-1)
         self._library_lock.release()
-        self.stack.set_visible_child(self.scroll)
+        GObject.idle_add(self.stack.set_visible_child, self.scroll)
+        self._sort_grid_model()
 
 
     def _set_widget_grid_size(self, grid_widget, size, vertical):
@@ -548,50 +382,31 @@ class LibraryPanel(Gtk.Stack):
     def _set_widget_grid_size_thread(self, grid_widget, size, vertical):
         self._library_lock.acquire()
         self._library_stop.clear()
-        grid_filter = grid_widget.get_model()
-        grid_model = grid_filter.get_model()
-
-        # get old_range
-        grid_widget_id = id(grid_widget)
-        if grid_widget_id not in self._old_ranges or self._old_ranges[grid_widget_id] is None:
-            self._old_ranges[grid_widget_id] = range(0, len(grid_filter))
-        old_range = self._old_ranges[grid_widget_id]
-        old_start = len(old_range) > 0 and old_range[0] or 0
-        old_end = len(old_range) > 0 and old_range[len(old_range)-1] + 1 or 0
-
-        # calculate visible range
-        w = (grid_widget.get_allocation().width // size) + (vertical and 0 or 1)
-        h = (grid_widget.get_allocation().height // size) + (vertical and 1 or 0)
-        c = w * h
-        vis_range = grid_widget.get_visible_range()
-        if vis_range is None:
+        if size == self._item_size:
             self._library_lock.release()
             return
-        (vis_start,), (vis_end,) = vis_range
-        vis_end = min(vis_start + c, len(grid_filter))
-        vis_range = range(vis_start, vis_end)
-        
-        # set pixbuf
-        cur_start = min(old_start, vis_start)
-        cur_end = max(old_end, vis_end)
-        cur_range = range(cur_start, cur_end)
-        for index in cur_range:
-            iter = grid_filter.convert_iter_to_child_iter(grid_filter[index].iter)
-            if index in vis_range:
-                album_id = grid_model.get_value(iter, 2)
-                pixbuf = self._grid_pixbufs[album_id]
+        for i in range(self._library_grid_model.get_n_items()):
+            grid_item = self._library_grid_model.get_item(i)
+            album_id = grid_item.get_album().get_id()
+
+            pixbuf = self._grid_pixbufs[album_id]
+            if pixbuf is not None:
                 pixbuf = pixbuf.scale_simple(size, size, GdkPixbuf.InterpType.NEAREST)
             else:
-                pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, False, 8, 1, 1)
-            grid_model.set_value(iter, 0, pixbuf)
+                pixbuf = self._icon_theme.lookup_icon(
+                    Utils.STOCK_ICON_DEFAULT,
+                    None,
+                    size,
+                    size,
+                    Gtk.TextDirection.LTR,
+                    Gtk.IconLookupFlags.FORCE_SYMBOLIC
+                )
+            GObject.idle_add(grid_item.set_cover, pixbuf)
 
             if self._library_stop.is_set():
                 self._library_lock.release()
                 return
 
-        self._old_ranges[grid_widget_id] = vis_range
-        grid_widget.set_item_width(size)
-
         self._library_lock.release()
 
 
@@ -606,13 +421,34 @@ class LibraryPanel(Gtk.Stack):
             self.set_albums(self._host, self._albums)
 
 
+    def _set_marks(self):
+        width = self.scroll.get_width()
+        if width == self._grid_width:
+            return
+        self._grid_width = width
+        self.grid_scale.clear_marks()
+
+        lower = int(self.grid_scale.get_adjustment().get_lower())
+        upper = int(self.grid_scale.get_adjustment().get_upper())
+        countMin = max(int(width / upper), 1)
+        countMax = max(int(width / lower), 1)
+        for index in range(countMin, countMax):
+            pixel = int(width / index)
+            pixel = pixel - (2 * int(pixel / 100))
+            self.grid_scale.add_mark(
+                pixel,
+                Gtk.PositionType.BOTTOM,
+                None
+            )
+
+
     def _open_standalone(self):
-        self.set_visible_child(self.panel_standalone)
+        self.library_stack.set_visible_child(self.panel_standalone)
         self.emit('open-standalone')
 
 
     def _close_standalone(self):
-        self.set_visible_child(self.get_children()[0])
+        self.library_stack.set_visible_child(self.panel_normal)
         self.emit('close-standalone')
 
 
@@ -620,15 +456,19 @@ class LibraryPanel(Gtk.Stack):
         """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
         auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
         """
+        # Get size
+        size_width = self.standalone_stack.get_width()
+        size_height = self.standalone_stack.get_height()
+
+        # Get pixelbuffer
         pixbuf = self._standalone_pixbuf
-        size = self.standalone_scroll.get_allocation()
         # Check pixelbuffer
         if pixbuf is None:
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
-        ratioW = float(size.width) / float(pixbuf.get_width())
-        ratioH = float(size.height) / float(pixbuf.get_height())
+        ratioW = float(size_width) / float(pixbuf.get_width())
+        ratioH = float(size_height) / float(pixbuf.get_height())
         # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
         ratio = min(ratioW, ratioH)
         ratio = min(ratio, 1)
@@ -638,18 +478,24 @@ class LibraryPanel(Gtk.Stack):
         if width <= 0 or height <= 0:
             return
         # Pixelpuffer auf Oberfläche zeichnen
-        self.standalone_image.set_allocation(self.standalone_scroll.get_allocation())
         self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.standalone_image.show()
 
 
     def _get_default_image(self):
-        return self._icon_theme.load_icon(
+        return self._icon_theme.lookup_icon(
             Utils.STOCK_ICON_DEFAULT,
+            None,
             512,
-            Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE
+            512,
+            Gtk.TextDirection.LTR,
+            Gtk.IconLookupFlags.FORCE_SYMBOLIC
         )
 
 
-
-
+    def _get_selected_albums(self):
+        albums = []
+        for i in range(self.library_grid.get_model().get_n_items()):
+            if self.library_grid.get_model().is_selected(i):
+                albums.append(self.library_grid.get_model().get_item(i).get_album().get_id())
+        return albums
diff --git a/src/main.py b/src/main.py
index d1b5a53..39e5be5 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,6 +1,4 @@
 import sys
-import gi
-gi.require_version('Gtk', '3.0')
 
 from .application import Application
 
diff --git a/src/meson.build b/src/meson.build
index 2ea68ea..d30b1c7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,7 +25,6 @@ mcg_sources = [
     'client.py',
     'connectionpanel.py',
     'coverpanel.py',
-    'infodialog.py',
     'librarypanel.py',
     'playlistpanel.py',
     'serverpanel.py',
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index a268233..c705f1d 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -2,56 +2,24 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 import logging
 import math
 import threading
 
-from gi.repository import Gtk, GObject, GdkPixbuf
+from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw
 
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
 from mcg.utils import Utils
-
-
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-toolbar.ui')
-class PlaylistToolbar(Gtk.ButtonBox):
-    __gtype_name__ = 'McgPlaylistToolbar'
-    __gsignals__ = {
-        'select': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
-        'clear-playlist': (GObject.SIGNAL_RUN_FIRST, None, ())
-    }
-
-    # Widgets
-    playlist_clear_button = Gtk.Template.Child()
-    select_button = Gtk.Template.Child()
-
-
-    def __init__(self):
-        super().__init__()
-
-
-    @Gtk.Template.Callback()
-    def on_select_toggled(self, widget):
-        self.emit('select', widget.get_active())
-
-
-    @Gtk.Template.Callback()
-    def on_clear_clicked(self, widget):
-        if widget is self.playlist_clear_button:
-            self.emit('clear-playlist')
-
-
-    def exit_selection(self):
-        self.select_button.set_active(False)
+from mcg.utils import GridItem
 
 
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-panel.ui')
-class PlaylistPanel(Gtk.Stack):
+class PlaylistPanel(Adw.Bin):
     __gtype_name__ = 'McgPlaylistPanel'
     __gsignals__ = {
         'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
@@ -60,13 +28,19 @@ class PlaylistPanel(Gtk.Stack):
         'remove-album': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
         'remove-multiple-albums': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
         'play': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,))
+        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
     }
 
 
     # Widgets
+    playlist_stack = Gtk.Template.Child()
+    panel_normal = Gtk.Template.Child()
     panel_standalone = Gtk.Template.Child()
     actionbar_revealer = Gtk.Template.Child()
+    # Toolbar
+    toolbar = Gtk.Template.Child()
+    playlist_clear_button = Gtk.Template.Child()
+    select_button = Gtk.Template.Child()
     # Playlist Grid
     playlist_grid = Gtk.Template.Child()
     # Action bar (normal)
@@ -79,8 +53,8 @@ class PlaylistPanel(Gtk.Stack):
     standalone_image = Gtk.Template.Child()
 
 
-    def __init__(self, client):
-        GObject.GObject.__init__(self)
+    def __init__(self, client, **kwargs):
+        super().__init__(**kwargs)
         self._client = client
         self._host = None
         self._item_size = 150
@@ -88,25 +62,21 @@ class PlaylistPanel(Gtk.Stack):
         self._playlist_albums = None
         self._playlist_lock = threading.Lock()
         self._playlist_stop = threading.Event()
-        self._icon_theme = Gtk.IconTheme.get_default()
+        self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
         self._standalone_pixbuf = None
         self._selected_albums = []
         self._is_selected = False
 
         # Widgets
-        self._toolbar = PlaylistToolbar()
-        self._toolbar.connect('select', self.on_toolbar_select)
-        self._toolbar.connect('clear-playlist', self.on_toolbar_clear)
         # Header bar
         self._headerbar_standalone = AlbumHeaderbar()
         self._headerbar_standalone.connect('close', self.on_headerbar_close_clicked)
         # Playlist Grid: Model
-        self._playlist_grid_model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str)
+        self._playlist_grid_model = Gio.ListStore()
+        self._playlist_grid_selection_multi = Gtk.MultiSelection.new(self._playlist_grid_model)
+        self._playlist_grid_selection_single = Gtk.SingleSelection.new(self._playlist_grid_model)
         # Playlist Grid
-        self.playlist_grid.set_model(self._playlist_grid_model)
-        self.playlist_grid.set_pixbuf_column(0)
-        self.playlist_grid.set_text_column(-1)
-        self.playlist_grid.set_tooltip_column(1)
+        self.playlist_grid.set_model(self._playlist_grid_selection_single)
 
 
     def get_headerbar_standalone(self):
@@ -114,39 +84,43 @@ class PlaylistPanel(Gtk.Stack):
 
 
     def get_toolbar(self):
-        return self._toolbar
+        return self.toolbar
 
 
     def set_selected(self, selected):
         self._is_selected = selected
 
 
-    def on_toolbar_select(self, widget, active):
-        if active:
+    @Gtk.Template.Callback()
+    def on_select_toggled(self, widget):
+        if self.select_button.get_active():
             self.actionbar_revealer.set_reveal_child(True)
-            self.playlist_grid.set_selection_mode(Gtk.SelectionMode.MULTIPLE)
+            self.playlist_grid.set_model(self._playlist_grid_selection_multi)
+            self.playlist_grid.set_single_click_activate(False)
             self.playlist_grid.get_style_context().add_class(Utils.CSS_SELECTION)
         else:
             self.actionbar_revealer.set_reveal_child(False)
-            self.playlist_grid.set_selection_mode(Gtk.SelectionMode.SINGLE)
+            self.playlist_grid.set_model(self._playlist_grid_selection_single)
+            self.playlist_grid.set_single_click_activate(True)
             self.playlist_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
 
 
-    def on_toolbar_clear(self, widget):
+    @Gtk.Template.Callback()
+    def on_clear_clicked(self, widget):
         self.emit('clear-playlist')
 
 
     @Gtk.Template.Callback()
-    def on_playlist_grid_clicked(self, widget, path):
+    def on_playlist_grid_clicked(self, widget, position):
         # Get selected album
-        iter = self._playlist_grid_model.get_iter(path)
-        hash = self._playlist_grid_model.get_value(iter, 2)
-        album = self._playlist_albums[hash]
+        item = self._playlist_grid_model.get_item(position)
+        album = item.get_album()
+        id = album.get_id()
         self._selected_albums = [album]
-        self.emit('albumart', hash)
+        self.emit('albumart', id)
 
         # Show standalone album
-        if widget.get_selection_mode() == Gtk.SelectionMode.SINGLE:
+        if widget.get_model() == self._playlist_grid_selection_single:
             # Set labels
             self._headerbar_standalone.set_album(album)
 
@@ -158,29 +132,15 @@ class PlaylistPanel(Gtk.Stack):
             self.standalone_spinner.start()
 
 
-    @Gtk.Template.Callback()
-    def on_playlist_grid_selection_changed(self, widget):
-        self._selected_albums = []
-        for path in widget.get_selected_items():
-            iter = self._playlist_grid_model.get_iter(path)
-            hash = self._playlist_grid_model.get_value(iter, 2)
-            self._selected_albums.append(self._playlist_albums[hash])
-
-
     @Gtk.Template.Callback()
     def on_selection_cancel_clicked(self, widget):
-        self._toolbar.exit_selection()
+        self.select_button.set_active(False)
 
 
     @Gtk.Template.Callback()
     def on_selection_remove_clicked(self, widget):
-        self.emit('remove-multiple-albums', self._selected_albums)
-        self._toolbar.exit_selection()
-
-
-    @Gtk.Template.Callback()
-    def on_standalone_scroll_size_allocate(self, widget, allocation):
-        self._resize_standalone_image()
+        self.emit('remove-multiple-albums', self._get_selected_albums())
+        self.select_button.set_active(False)
 
 
     def on_headerbar_close_clicked(self, widget):
@@ -189,16 +149,20 @@ class PlaylistPanel(Gtk.Stack):
 
     @Gtk.Template.Callback()
     def on_standalone_remove_clicked(self, widget):
-        self.emit('remove-album', self._selected_albums[0])
+        self.emit('remove-album', self._get_selected_albums()[0])
         self._close_standalone()
 
 
     @Gtk.Template.Callback()
     def on_standalone_play_clicked(self, widget):
-        self.emit('play', self._selected_albums[0])
+        self.emit('play', self._get_selected_albums()[0])
         self._close_standalone()
 
 
+    def set_size(self, width, height):
+        self._resize_standalone_image()
+
+
     def set_item_size(self, item_size):
         if self._item_size != item_size:
             self._item_size = item_size
@@ -235,23 +199,13 @@ class PlaylistPanel(Gtk.Stack):
 
 
     def _set_playlist(self, host, playlist, size):
-        if not self._is_selected and self._playlist != playlist:
-            GObject.idle_add(
-                self.get_parent().child_set_property,
-                self,
-                'needs-attention',
-                True
-            )
         self._playlist_lock.acquire()
         self._playlist_stop.clear()
         self._playlist = playlist
         self._playlist_albums = {}
         for album in playlist:
             self._playlist_albums[album.get_id()] = album
-        self.playlist_grid.set_model(None)
-        self.playlist_grid.freeze_child_notify()
-        self._playlist_grid_model.clear()
-        GObject.idle_add(self.playlist_grid.set_item_padding, size / 100)
+        self._playlist_grid_model.remove_all()
 
         cache = client.MCGCache(host, size)
         for album in playlist:
@@ -265,31 +219,22 @@ class PlaylistPanel(Gtk.Stack):
             except Exception:
                 self._logger.exception("Failed to load albumart")
             if pixbuf is None:
-                pixbuf = self._icon_theme.load_icon(
+                pixbuf = self._icon_theme.lookup_icon(
                     Utils.STOCK_ICON_DEFAULT,
+                    None,
                     self._item_size,
-                    Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE
+                    self._item_size,
+                    Gtk.TextDirection.LTR,
+                    Gtk.IconLookupFlags.FORCE_SYMBOLIC
                 )
             if pixbuf is not None:
-                self._playlist_grid_model.append([
-                    pixbuf,
-                    GObject.markup_escape_text("\n".join([
-                        album.get_title(),
-                        ', '.join(album.get_dates()),
-                        Utils.create_artists_label(album),
-                        Utils.create_length_label(album)
-                    ])),
-                    album.get_id()
-                ])
+                self._playlist_grid_model.append(GridItem(album, pixbuf))
 
             if self._playlist_stop.is_set():
                 self._playlist_lock.release()
                 return
 
-        self.playlist_grid.set_model(self._playlist_grid_model)
-        self.playlist_grid.thaw_child_notify()
-        # TODO why set_columns()?
-        #self.playlist_grid.set_columns(len(playlist))
+        self.playlist_grid.set_model(self._playlist_grid_selection_single)
         self._playlist_lock.release()
 
 
@@ -305,12 +250,12 @@ class PlaylistPanel(Gtk.Stack):
 
 
     def _open_standalone(self):
-        self.set_visible_child(self.panel_standalone)
+        self.playlist_stack.set_visible_child(self.panel_standalone)
         self.emit('open-standalone')
 
 
     def _close_standalone(self):
-        self.set_visible_child(self.get_children()[0])
+        self.playlist_stack.set_visible_child(self.panel_normal)
         self.emit('close-standalone')
 
 
@@ -318,15 +263,19 @@ class PlaylistPanel(Gtk.Stack):
         """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
         auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
         """
+        # Get size
+        size_width = self.standalone_stack.get_width()
+        size_height = self.standalone_stack.get_height()
+
+        # Get pixelbuffer
         pixbuf = self._standalone_pixbuf
-        size = self.standalone_scroll.get_allocation()
         # Check pixelbuffer
         if pixbuf is None:
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
-        ratioW = float(size.width) / float(pixbuf.get_width())
-        ratioH = float(size.height) / float(pixbuf.get_height())
+        ratioW = float(size_width) / float(pixbuf.get_width())
+        ratioH = float(size_height) / float(pixbuf.get_height())
         # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
         ratio = min(ratioW, ratioH)
         ratio = min(ratio, 1)
@@ -336,18 +285,24 @@ class PlaylistPanel(Gtk.Stack):
         if width <= 0 or height <= 0:
             return
         # Pixelpuffer auf Oberfläche zeichnen
-        self.standalone_image.set_allocation(self.standalone_scroll.get_allocation())
         self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.standalone_image.show()
 
 
     def _get_default_image(self):
-        return self._icon_theme.load_icon(
+        return self._icon_theme.lookup_icon(
             Utils.STOCK_ICON_DEFAULT,
+            None,
             512,
-            Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE
+            512,
+            Gtk.TextDirection.LTR,
+            Gtk.IconLookupFlags.FORCE_SYMBOLIC
         )
 
 
-
-
+    def _get_selected_albums(self):
+        albums = []
+        for i in range(self.playlist_grid.get_model().get_n_items()):
+            if self.playlist_grid.get_model().is_selected(i):
+                albums.append(self.playlist_grid.get_model().get_item(i).get_album())
+        return albums
diff --git a/src/serverpanel.py b/src/serverpanel.py
index 22f3836..75c3628 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -2,32 +2,23 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 
-from gi.repository import Gtk, GObject
-
-
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-toolbar.ui')
-class ServerToolbar(Gtk.ButtonBox):
-    __gtype_name__ = 'McgServerToolbar'
-
-
-    def __init__(self):
-        super().__init__()
+from gi.repository import Gtk, Adw, GObject
 
 
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-panel.ui')
-class ServerPanel(Gtk.Box):
+class ServerPanel(Adw.Bin):
     __gtype_name__ = 'McgServerPanel'
     __gsignals__ = {
         'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,bool,)),
     }
 
     # Widgets
+    toolbar = Gtk.Template.Child()
     # Status widgets
     status_file = Gtk.Template.Child()
     status_audio = Gtk.Template.Child()
@@ -44,14 +35,13 @@ class ServerPanel(Gtk.Box):
     output_devices = Gtk.Template.Child()
 
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
         self._none_label = ""
         self._output_buttons = {}
         self._is_selected = False
 
         # Widgets
-        self._toolbar = ServerToolbar()
         self._none_label = self.status_file.get_label()
 
 
@@ -60,7 +50,7 @@ class ServerPanel(Gtk.Box):
 
 
     def get_toolbar(self):
-        return self._toolbar
+        return self.toolbar
 
 
     def on_output_device_toggled(self, widget, device):
@@ -115,13 +105,12 @@ class ServerPanel(Gtk.Box):
                 self._output_buttons[device.get_id()].set_active(device.is_enabled())
                 self._output_buttons[device.get_id()].thaw_notify()
             else:
-                button = Gtk.CheckButton(device.get_name())
+                button = Gtk.CheckButton.new_with_label(device.get_name())
                 if device.is_enabled():
                     button.set_active(True)
                 handler = button.connect('toggled', self.on_output_device_toggled, device)
                 self.output_devices.insert(button, -1)
                 self._output_buttons[device.get_id()] = button
-        self.output_devices.show_all()
 
         # Remove devices
         for id in self._output_buttons.keys():
diff --git a/src/shortcutsdialog.py b/src/shortcutsdialog.py
index f73864e..6bf16e5 100644
--- a/src/shortcutsdialog.py
+++ b/src/shortcutsdialog.py
@@ -2,8 +2,8 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
-
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk
 
 
diff --git a/src/utils.py b/src/utils.py
index e5a08bd..3f2ef3a 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -2,13 +2,13 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
 import hashlib
 import locale
 import os
 import urllib
 
-from gi.repository import GdkPixbuf
+from gi.repository import Gdk, GdkPixbuf, GObject, Gtk
 
 
 
@@ -87,3 +87,47 @@ class SortOrder:
     TITLE = 1
     YEAR = 2
     MODIFIED = 3
+
+
+
+
+class GridItem(GObject.GObject):
+    __gtype_name__ = "GridItem"
+
+    tooltip = GObject.Property(type=str, default=None)
+    cover = GObject.Property(type=Gdk.Paintable, default=None)
+
+
+    def __init__(self, album, cover):
+        super().__init__()
+        self._album = album
+        if cover:
+            self.cover = Gdk.Texture.new_for_pixbuf(cover)
+        self.tooltip = GObject.markup_escape_text("\n".join([
+            album.get_title(),
+            ', '.join(album.get_dates()),
+            Utils.create_artists_label(album),
+            Utils.create_length_label(album)
+        ]))
+
+
+    def get_album(self):
+        return self._album
+
+
+    def set_cover(self, cover):
+        self.cover = Gdk.Texture.new_for_pixbuf(cover)
+
+
+
+
+class SearchFilter(Gtk.Filter):
+
+
+    def __init__(self, search_string):
+        super().__init__()
+        self._search_string = search_string
+
+
+    def do_match(self, grid_item):
+        return grid_item.get_album().filter(self._search_string)
diff --git a/src/window.py b/src/window.py
index c0dd46c..26eed81 100644
--- a/src/window.py
+++ b/src/window.py
@@ -2,16 +2,18 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 try:
     import keyring
     use_keyring = True
 except:
     use_keyring = False
+use_keyring = False
 import locale
 import logging
 
-from gi.repository import Gtk, Gdk, GObject, GLib, Gio
+from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio
 
 from . import client
 from .shortcutsdialog import ShortcutsDialog
@@ -43,7 +45,7 @@ class WindowState(GObject.Object):
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/window.ui')
-class Window(Gtk.ApplicationWindow):
+class Window(Adw.ApplicationWindow):
     __gtype_name__ = 'McgAppWindow'
     SETTING_HOST = 'host'
     SETTING_PORT = 'port'
@@ -55,36 +57,33 @@ class Window(Gtk.ApplicationWindow):
     SETTING_ITEM_SIZE = 'item-size'
     SETTING_SORT_ORDER = 'sort-order'
     SETTING_SORT_TYPE = 'sort-type'
-    _CUSTOM_STARTUP_COMPLETE = 'startup-complete'
 
     # Widgets
+    toolbar_view = Gtk.Template.Child()
     content_stack = Gtk.Template.Child()
     panel_stack = Gtk.Template.Child()
     toolbar_stack = Gtk.Template.Child()
     # Headerbar
     headerbar = Gtk.Template.Child()
-    headerbar_title_stack = Gtk.Template.Child()
     headerbar_panel_switcher = Gtk.Template.Child()
-    headerbar_connection_label = Gtk.Template.Child()
     headerbar_button_connect = Gtk.Template.Child()
     headerbar_button_playpause = Gtk.Template.Child()
     headerbar_button_volume = Gtk.Template.Child()
     # Infobar
-    info_revealer = Gtk.Template.Child()
-    info_bar = Gtk.Template.Child()
-    info_label = Gtk.Template.Child()
+    info_toast = Gtk.Template.Child()
 
 
-    def __init__(self, app, title, settings):
-        super().__init__()
+    def __init__(self, app, title, settings, **kwargs):
+        super().__init__(**kwargs)
         self.set_application(app)
         self.set_title(title)
         self._settings = settings
         self._panels = []
         self._mcg = client.Client()
         self._state = WindowState()
-        self._changing_volume = False
         self._setting_volume = False
+        self._headerbar_connection_button_active = True
+        self._headerbar_playpause_button_active = True
 
         # Help/Shortcuts dialog
         self.set_help_overlay(ShortcutsDialog())
@@ -108,19 +107,16 @@ class Window(Gtk.ApplicationWindow):
         self._library_panel.connect('close-standalone', self.on_panel_close_standalone)
         self._panels.append(self._library_panel)
         # Stack
-        self.content_stack.add(self._connection_panel)
-        self.panel_stack.add_titled(self._server_panel, 'server-panel', locale.gettext("Server"))
-        self.panel_stack.add_titled(self._cover_panel, 'cover-panel', locale.gettext("Cover"))
-        self.panel_stack.add_titled(self._playlist_panel, 'playlist-panel', locale.gettext("Playlist"))
-        self.panel_stack.add_titled(self._library_panel, 'library-panel', locale.gettext("Library"))
-        # Header
-        self._playlist_panel.get_headerbar_standalone().connect('close', self.on_panel_close_standalone)
-        self._library_panel.get_headerbar_standalone().connect('close', self.on_panel_close_standalone)
+        self.content_stack.add_child(self._connection_panel)
+        self.panel_stack.add_titled_with_icon(self._server_panel, 'server-panel', locale.gettext("Server"), "network-wired-symbolic")
+        self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel', locale.gettext("Cover"), "image-x-generic-symbolic")
+        self.panel_stack.add_titled_with_icon(self._playlist_panel, 'playlist-panel', locale.gettext("Playlist"), "view-list-symbolic")
+        self.panel_stack.add_titled_with_icon(self._library_panel, 'library-panel', locale.gettext("Library"), "emblem-music-symbolic")
         # Toolbar stack
-        self.toolbar_stack.add(self._server_panel.get_toolbar())
-        self.toolbar_stack.add(self._cover_panel.get_toolbar())
-        self.toolbar_stack.add(self._playlist_panel.get_toolbar())
-        self.toolbar_stack.add(self._library_panel.get_toolbar())
+        self.toolbar_stack.add_child(self._server_panel.get_toolbar())
+        self.toolbar_stack.add_child(self._cover_panel.get_toolbar())
+        self.toolbar_stack.add_child(self._playlist_panel.get_toolbar())
+        self.toolbar_stack.add_child(self._library_panel.get_toolbar())
 
         # Properties
         self._set_headerbar_sensitive(False, False)
@@ -134,6 +130,10 @@ class Window(Gtk.ApplicationWindow):
         self._library_panel.set_sort_type(self._settings.get_boolean(Window.SETTING_SORT_TYPE))
 
         # Signals
+        self.connect("notify::default-width", self.on_resize)
+        self.connect("notify::default-height", self.on_resize)
+        self.connect("notify::maximized", self.on_maximized)
+        self.connect("notify::fullscreened", self.on_fullscreened)
         self._connection_panel.connect('connection-changed', self.on_connection_panel_connection_changed)
         self.panel_stack.connect('notify::visible-child', self.on_stack_switched)
         self._server_panel.connect('change-output-device', self.on_server_panel_output_device_changed)
@@ -162,7 +162,6 @@ class Window(Gtk.ApplicationWindow):
         self._mcg.connect_signal(client.Client.SIGNAL_INIT_ALBUMS, self.on_mcg_init_albums)
         self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMS, self.on_mcg_load_albums)
         self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMART, self.on_mcg_load_albumart)
-        self._mcg.connect_signal(client.Client.SIGNAL_CUSTOM, self.on_mcg_custom)
         self._mcg.connect_signal(client.Client.SIGNAL_ERROR, self.on_mcg_error)
         self._settings.connect('changed::'+Window.SETTING_PANEL, self.on_settings_panel_changed)
         self._settings.connect('changed::'+Window.SETTING_ITEM_SIZE, self.on_settings_item_size_changed)
@@ -176,7 +175,6 @@ class Window(Gtk.ApplicationWindow):
         self.set_default_size(self._state.width, self._state.height)
         if self._state.get_property(WindowState.IS_MAXIMIZED):
             self.maximize()
-        self.show_all()
         self.content_stack.set_visible_child(self._connection_panel)
         if self._settings.get_boolean(Window.SETTING_CONNECTED):
             self._connect()
@@ -236,52 +234,38 @@ class Window(Gtk.ApplicationWindow):
 
 
     def on_menu_search_library(self, action, value):
-        self.panel_stack.set_visible_child(self._library_panel)
+        self.panel_stack.set_visible_child(self.library_panel_page)
         self._library_panel.show_search()
 
 
     # Window callbacks
 
-    @Gtk.Template.Callback()
     def on_resize(self, widget, event):
-        if not self._state.get_property(WindowState.IS_MAXIMIZED):
-            size = self.get_size()
-            self._state.set_property(WindowState.WIDTH, size.width)
-            self._state.set_property(WindowState.HEIGHT, size.height)
+        width = self.get_size(Gtk.Orientation.HORIZONTAL)
+        height = self.get_size(Gtk.Orientation.VERTICAL)
+        if width > 0:
+            self._cover_panel.set_width(width)
+            if not self._state.get_property(WindowState.IS_MAXIMIZED):
+                self._state.set_property(WindowState.WIDTH, width)
+                self._state.set_property(WindowState.HEIGHT, height)
+            GObject.idle_add(self._playlist_panel.set_size, width, height)
+            GObject.idle_add(self._library_panel.set_size, width, height)
 
 
-    @Gtk.Template.Callback()
-    def on_state(self, widget, state):
-        self._state.set_property(WindowState.IS_MAXIMIZED, (state.new_window_state & Gdk.WindowState.MAXIMIZED > 0))
-        self._fullscreen((state.new_window_state & Gdk.WindowState.FULLSCREEN > 0))
+    def on_maximized(self, widget, maximized):
+        self._state.set_property(WindowState.IS_MAXIMIZED, maximized is True)
+
+
+    def on_fullscreened(self, widget, fullscreened):
+        self._fullscreen(self.is_fullscreen())
 
 
     # HeaderBar callbacks
 
-    @Gtk.Template.Callback()
-    def on_headerbar_connection_active_notify(self, widget, status):
-        self._connect()
-
-
     @Gtk.Template.Callback()
     def on_headerbar_connection_state_set(self, widget, state):
-        return True
-
-
-    @Gtk.Template.Callback()
-    def on_headerbar_volume_press(self, widget, active):
-        self._changing_volume = active
-
-
-    @Gtk.Template.Callback()
-    def on_headerbar_volume_release(self, widget, active):
-        self._changing_volume = active
-
-
-    @Gtk.Template.Callback()
-    def on_headerbar_playpause_toggled(self, widget):
-        self._mcg.playpause()
-        self._mcg.get_status()
+        if self._headerbar_connection_button_active:
+            self._connect()
 
 
     @Gtk.Template.Callback()
@@ -290,17 +274,11 @@ class Window(Gtk.ApplicationWindow):
             self._mcg.set_volume(int(value*100))
 
 
-    # Infobar callback
-
     @Gtk.Template.Callback()
-    def on_info_bar_close(self, *args):
-        self.info_revealer.set_reveal_child(False)
-
-
-    @Gtk.Template.Callback()
-    def on_info_bar_response(self, widget, response):
-        self.info_revealer.set_reveal_child(False)
-
+    def on_headerbar_playpause_toggled(self, widget):
+        if self._headerbar_playpause_button_active:
+            self._mcg.playpause()
+            self._mcg.get_status()
 
 
     # Panel callbacks
@@ -311,19 +289,17 @@ class Window(Gtk.ApplicationWindow):
         self._set_menu_visible_panel()
         for panel in self._panels:
             panel.set_selected(panel == self.panel_stack.get_visible_child())
-        GObject.idle_add(
-            self.panel_stack.child_set_property,
-            self.panel_stack.get_visible_child(),
-            'needs-attention',
-            False
-        )
+
 
     def on_panel_open_standalone(self, panel):
-        self.set_titlebar(panel.get_headerbar_standalone())
+        self.toolbar_view.add_top_bar(panel.get_headerbar_standalone())
+        self.toolbar_view.remove(self.headerbar)
 
 
-    def on_panel_close_standalone(self, headerbar):
-        self.set_titlebar(self.headerbar)
+    def on_panel_close_standalone(self, panel):
+        self.toolbar_view.add_top_bar(self.headerbar)
+        self.toolbar_view.remove(panel.get_headerbar_standalone())
+
 
     def on_connection_panel_connection_changed(self, widget, host, port, password):
         self._settings.set_string(Window.SETTING_HOST, host)
@@ -397,11 +373,11 @@ class Window(Gtk.ApplicationWindow):
 
 
     def on_library_panel_sort_order_changed(self, widget, sort_order):
-        self._settings.set_enum(Window.SETTING_SORT_ORDER, self._library_panel.get_sort_order())
+        self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order)
 
 
     def on_library_panel_sort_type_changed(self, widget, sort_type):
-        self._settings.set_boolean(Window.SETTING_SORT_TYPE, self._library_panel.get_sort_type())
+        self._settings.set_boolean(Window.SETTING_SORT_TYPE, sort_type)
 
 
     def on_library_panel_albumart(self, widget, album):
@@ -415,7 +391,6 @@ class Window(Gtk.ApplicationWindow):
             GObject.idle_add(self._connect_connected)
             self._mcg.load_playlist()
             self._mcg.load_albums()
-            self._mcg.get_custom(Window._CUSTOM_STARTUP_COMPLETE)
             self._mcg.get_status()
             self._mcg.get_stats()
             self._mcg.get_output_devices()
@@ -450,9 +425,7 @@ class Window(Gtk.ApplicationWindow):
         # Status
         self._server_panel.set_status(file, audio, bitrate, error)
         # Error
-        if error is None:
-            self.info_revealer.set_reveal_child(False)
-        else:
+        if error:
             self._show_error(error)
 
 
@@ -486,17 +459,6 @@ class Window(Gtk.ApplicationWindow):
         self._library_panel.set_albumart(album, data)
 
 
-    def on_mcg_custom(self, name):
-        if name == Window._CUSTOM_STARTUP_COMPLETE:
-            for panel in self._panels:
-                GObject.idle_add(
-                    self.panel_stack.child_set_property,
-                    panel,
-                    'needs-attention',
-                    False
-                )
-
-
     def on_mcg_error(self, error):
         GObject.idle_add(self._show_error, str(error))
 
@@ -563,17 +525,11 @@ class Window(Gtk.ApplicationWindow):
             if self._state.get_property(WindowState.IS_FULLSCREENED):
                 self.headerbar.hide()
                 self._cover_panel.set_fullscreen(True)
-                # Hide cursor
-                self.get_window().set_cursor(
-                    Gdk.Cursor.new_from_name(Gdk.Display.get_default(), "none")
-                )
+                self.set_cursor(Gdk.Cursor.new_from_name("none", None))
             else:
                 self.headerbar.show()
                 self._cover_panel.set_fullscreen(False)
-                # Reset cursor
-                self.get_window().set_cursor(
-                    Gdk.Cursor.new_from_name(Gdk.Display.get_default(), "default")
-                )
+                self.set_cursor(Gdk.Cursor.new_from_name("default", None))
 
 
     def _save_visible_panel(self):
@@ -593,58 +549,39 @@ class Window(Gtk.ApplicationWindow):
 
 
     def _set_play(self):
-        self.headerbar_button_playpause.handler_block_by_func(
-            self.on_headerbar_playpause_toggled
-        )
+        self._headerbar_playpause_button_active = False
         self.headerbar_button_playpause.set_active(True)
-        self.headerbar_button_playpause.handler_unblock_by_func(
-            self.on_headerbar_playpause_toggled
-        )
+        self._headerbar_playpause_button_active = True
 
 
     def _set_pause(self):
-        self.headerbar_button_playpause.handler_block_by_func(
-            self.on_headerbar_playpause_toggled
-        )
+        self._headerbar_playpause_button_active = False
         self.headerbar_button_playpause.set_active(False)
-        self.headerbar_button_playpause.handler_unblock_by_func(
-            self.on_headerbar_playpause_toggled
-        )
+        self._headerbar_playpause_button_active = True
 
 
     def _set_volume(self, volume):
         if volume >= 0:
             self.headerbar_button_volume.set_visible(True)
-            if not self._changing_volume:
-                self._setting_volume = True
-                self.headerbar_button_volume.set_value(volume / 100)
-                self._setting_volume = False
+            self._setting_volume = True
+            self.headerbar_button_volume.set_value(volume / 100)
+            self._setting_volume = False
         else:
             self.headerbar_button_volume.set_visible(False)
 
 
     def _headerbar_connected(self):
-        self.headerbar_button_connect.handler_block_by_func(
-            self.on_headerbar_connection_active_notify
-        )
+        self._headerbar_connection_button_active = False
         self.headerbar_button_connect.set_active(True)
         self.headerbar_button_connect.set_state(True)
-        self.headerbar_button_connect.handler_unblock_by_func(
-            self.on_headerbar_connection_active_notify
-        )
-        self.headerbar_title_stack.set_visible_child(self.headerbar_panel_switcher)
+        self._headerbar_connection_button_active = True
 
 
     def _headerbar_disconnected(self):
-        self.headerbar_button_connect.handler_block_by_func(
-            self.on_headerbar_connection_active_notify
-        )
+        self._headerbar_connection_button_active = False
         self.headerbar_button_connect.set_active(False)
         self.headerbar_button_connect.set_state(False)
-        self.headerbar_button_connect.handler_unblock_by_func(
-            self.on_headerbar_connection_active_notify
-        )
-        self.headerbar_title_stack.set_visible_child(self.headerbar_connection_label)
+        self._headerbar_connection_button_active = True
 
 
     def _set_headerbar_sensitive(self, sensitive, connecting):
@@ -655,6 +592,4 @@ class Window(Gtk.ApplicationWindow):
 
 
     def _show_error(self, message):
-        self.info_bar.set_message_type(Gtk.MessageType.ERROR)
-        self.info_label.set_text(message)
-        self.info_revealer.set_reveal_child(True)
+        self.info_toast.add_toast(Adw.Toast.new(message))

From d2e1f6f5d85e2fac2fb673aa5f5353aeb4678f77 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 26 May 2024 18:29:10 +0200
Subject: [PATCH 04/33] Adjust blank lines to match Code Style Guide (see #103)

---
 src/__init__.py        |   9 ---
 src/albumheaderbar.py  |   7 +-
 src/application.py     |  19 +----
 src/client.py          | 159 ++---------------------------------------
 src/connectionpanel.py |  16 +----
 src/coverpanel.py      |  22 +-----
 src/librarypanel.py    |  48 +------------
 src/main.py            |   1 -
 src/playlistpanel.py   |  32 +--------
 src/serverpanel.py     |  11 +--
 src/shortcutsdialog.py |   5 +-
 src/utils.py           |  21 +-----
 src/window.py          |  69 +-----------------
 src/zeroconf.py        |   8 ---
 14 files changed, 14 insertions(+), 413 deletions(-)

diff --git a/src/__init__.py b/src/__init__.py
index cb91a42..aae3b90 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,12 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-
 import os
 
-
-
-
 # Set environment
 srcdir = os.path.abspath(os.path.dirname(__file__))
 datadir = os.path.join(srcdir, 'data')
@@ -23,19 +19,14 @@ if not os.environ.get('GSETTINGS_SCHEMA_DIR'):
     os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev
 
 
-
-
 class Environment:
     """Wrapper class to access environment settings."""
 
-
     def get_srcdir():
         return srcdir
 
-
     def get_data(subdir):
         return os.path.join(datadir, subdir)
 
-
     def get_locale():
         return localedir
diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py
index ab6607a..801e884 100644
--- a/src/albumheaderbar.py
+++ b/src/albumheaderbar.py
@@ -1,15 +1,13 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 
 from gi.repository import Gtk, GObject, Adw
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/album-headerbar.ui')
 class AlbumHeaderbar(Adw.Bin):
     __gtype_name__ = 'McgAlbumHeaderbar'
@@ -21,16 +19,13 @@ class AlbumHeaderbar(Adw.Bin):
     standalone_title = Gtk.Template.Child()
     standalone_artist = Gtk.Template.Child()
 
-
     def __init__(self):
         super().__init__()
 
-
     @Gtk.Template.Callback()
     def on_close_clicked(self, widget):
         self.emit('close')
 
-
     def set_album(self, album):
         self.standalone_title.set_text(album.get_title())
         self.standalone_artist.set_text(", ".join(album.get_albumartists()))
diff --git a/src/application.py b/src/application.py
index 7bbde2b..493dffd 100644
--- a/src/application.py
+++ b/src/application.py
@@ -1,25 +1,19 @@
 #!/usr/bin/env python3
 
-
 import logging
-import urllib
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 from gi.repository import Gio, Gtk, Gdk, GLib, Adw
-
 from .window import Window
 
 
-
-
 class Application(Gtk.Application):
     TITLE = "CoverGrid"
     ID = 'xyz.suruatoel.mcg'
     DOMAIN = 'mcg'
 
-
     def __init__(self):
         super().__init__(application_id=Application.ID, flags=Gio.ApplicationFlags.FLAGS_NONE)
         self._window = None
@@ -38,7 +32,6 @@ class Application(Gtk.Application):
         self.set_accels_for_action('win.panel("2")', ['<primary>KP_3'])
         self.set_accels_for_action('win.panel("3")', ['<primary>KP_4'])
 
-
     def do_startup(self):
         Gtk.Application.do_startup(self)
         self._setup_logging()
@@ -48,14 +41,12 @@ class Application(Gtk.Application):
         self._setup_actions()
         self._setup_adw()
 
-
     def do_activate(self):
         Gtk.Application.do_activate(self)
         if not self._window:
             self._window = Window(self, Application.TITLE, self._settings)
         self._window.present()
 
-
     def on_menu_info(self, action, value):
         self._info_dialog = Adw.AboutDialog()
         self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
@@ -67,27 +58,22 @@ class Application(Gtk.Application):
         self._info_dialog.set_issue_url("https://git.suruatoel.xyz/coderkun/mcg")
         self._info_dialog.present()
 
-
     def on_menu_quit(self, action, value):
         self.quit()
 
-
     def _setup_logging(self):
         logging.basicConfig(
             level=self._verbosity,
             format="%(asctime)s %(levelname)s: %(message)s"
         )
 
-
     def _load_settings(self):
         self._settings = Gio.Settings.new(Application.ID)
 
-
     def _set_default_settings(self):
         style_manager = Adw.StyleManager.get_default()
         style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK)
 
-
     def _load_css(self):
         styleProvider = Gtk.CssProvider()
         styleProvider.load_from_resource(self._get_resource_path('gtk.css'))
@@ -97,7 +83,6 @@ class Application(Gtk.Application):
             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
         )
 
-
     def _setup_actions(self):
         action = Gio.SimpleAction.new("info", None)
         action.connect('activate', self.on_menu_info)
@@ -106,11 +91,9 @@ class Application(Gtk.Application):
         action.connect('activate', self.on_menu_quit)
         self.add_action(action)
 
-
     def _get_resource_path(self, path):
         return "/{}/{}".format(Application.ID.replace('.', '/'), path)
 
-
     def _setup_adw(self):
         Adw.HeaderBar()
         Adw.ToolbarView()
diff --git a/src/client.py b/src/client.py
index 551f524..382c414 100644
--- a/src/client.py
+++ b/src/client.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-
 import concurrent.futures
 import configparser
 import dateutil.parser
@@ -15,14 +14,12 @@ from mcg.utils import SortOrder
 from mcg.utils import Utils
 
 
-
-
 class MPDException(Exception):
+
     def __init__(self, error):
         super(MPDException, self).__init__(self._parse_error(error))
         self._error = error
 
-
     def _parse_error(self, error):
         if error:
             parts = re.match("\[(\d+)@(\d+)\]\s\{(\w+)\}\s(.*)", error)
@@ -33,19 +30,15 @@ class MPDException(Exception):
                 return parts.group(4)
         return error
 
-
     def get_error(self):
         return self._error
 
-
     def get_error_number(self):
         return self._error_number
 
-
     def get_command_number(self):
         return self._command_number
 
-
     def get_command_name(self):
         return self._command_name
 
@@ -62,53 +55,43 @@ class CommandException(MPDException):
     pass
 
 
-
-
 class Future(concurrent.futures.Future):
+
     def __init__(self, signal):
         concurrent.futures.Future.__init__(self)
         self._signal = signal
 
-
     def get_signal(self):
         return self._signal
 
 
-
-
 class Base():
+
     def __init__(self):
         self._callbacks = {}
 
-
     def connect_signal(self, signal, callback):
         """Connect a callback function to a signal (event)."""
         self._callbacks[signal] = callback
 
-
     def disconnect_signal(self, signal):
         """Disconnect a callback function from a signal (event)."""
         if self._has_callback(signal):
             del self._callbacks[signal]
 
-
     def _has_callback(self, signal):
         """Check if there is a registered callback function for a signal."""
         return signal in self._callbacks
 
-
     def _callback(self, signal, *data):
         if signal in self._callbacks:
             callback = self._callbacks[signal]
             callback(*data)
 
-
     def _callback_future(self, future):
         self._callback(future.get_signal(), *future.result())
 
 
-
-
 class Client(Base):
     """Client library for handling the connection to the Music Player Daemon.
 
@@ -148,8 +131,6 @@ class Client(Base):
     # Buffer size for reading from socket
     SOCKET_BUFSIZE = 4096
 
-
-
     def __init__(self):
         """Set class variables and instantiates the Client."""
         Base.__init__(self)
@@ -166,11 +147,9 @@ class Client(Base):
         self._playlist = []
         self._state = None
 
-
     def get_logger(self):
         return self._logger
 
-
     # Client commands
 
     def connect(self, host, port, password=None):
@@ -183,132 +162,108 @@ class Client(Base):
         self._stop.clear()
         self._start_worker()
 
-
     def is_connected(self):
         """Return the connection status."""
         return self._worker is not None and self._worker.is_alive()
 
-
     def disconnect(self):
         """Disconnect from the connected MPD."""
         self._logger.info("disconnect")
         self._stop.set()
         self._add_action(self._disconnect)
 
-
     def join(self):
         self._actions.join()
 
-
     def get_status(self):
         """Determine the current status."""
         self._logger.info("get status")
         self._add_action_signal(Client.SIGNAL_STATUS, self._get_status)
 
-
     def get_stats(self):
         """Load statistics."""
         self._logger.info("get stats")
         self._add_action_signal(Client.SIGNAL_STATS, self._get_stats)
 
-
     def get_output_devices(self):
         """Determine the list of audio output devices."""
         self._logger.info("get output devices")
         self._add_action_signal(Client.SIGNAL_LOAD_OUTPUT_DEVICES, self._get_output_devices)
 
-
     def enable_output_device(self, device, enabled):
         """Enable/disable an audio output device."""
         self._logger.info("enable output device")
         self._add_action(self._enable_output_device, device, enabled)
 
-
-
     def load_albums(self):
         self._logger.info("load albums")
         self._add_action_signal(Client.SIGNAL_LOAD_ALBUMS, self._load_albums)
 
-
     def update(self):
         self._logger.info("update")
         self._add_action(self._update)
 
-
     def load_playlist(self):
         self._logger.info("load playlist")
         self._add_action_signal(Client.SIGNAL_LOAD_PLAYLIST, self._load_playlist)
 
-
     def clear_playlist(self):
         """Clear the current playlist"""
         self._logger.info("clear playlist")
         self._add_action(self._clear_playlist)
 
-
     def remove_album_from_playlist(self, album):
         """Remove the given album from the playlist."""
         self._logger.info("remove album from playlist")
         self._add_action(self._remove_album_from_playlist, album)
 
-
     def remove_albums_from_playlist(self, albums):
         """Remove multiple albums from the playlist in one step."""
         self._logger.info("remove multiple albums from playlist")
         self._add_action(self._remove_albums_from_playlist, albums)
 
-
     def play_album_from_playlist(self, album):
         """Play the given album from the playlist."""
         self._logger.info("play album from playlist")
         self._add_action(self._play_album_from_playlist, album)
 
-
     def playpause(self):
         """Play or pauses the current state."""
         self._logger.info("playpause")
         self._add_action(self._playpause)
 
-
     def play_album(self, album):
         """Add the given album to the queue and play it immediately."""
         self._logger.info("play album")
         self._add_action(self._play_album, album)
 
-
     def queue_album(self, album):
         """Add the given album to the queue."""
         self._logger.info("play album")
         self._add_action(self._queue_album, album)
 
-
     def queue_albums(self, albums):
         """Add the given albums to the queue."""
         self._logger.info("play albums")
         self._add_action(self._queue_albums, albums)
 
-
     def seek(self, pos, time):
         """Seeks to a song at a position"""
         self._logger.info("seek")
         self._add_action(self._seek, pos, time)
 
-
     def stop(self):
         self._logger.info("stop")
         self._add_action(self._stop)
 
-
     def set_volume(self, volume):
         self._logger.info("set volume")
         self._add_action(self._set_volume, volume)
 
-
     def get_albumart(self, album):
         self._logger.info("get albumart")
         self._add_action_signal(Client.SIGNAL_LOAD_ALBUMART, self._get_albumart, album)
 
-
     def get_albumart_now(self, album):
         self._logger.info("get albumart now")
         future = concurrent.futures.Future()
@@ -316,7 +271,6 @@ class Client(Base):
         (_, albumart) = future.result()
         return albumart
 
-
     # Private methods
 
     def _connect(self, host, port, password):
@@ -335,7 +289,6 @@ class Client(Base):
         except OSError as e:
             raise ConnectionException("connection failed: {}".format(e))
 
-
     def _connect_socket(self, host, port):
         sock = None
         error = None
@@ -356,7 +309,6 @@ class Client(Base):
         else:
             raise ConnectionException("no suitable socket")
 
-
     def _greet(self):
         greeting = self._read_line()
         self._logger.debug("greeting: %s", greeting.strip())
@@ -366,12 +318,10 @@ class Client(Base):
         self._protocol_version = greeting[len(Client.PROTOCOL_GREETING):].strip()
         self._logger.debug("protocol version: %s", self._protocol_version)
 
-
     def _disconnect(self):
         self._logger.info("disconnecting")
         self._disconnect_socket()
 
-
     def _disconnect_socket(self):
         if self._sock_write is not None:
             self._sock_write.close()
@@ -382,7 +332,6 @@ class Client(Base):
         self._logger.info("disconnected")
         self._set_connection_status(False)
 
-
     def _idle(self):
         """React to idle events from MPD."""
         self._logger.info("idle")
@@ -410,13 +359,11 @@ class Client(Base):
                 self.get_output_devices()
                 self.get_status()
 
-
     def _noidle(self):
         if self._idling:
             self._logger.debug("noidle")
             self._write("noidle")
 
-
     def _get_status(self):
         """Action: Perform the real status determination."""
         self._logger.info("getting status")
@@ -471,7 +418,6 @@ class Client(Base):
             bitrate = status['bitrate']
         return (state, album, pos, time, volume, file, audio, bitrate, error)
 
-
     def _get_stats(self):
         """Action: Perform the real statistics gathering."""
         self._logger.info("getting statistics")
@@ -504,7 +450,6 @@ class Client(Base):
             uptime = stats['uptime']
         return (artists, albums, songs, dbplaytime, playtime, uptime)
 
-
     def _get_output_devices(self):
         """Action: Perform the real loading of output devices."""
         devices = []
@@ -514,7 +459,6 @@ class Client(Base):
             devices.append(device)
         return (devices, )
 
-
     def _enable_output_device(self, device, enabled):
         """Action: Perform the real enabling/disabling of an output device."""
         if enabled:
@@ -522,7 +466,6 @@ class Client(Base):
         else:
             self._call('disableoutput ', device.get_id())
 
-
     def _load_albums(self):
         """Action: Perform the real update."""
         self._callback(Client.SIGNAL_INIT_ALBUMS)
@@ -542,11 +485,9 @@ class Client(Base):
                     album.add_track(track)
         return (self._albums, )
 
-
     def _update(self):
         self._call('update')
 
-
     def _load_playlist(self):
         self._playlist = []
         for song in self._parse_list(self._call('playlistinfo'), ['file', 'playlist']):
@@ -565,19 +506,16 @@ class Client(Base):
                 album.add_track(track)
         return (self._playlist, )
 
-
     def _clear_playlist(self):
         """Action: Perform the real clearing of the current playlist."""
         self._call('clear')
 
-
     def _remove_album_from_playlist(self, album):
         self._call_list('command_list_begin')
         for track in album.get_tracks():
             self._call_list('deleteid', track.get_id())
         self._call('command_list_end')
 
-
     def _remove_albums_from_playlist(self, albums):
         self._call_list('command_list_begin')
         for album in albums:
@@ -585,12 +523,10 @@ class Client(Base):
                 self._call_list('deleteid', track.get_id())
         self._call('command_list_end')
 
-
     def _play_album_from_playlist(self, album):
         if album.get_tracks():
             self._call('playid', album.get_tracks()[0].get_id())
 
-
     def _playpause(self):
         """Action: Perform the real play/pause command."""
         #status = self._parse_dict(self._call('status'))
@@ -600,14 +536,12 @@ class Client(Base):
         else:
             self._call('play')
 
-
     def _play_album(self, album):
         track_ids = self._queue_album(album)
         if track_ids:
             self._logger.info("play track %d", track_ids[0])
             self._call('playid', track_ids[0])
 
-
     def _queue_album(self, album):
         track_ids = []
         if album in self._albums:
@@ -623,25 +557,20 @@ class Client(Base):
                     track_ids.append(track_id)
         return track_ids
 
-
     def _queue_albums(self, albums):
         track_ids = []
         for album in albums:
             track_ids.extend(self._queue_album(album))
 
-
     def _seek(self, pos, time):
         self._call('seek', pos, time)
 
-
     def _stop(self):
         self._call('stop')
 
-
     def _set_volume(self, volume):
         self._call('setvol', volume)
 
-
     def _get_albumart(self, album):
         if album in self._albums:
             album = self._albums[album]
@@ -663,7 +592,6 @@ class Client(Base):
 
         return (album, None)
 
-
     def _start_worker(self):
         """Start the worker thread which waits for action to be performed."""
         self._logger.debug("start worker")
@@ -672,7 +600,6 @@ class Client(Base):
         self._worker.start()
         self._logger.debug("worker started")
 
-
     def _run(self):
         while not self._stop.is_set() or not self._actions.empty():
             if self._sock is not None and self._actions.empty():
@@ -684,7 +611,6 @@ class Client(Base):
             self._logger.debug("action done")
         self._logger.debug("worker finished")
 
-
     def _add_action(self, method, *args):
         """Add an action to the action list."""
         self._logger.debug("add action %r (%r)", method.__name__, args)
@@ -695,7 +621,6 @@ class Client(Base):
 
         return future
 
-
     def _add_action_signal(self, signal, method, *args):
         """Add an action to the action list that triggers a callback."""
         self._logger.debug("add action signal %r: %r (%r)", signal, method.__name__, args)
@@ -705,7 +630,6 @@ class Client(Base):
 
         return future
 
-
     def _add_action_future(self, future, method, *args):
         """Add an action to the action list based on a futre."""
         self._logger.debug("add action future %r (%r)", method.__name__, args)
@@ -713,7 +637,6 @@ class Client(Base):
         self._actions.put(action)
         self._noidle()
 
-
     def _work(self, action):
         (future, method, args) = action
         self._logger.debug("work: %r", method.__name__)
@@ -730,7 +653,6 @@ class Client(Base):
             future.set_exception(e)
             self._callback(Client.SIGNAL_ERROR, e)
 
-
     def _call(self, command, *args):
         try:
             self._write(command, args)
@@ -740,7 +662,6 @@ class Client(Base):
                 self.disconnect()
             self._callback(Client.SIGNAL_ERROR, e)
 
-
     def _call_list(self, command, *args):
         try:
             self._write(command, args)
@@ -749,7 +670,6 @@ class Client(Base):
                 self.disconnect()
             self._callback(Client.SIGNAL_ERROR, e)
 
-
     def _write(self, command, args=None):
         if args is not None and len(args) > 0:
             line = '{} "{}"\n'.format(command, '" "'.join(str(x).replace('"', '\\\"') for x in args))
@@ -759,7 +679,6 @@ class Client(Base):
         self._sock_write.write(line)
         self._sock_write.flush()
 
-
     def _read(self):
         self._logger.debug("reading response")
         response = []
@@ -776,7 +695,6 @@ class Client(Base):
         self._logger.debug("response: %r", response)
         return response
 
-
     def _read_line(self):
         self._logger.debug("reading line")
 
@@ -800,7 +718,6 @@ class Client(Base):
             return data.decode('utf-8')
         return None
 
-
     def _read_binary(self, command, filename, has_mimetype):
         data = None
         size = 1
@@ -849,7 +766,6 @@ class Client(Base):
                 break
         return data
 
-
     def _read_bytes(self, buf, nbytes):
         self._logger.debug("reading bytes")
         # Use already buffered data
@@ -863,7 +779,6 @@ class Client(Base):
             nbytes_read += self._sock.recv_into(buf_view, nbytes)
         return nbytes_read
 
-
     def _buffer_get_char(self, char):
         pos = self._buffer.find(char)
         if pos < 0:
@@ -872,7 +787,6 @@ class Client(Base):
         self._buffer = self._buffer[pos+1:]
         return buf
 
-
     def _buffer_get_size(self, size):
         buf = self._buffer[0:size]
         self._logger.debug("get %d bytes from buffer", len(buf))
@@ -880,12 +794,10 @@ class Client(Base):
         self._logger.debug("leaving %d in the buffer", len(self._buffer))
         return buf
 
-
     def _buffer_set(self, buf):
         self._logger.debug("set %d %s as buffer", len(buf), type(buf))
         self._buffer = buf
 
-
     def _parse_dict(self, response):
         dict = {}
         if response:
@@ -894,7 +806,6 @@ class Client(Base):
                 dict[key] = value
         return dict
 
-
     def _parse_list(self, response, delimiters):
         entry = {}
         if response:
@@ -912,12 +823,10 @@ class Client(Base):
         if entry:
             yield entry
 
-
     def _split_line(self, line):
         parts = line.split(':')
         return parts[0].lower(), ':'.join(parts[1:]).lstrip()
 
-
     def _extract_album(self, song, lookup=True):
         album = None
         if 'album' not in song:
@@ -931,7 +840,6 @@ class Client(Base):
             self._albums[id] = album
         return album
 
-
     def _extract_track(self, song):
         track = None
         if 'artist' in song and 'title' in song and 'file' in song:
@@ -948,54 +856,42 @@ class Client(Base):
                 track.set_last_modified(song['last-modified'])
         return track
 
-
     def _extract_playlist_track(self, song):
         track = self._extract_track(song)
         if track and 'id' in song and 'pos' in song:
             track = MCGPlaylistTrack(track, song['id'], song['pos'])
         return track
 
-
     def _set_connection_status(self, status):
         self._callback(Client.SIGNAL_CONNECTION, status)
 
 
-
-
 class OutputDevice:
 
-
     def __init__(self, id, name):
         self._id = id
         self._name = name
         self._enabled = None
 
-
     def get_id(self):
         return self._id
 
-
     def get_name(self):
         return self._name
 
-
     def set_enabled(self, enabled):
         self._enabled = enabled
 
-
     def is_enabled(self):
         return self._enabled
 
 
-
-
 class MCGAlbum:
     DEFAULT_ALBUM = 'Various'
     _FILE_NAMES = ['cover', 'folder']
     _FILE_EXTS = ['jpg', 'png', 'jpeg']
     _FILTER_DELIMITER = ' '
 
-
     def __init__(self, title, host):
         self._artists = []
         self._albumartists = []
@@ -1010,49 +906,39 @@ class MCGAlbum:
         self._last_modified = None
         self._id = Utils.generate_id(title)
 
-
     def __eq__(self, other):
         return (other and self.get_id() == other.get_id())
 
-
     def __hash__(self):
         return hash(self._title)
 
-
     def get_id(self):
         return self._id
 
-
     def get_artists(self):
         if self._albumartists:
             return [artist for artist in self._artists if artist not in self._albumartists]
         return self._artists
 
-
     def get_albumartists(self):
         if self._albumartists:
             return self._albumartists
         return self._artists
 
-
     def get_title(self):
         return self._title
 
-
     def get_dates(self):
         return self._dates
 
-
     def get_date(self):
         if len(self._dates) == 0:
             return None
         return self._dates[0]
 
-
     def get_path(self):
         return self._path
 
-
     def add_track(self, track):
         self._tracks.append(track)
         self._length = self._length + track.get_length()
@@ -1071,19 +957,15 @@ class MCGAlbum:
             if not self._last_modified or track.get_last_modified() > self._last_modified:
                 self._last_modified = track.get_last_modified()
 
-
     def get_tracks(self):
         return self._tracks
 
-
     def get_length(self):
         return self._length
 
-
     def get_last_modified(self):
         return self._last_modified
 
-
     def filter(self, filter_string):
         if len(filter_string) == 0:
             return True
@@ -1109,7 +991,6 @@ class MCGAlbum:
                 return False
         return True
 
-
     def compare(album1, album2, criterion=None, reverse=False):
         if criterion == None:
             criterion = SortOrder.TITLE
@@ -1140,9 +1021,8 @@ class MCGAlbum:
             return 1 * reverseMultiplier
 
 
-
-
 class MCGTrack:
+
     def __init__(self, artists, title, file):
         if type(artists) is not list:
             artists = [artists]
@@ -1160,41 +1040,33 @@ class MCGTrack:
         self._date = None
         self._last_modified = None
 
-
     def __eq__(self, other):
         return self._file == other.get_file()
 
-
     def __hash__(self):
         return hash(self._file)
 
-
     def get_artists(self):
         if self._albumartists:
             return [artist for artist in self._artists if artist not in self._albumartists]
         return self._artists
 
-
     def set_albumartists(self, artists):
         if type(artists) is not list:
             artists = [artists]
         self._albumartists = artists
 
-
     def get_albumartists(self):
         if self._albumartists:
             return self._albumartists
         return self._artists
 
-
     def get_title(self):
         return self._title
 
-
     def get_track(self):
         return self._track
 
-
     def set_track(self, track):
         if type(track) is list:
             track = track[0]
@@ -1207,29 +1079,23 @@ class MCGTrack:
                 track = 0
         self._track = track
 
-
     def get_length(self):
         return self._length
 
-
     def set_length(self, length):
         self._length = int(length)
 
-
     def get_date(self):
         return self._date
 
-
     def set_date(self, date):
         if type(date) is list:
             date = date[0]
         self._date = date
 
-
     def get_file(self):
         return self._file
 
-
     def set_last_modified(self, date_string):
         if date_string:
             try:
@@ -1237,13 +1103,10 @@ class MCGTrack:
             except ValueError as e:
                 self._logger.debug("Invalid date format: %s", date_string)
 
-
     def get_last_modified(self):
         return self._last_modified
 
 
-
-
 class MCGPlaylistTrack(MCGTrack):
     def __init__(self, track, id, pos):
         MCGTrack.__init__(
@@ -1259,51 +1122,40 @@ class MCGPlaylistTrack(MCGTrack):
         self._id = int(id)
         self._pos = int(pos)
 
-
     def get_id(self):
         return self._id
 
-
     def get_pos(self):
         return self._pos
 
 
-
-
 class MCGConfig(configparser.ConfigParser):
     CONFIG_DIR = '~/.config/mcg/'
 
-
     def __init__(self, filename):
         configparser.ConfigParser.__init__(self)
         self._filename = os.path.expanduser(os.path.join(MCGConfig.CONFIG_DIR, filename))
         self._create_dir()
 
-
     def load(self):
         if os.path.isfile(self._filename):
             self.read(self._filename)
 
-
     def save(self):
         with open(self._filename, 'w') as configfile:
             self.write(configfile)
 
-
     def _create_dir(self):
         dirname = os.path.dirname(self._filename)
         if not os.path.exists(dirname):
             os.makedirs(dirname)
 
 
-
-
 class MCGCache():
     DIRNAME = '~/.cache/mcg/'
     SIZE_FILENAME = 'size'
     _lock = threading.Lock()
 
-
     def __init__(self, host, size):
         self._logger = logging.getLogger(__name__)
         self._host = host
@@ -1313,11 +1165,9 @@ class MCGCache():
             os.makedirs(self._dirname)
         self._read_size()
 
-
     def create_filename(self, album):
         return os.path.join(self._dirname, '-'.join([album.get_id()]))
 
-
     def _read_size(self):
         size = 100
         MCGCache._lock.acquire()
@@ -1338,7 +1188,6 @@ class MCGCache():
             f.write(str(self._size))
         MCGCache._lock.release()
 
-
     def _clear(self):
         for filename in os.listdir(self._dirname):
             path = os.path.join(self._dirname, filename)
diff --git a/src/connectionpanel.py b/src/connectionpanel.py
index 5cfd4ad..65a7cf1 100644
--- a/src/connectionpanel.py
+++ b/src/connectionpanel.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 import locale
@@ -11,8 +11,6 @@ from gi.repository import Gtk, Gio, GObject, Adw
 from mcg.zeroconf import ZeroconfProvider
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui')
 class ConnectionPanel(Adw.Bin):
     __gtype_name__ = 'McgConnectionPanel'
@@ -27,7 +25,6 @@ class ConnectionPanel(Adw.Bin):
     port_spinner = Gtk.Template.Child()
     password_row = Gtk.Template.Child()
 
-
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
@@ -35,7 +32,6 @@ class ConnectionPanel(Adw.Bin):
         self._zeroconf_provider = ZeroconfProvider()
         self._zeroconf_provider.connect_signal(ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service)
 
-
     def on_new_service(self, service):
         name, host, port = service
 
@@ -50,50 +46,40 @@ class ConnectionPanel(Adw.Bin):
 
         self.zeroconf_list.insert(row, -1)
 
-
     def on_service_selected(self, widget, host, port):
         self.set_host(host)
         self.set_port(port)
 
-
     @Gtk.Template.Callback()
     def on_host_entry_apply(self, widget):
         self._call_back()
 
-
     @Gtk.Template.Callback()
     def on_port_spinner_value_changed(self, widget):
         self._call_back()
 
-
     def set_host(self, host):
         self.host_row.set_text(host)
 
-
     def get_host(self):
         return self.host_row.get_text()
 
-
     def set_port(self, port):
         self.port_spinner.set_value(port)
 
-
     def get_port(self):
         return self.port_spinner.get_value_as_int()
 
-
     def set_password(self, password):
         if password is None:
             password = ""
         self.password_row.set_text(password)
 
-
     def get_password(self):
         if self.password_row.get_text() == "":
             return None
         else:
             return self.password_entry.get_text()
 
-
     def _call_back(self):
         self.emit('connection-changed', self.get_host(), self.get_port(), self.get_password(),)
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 59c75a3..02fa545 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -1,18 +1,15 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 import logging
 import math
 
 from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
-
 from mcg.utils import Utils
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-panel.ui')
 class CoverPanel(Gtk.Overlay):
     __gtype_name__ = 'McgCoverPanel'
@@ -42,8 +39,6 @@ class CoverPanel(Gtk.Overlay):
     # Songs
     songs_scale = Gtk.Template.Child()
 
-
-
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
@@ -70,25 +65,20 @@ class CoverPanel(Gtk.Overlay):
         buttonController.connect('unpaired-release', self.on_songs_scale_released)
         self.songs_scale.add_controller(buttonController)
 
-
     def get_toolbar(self):
         return self.toolbar
 
-
     def set_selected(self, selected):
         pass
 
-
     def on_cover_box_pressed(self, widget, npress, x, y):
         if self._current_album and npress == 2:
             self.emit('toggle-fullscreen')
 
-
     def set_width(self, width):
         GObject.idle_add(self._resize_image)
         self.cover_info_scroll.set_max_content_width(width // 2)
 
-
     def on_songs_scale_pressed(self, widget, npress, x, y):
         if self._timer:
             GObject.source_remove(self._timer)
@@ -107,7 +97,6 @@ class CoverPanel(Gtk.Overlay):
         time = max(value - time - 1, 0)
         self.emit('set-song', pos, time)
 
-
     def set_album(self, album):
         if album:
             # Set labels
@@ -129,7 +118,6 @@ class CoverPanel(Gtk.Overlay):
         self._enable_tracklist()
         self.fullscreen_button.set_sensitive(self._current_album is not None)
 
-
     def set_play(self, pos, time):
         if self._timer is not None:
             GObject.source_remove(self._timer)
@@ -141,13 +129,11 @@ class CoverPanel(Gtk.Overlay):
         self.songs_scale.set_value(time+1)
         self._timer = GObject.timeout_add(1000, self._playing)
 
-
     def set_pause(self):
         if self._timer is not None:
             GObject.source_remove(self._timer)
             self._timer = None
 
-
     def set_fullscreen(self, active):
         if active:
             self.info_revealer.set_reveal_child(False)
@@ -159,7 +145,6 @@ class CoverPanel(Gtk.Overlay):
                 self.info_revealer.set_reveal_child(True)
             GObject.idle_add(self._resize_image)
 
-
     def set_albumart(self, album, data):
         if album == self._current_album:
             if data:
@@ -177,7 +162,6 @@ class CoverPanel(Gtk.Overlay):
             # Show image
             GObject.idle_add(self._show_image)
 
-
     def _set_tracks(self, album):
         self.songs_scale.clear_marks()
         self.songs_scale.set_range(0, album.get_length())
@@ -200,7 +184,6 @@ class CoverPanel(Gtk.Overlay):
             "{0[0]:02d}:{0[1]:02d} minutes".format(divmod(length, 60))
         )
 
-
     def _enable_tracklist(self):
         if self._current_album:
             # enable
@@ -210,14 +193,12 @@ class CoverPanel(Gtk.Overlay):
             # disable
             self.info_revealer.set_reveal_child(False)
 
-
     def _playing(self):
         value = self.songs_scale.get_value() + 1
         self.songs_scale.set_value(value)
 
         return True
 
-
     def _show_image(self):
         if self._cover_pixbuf:
             self._resize_image()
@@ -226,7 +207,6 @@ class CoverPanel(Gtk.Overlay):
             self.cover_stack.set_visible_child(self.cover_default)
         self.cover_spinner.stop()
 
-
     def _resize_image(self):
         """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
         auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
diff --git a/src/librarypanel.py b/src/librarypanel.py
index aee5fcc..59a06a0 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 import locale
@@ -10,7 +10,6 @@ import math
 import threading
 
 from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw
-
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
 from mcg.utils import SortOrder
@@ -19,8 +18,6 @@ from mcg.utils import GridItem
 from mcg.utils import SearchFilter
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui')
 class LibraryPanel(Adw.Bin):
     __gtype_name__ = 'McgLibraryPanel'
@@ -37,7 +34,6 @@ class LibraryPanel(Adw.Bin):
         'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
     }
 
-
     # Widgets
     library_stack = Gtk.Template.Child()
     panel_normal = Gtk.Template.Child()
@@ -74,7 +70,6 @@ class LibraryPanel(Adw.Bin):
     standalone_scroll = Gtk.Template.Child()
     standalone_image = Gtk.Template.Child()
 
-
     def __init__(self, client, **kwargs):
         super().__init__(**kwargs)
         self._logger = logging.getLogger(__name__)
@@ -121,19 +116,15 @@ class LibraryPanel(Adw.Bin):
         buttonController.connect('unpaired-release', self.on_grid_scale_released)
         self.grid_scale.add_controller(buttonController)
 
-
     def get_headerbar_standalone(self):
         return self._headerbar_standalone
 
-
     def get_toolbar(self):
         return self.toolbar
 
-
     def set_selected(self, selected):
         self._is_selected = selected
 
-
     @Gtk.Template.Callback()
     def on_select_toggled(self, widget):
         if self.select_button.get_active():
@@ -147,12 +138,10 @@ class LibraryPanel(Adw.Bin):
             self.library_grid.set_single_click_activate(True)
             self.library_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
 
-
     @Gtk.Template.Callback()
     def on_update_clicked(self, widget):
         self.emit('update')
 
-
     def on_grid_scale_released(self, widget, x, y, npress, sequence):
         size = math.floor(self.grid_scale.get_value())
         range = self.grid_scale.get_adjustment()
@@ -163,7 +152,6 @@ class LibraryPanel(Adw.Bin):
         self._redraw()
         GObject.idle_add(self.toolbar_popover.popdown)
 
-
     @Gtk.Template.Callback()
     def on_grid_scale_changed(self, widget):
         size = math.floor(self.grid_scale.get_value())
@@ -172,7 +160,6 @@ class LibraryPanel(Adw.Bin):
             return
         self._set_widget_grid_size(self.library_grid, size, True)
 
-
     @Gtk.Template.Callback()
     def on_sort_toggled(self, widget):
         if widget.get_active():
@@ -180,7 +167,6 @@ class LibraryPanel(Adw.Bin):
             self._sort_grid_model()
             self.emit('sort-order-changed', self._sort_order)
 
-
     @Gtk.Template.Callback()
     def on_sort_order_toggled(self, button):
         if button.get_active():
@@ -190,17 +176,14 @@ class LibraryPanel(Adw.Bin):
         self._sort_grid_model()
         self.emit('sort-type-changed', button.get_active())
 
-
     def set_size(self, width, height):
         self._set_marks()
         self._resize_standalone_image()
 
-
     @Gtk.Template.Callback()
     def on_filter_entry_changed(self, widget):
         self._library_grid_filter.set_filter(SearchFilter(self.filter_entry.get_text()))
 
-
     @Gtk.Template.Callback()
     def on_library_grid_clicked(self, widget, position):
         # Get selected album
@@ -222,49 +205,40 @@ class LibraryPanel(Adw.Bin):
             self.standalone_stack.set_visible_child(self.standalone_spinner)
             self.standalone_spinner.start()
 
-
     @Gtk.Template.Callback()
     def on_selection_cancel_clicked(self, widget):
         self.select_button.set_active(False)
 
-
     @Gtk.Template.Callback()
     def on_selection_add_clicked(self, widget):
         self.emit('queue-multiple', self._get_selected_albums())
         self.select_button.set_active(False)
 
-
     @Gtk.Template.Callback()
     def on_standalone_play_clicked(self, widget):
         self.emit('play', self._selected_albums[0].get_id())
         self._close_standalone()
 
-
     @Gtk.Template.Callback()
     def on_standalone_queue_clicked(self, widget):
         self.emit('queue', self._selected_albums[0].get_id())
         self._close_standalone()
 
-
     def on_standalone_close_clicked(self, widget):
         self._close_standalone()
 
-
     def show_search(self):
         self.filter_bar.set_search_mode(True)
 
-
     def set_item_size(self, item_size):
         if self._item_size != item_size:
             self._item_size = item_size
             self.grid_scale.set_value(item_size)
             self._redraw()
 
-
     def get_item_size(self):
         return self._item_size
 
-
     def set_sort_order(self, sort):
         button = self._toolbar_sort_buttons[sort]
         if button:
@@ -273,7 +247,6 @@ class LibraryPanel(Adw.Bin):
                 button.set_active(True)
             self._sort_grid_model()
 
-
     def set_sort_type(self, sort_type):
         sort_type_gtk = Gtk.SortType.DESCENDING if sort_type else Gtk.SortType.ASCENDING
 
@@ -282,25 +255,20 @@ class LibraryPanel(Adw.Bin):
             self.toolbar_sort_order_button.set_active(sort_type)
             self._sort_grid_model()
 
-
     def get_sort_type(self):
         return (self._sort_type != Gtk.SortType.ASCENDING)
 
-
     def init_albums(self):
         self.progress_bar.set_text(locale.gettext("Loading albums"))
 
-
     def load_albums(self):
         self.progress_bar.pulse()
 
-
     def set_albums(self, host, albums):
         self._host = host
         self._library_stop.set()
         threading.Thread(target=self._set_albums, args=(host, albums, self._item_size,)).start()
 
-
     def set_albumart(self, album, data):
         if album in self._selected_albums:
             if data:
@@ -315,19 +283,15 @@ class LibraryPanel(Adw.Bin):
             # Show image
             GObject.idle_add(self._show_image)
 
-
     def _sort_grid_model(self):
         GObject.idle_add(self._library_grid_model.sort, self._grid_model_compare_func, self._sort_order, self._sort_type)
 
-
     def _grid_model_compare_func(self, item1, item2, criterion, order):
         return client.MCGAlbum.compare(item1.get_album(), item2.get_album(), criterion, (order == Gtk.SortType.DESCENDING))
 
-
     def stop_threads(self):
         self._library_stop.set()
 
-
     def _set_albums(self, host, albums, size):
         self._library_lock.acquire()
         self._albums = albums
@@ -373,12 +337,10 @@ class LibraryPanel(Adw.Bin):
         GObject.idle_add(self.stack.set_visible_child, self.scroll)
         self._sort_grid_model()
 
-
     def _set_widget_grid_size(self, grid_widget, size, vertical):
         self._library_stop.set()
         threading.Thread(target=self._set_widget_grid_size_thread, args=(grid_widget, size, vertical,)).start()
 
-
     def _set_widget_grid_size_thread(self, grid_widget, size, vertical):
         self._library_lock.acquire()
         self._library_stop.clear()
@@ -409,18 +371,15 @@ class LibraryPanel(Adw.Bin):
 
         self._library_lock.release()
 
-
     def _show_image(self):
         self._resize_standalone_image()
         self.standalone_stack.set_visible_child(self.standalone_scroll)
         self.standalone_spinner.stop()
 
-
     def _redraw(self):
         if self._albums is not None:
             self.set_albums(self._host, self._albums)
 
-
     def _set_marks(self):
         width = self.scroll.get_width()
         if width == self._grid_width:
@@ -441,17 +400,14 @@ class LibraryPanel(Adw.Bin):
                 None
             )
 
-
     def _open_standalone(self):
         self.library_stack.set_visible_child(self.panel_standalone)
         self.emit('open-standalone')
 
-
     def _close_standalone(self):
         self.library_stack.set_visible_child(self.panel_normal)
         self.emit('close-standalone')
 
-
     def _resize_standalone_image(self):
         """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
         auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
@@ -481,7 +437,6 @@ class LibraryPanel(Adw.Bin):
         self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.standalone_image.show()
 
-
     def _get_default_image(self):
         return self._icon_theme.lookup_icon(
             Utils.STOCK_ICON_DEFAULT,
@@ -492,7 +447,6 @@ class LibraryPanel(Adw.Bin):
             Gtk.IconLookupFlags.FORCE_SYMBOLIC
         )
 
-
     def _get_selected_albums(self):
         albums = []
         for i in range(self.library_grid.get_model().get_n_items()):
diff --git a/src/main.py b/src/main.py
index 39e5be5..bc1476c 100644
--- a/src/main.py
+++ b/src/main.py
@@ -3,7 +3,6 @@ import sys
 from .application import Application
 
 
-
 def main(version):
     app = Application()
     return app.run(sys.argv)
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index c705f1d..b181937 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 import logging
@@ -9,15 +9,12 @@ import math
 import threading
 
 from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw
-
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
 from mcg.utils import Utils
 from mcg.utils import GridItem
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-panel.ui')
 class PlaylistPanel(Adw.Bin):
     __gtype_name__ = 'McgPlaylistPanel'
@@ -31,7 +28,6 @@ class PlaylistPanel(Adw.Bin):
         'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
     }
 
-
     # Widgets
     playlist_stack = Gtk.Template.Child()
     panel_normal = Gtk.Template.Child()
@@ -52,7 +48,6 @@ class PlaylistPanel(Adw.Bin):
     standalone_scroll = Gtk.Template.Child()
     standalone_image = Gtk.Template.Child()
 
-
     def __init__(self, client, **kwargs):
         super().__init__(**kwargs)
         self._client = client
@@ -78,19 +73,15 @@ class PlaylistPanel(Adw.Bin):
         # Playlist Grid
         self.playlist_grid.set_model(self._playlist_grid_selection_single)
 
-
     def get_headerbar_standalone(self):
         return self._headerbar_standalone
 
-
     def get_toolbar(self):
         return self.toolbar
 
-
     def set_selected(self, selected):
         self._is_selected = selected
 
-
     @Gtk.Template.Callback()
     def on_select_toggled(self, widget):
         if self.select_button.get_active():
@@ -104,12 +95,10 @@ class PlaylistPanel(Adw.Bin):
             self.playlist_grid.set_single_click_activate(True)
             self.playlist_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
 
-
     @Gtk.Template.Callback()
     def on_clear_clicked(self, widget):
         self.emit('clear-playlist')
 
-
     @Gtk.Template.Callback()
     def on_playlist_grid_clicked(self, widget, position):
         # Get selected album
@@ -131,54 +120,44 @@ class PlaylistPanel(Adw.Bin):
             self.standalone_stack.set_visible_child(self.standalone_spinner)
             self.standalone_spinner.start()
 
-
     @Gtk.Template.Callback()
     def on_selection_cancel_clicked(self, widget):
         self.select_button.set_active(False)
 
-
     @Gtk.Template.Callback()
     def on_selection_remove_clicked(self, widget):
         self.emit('remove-multiple-albums', self._get_selected_albums())
         self.select_button.set_active(False)
 
-
     def on_headerbar_close_clicked(self, widget):
         self._close_standalone()
 
-
     @Gtk.Template.Callback()
     def on_standalone_remove_clicked(self, widget):
         self.emit('remove-album', self._get_selected_albums()[0])
         self._close_standalone()
 
-
     @Gtk.Template.Callback()
     def on_standalone_play_clicked(self, widget):
         self.emit('play', self._get_selected_albums()[0])
         self._close_standalone()
 
-
     def set_size(self, width, height):
         self._resize_standalone_image()
 
-
     def set_item_size(self, item_size):
         if self._item_size != item_size:
             self._item_size = item_size
             self._redraw()
 
-
     def get_item_size(self):
         return self._item_size
 
-
     def set_playlist(self, host, playlist):
         self._host = host
         self._playlist_stop.set()
         threading.Thread(target=self._set_playlist, args=(host, playlist, self._item_size,)).start()
 
-
     def set_albumart(self, album, data):
         if album in self._selected_albums:
             if data:
@@ -193,11 +172,9 @@ class PlaylistPanel(Adw.Bin):
             # Show image
             GObject.idle_add(self._show_image)
 
-
     def stop_threads(self):
         self._playlist_stop.set()
 
-
     def _set_playlist(self, host, playlist, size):
         self._playlist_lock.acquire()
         self._playlist_stop.clear()
@@ -237,28 +214,23 @@ class PlaylistPanel(Adw.Bin):
         self.playlist_grid.set_model(self._playlist_grid_selection_single)
         self._playlist_lock.release()
 
-
     def _show_image(self):
         self._resize_standalone_image()
         self.standalone_stack.set_visible_child(self.standalone_scroll)
         self.standalone_spinner.stop()
 
-
     def _redraw(self):
         if self._playlist is not None:
             self.set_playlist(self._host, self._playlist)
 
-
     def _open_standalone(self):
         self.playlist_stack.set_visible_child(self.panel_standalone)
         self.emit('open-standalone')
 
-
     def _close_standalone(self):
         self.playlist_stack.set_visible_child(self.panel_normal)
         self.emit('close-standalone')
 
-
     def _resize_standalone_image(self):
         """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
         auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
@@ -288,7 +260,6 @@ class PlaylistPanel(Adw.Bin):
         self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.standalone_image.show()
 
-
     def _get_default_image(self):
         return self._icon_theme.lookup_icon(
             Utils.STOCK_ICON_DEFAULT,
@@ -299,7 +270,6 @@ class PlaylistPanel(Adw.Bin):
             Gtk.IconLookupFlags.FORCE_SYMBOLIC
         )
 
-
     def _get_selected_albums(self):
         albums = []
         for i in range(self.playlist_grid.get_model().get_n_items()):
diff --git a/src/serverpanel.py b/src/serverpanel.py
index 75c3628..247860c 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -1,15 +1,13 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 
 from gi.repository import Gtk, Adw, GObject
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-panel.ui')
 class ServerPanel(Adw.Bin):
     __gtype_name__ = 'McgServerPanel'
@@ -34,7 +32,6 @@ class ServerPanel(Adw.Bin):
     # Audio ouptut devices widgets
     output_devices = Gtk.Template.Child()
 
-
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self._none_label = ""
@@ -44,19 +41,15 @@ class ServerPanel(Adw.Bin):
         # Widgets
         self._none_label = self.status_file.get_label()
 
-
     def set_selected(self, selected):
         self._is_selected = selected
 
-
     def get_toolbar(self):
         return self.toolbar
 
-
     def on_output_device_toggled(self, widget, device):
         self.emit('change-output-device', device, widget.get_active())
 
-
     def set_status(self, file, audio, bitrate, error):
         if file:
             file = GObject.markup_escape_text(file)
@@ -84,7 +77,6 @@ class ServerPanel(Adw.Bin):
             error = self._none_label
         self.status_error.set_markup(error)
 
-
     def set_stats(self, artists, albums, songs, dbplaytime, playtime, uptime):
         self.stats_artists.set_text(str(artists))
         self.stats_albums.set_text(str(albums))
@@ -93,7 +85,6 @@ class ServerPanel(Adw.Bin):
         self.stats_playtime.set_text(str(playtime))
         self.stats_uptime.set_text(str(uptime))
 
-
     def set_output_devices(self, devices):
         device_ids = []
 
diff --git a/src/shortcutsdialog.py b/src/shortcutsdialog.py
index 6bf16e5..2db83e3 100644
--- a/src/shortcutsdialog.py
+++ b/src/shortcutsdialog.py
@@ -1,18 +1,15 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 from gi.repository import Gtk
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/shortcuts-dialog.ui')
 class ShortcutsDialog(Gtk.ShortcutsWindow):
     __gtype_name__ = 'McgShortcutsDialog'
 
-
     def __init__(self):
         super().__init__()
diff --git a/src/utils.py b/src/utils.py
index 3f2ef3a..7d817bd 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 import hashlib
 import locale
@@ -11,13 +11,10 @@ import urllib
 from gi.repository import Gdk, GdkPixbuf, GObject, Gtk
 
 
-
-
 class Utils:
     CSS_SELECTION = 'selection'
     STOCK_ICON_DEFAULT = 'image-x-generic-symbolic'
 
-
     def load_pixbuf(data):
         loader = GdkPixbuf.PixbufLoader()
         try:
@@ -26,7 +23,6 @@ class Utils:
             loader.close()
         return loader.get_pixbuf()
 
-
     def load_thumbnail(cache, client, album, size):
         cache_url = cache.create_filename(album)
         pixbuf = None
@@ -43,7 +39,6 @@ class Utils:
                 pixbuf.savev(cache_url, 'jpeg', [], [])
         return pixbuf
 
-
     def create_artists_label(album):
         label = ', '.join(album.get_albumartists())
         if album.get_artists():
@@ -53,14 +48,12 @@ class Utils:
             )
         return label
 
-
     def create_length_label(album):
         minutes = album.get_length() // 60
         seconds = album.get_length() - minutes * 60
 
         return locale.gettext("{}:{} minutes").format(minutes, seconds)
 
-
     def create_track_title(track):
         title = track.get_title()
         if track.get_artists():
@@ -70,7 +63,6 @@ class Utils:
             )
         return title
 
-
     def generate_id(values):
         if type(values) is not list:
             values = [values]
@@ -80,8 +72,6 @@ class Utils:
         return m.hexdigest()
 
 
-
-
 class SortOrder:
     ARTIST = 0
     TITLE = 1
@@ -89,15 +79,12 @@ class SortOrder:
     MODIFIED = 3
 
 
-
-
 class GridItem(GObject.GObject):
     __gtype_name__ = "GridItem"
 
     tooltip = GObject.Property(type=str, default=None)
     cover = GObject.Property(type=Gdk.Paintable, default=None)
 
-
     def __init__(self, album, cover):
         super().__init__()
         self._album = album
@@ -110,24 +97,18 @@ class GridItem(GObject.GObject):
             Utils.create_length_label(album)
         ]))
 
-
     def get_album(self):
         return self._album
 
-
     def set_cover(self, cover):
         self.cover = Gdk.Texture.new_for_pixbuf(cover)
 
 
-
-
 class SearchFilter(Gtk.Filter):
 
-
     def __init__(self, search_string):
         super().__init__()
         self._search_string = search_string
 
-
     def do_match(self, grid_item):
         return grid_item.get_album().filter(self._search_string)
diff --git a/src/window.py b/src/window.py
index 26eed81..127e2f6 100644
--- a/src/window.py
+++ b/src/window.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 try:
@@ -25,8 +25,6 @@ from .librarypanel import LibraryPanel
 from .zeroconf import ZeroconfProvider
 
 
-
-
 class WindowState(GObject.Object):
     WIDTH = 'width'
     HEIGHT = 'height'
@@ -37,13 +35,10 @@ class WindowState(GObject.Object):
     is_maximized = GObject.Property(type=bool, default=False)
     is_fullscreened = GObject.Property(type=bool, default=False)
 
-
     def __init__(self):
         super().__init__()
 
 
-
-
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/window.ui')
 class Window(Adw.ApplicationWindow):
     __gtype_name__ = 'McgAppWindow'
@@ -72,7 +67,6 @@ class Window(Adw.ApplicationWindow):
     # Infobar
     info_toast = Gtk.Template.Child()
 
-
     def __init__(self, app, title, settings, **kwargs):
         super().__init__(**kwargs)
         self.set_application(app)
@@ -205,26 +199,21 @@ class Window(Adw.ApplicationWindow):
         self._search_library_action.connect('activate', self.on_menu_search_library)
         self.add_action(self._search_library_action)
 
-
     # Menu callbacks
 
     def on_menu_connect(self, action, value):
         self._connect()
 
-
     def on_menu_play(self, action, value):
         self._mcg.playpause()
 
-
     def on_menu_clear_playlist(self, action, value):
         self._mcg.clear_playlist()
 
-
     def on_menu_panel(self, action, value):
         action.set_state(value)
         self.panel_stack.set_visible_child(self._panels[int(value.get_string())])
 
-
     def on_menu_toggle_fullscreen(self, action, value):
         self.panel_stack.set_visible_child(self._cover_panel)
         if not self._state.get_property(WindowState.IS_FULLSCREENED):
@@ -232,12 +221,10 @@ class Window(Adw.ApplicationWindow):
         else:
             self.unfullscreen()
 
-
     def on_menu_search_library(self, action, value):
         self.panel_stack.set_visible_child(self.library_panel_page)
         self._library_panel.show_search()
 
-
     # Window callbacks
 
     def on_resize(self, widget, event):
@@ -251,15 +238,12 @@ class Window(Adw.ApplicationWindow):
             GObject.idle_add(self._playlist_panel.set_size, width, height)
             GObject.idle_add(self._library_panel.set_size, width, height)
 
-
     def on_maximized(self, widget, maximized):
         self._state.set_property(WindowState.IS_MAXIMIZED, maximized is True)
 
-
     def on_fullscreened(self, widget, fullscreened):
         self._fullscreen(self.is_fullscreen())
 
-
     # HeaderBar callbacks
 
     @Gtk.Template.Callback()
@@ -267,20 +251,17 @@ class Window(Adw.ApplicationWindow):
         if self._headerbar_connection_button_active:
             self._connect()
 
-
     @Gtk.Template.Callback()
     def on_headerbar_volume_changed(self, widget, value):
         if not self._setting_volume:
             self._mcg.set_volume(int(value*100))
 
-
     @Gtk.Template.Callback()
     def on_headerbar_playpause_toggled(self, widget):
         if self._headerbar_playpause_button_active:
             self._mcg.playpause()
             self._mcg.get_status()
 
-
     # Panel callbacks
 
     def on_stack_switched(self, widget, prop):
@@ -290,17 +271,14 @@ class Window(Adw.ApplicationWindow):
         for panel in self._panels:
             panel.set_selected(panel == self.panel_stack.get_visible_child())
 
-
     def on_panel_open_standalone(self, panel):
         self.toolbar_view.add_top_bar(panel.get_headerbar_standalone())
         self.toolbar_view.remove(self.headerbar)
 
-
     def on_panel_close_standalone(self, panel):
         self.toolbar_view.add_top_bar(self.headerbar)
         self.toolbar_view.remove(panel.get_headerbar_standalone())
 
-
     def on_connection_panel_connection_changed(self, widget, host, port, password):
         self._settings.set_string(Window.SETTING_HOST, host)
         self._settings.set_int(Window.SETTING_PORT, port)
@@ -311,79 +289,61 @@ class Window(Adw.ApplicationWindow):
                 if keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME):
                    keyring.delete_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME)
 
-
     def on_playlist_panel_clear_playlist(self, widget):
         self._mcg.clear_playlist()
 
-
     def on_playlist_panel_remove(self, widget, album):
         self._mcg.remove_album_from_playlist(album)
 
-
     def on_playlist_panel_remove_multiple(self, widget, albums):
         self._mcg.remove_albums_from_playlist(albums)
 
-
     def on_playlist_panel_play(self, widget, album):
         self._mcg.play_album_from_playlist(album)
 
-
     def on_playlist_panel_albumart(self, widget, album):
         self._mcg.get_albumart(album)
 
-
     def on_server_panel_output_device_changed(self, widget, device, enabled):
         self._mcg.enable_output_device(device, enabled)
 
-
     def on_cover_panel_toggle_fullscreen(self, widget):
         if not self._state.get_property(WindowState.IS_FULLSCREENED):
             self.fullscreen()
         else:
             self.unfullscreen()
 
-
     def on_cover_panel_set_song(self, widget, pos, time):
         self._mcg.seek(pos, time)
 
-
     def on_cover_panel_albumart(self, widget, album):
         self._mcg.get_albumart(album)
 
-
     def on_library_panel_update(self, widget):
         self._mcg.update()
 
-
     def on_library_panel_play(self, widget, album):
         self._mcg.play_album(album)
 
-
     def on_library_panel_queue(self, widget, album):
         self._mcg.queue_album(album)
 
-
     def on_library_panel_queue_multiple(self, widget, albums):
         self._mcg.queue_albums(albums)
 
-
     def on_library_panel_item_size_changed(self, widget, size):
         self._playlist_panel.set_item_size(size)
         self._settings.set_int(Window.SETTING_ITEM_SIZE, self._library_panel.get_item_size())
 
-
     def on_library_panel_sort_order_changed(self, widget, sort_order):
         self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order)
 
-
     def on_library_panel_sort_type_changed(self, widget, sort_type):
         self._settings.set_boolean(Window.SETTING_SORT_TYPE, sort_type)
 
-
     def on_library_panel_albumart(self, widget, album):
         self._mcg.get_albumart(album)
 
-
     # MCG callbacks
 
     def on_mcg_connect(self, connected):
@@ -405,7 +365,6 @@ class Window(Adw.ApplicationWindow):
             self._clear_playlist_action.set_enabled(False)
             self._panel_action.set_enabled(False)
 
-
     def on_mcg_status(self, state, album, pos, time, volume, file, audio, bitrate, error):
         # Album
         GObject.idle_add(self._cover_panel.set_album, album)
@@ -428,64 +387,51 @@ class Window(Adw.ApplicationWindow):
         if error:
             self._show_error(error)
 
-
     def on_mcg_stats(self, artists, albums, songs, dbplaytime, playtime, uptime):
         self._server_panel.set_stats(artists, albums, songs, dbplaytime, playtime, uptime)
 
-
     def on_mcg_load_output_devices(self, devices):
         self._server_panel.set_output_devices(devices)
 
-
     def on_mcg_load_playlist(self, playlist):
         self._playlist_panel.set_playlist(self._connection_panel.get_host(), playlist)
 
-
     def on_mcg_init_albums(self):
         GObject.idle_add(self._library_panel.init_albums)
 
-
     def on_mcg_pulse_albums(self):
         GObject.idle_add(self._library_panel.load_albums)
 
-
     def on_mcg_load_albums(self, albums):
         self._library_panel.set_albums(self._connection_panel.get_host(), albums)
 
-
     def on_mcg_load_albumart(self, album, data):
         self._cover_panel.set_albumart(album, data)
         self._playlist_panel.set_albumart(album, data)
         self._library_panel.set_albumart(album, data)
 
-
     def on_mcg_error(self, error):
         GObject.idle_add(self._show_error, str(error))
 
-
     # Settings callbacks
 
     def on_settings_panel_changed(self, settings, key):
         panel_index = settings.get_int(key)
         self.panel_stack.set_visible_child(self._panels[panel_index])
 
-
     def on_settings_item_size_changed(self, settings, key):
         size = settings.get_int(key)
         self._playlist_panel.set_item_size(size)
         self._library_panel.set_item_size(size)
 
-
     def on_settings_sort_order_changed(self, settings, key):
         sort_order = settings.get_enum(key)
         self._library_panel.set_sort_order(sort_order)
 
-
     def on_settings_sort_type_changed(self, settings, key):
         sort_type = settings.get_boolean(key)
         self._library_panel.set_sort_type(sort_type)
 
-
     # Private methods
 
     def _connect(self):
@@ -501,14 +447,12 @@ class Window(Adw.ApplicationWindow):
             self._mcg.connect(host, port, password)
             self._settings.set_boolean(Window.SETTING_CONNECTED, True)
 
-
     def _connect_connected(self):
         self._headerbar_connected()
         self._set_headerbar_sensitive(True, False)
         self.content_stack.set_visible_child(self.panel_stack)
         self.panel_stack.set_visible_child(self._panels[self._settings.get_int(Window.SETTING_PANEL)])
 
-
     def _connect_disconnected(self):
         self._playlist_panel.stop_threads();
         self._library_panel.stop_threads();
@@ -518,7 +462,6 @@ class Window(Adw.ApplicationWindow):
         self.content_stack.set_visible_child(self._connection_panel)
         self._connection_panel.set_sensitive(True)
 
-
     def _fullscreen(self, fullscreened_new):
         if fullscreened_new != self._state.get_property(WindowState.IS_FULLSCREENED):
             self._state.set_property(WindowState.IS_FULLSCREENED, fullscreened_new)
@@ -531,35 +474,29 @@ class Window(Adw.ApplicationWindow):
                 self._cover_panel.set_fullscreen(False)
                 self.set_cursor(Gdk.Cursor.new_from_name("default", None))
 
-
     def _save_visible_panel(self):
         panel_index_selected = self._panels.index(self.panel_stack.get_visible_child())
         self._settings.set_int(Window.SETTING_PANEL, panel_index_selected)
 
-
     def _set_menu_visible_panel(self):
         panel_index_selected = self._panels.index(self.panel_stack.get_visible_child())
         self._panel_action.set_state(GLib.Variant.new_string(str(panel_index_selected)))
 
-
     def _set_visible_toolbar(self):
         panel_index_selected = self._panels.index(self.panel_stack.get_visible_child())
         toolbar = self._panels[panel_index_selected].get_toolbar()
         self.toolbar_stack.set_visible_child(toolbar)
 
-
     def _set_play(self):
         self._headerbar_playpause_button_active = False
         self.headerbar_button_playpause.set_active(True)
         self._headerbar_playpause_button_active = True
 
-
     def _set_pause(self):
         self._headerbar_playpause_button_active = False
         self.headerbar_button_playpause.set_active(False)
         self._headerbar_playpause_button_active = True
 
-
     def _set_volume(self, volume):
         if volume >= 0:
             self.headerbar_button_volume.set_visible(True)
@@ -569,27 +506,23 @@ class Window(Adw.ApplicationWindow):
         else:
             self.headerbar_button_volume.set_visible(False)
 
-
     def _headerbar_connected(self):
         self._headerbar_connection_button_active = False
         self.headerbar_button_connect.set_active(True)
         self.headerbar_button_connect.set_state(True)
         self._headerbar_connection_button_active = True
 
-
     def _headerbar_disconnected(self):
         self._headerbar_connection_button_active = False
         self.headerbar_button_connect.set_active(False)
         self.headerbar_button_connect.set_state(False)
         self._headerbar_connection_button_active = True
 
-
     def _set_headerbar_sensitive(self, sensitive, connecting):
         self.headerbar_button_playpause.set_sensitive(sensitive)
         self.headerbar_button_volume.set_sensitive(sensitive)
         self.headerbar_panel_switcher.set_sensitive(sensitive)
         self.headerbar_button_connect.set_sensitive(not connecting)
 
-
     def _show_error(self, message):
         self.info_toast.add_toast(Adw.Toast.new(message))
diff --git a/src/zeroconf.py b/src/zeroconf.py
index eaa1faa..226b9e1 100644
--- a/src/zeroconf.py
+++ b/src/zeroconf.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-
 import gi
 try:
     gi.require_version('Avahi', '0.6')
@@ -13,15 +12,12 @@ import logging
 from mcg import client
 
 
-
-
 class ZeroconfProvider(client.Base):
     KEYRING_SYSTEM = 'mcg'
     KEYRING_USERNAME = 'mpd'
     SIGNAL_SERVICE_NEW = 'service-new'
     TYPE = '_mpd._tcp'
 
-
     def __init__(self):
         client.Base.__init__(self)
         self._service_resolvers = []
@@ -31,7 +27,6 @@ class ZeroconfProvider(client.Base):
         if use_avahi:
             self._start_client()
 
-
     def on_new_service(self, browser, interface, protocol, name, type, domain, flags):
         #if not (flags & Avahi.LookupResultFlags.GA_LOOKUP_RESULT_LOCAL):
         service_resolver = Avahi.ServiceResolver(interface=interface, protocol=protocol, name=name, type=type, domain=domain, aprotocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC, flags=0,)
@@ -40,19 +35,16 @@ class ZeroconfProvider(client.Base):
         service_resolver.attach(self._client)
         self._service_resolvers.append(service_resolver)
 
-
     def on_found(self, resolver, interface, protocol, name, type, domain, host, date, port, *args):
         if (host, port) not in self._services.keys():
             service = (name,host,port)
             self._services[(host,port)] = service
             self._callback(ZeroconfProvider.SIGNAL_SERVICE_NEW, service)
 
-
     def on_failure(self, resolver, date):
         if resolver in self._service_resolvers:
             self._service_resolvers.remove(resolver)
 
-
     def _start_client(self):
         self._logger.info("Starting Avahi client")
         self._client = Avahi.Client(flags=0,)

From a1f8b735907f184012981ffe7579efc1bbd5610b Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Mon, 27 May 2024 12:46:46 +0200
Subject: [PATCH 05/33] Adjust line length to match Code Style Guide (see #103)

---
 src/albumheaderbar.py  |   4 +-
 src/application.py     |  22 ++--
 src/client.py          | 127 ++++++++++++++++-------
 src/connectionpanel.py |  10 +-
 src/coverpanel.py      |  43 ++++----
 src/librarypanel.py    | 136 ++++++++++++++-----------
 src/playlistpanel.py   |  66 ++++++------
 src/serverpanel.py     |  20 ++--
 src/utils.py           |  14 +--
 src/window.py          | 223 ++++++++++++++++++++++++++++-------------
 src/zeroconf.py        |  29 ++++--
 11 files changed, 436 insertions(+), 258 deletions(-)

diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py
index 801e884..2a8a7e1 100644
--- a/src/albumheaderbar.py
+++ b/src/albumheaderbar.py
@@ -11,9 +11,7 @@ from gi.repository import Gtk, GObject, Adw
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/album-headerbar.ui')
 class AlbumHeaderbar(Adw.Bin):
     __gtype_name__ = 'McgAlbumHeaderbar'
-    __gsignals__ = {
-        'close': (GObject.SIGNAL_RUN_FIRST, None, ())
-    }
+    __gsignals__ = {'close': (GObject.SIGNAL_RUN_FIRST, None, ())}
 
     # Widgets
     standalone_title = Gtk.Template.Child()
diff --git a/src/application.py b/src/application.py
index 493dffd..187793e 100644
--- a/src/application.py
+++ b/src/application.py
@@ -15,7 +15,8 @@ class Application(Gtk.Application):
     DOMAIN = 'mcg'
 
     def __init__(self):
-        super().__init__(application_id=Application.ID, flags=Gio.ApplicationFlags.FLAGS_NONE)
+        super().__init__(application_id=Application.ID,
+                         flags=Gio.ApplicationFlags.FLAGS_NONE)
         self._window = None
         self._info_dialog = None
         self._verbosity = logging.WARNING
@@ -52,20 +53,21 @@ class Application(Gtk.Application):
         self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
         self._info_dialog.set_application_name("CoverGrid")
         self._info_dialog.set_version("3.2.1")
-        self._info_dialog.set_comments("CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.")
+        self._info_dialog.set_comments(
+            """CoverGrid is a client for the Music Player Daemon, focusing on \
+albums instead of single tracks.""")
         self._info_dialog.set_website("https://www.suruatoel.xyz/codes/mcg")
         self._info_dialog.set_license_type(Gtk.License.GPL_3_0)
-        self._info_dialog.set_issue_url("https://git.suruatoel.xyz/coderkun/mcg")
+        self._info_dialog.set_issue_url(
+            "https://git.suruatoel.xyz/coderkun/mcg")
         self._info_dialog.present()
 
     def on_menu_quit(self, action, value):
         self.quit()
 
     def _setup_logging(self):
-        logging.basicConfig(
-            level=self._verbosity,
-            format="%(asctime)s %(levelname)s: %(message)s"
-        )
+        logging.basicConfig(level=self._verbosity,
+                            format="%(asctime)s %(levelname)s: %(message)s")
 
     def _load_settings(self):
         self._settings = Gio.Settings.new(Application.ID)
@@ -78,10 +80,8 @@ class Application(Gtk.Application):
         styleProvider = Gtk.CssProvider()
         styleProvider.load_from_resource(self._get_resource_path('gtk.css'))
         Gtk.StyleContext.add_provider_for_display(
-            Gdk.Display.get_default(),
-            styleProvider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
-        )
+            Gdk.Display.get_default(), styleProvider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 
     def _setup_actions(self):
         action = Gio.SimpleAction.new("info", None)
diff --git a/src/client.py b/src/client.py
index 382c414..ac7235b 100644
--- a/src/client.py
+++ b/src/client.py
@@ -188,7 +188,8 @@ class Client(Base):
     def get_output_devices(self):
         """Determine the list of audio output devices."""
         self._logger.info("get output devices")
-        self._add_action_signal(Client.SIGNAL_LOAD_OUTPUT_DEVICES, self._get_output_devices)
+        self._add_action_signal(Client.SIGNAL_LOAD_OUTPUT_DEVICES,
+                                self._get_output_devices)
 
     def enable_output_device(self, device, enabled):
         """Enable/disable an audio output device."""
@@ -205,7 +206,8 @@ class Client(Base):
 
     def load_playlist(self):
         self._logger.info("load playlist")
-        self._add_action_signal(Client.SIGNAL_LOAD_PLAYLIST, self._load_playlist)
+        self._add_action_signal(Client.SIGNAL_LOAD_PLAYLIST,
+                                self._load_playlist)
 
     def clear_playlist(self):
         """Clear the current playlist"""
@@ -262,7 +264,8 @@ class Client(Base):
 
     def get_albumart(self, album):
         self._logger.info("get albumart")
-        self._add_action_signal(Client.SIGNAL_LOAD_ALBUMART, self._get_albumart, album)
+        self._add_action_signal(Client.SIGNAL_LOAD_ALBUMART,
+                                self._get_albumart, album)
 
     def get_albumart_now(self, album):
         self._logger.info("get albumart now")
@@ -292,7 +295,9 @@ class Client(Base):
     def _connect_socket(self, host, port):
         sock = None
         error = None
-        for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM, socket.IPPROTO_TCP):
+        resources = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
+                                       socket.SOCK_STREAM, socket.IPPROTO_TCP)
+        for res in resources:
             af, socktype, proto, canonname, sa = res
             try:
                 sock = socket.socket(af, socktype, proto)
@@ -315,7 +320,8 @@ class Client(Base):
         if not greeting.startswith(Client.PROTOCOL_GREETING):
             self._disconnect_socket()
             raise ProtocolException("invalid greeting: {}".format(greeting))
-        self._protocol_version = greeting[len(Client.PROTOCOL_GREETING):].strip()
+        self._protocol_version = greeting[len(Client.PROTOCOL_GREETING
+                                              ):].strip()
         self._logger.debug("protocol version: %s", self._protocol_version)
 
     def _disconnect(self):
@@ -428,7 +434,7 @@ class Client(Base):
         artists = 0
         if 'artists' in stats:
             artists = int(stats['artists'])
-         # Albums
+        # Albums
         albums = 0
         if 'albums' in stats:
             albums = int(stats['albums'])
@@ -478,7 +484,9 @@ class Client(Base):
             album = self._extract_album(album)
             self._logger.debug("album: %r", album)
             # Tracks
-            for song in self._parse_list(self._call('find album ', album.get_title()), ['file']):
+            songs = self._parse_list(
+                self._call('find album ', album.get_title()), ['file'])
+            for song in songs:
                 track = self._extract_track(song)
                 if track:
                     self._logger.debug("track: %r", track)
@@ -490,17 +498,22 @@ class Client(Base):
 
     def _load_playlist(self):
         self._playlist = []
-        for song in self._parse_list(self._call('playlistinfo'), ['file', 'playlist']):
+        songs = self._parse_list(self._call('playlistinfo'),
+                                 ['file', 'playlist'])
+        for song in songs:
             self._logger.debug("song: %r", song)
             # Track
             track = self._extract_playlist_track(song)
             self._logger.debug("track: %r", track)
             # Album
             album = self._extract_album(song, lookup=False)
-            if len(self._playlist) == 0 or self._playlist[len(self._playlist)-1] != album:
+            if (
+                len(self._playlist) == 0
+                or self._playlist[len(self._playlist) - 1] != album
+            ):
                 self._playlist.append(album)
             else:
-                album = self._playlist[len(self._playlist)-1]
+                album = self._playlist[len(self._playlist) - 1]
             self._logger.debug("album: %r", album)
             if track:
                 album.add_track(track)
@@ -549,7 +562,8 @@ class Client(Base):
             for track in self._albums[album].get_tracks():
                 self._logger.info("addid: %r", track.get_file())
                 track_id = None
-                track_id_response = self._parse_dict(self._call('addid', track.get_file()))
+                track_id_response = self._parse_dict(
+                    self._call('addid', track.get_file()))
                 if 'id' in track_id_response:
                     track_id = track_id_response['id']
                 self._logger.debug("track id: %r", track_id)
@@ -574,19 +588,24 @@ class Client(Base):
     def _get_albumart(self, album):
         if album in self._albums:
             album = self._albums[album]
-            self._logger.debug("get albumart for album \"%s\"", album.get_title())
+            self._logger.debug("get albumart for album \"%s\"",
+                               album.get_title())
 
             # Use "albumart" command
             if album.get_tracks():
                 try:
-                    return (album, self._read_binary('albumart', album.get_tracks()[0].get_file(), False))
+                    return (album,
+                            self._read_binary('albumart',
+                                              album.get_tracks()[0].get_file(),
+                                              False))
                 except CommandException as e:
                     # The "albumart" command throws an exception if not found
                     if e.get_error_number() != Client.PROTOCOL_ERROR_NOEXISTS:
                         raise e
                     # If no albumart can be found, use "readpicture" command
                     for track in album.get_tracks():
-                        data = self._read_binary('readpicture', track.get_file(), True)
+                        data = self._read_binary('readpicture',
+                                                 track.get_file(), True)
                         if data:
                             return (album, data)
 
@@ -595,7 +614,9 @@ class Client(Base):
     def _start_worker(self):
         """Start the worker thread which waits for action to be performed."""
         self._logger.debug("start worker")
-        self._worker = threading.Thread(target=self._run, name='mcg-worker', args=())
+        self._worker = threading.Thread(target=self._run,
+                                        name='mcg-worker',
+                                        args=())
         self._worker.setDaemon(True)
         self._worker.start()
         self._logger.debug("worker started")
@@ -623,7 +644,8 @@ class Client(Base):
 
     def _add_action_signal(self, signal, method, *args):
         """Add an action to the action list that triggers a callback."""
-        self._logger.debug("add action signal %r: %r (%r)", signal, method.__name__, args)
+        self._logger.debug("add action signal %r: %r (%r)", signal,
+                           method.__name__, args)
         future = Future(signal)
         future.add_done_callback(self._callback_future)
         self._add_action_future(future, method, *args)
@@ -658,7 +680,10 @@ class Client(Base):
             self._write(command, args)
             return self._read()
         except MPDException as e:
-            if command == 'idle' and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION:
+            if (
+                command == 'idle'
+                and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION
+            ):
                 self.disconnect()
             self._callback(Client.SIGNAL_ERROR, e)
 
@@ -666,13 +691,17 @@ class Client(Base):
         try:
             self._write(command, args)
         except MPDException as e:
-            if command == 'idle' and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION:
+            if (
+                command == 'idle'
+                and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION
+            ):
                 self.disconnect()
             self._callback(Client.SIGNAL_ERROR, e)
 
     def _write(self, command, args=None):
         if args is not None and len(args) > 0:
-            line = '{} "{}"\n'.format(command, '" "'.join(str(x).replace('"', '\\\"') for x in args))
+            line = '{} "{}"\n'.format(
+                command, '" "'.join(str(x).replace('"', '\\\"') for x in args))
         else:
             line = '{}\n'.format(command)
         self._logger.debug("write: %r", line)
@@ -683,7 +712,10 @@ class Client(Base):
         self._logger.debug("reading response")
         response = []
         line = self._read_line()
-        while not line.startswith(Client.PROTOCOL_COMPLETION) and not line.startswith(Client.PROTOCOL_ERROR):
+        while (
+            not line.startswith(Client.PROTOCOL_COMPLETION)
+            and not line.startswith(Client.PROTOCOL_ERROR)
+        ):
             response.append(line.strip())
             line = self._read_line()
         if line.startswith(Client.PROTOCOL_COMPLETION):
@@ -752,7 +784,7 @@ class Client(Base):
             if not data:
                 data = bytearray(size)
             # Create a view for the current chunk of data
-            data_view = memoryview(data)[offset:offset+binary]
+            data_view = memoryview(data)[offset:offset + binary]
             # Read actual bytes
             self._read_bytes(data_view, binary)
             offset += binary
@@ -782,9 +814,9 @@ class Client(Base):
     def _buffer_get_char(self, char):
         pos = self._buffer.find(char)
         if pos < 0:
-            pos = len(self._buffer)-1
-        buf = self._buffer[0:pos+1]
-        self._buffer = self._buffer[pos+1:]
+            pos = len(self._buffer) - 1
+        buf = self._buffer[0:pos + 1]
+        self._buffer = self._buffer[pos + 1:]
         return buf
 
     def _buffer_get_size(self, size):
@@ -917,7 +949,10 @@ class MCGAlbum:
 
     def get_artists(self):
         if self._albumartists:
-            return [artist for artist in self._artists if artist not in self._albumartists]
+            return [
+                artist for artist in self._artists
+                if artist not in self._albumartists
+            ]
         return self._artists
 
     def get_albumartists(self):
@@ -948,13 +983,19 @@ class MCGAlbum:
         for artist in track.get_albumartists():
             if artist not in self._albumartists:
                 self._albumartists.append(artist)
-        if track.get_date() is not None and track.get_date() not in self._dates:
+        if (
+            track.get_date() is not None
+            and track.get_date() not in self._dates
+        ):
             self._dates.append(track.get_date())
         path = os.path.dirname(track.get_file())
         if path not in self._pathes:
             self._pathes.append(path)
         if track.get_last_modified():
-            if not self._last_modified or track.get_last_modified() > self._last_modified:
+            if (
+                not self._last_modified
+                or track.get_last_modified() > self._last_modified
+            ):
                 self._last_modified = track.get_last_modified()
 
     def get_tracks(self):
@@ -984,7 +1025,10 @@ class MCGAlbum:
                 continue
             # Search in track data
             for track in self._tracks:
-                if keyword in track.get_title().lower() or keyword in track.get_file().lower():
+                if (
+                    keyword in track.get_title().lower()
+                    or keyword in track.get_file().lower()
+                ):
                     result = True
                     break
             if not result:
@@ -1048,7 +1092,10 @@ class MCGTrack:
 
     def get_artists(self):
         if self._albumartists:
-            return [artist for artist in self._artists if artist not in self._albumartists]
+            return [
+                artist for artist in self._artists
+                if artist not in self._albumartists
+            ]
         return self._artists
 
     def set_albumartists(self, artists):
@@ -1071,7 +1118,7 @@ class MCGTrack:
         if type(track) is list:
             track = track[0]
         if type(track) is str and '/' in track:
-            track = track[0: track.index('/')]
+            track = track[0:track.index('/')]
         if track is not None:
             try:
                 track = int(track)
@@ -1108,13 +1155,10 @@ class MCGTrack:
 
 
 class MCGPlaylistTrack(MCGTrack):
+
     def __init__(self, track, id, pos):
-        MCGTrack.__init__(
-            self,
-            track.get_artists(),
-            track.get_title(),
-            track.get_file()
-        )
+        MCGTrack.__init__(self, track.get_artists(), track.get_title(),
+                          track.get_file())
         self.set_albumartists(track.get_albumartists())
         self.set_track(track.get_track())
         self.set_length(track.get_length())
@@ -1134,7 +1178,8 @@ class MCGConfig(configparser.ConfigParser):
 
     def __init__(self, filename):
         configparser.ConfigParser.__init__(self)
-        self._filename = os.path.expanduser(os.path.join(MCGConfig.CONFIG_DIR, filename))
+        self._filename = os.path.expanduser(
+            os.path.join(MCGConfig.CONFIG_DIR, filename))
         self._create_dir()
 
     def load(self):
@@ -1160,7 +1205,8 @@ class MCGCache():
         self._logger = logging.getLogger(__name__)
         self._host = host
         self._size = size
-        self._dirname = os.path.expanduser(os.path.join(MCGCache.DIRNAME, host))
+        self._dirname = os.path.expanduser(os.path.join(
+            MCGCache.DIRNAME, host))
         if not os.path.exists(self._dirname):
             os.makedirs(self._dirname)
         self._read_size()
@@ -1178,7 +1224,10 @@ class MCGCache():
                 try:
                     size = int(f.readline())
                 except:
-                    self._logger.warning("invalid cache file: %s, deleting file", filename, exc_info=True)
+                    self._logger.warning(
+                        "invalid cache file: %s, deleting file",
+                        filename,
+                        exc_info=True)
                     size = None
         # Clear cache if size has changed
         if size != self._size:
diff --git a/src/connectionpanel.py b/src/connectionpanel.py
index 65a7cf1..4286e6a 100644
--- a/src/connectionpanel.py
+++ b/src/connectionpanel.py
@@ -30,7 +30,8 @@ class ConnectionPanel(Adw.Bin):
 
         # Zeroconf provider
         self._zeroconf_provider = ZeroconfProvider()
-        self._zeroconf_provider.connect_signal(ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service)
+        self._zeroconf_provider.connect_signal(
+            ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service)
 
     def on_new_service(self, service):
         name, host, port = service
@@ -82,4 +83,9 @@ class ConnectionPanel(Adw.Bin):
             return self.password_entry.get_text()
 
     def _call_back(self):
-        self.emit('connection-changed', self.get_host(), self.get_port(), self.get_password(),)
+        self.emit(
+            'connection-changed',
+            self.get_host(),
+            self.get_port(),
+            self.get_password(),
+        )
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 02fa545..9ac970b 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -15,8 +15,8 @@ class CoverPanel(Gtk.Overlay):
     __gtype_name__ = 'McgCoverPanel'
     __gsignals__ = {
         'toggle-fullscreen': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'set-song': (GObject.SIGNAL_RUN_FIRST, None, (int, int,)),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,))
+        'set-song': (GObject.SIGNAL_RUN_FIRST, None, (int, int, )),
+        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, ))
     }
 
     # Widgets
@@ -47,7 +47,8 @@ class CoverPanel(Gtk.Overlay):
         self._cover_pixbuf = None
         self._timer = None
         self._properties = {}
-        self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
+        self._icon_theme = Gtk.IconTheme.get_for_display(
+            Gdk.Display.get_default())
         self._fullscreened = False
         self._current_size = None
 
@@ -62,7 +63,8 @@ class CoverPanel(Gtk.Overlay):
         # Button controller for songs scale
         buttonController = Gtk.GestureClick()
         buttonController.connect('pressed', self.on_songs_scale_pressed)
-        buttonController.connect('unpaired-release', self.on_songs_scale_released)
+        buttonController.connect('unpaired-release',
+                                 self.on_songs_scale_released)
         self.songs_scale.add_controller(buttonController)
 
     def get_toolbar(self):
@@ -89,7 +91,7 @@ class CoverPanel(Gtk.Overlay):
         time = self._current_album.get_length()
         tracks = self._current_album.get_tracks()
         pos = 0
-        for index in range(len(tracks)-1, -1, -1):
+        for index in range(len(tracks) - 1, -1, -1):
             time = time - tracks[index].get_length()
             pos = tracks[index].get_pos()
             if time < value:
@@ -102,7 +104,8 @@ class CoverPanel(Gtk.Overlay):
             # Set labels
             self.album_title_label.set_label(album.get_title())
             self.album_date_label.set_label(', '.join(album.get_dates()))
-            self.album_artist_label.set_label(', '.join(album.get_albumartists()))
+            self.album_artist_label.set_label(', '.join(
+                album.get_albumartists()))
 
             # Set tracks
             self._set_tracks(album)
@@ -126,7 +129,7 @@ class CoverPanel(Gtk.Overlay):
         for index in range(0, pos):
             time = time + tracks[index].get_length()
 
-        self.songs_scale.set_value(time+1)
+        self.songs_scale.set_value(time + 1)
         self._timer = GObject.timeout_add(1000, self._playing)
 
     def set_pause(self):
@@ -171,18 +174,12 @@ class CoverPanel(Gtk.Overlay):
             if length > 0 and length < album.get_length():
                 cur_length = cur_length + 1
             self.songs_scale.add_mark(
-                cur_length,
-                Gtk.PositionType.RIGHT,
-                GObject.markup_escape_text(
-                    Utils.create_track_title(track)
-                )
-            )
+                cur_length, Gtk.PositionType.RIGHT,
+                GObject.markup_escape_text(Utils.create_track_title(track)))
             length = length + track.get_length()
         self.songs_scale.add_mark(
-            length,
-            Gtk.PositionType.RIGHT,
-            "{0[0]:02d}:{0[1]:02d} minutes".format(divmod(length, 60))
-        )
+            length, Gtk.PositionType.RIGHT,
+            "{0[0]:02d}:{0[1]:02d} minutes".format(divmod(length, 60)))
 
     def _enable_tracklist(self):
         if self._current_album:
@@ -219,7 +216,10 @@ class CoverPanel(Gtk.Overlay):
             current_width, current_height = self._current_size
             if size_width == current_width and size_height == current_height:
                 return
-        self._current_size = (size_width, size_height,)
+        self._current_size = (
+            size_width,
+            size_height,
+        )
 
         # Get pixelbuffer
         pixbuf = self._cover_pixbuf
@@ -234,9 +234,10 @@ class CoverPanel(Gtk.Overlay):
         ratio = min(ratioW, ratioH)
         ratio = min(ratio, 1)
         # Neue Breite und Höhe berechnen
-        width = int(math.floor(pixbuf.get_width()*ratio))
-        height = int(math.floor(pixbuf.get_height()*ratio))
+        width = int(math.floor(pixbuf.get_width() * ratio))
+        height = int(math.floor(pixbuf.get_height() * ratio))
         if width <= 0 or height <= 0:
             return
-        self.cover_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
+        self.cover_image.set_from_pixbuf(
+            pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.cover_image.show()
diff --git a/src/librarypanel.py b/src/librarypanel.py
index 59a06a0..27f8e60 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -25,13 +25,14 @@ class LibraryPanel(Adw.Bin):
         'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
         'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
         'update': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'play': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
-        'queue': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
-        'queue-multiple': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
-        'item-size-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
-        'sort-order-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
-        'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
+        'play': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
+        'queue': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
+        'queue-multiple':
+        (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
+        'item-size-changed': (GObject.SIGNAL_RUN_FIRST, None, (int, )),
+        'sort-order-changed': (GObject.SIGNAL_RUN_FIRST, None, (int, )),
+        'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool, )),
+        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
     }
 
     # Widgets
@@ -85,7 +86,8 @@ class LibraryPanel(Adw.Bin):
         self._old_ranges = {}
         self._library_lock = threading.Lock()
         self._library_stop = threading.Event()
-        self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
+        self._icon_theme = Gtk.IconTheme.get_for_display(
+            Gdk.Display.get_default())
         self._standalone_pixbuf = None
         self._selected_albums = []
         self._is_selected = False
@@ -93,13 +95,16 @@ class LibraryPanel(Adw.Bin):
         # Widgets
         # Header bar
         self._headerbar_standalone = AlbumHeaderbar()
-        self._headerbar_standalone.connect('close', self.on_standalone_close_clicked)
+        self._headerbar_standalone.connect('close',
+                                           self.on_standalone_close_clicked)
         # Library Grid: Model
         self._library_grid_model = Gio.ListStore()
         self._library_grid_filter = Gtk.FilterListModel()
         self._library_grid_filter.set_model(self._library_grid_model)
-        self._library_grid_selection_multi = Gtk.MultiSelection.new(self._library_grid_filter)
-        self._library_grid_selection_single = Gtk.SingleSelection.new(self._library_grid_filter)
+        self._library_grid_selection_multi = Gtk.MultiSelection.new(
+            self._library_grid_filter)
+        self._library_grid_selection_single = Gtk.SingleSelection.new(
+            self._library_grid_filter)
         # Library Grid
         self.library_grid.set_model(self._library_grid_selection_single)
         # Toolbar menu
@@ -113,7 +118,8 @@ class LibraryPanel(Adw.Bin):
 
         # Button controller for grid scale
         buttonController = Gtk.GestureClick()
-        buttonController.connect('unpaired-release', self.on_grid_scale_released)
+        buttonController.connect('unpaired-release',
+                                 self.on_grid_scale_released)
         self.grid_scale.add_controller(buttonController)
 
     def get_headerbar_standalone(self):
@@ -131,12 +137,14 @@ class LibraryPanel(Adw.Bin):
             self.actionbar_revealer.set_reveal_child(True)
             self.library_grid.set_model(self._library_grid_selection_multi)
             self.library_grid.set_single_click_activate(False)
-            self.library_grid.get_style_context().add_class(Utils.CSS_SELECTION)
+            self.library_grid.get_style_context().add_class(
+                Utils.CSS_SELECTION)
         else:
             self.actionbar_revealer.set_reveal_child(False)
             self.library_grid.set_model(self._library_grid_selection_single)
             self.library_grid.set_single_click_activate(True)
-            self.library_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
+            self.library_grid.get_style_context().remove_class(
+                Utils.CSS_SELECTION)
 
     @Gtk.Template.Callback()
     def on_update_clicked(self, widget):
@@ -163,7 +171,10 @@ class LibraryPanel(Adw.Bin):
     @Gtk.Template.Callback()
     def on_sort_toggled(self, widget):
         if widget.get_active():
-            self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is widget][0]
+            self._sort_order = [
+                key for key, value in self._toolbar_sort_buttons.items()
+                if value is widget
+            ][0]
             self._sort_grid_model()
             self.emit('sort-order-changed', self._sort_order)
 
@@ -182,7 +193,8 @@ class LibraryPanel(Adw.Bin):
 
     @Gtk.Template.Callback()
     def on_filter_entry_changed(self, widget):
-        self._library_grid_filter.set_filter(SearchFilter(self.filter_entry.get_text()))
+        self._library_grid_filter.set_filter(
+            SearchFilter(self.filter_entry.get_text()))
 
     @Gtk.Template.Callback()
     def on_library_grid_clicked(self, widget, position):
@@ -242,13 +254,19 @@ class LibraryPanel(Adw.Bin):
     def set_sort_order(self, sort):
         button = self._toolbar_sort_buttons[sort]
         if button:
-            self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is button][0]
+            self._sort_order = [
+                key for key, value in self._toolbar_sort_buttons.items()
+                if value is button
+            ][0]
             if not button.get_active():
                 button.set_active(True)
             self._sort_grid_model()
 
     def set_sort_type(self, sort_type):
-        sort_type_gtk = Gtk.SortType.DESCENDING if sort_type else Gtk.SortType.ASCENDING
+        if sort_type:
+            sort_type_gtk = Gtk.SortType.DESCENDING
+        else:
+            sort_type_gtk = Gtk.SortType.ASCENDING
 
         if sort_type_gtk != self._sort_type:
             self._sort_type = sort_type_gtk
@@ -267,7 +285,12 @@ class LibraryPanel(Adw.Bin):
     def set_albums(self, host, albums):
         self._host = host
         self._library_stop.set()
-        threading.Thread(target=self._set_albums, args=(host, albums, self._item_size,)).start()
+        threading.Thread(target=self._set_albums,
+                         args=(
+                             host,
+                             albums,
+                             self._item_size,
+                         )).start()
 
     def set_albumart(self, album, data):
         if album in self._selected_albums:
@@ -284,10 +307,14 @@ class LibraryPanel(Adw.Bin):
             GObject.idle_add(self._show_image)
 
     def _sort_grid_model(self):
-        GObject.idle_add(self._library_grid_model.sort, self._grid_model_compare_func, self._sort_order, self._sort_type)
+        GObject.idle_add(self._library_grid_model.sort,
+                         self._grid_model_compare_func, self._sort_order,
+                         self._sort_type)
 
     def _grid_model_compare_func(self, item1, item2, criterion, order):
-        return client.MCGAlbum.compare(item1.get_album(), item2.get_album(), criterion, (order == Gtk.SortType.DESCENDING))
+        return client.MCGAlbum.compare(item1.get_album(), item2.get_album(),
+                                       criterion,
+                                       (order == Gtk.SortType.DESCENDING))
 
     def stop_threads(self):
         self._library_stop.set()
@@ -296,7 +323,8 @@ class LibraryPanel(Adw.Bin):
         self._library_lock.acquire()
         self._albums = albums
         stack_transition_type = self.stack.get_transition_type()
-        GObject.idle_add(self.stack.set_transition_type, Gtk.StackTransitionType.NONE)
+        GObject.idle_add(self.stack.set_transition_type,
+                         Gtk.StackTransitionType.NONE)
         GObject.idle_add(self.stack.set_visible_child, self.progress_box)
         GObject.idle_add(self.progress_bar.set_fraction, 0.0)
         GObject.idle_add(self.stack.set_transition_type, stack_transition_type)
@@ -318,20 +346,18 @@ class LibraryPanel(Adw.Bin):
                 self._logger.exception("Failed to load albumart", e)
             if pixbuf is None:
                 pixbuf = self._icon_theme.lookup_icon(
-                    Utils.STOCK_ICON_DEFAULT,
-                    None,
-                    self._item_size,
-                    self._item_size,
-                    Gtk.TextDirection.LTR,
-                    Gtk.IconLookupFlags.FORCE_SYMBOLIC
-                )
+                    Utils.STOCK_ICON_DEFAULT, None, self._item_size,
+                    self._item_size, Gtk.TextDirection.LTR,
+                    Gtk.IconLookupFlags.FORCE_SYMBOLIC)
             if pixbuf is not None:
                 self._grid_pixbufs[album.get_id()] = pixbuf
-                GObject.idle_add(self._library_grid_model.append, GridItem(album, pixbuf))
+                GObject.idle_add(self._library_grid_model.append,
+                                 GridItem(album, pixbuf))
 
             i += 1
-            GObject.idle_add(self.progress_bar.set_fraction, i/n)
-            GObject.idle_add(self.progress_bar.set_text, locale.gettext("Loading images"))
+            GObject.idle_add(self.progress_bar.set_fraction, i / n)
+            GObject.idle_add(self.progress_bar.set_text,
+                             locale.gettext("Loading images"))
 
         self._library_lock.release()
         GObject.idle_add(self.stack.set_visible_child, self.scroll)
@@ -339,7 +365,12 @@ class LibraryPanel(Adw.Bin):
 
     def _set_widget_grid_size(self, grid_widget, size, vertical):
         self._library_stop.set()
-        threading.Thread(target=self._set_widget_grid_size_thread, args=(grid_widget, size, vertical,)).start()
+        threading.Thread(target=self._set_widget_grid_size_thread,
+                         args=(
+                             grid_widget,
+                             size,
+                             vertical,
+                         )).start()
 
     def _set_widget_grid_size_thread(self, grid_widget, size, vertical):
         self._library_lock.acquire()
@@ -353,16 +384,12 @@ class LibraryPanel(Adw.Bin):
 
             pixbuf = self._grid_pixbufs[album_id]
             if pixbuf is not None:
-                pixbuf = pixbuf.scale_simple(size, size, GdkPixbuf.InterpType.NEAREST)
+                pixbuf = pixbuf.scale_simple(size, size,
+                                             GdkPixbuf.InterpType.NEAREST)
             else:
                 pixbuf = self._icon_theme.lookup_icon(
-                    Utils.STOCK_ICON_DEFAULT,
-                    None,
-                    size,
-                    size,
-                    Gtk.TextDirection.LTR,
-                    Gtk.IconLookupFlags.FORCE_SYMBOLIC
-                )
+                    Utils.STOCK_ICON_DEFAULT, None, size, size,
+                    Gtk.TextDirection.LTR, Gtk.IconLookupFlags.FORCE_SYMBOLIC)
             GObject.idle_add(grid_item.set_cover, pixbuf)
 
             if self._library_stop.is_set():
@@ -394,11 +421,7 @@ class LibraryPanel(Adw.Bin):
         for index in range(countMin, countMax):
             pixel = int(width / index)
             pixel = pixel - (2 * int(pixel / 100))
-            self.grid_scale.add_mark(
-                pixel,
-                Gtk.PositionType.BOTTOM,
-                None
-            )
+            self.grid_scale.add_mark(pixel, Gtk.PositionType.BOTTOM, None)
 
     def _open_standalone(self):
         self.library_stack.set_visible_child(self.panel_standalone)
@@ -429,27 +452,24 @@ class LibraryPanel(Adw.Bin):
         ratio = min(ratioW, ratioH)
         ratio = min(ratio, 1)
         # Neue Breite und Höhe berechnen
-        width = int(math.floor(pixbuf.get_width()*ratio))
-        height = int(math.floor(pixbuf.get_height()*ratio))
+        width = int(math.floor(pixbuf.get_width() * ratio))
+        height = int(math.floor(pixbuf.get_height() * ratio))
         if width <= 0 or height <= 0:
             return
         # Pixelpuffer auf Oberfläche zeichnen
-        self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
+        self.standalone_image.set_from_pixbuf(
+            pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.standalone_image.show()
 
     def _get_default_image(self):
-        return self._icon_theme.lookup_icon(
-            Utils.STOCK_ICON_DEFAULT,
-            None,
-            512,
-            512,
-            Gtk.TextDirection.LTR,
-            Gtk.IconLookupFlags.FORCE_SYMBOLIC
-        )
+        return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None,
+                                            512, 512, Gtk.TextDirection.LTR,
+                                            Gtk.IconLookupFlags.FORCE_SYMBOLIC)
 
     def _get_selected_albums(self):
         albums = []
         for i in range(self.library_grid.get_model().get_n_items()):
             if self.library_grid.get_model().is_selected(i):
-                albums.append(self.library_grid.get_model().get_item(i).get_album().get_id())
+                albums.append(self.library_grid.get_model().get_item(
+                    i).get_album().get_id())
         return albums
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index b181937..dc5e3e5 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -22,10 +22,12 @@ class PlaylistPanel(Adw.Bin):
         'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
         'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
         'clear-playlist': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'remove-album': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
-        'remove-multiple-albums': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
-        'play': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
+        'remove-album':
+        (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
+        'remove-multiple-albums':
+        (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
+        'play': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
+        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
     }
 
     # Widgets
@@ -57,7 +59,8 @@ class PlaylistPanel(Adw.Bin):
         self._playlist_albums = None
         self._playlist_lock = threading.Lock()
         self._playlist_stop = threading.Event()
-        self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
+        self._icon_theme = Gtk.IconTheme.get_for_display(
+            Gdk.Display.get_default())
         self._standalone_pixbuf = None
         self._selected_albums = []
         self._is_selected = False
@@ -65,11 +68,14 @@ class PlaylistPanel(Adw.Bin):
         # Widgets
         # Header bar
         self._headerbar_standalone = AlbumHeaderbar()
-        self._headerbar_standalone.connect('close', self.on_headerbar_close_clicked)
+        self._headerbar_standalone.connect('close',
+                                           self.on_headerbar_close_clicked)
         # Playlist Grid: Model
         self._playlist_grid_model = Gio.ListStore()
-        self._playlist_grid_selection_multi = Gtk.MultiSelection.new(self._playlist_grid_model)
-        self._playlist_grid_selection_single = Gtk.SingleSelection.new(self._playlist_grid_model)
+        self._playlist_grid_selection_multi = Gtk.MultiSelection.new(
+            self._playlist_grid_model)
+        self._playlist_grid_selection_single = Gtk.SingleSelection.new(
+            self._playlist_grid_model)
         # Playlist Grid
         self.playlist_grid.set_model(self._playlist_grid_selection_single)
 
@@ -88,12 +94,14 @@ class PlaylistPanel(Adw.Bin):
             self.actionbar_revealer.set_reveal_child(True)
             self.playlist_grid.set_model(self._playlist_grid_selection_multi)
             self.playlist_grid.set_single_click_activate(False)
-            self.playlist_grid.get_style_context().add_class(Utils.CSS_SELECTION)
+            self.playlist_grid.get_style_context().add_class(
+                Utils.CSS_SELECTION)
         else:
             self.actionbar_revealer.set_reveal_child(False)
             self.playlist_grid.set_model(self._playlist_grid_selection_single)
             self.playlist_grid.set_single_click_activate(True)
-            self.playlist_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
+            self.playlist_grid.get_style_context().remove_class(
+                Utils.CSS_SELECTION)
 
     @Gtk.Template.Callback()
     def on_clear_clicked(self, widget):
@@ -156,7 +164,12 @@ class PlaylistPanel(Adw.Bin):
     def set_playlist(self, host, playlist):
         self._host = host
         self._playlist_stop.set()
-        threading.Thread(target=self._set_playlist, args=(host, playlist, self._item_size,)).start()
+        threading.Thread(target=self._set_playlist,
+                         args=(
+                             host,
+                             playlist,
+                             self._item_size,
+                         )).start()
 
     def set_albumart(self, album, data):
         if album in self._selected_albums:
@@ -197,13 +210,9 @@ class PlaylistPanel(Adw.Bin):
                 self._logger.exception("Failed to load albumart")
             if pixbuf is None:
                 pixbuf = self._icon_theme.lookup_icon(
-                    Utils.STOCK_ICON_DEFAULT,
-                    None,
-                    self._item_size,
-                    self._item_size,
-                    Gtk.TextDirection.LTR,
-                    Gtk.IconLookupFlags.FORCE_SYMBOLIC
-                )
+                    Utils.STOCK_ICON_DEFAULT, None, self._item_size,
+                    self._item_size, Gtk.TextDirection.LTR,
+                    Gtk.IconLookupFlags.FORCE_SYMBOLIC)
             if pixbuf is not None:
                 self._playlist_grid_model.append(GridItem(album, pixbuf))
 
@@ -252,27 +261,24 @@ class PlaylistPanel(Adw.Bin):
         ratio = min(ratioW, ratioH)
         ratio = min(ratio, 1)
         # Neue Breite und Höhe berechnen
-        width = int(math.floor(pixbuf.get_width()*ratio))
-        height = int(math.floor(pixbuf.get_height()*ratio))
+        width = int(math.floor(pixbuf.get_width() * ratio))
+        height = int(math.floor(pixbuf.get_height() * ratio))
         if width <= 0 or height <= 0:
             return
         # Pixelpuffer auf Oberfläche zeichnen
-        self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
+        self.standalone_image.set_from_pixbuf(
+            pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
         self.standalone_image.show()
 
     def _get_default_image(self):
-        return self._icon_theme.lookup_icon(
-            Utils.STOCK_ICON_DEFAULT,
-            None,
-            512,
-            512,
-            Gtk.TextDirection.LTR,
-            Gtk.IconLookupFlags.FORCE_SYMBOLIC
-        )
+        return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None,
+                                            512, 512, Gtk.TextDirection.LTR,
+                                            Gtk.IconLookupFlags.FORCE_SYMBOLIC)
 
     def _get_selected_albums(self):
         albums = []
         for i in range(self.playlist_grid.get_model().get_n_items()):
             if self.playlist_grid.get_model().is_selected(i):
-                albums.append(self.playlist_grid.get_model().get_item(i).get_album())
+                albums.append(
+                    self.playlist_grid.get_model().get_item(i).get_album())
         return albums
diff --git a/src/serverpanel.py b/src/serverpanel.py
index 247860c..e52e45d 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -12,7 +12,10 @@ from gi.repository import Gtk, Adw, GObject
 class ServerPanel(Adw.Bin):
     __gtype_name__ = 'McgServerPanel'
     __gsignals__ = {
-        'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,bool,)),
+        'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, (
+            GObject.TYPE_PYOBJECT,
+            bool,
+        )),
     }
 
     # Widgets
@@ -57,10 +60,11 @@ class ServerPanel(Adw.Bin):
             file = self._none_label
         self.status_file.set_markup(file)
         # Audio information
-        if  audio:
+        if audio:
             parts = audio.split(":")
             if len(parts) == 3:
-                audio = "{} Hz, {} bit, {} channels".format(parts[0], parts[1], parts[2])
+                audio = "{} Hz, {} bit, {} channels".format(
+                    parts[0], parts[1], parts[2])
         else:
             audio = self._none_label
         self.status_audio.set_markup(audio)
@@ -93,17 +97,21 @@ class ServerPanel(Adw.Bin):
             device_ids.append(device.get_id())
             if device.get_id() in self._output_buttons.keys():
                 self._output_buttons[device.get_id()].freeze_notify()
-                self._output_buttons[device.get_id()].set_active(device.is_enabled())
+                self._output_buttons[device.get_id()].set_active(
+                    device.is_enabled())
                 self._output_buttons[device.get_id()].thaw_notify()
             else:
                 button = Gtk.CheckButton.new_with_label(device.get_name())
                 if device.is_enabled():
                     button.set_active(True)
-                handler = button.connect('toggled', self.on_output_device_toggled, device)
+                handler = button.connect('toggled',
+                                         self.on_output_device_toggled, device)
                 self.output_devices.insert(button, -1)
                 self._output_buttons[device.get_id()] = button
 
         # Remove devices
         for id in self._output_buttons.keys():
             if id not in device_ids:
-                self.output_devices.remove(self._output_buttons[id].get_parent())
+                self.output_devices.remove(
+                    self._output_buttons[id].get_parent())
+
diff --git a/src/utils.py b/src/utils.py
index 7d817bd..1b16308 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -35,7 +35,8 @@ class Utils:
             if albumart:
                 pixbuf = Utils.load_pixbuf(albumart)
             if pixbuf is not None:
-                pixbuf = pixbuf.scale_simple(size, size, GdkPixbuf.InterpType.HYPER)
+                pixbuf = pixbuf.scale_simple(size, size,
+                                             GdkPixbuf.InterpType.HYPER)
                 pixbuf.savev(cache_url, 'jpeg', [], [])
         return pixbuf
 
@@ -43,9 +44,7 @@ class Utils:
         label = ', '.join(album.get_albumartists())
         if album.get_artists():
             label = locale.gettext("{} feat. {}").format(
-                label,
-                ", ".join(album.get_artists())
-            )
+                label, ", ".join(album.get_artists()))
         return label
 
     def create_length_label(album):
@@ -58,9 +57,7 @@ class Utils:
         title = track.get_title()
         if track.get_artists():
             title = locale.gettext("{} feat. {}").format(
-                title,
-                ", ".join(track.get_artists())
-            )
+                title, ", ".join(track.get_artists()))
         return title
 
     def generate_id(values):
@@ -91,8 +88,7 @@ class GridItem(GObject.GObject):
         if cover:
             self.cover = Gdk.Texture.new_for_pixbuf(cover)
         self.tooltip = GObject.markup_escape_text("\n".join([
-            album.get_title(),
-            ', '.join(album.get_dates()),
+            album.get_title(), ', '.join(album.get_dates()),
             Utils.create_artists_label(album),
             Utils.create_length_label(album)
         ]))
diff --git a/src/window.py b/src/window.py
index 127e2f6..2024894 100644
--- a/src/window.py
+++ b/src/window.py
@@ -92,20 +92,35 @@ class Window(Adw.ApplicationWindow):
         self._panels.append(self._cover_panel)
         # Playlist panel
         self._playlist_panel = PlaylistPanel(self._mcg)
-        self._playlist_panel.connect('open-standalone', self.on_panel_open_standalone)
-        self._playlist_panel.connect('close-standalone', self.on_panel_close_standalone)
+        self._playlist_panel.connect('open-standalone',
+                                     self.on_panel_open_standalone)
+        self._playlist_panel.connect('close-standalone',
+                                     self.on_panel_close_standalone)
         self._panels.append(self._playlist_panel)
         # Library panel
         self._library_panel = LibraryPanel(self._mcg)
-        self._library_panel.connect('open-standalone', self.on_panel_open_standalone)
-        self._library_panel.connect('close-standalone', self.on_panel_close_standalone)
+        self._library_panel.connect('open-standalone',
+                                    self.on_panel_open_standalone)
+        self._library_panel.connect('close-standalone',
+                                    self.on_panel_close_standalone)
         self._panels.append(self._library_panel)
         # Stack
         self.content_stack.add_child(self._connection_panel)
-        self.panel_stack.add_titled_with_icon(self._server_panel, 'server-panel', locale.gettext("Server"), "network-wired-symbolic")
-        self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel', locale.gettext("Cover"), "image-x-generic-symbolic")
-        self.panel_stack.add_titled_with_icon(self._playlist_panel, 'playlist-panel', locale.gettext("Playlist"), "view-list-symbolic")
-        self.panel_stack.add_titled_with_icon(self._library_panel, 'library-panel', locale.gettext("Library"), "emblem-music-symbolic")
+        self.panel_stack.add_titled_with_icon(self._server_panel,
+                                              'server-panel',
+                                              locale.gettext("Server"),
+                                              "network-wired-symbolic")
+        self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel',
+                                              locale.gettext("Cover"),
+                                              "image-x-generic-symbolic")
+        self.panel_stack.add_titled_with_icon(self._playlist_panel,
+                                              'playlist-panel',
+                                              locale.gettext("Playlist"),
+                                              "view-list-symbolic")
+        self.panel_stack.add_titled_with_icon(self._library_panel,
+                                              'library-panel',
+                                              locale.gettext("Library"),
+                                              "emblem-music-symbolic")
         # Toolbar stack
         self.toolbar_stack.add_child(self._server_panel.get_toolbar())
         self.toolbar_stack.add_child(self._cover_panel.get_toolbar())
@@ -114,56 +129,92 @@ class Window(Adw.ApplicationWindow):
 
         # Properties
         self._set_headerbar_sensitive(False, False)
-        self._connection_panel.set_host(self._settings.get_string(Window.SETTING_HOST))
-        self._connection_panel.set_port(self._settings.get_int(Window.SETTING_PORT))
+        self._connection_panel.set_host(
+            self._settings.get_string(Window.SETTING_HOST))
+        self._connection_panel.set_port(
+            self._settings.get_int(Window.SETTING_PORT))
         if use_keyring:
-            self._connection_panel.set_password(keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME))
-        self._playlist_panel.set_item_size(self._settings.get_int(Window.SETTING_ITEM_SIZE))
-        self._library_panel.set_item_size(self._settings.get_int(Window.SETTING_ITEM_SIZE))
-        self._library_panel.set_sort_order(self._settings.get_enum(Window.SETTING_SORT_ORDER))
-        self._library_panel.set_sort_type(self._settings.get_boolean(Window.SETTING_SORT_TYPE))
+            self._connection_panel.set_password(
+                keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM,
+                                     ZeroconfProvider.KEYRING_USERNAME))
+        self._playlist_panel.set_item_size(
+            self._settings.get_int(Window.SETTING_ITEM_SIZE))
+        self._library_panel.set_item_size(
+            self._settings.get_int(Window.SETTING_ITEM_SIZE))
+        self._library_panel.set_sort_order(
+            self._settings.get_enum(Window.SETTING_SORT_ORDER))
+        self._library_panel.set_sort_type(
+            self._settings.get_boolean(Window.SETTING_SORT_TYPE))
 
         # Signals
         self.connect("notify::default-width", self.on_resize)
         self.connect("notify::default-height", self.on_resize)
         self.connect("notify::maximized", self.on_maximized)
         self.connect("notify::fullscreened", self.on_fullscreened)
-        self._connection_panel.connect('connection-changed', self.on_connection_panel_connection_changed)
-        self.panel_stack.connect('notify::visible-child', self.on_stack_switched)
-        self._server_panel.connect('change-output-device', self.on_server_panel_output_device_changed)
-        self._cover_panel.connect('toggle-fullscreen', self.on_cover_panel_toggle_fullscreen)
+        self._connection_panel.connect(
+            'connection-changed', self.on_connection_panel_connection_changed)
+        self.panel_stack.connect('notify::visible-child',
+                                 self.on_stack_switched)
+        self._server_panel.connect('change-output-device',
+                                   self.on_server_panel_output_device_changed)
+        self._cover_panel.connect('toggle-fullscreen',
+                                  self.on_cover_panel_toggle_fullscreen)
         self._cover_panel.connect('set-song', self.on_cover_panel_set_song)
         self._cover_panel.connect('albumart', self.on_cover_panel_albumart)
-        self._playlist_panel.connect('clear-playlist', self.on_playlist_panel_clear_playlist)
-        self._playlist_panel.connect('remove-album', self.on_playlist_panel_remove)
-        self._playlist_panel.connect('remove-multiple-albums', self.on_playlist_panel_remove_multiple)
+        self._playlist_panel.connect('clear-playlist',
+                                     self.on_playlist_panel_clear_playlist)
+        self._playlist_panel.connect('remove-album',
+                                     self.on_playlist_panel_remove)
+        self._playlist_panel.connect('remove-multiple-albums',
+                                     self.on_playlist_panel_remove_multiple)
         self._playlist_panel.connect('play', self.on_playlist_panel_play)
-        self._playlist_panel.connect('albumart', self.on_playlist_panel_albumart)
+        self._playlist_panel.connect('albumart',
+                                     self.on_playlist_panel_albumart)
         self._library_panel.connect('update', self.on_library_panel_update)
         self._library_panel.connect('play', self.on_library_panel_play)
         self._library_panel.connect('queue', self.on_library_panel_queue)
-        self._library_panel.connect('queue-multiple', self.on_library_panel_queue_multiple)
-        self._library_panel.connect('item-size-changed', self.on_library_panel_item_size_changed)
-        self._library_panel.connect('sort-order-changed', self.on_library_panel_sort_order_changed)
-        self._library_panel.connect('sort-type-changed', self.on_library_panel_sort_type_changed)
+        self._library_panel.connect('queue-multiple',
+                                    self.on_library_panel_queue_multiple)
+        self._library_panel.connect('item-size-changed',
+                                    self.on_library_panel_item_size_changed)
+        self._library_panel.connect('sort-order-changed',
+                                    self.on_library_panel_sort_order_changed)
+        self._library_panel.connect('sort-type-changed',
+                                    self.on_library_panel_sort_type_changed)
         self._library_panel.connect('albumart', self.on_library_panel_albumart)
-        self._mcg.connect_signal(client.Client.SIGNAL_CONNECTION, self.on_mcg_connect)
-        self._mcg.connect_signal(client.Client.SIGNAL_STATUS, self.on_mcg_status)
+        self._mcg.connect_signal(client.Client.SIGNAL_CONNECTION,
+                                 self.on_mcg_connect)
+        self._mcg.connect_signal(client.Client.SIGNAL_STATUS,
+                                 self.on_mcg_status)
         self._mcg.connect_signal(client.Client.SIGNAL_STATS, self.on_mcg_stats)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_OUTPUT_DEVICES, self.on_mcg_load_output_devices)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_PLAYLIST, self.on_mcg_load_playlist)
-        self._mcg.connect_signal(client.Client.SIGNAL_PULSE_ALBUMS, self.on_mcg_pulse_albums)
-        self._mcg.connect_signal(client.Client.SIGNAL_INIT_ALBUMS, self.on_mcg_init_albums)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMS, self.on_mcg_load_albums)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMART, self.on_mcg_load_albumart)
+        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_OUTPUT_DEVICES,
+                                 self.on_mcg_load_output_devices)
+        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_PLAYLIST,
+                                 self.on_mcg_load_playlist)
+        self._mcg.connect_signal(client.Client.SIGNAL_PULSE_ALBUMS,
+                                 self.on_mcg_pulse_albums)
+        self._mcg.connect_signal(client.Client.SIGNAL_INIT_ALBUMS,
+                                 self.on_mcg_init_albums)
+        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMS,
+                                 self.on_mcg_load_albums)
+        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMART,
+                                 self.on_mcg_load_albumart)
         self._mcg.connect_signal(client.Client.SIGNAL_ERROR, self.on_mcg_error)
-        self._settings.connect('changed::'+Window.SETTING_PANEL, self.on_settings_panel_changed)
-        self._settings.connect('changed::'+Window.SETTING_ITEM_SIZE, self.on_settings_item_size_changed)
-        self._settings.connect('changed::'+Window.SETTING_SORT_ORDER, self.on_settings_sort_order_changed)
-        self._settings.connect('changed::'+Window.SETTING_SORT_TYPE, self.on_settings_sort_type_changed)
-        self._settings.bind(Window.SETTING_WINDOW_WIDTH, self._state, WindowState.WIDTH, Gio.SettingsBindFlags.DEFAULT)
-        self._settings.bind(Window.SETTING_WINDOW_HEIGHT, self._state, WindowState.HEIGHT, Gio.SettingsBindFlags.DEFAULT)
-        self._settings.bind(Window.SETTING_WINDOW_MAXIMIZED, self._state, WindowState.IS_MAXIMIZED, Gio.SettingsBindFlags.DEFAULT)
+        self._settings.connect('changed::' + Window.SETTING_PANEL,
+                               self.on_settings_panel_changed)
+        self._settings.connect('changed::' + Window.SETTING_ITEM_SIZE,
+                               self.on_settings_item_size_changed)
+        self._settings.connect('changed::' + Window.SETTING_SORT_ORDER,
+                               self.on_settings_sort_order_changed)
+        self._settings.connect('changed::' + Window.SETTING_SORT_TYPE,
+                               self.on_settings_sort_type_changed)
+        self._settings.bind(Window.SETTING_WINDOW_WIDTH, self._state,
+                            WindowState.WIDTH, Gio.SettingsBindFlags.DEFAULT)
+        self._settings.bind(Window.SETTING_WINDOW_HEIGHT, self._state,
+                            WindowState.HEIGHT, Gio.SettingsBindFlags.DEFAULT)
+        self._settings.bind(Window.SETTING_WINDOW_MAXIMIZED, self._state,
+                            WindowState.IS_MAXIMIZED,
+                            Gio.SettingsBindFlags.DEFAULT)
 
         # Actions
         self.set_default_size(self._state.width, self._state.height)
@@ -174,29 +225,38 @@ class Window(Adw.ApplicationWindow):
             self._connect()
 
         # Menu actions
-        self._connect_action = Gio.SimpleAction.new_stateful("connect", None, GLib.Variant.new_boolean(False))
+        self._connect_action = Gio.SimpleAction.new_stateful(
+            "connect", None, GLib.Variant.new_boolean(False))
         self._connect_action.connect('change-state', self.on_menu_connect)
         self.add_action(self._connect_action)
-        self._play_action = Gio.SimpleAction.new_stateful("play", None, GLib.Variant.new_boolean(False))
+        self._play_action = Gio.SimpleAction.new_stateful(
+            "play", None, GLib.Variant.new_boolean(False))
         self._play_action.set_enabled(False)
         self._play_action.connect('change-state', self.on_menu_play)
         self.add_action(self._play_action)
-        self._clear_playlist_action = Gio.SimpleAction.new("clear-playlist", None)
+        self._clear_playlist_action = Gio.SimpleAction.new(
+            "clear-playlist", None)
         self._clear_playlist_action.set_enabled(False)
-        self._clear_playlist_action.connect('activate', self.on_menu_clear_playlist)
+        self._clear_playlist_action.connect('activate',
+                                            self.on_menu_clear_playlist)
         self.add_action(self._clear_playlist_action)
         panel_variant = GLib.Variant.new_string("0")
-        self._panel_action = Gio.SimpleAction.new_stateful("panel", panel_variant.get_type(), panel_variant)
+        self._panel_action = Gio.SimpleAction.new_stateful(
+            "panel", panel_variant.get_type(), panel_variant)
         self._panel_action.set_enabled(False)
         self._panel_action.connect('change-state', self.on_menu_panel)
         self.add_action(self._panel_action)
-        self._toggle_fullscreen_action = Gio.SimpleAction.new("toggle-fullscreen", None)
+        self._toggle_fullscreen_action = Gio.SimpleAction.new(
+            "toggle-fullscreen", None)
         self._toggle_fullscreen_action.set_enabled(True)
-        self._toggle_fullscreen_action.connect('activate', self.on_menu_toggle_fullscreen)
+        self._toggle_fullscreen_action.connect('activate',
+                                               self.on_menu_toggle_fullscreen)
         self.add_action(self._toggle_fullscreen_action)
-        self._search_library_action = Gio.SimpleAction.new("search-library", None)
+        self._search_library_action = Gio.SimpleAction.new(
+            "search-library", None)
         self._search_library_action.set_enabled(True)
-        self._search_library_action.connect('activate', self.on_menu_search_library)
+        self._search_library_action.connect('activate',
+                                            self.on_menu_search_library)
         self.add_action(self._search_library_action)
 
     # Menu callbacks
@@ -212,7 +272,8 @@ class Window(Adw.ApplicationWindow):
 
     def on_menu_panel(self, action, value):
         action.set_state(value)
-        self.panel_stack.set_visible_child(self._panels[int(value.get_string())])
+        self.panel_stack.set_visible_child(self._panels[int(
+            value.get_string())])
 
     def on_menu_toggle_fullscreen(self, action, value):
         self.panel_stack.set_visible_child(self._cover_panel)
@@ -254,7 +315,7 @@ class Window(Adw.ApplicationWindow):
     @Gtk.Template.Callback()
     def on_headerbar_volume_changed(self, widget, value):
         if not self._setting_volume:
-            self._mcg.set_volume(int(value*100))
+            self._mcg.set_volume(int(value * 100))
 
     @Gtk.Template.Callback()
     def on_headerbar_playpause_toggled(self, widget):
@@ -279,15 +340,20 @@ class Window(Adw.ApplicationWindow):
         self.toolbar_view.add_top_bar(self.headerbar)
         self.toolbar_view.remove(panel.get_headerbar_standalone())
 
-    def on_connection_panel_connection_changed(self, widget, host, port, password):
+    def on_connection_panel_connection_changed(self, widget, host, port,
+                                               password):
         self._settings.set_string(Window.SETTING_HOST, host)
         self._settings.set_int(Window.SETTING_PORT, port)
         if use_keyring:
             if password:
-                keyring.set_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME, password)
+                keyring.set_password(ZeroconfProvider.KEYRING_SYSTEM,
+                                     ZeroconfProvider.KEYRING_USERNAME,
+                                     password)
             else:
-                if keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME):
-                   keyring.delete_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME)
+                if keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM,
+                                        ZeroconfProvider.KEYRING_USERNAME):
+                    keyring.delete_password(ZeroconfProvider.KEYRING_SYSTEM,
+                                            ZeroconfProvider.KEYRING_USERNAME)
 
     def on_playlist_panel_clear_playlist(self, widget):
         self._mcg.clear_playlist()
@@ -333,7 +399,8 @@ class Window(Adw.ApplicationWindow):
 
     def on_library_panel_item_size_changed(self, widget, size):
         self._playlist_panel.set_item_size(size)
-        self._settings.set_int(Window.SETTING_ITEM_SIZE, self._library_panel.get_item_size())
+        self._settings.set_int(Window.SETTING_ITEM_SIZE,
+                               self._library_panel.get_item_size())
 
     def on_library_panel_sort_order_changed(self, widget, sort_order):
         self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order)
@@ -365,7 +432,8 @@ class Window(Adw.ApplicationWindow):
             self._clear_playlist_action.set_enabled(False)
             self._panel_action.set_enabled(False)
 
-    def on_mcg_status(self, state, album, pos, time, volume, file, audio, bitrate, error):
+    def on_mcg_status(self, state, album, pos, time, volume, file, audio,
+                      bitrate, error):
         # Album
         GObject.idle_add(self._cover_panel.set_album, album)
         if not album and self._state.get_property(WindowState.IS_FULLSCREENED):
@@ -387,14 +455,17 @@ class Window(Adw.ApplicationWindow):
         if error:
             self._show_error(error)
 
-    def on_mcg_stats(self, artists, albums, songs, dbplaytime, playtime, uptime):
-        self._server_panel.set_stats(artists, albums, songs, dbplaytime, playtime, uptime)
+    def on_mcg_stats(self, artists, albums, songs, dbplaytime, playtime,
+                     uptime):
+        self._server_panel.set_stats(artists, albums, songs, dbplaytime,
+                                     playtime, uptime)
 
     def on_mcg_load_output_devices(self, devices):
         self._server_panel.set_output_devices(devices)
 
     def on_mcg_load_playlist(self, playlist):
-        self._playlist_panel.set_playlist(self._connection_panel.get_host(), playlist)
+        self._playlist_panel.set_playlist(self._connection_panel.get_host(),
+                                          playlist)
 
     def on_mcg_init_albums(self):
         GObject.idle_add(self._library_panel.init_albums)
@@ -403,7 +474,8 @@ class Window(Adw.ApplicationWindow):
         GObject.idle_add(self._library_panel.load_albums)
 
     def on_mcg_load_albums(self, albums):
-        self._library_panel.set_albums(self._connection_panel.get_host(), albums)
+        self._library_panel.set_albums(self._connection_panel.get_host(),
+                                       albums)
 
     def on_mcg_load_albumart(self, album, data):
         self._cover_panel.set_albumart(album, data)
@@ -451,11 +523,12 @@ class Window(Adw.ApplicationWindow):
         self._headerbar_connected()
         self._set_headerbar_sensitive(True, False)
         self.content_stack.set_visible_child(self.panel_stack)
-        self.panel_stack.set_visible_child(self._panels[self._settings.get_int(Window.SETTING_PANEL)])
+        self.panel_stack.set_visible_child(self._panels[self._settings.get_int(
+            Window.SETTING_PANEL)])
 
     def _connect_disconnected(self):
-        self._playlist_panel.stop_threads();
-        self._library_panel.stop_threads();
+        self._playlist_panel.stop_threads()
+        self._library_panel.stop_threads()
         self._headerbar_disconnected()
         self._set_headerbar_sensitive(False, False)
         self._save_visible_panel()
@@ -463,8 +536,10 @@ class Window(Adw.ApplicationWindow):
         self._connection_panel.set_sensitive(True)
 
     def _fullscreen(self, fullscreened_new):
-        if fullscreened_new != self._state.get_property(WindowState.IS_FULLSCREENED):
-            self._state.set_property(WindowState.IS_FULLSCREENED, fullscreened_new)
+        if fullscreened_new != self._state.get_property(
+                WindowState.IS_FULLSCREENED):
+            self._state.set_property(WindowState.IS_FULLSCREENED,
+                                     fullscreened_new)
             if self._state.get_property(WindowState.IS_FULLSCREENED):
                 self.headerbar.hide()
                 self._cover_panel.set_fullscreen(True)
@@ -475,15 +550,19 @@ class Window(Adw.ApplicationWindow):
                 self.set_cursor(Gdk.Cursor.new_from_name("default", None))
 
     def _save_visible_panel(self):
-        panel_index_selected = self._panels.index(self.panel_stack.get_visible_child())
+        panel_index_selected = self._panels.index(
+            self.panel_stack.get_visible_child())
         self._settings.set_int(Window.SETTING_PANEL, panel_index_selected)
 
     def _set_menu_visible_panel(self):
-        panel_index_selected = self._panels.index(self.panel_stack.get_visible_child())
-        self._panel_action.set_state(GLib.Variant.new_string(str(panel_index_selected)))
+        panel_index_selected = self._panels.index(
+            self.panel_stack.get_visible_child())
+        self._panel_action.set_state(
+            GLib.Variant.new_string(str(panel_index_selected)))
 
     def _set_visible_toolbar(self):
-        panel_index_selected = self._panels.index(self.panel_stack.get_visible_child())
+        panel_index_selected = self._panels.index(
+            self.panel_stack.get_visible_child())
         toolbar = self._panels[panel_index_selected].get_toolbar()
         self.toolbar_stack.set_visible_child(toolbar)
 
diff --git a/src/zeroconf.py b/src/zeroconf.py
index 226b9e1..cdb0bd2 100644
--- a/src/zeroconf.py
+++ b/src/zeroconf.py
@@ -27,18 +27,28 @@ class ZeroconfProvider(client.Base):
         if use_avahi:
             self._start_client()
 
-    def on_new_service(self, browser, interface, protocol, name, type, domain, flags):
+    def on_new_service(self, browser, interface, protocol, name, type, domain,
+                       flags):
         #if not (flags & Avahi.LookupResultFlags.GA_LOOKUP_RESULT_LOCAL):
-        service_resolver = Avahi.ServiceResolver(interface=interface, protocol=protocol, name=name, type=type, domain=domain, aprotocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC, flags=0,)
+        service_resolver = Avahi.ServiceResolver(
+            interface=interface,
+            protocol=protocol,
+            name=name,
+            type=type,
+            domain=domain,
+            aprotocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC,
+            flags=0,
+        )
         service_resolver.connect('found', self.on_found)
         service_resolver.connect('failure', self.on_failure)
         service_resolver.attach(self._client)
         self._service_resolvers.append(service_resolver)
 
-    def on_found(self, resolver, interface, protocol, name, type, domain, host, date, port, *args):
+    def on_found(self, resolver, interface, protocol, name, type, domain, host,
+                 date, port, *args):
         if (host, port) not in self._services.keys():
-            service = (name,host,port)
-            self._services[(host,port)] = service
+            service = (name, host, port)
+            self._services[(host, port)] = service
             self._callback(ZeroconfProvider.SIGNAL_SERVICE_NEW, service)
 
     def on_failure(self, resolver, date):
@@ -47,11 +57,16 @@ class ZeroconfProvider(client.Base):
 
     def _start_client(self):
         self._logger.info("Starting Avahi client")
-        self._client = Avahi.Client(flags=0,)
+        self._client = Avahi.Client(flags=0, )
         try:
             self._client.start()
             # Browser
-            self._service_browser = Avahi.ServiceBrowser(domain='local', flags=0, interface=-1, protocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC, type=ZeroconfProvider.TYPE)
+            self._service_browser = Avahi.ServiceBrowser(
+                domain='local',
+                flags=0,
+                interface=-1,
+                protocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC,
+                type=ZeroconfProvider.TYPE)
             self._service_browser.connect('new_service', self.on_new_service)
             self._service_browser.attach(self._client)
         except Exception as e:

From 4ebfc12f0e1031c0fbc3e90ddc1dd09f699501ba Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Mon, 27 May 2024 18:33:59 +0200
Subject: [PATCH 06/33] Fix import statements and order (see #103)

---
 src/albumheaderbar.py  | 1 -
 src/application.py     | 2 +-
 src/connectionpanel.py | 6 ++----
 src/coverpanel.py      | 4 +---
 src/librarypanel.py    | 5 ++---
 src/playlistpanel.py   | 6 ++----
 src/serverpanel.py     | 1 -
 src/utils.py           | 4 +---
 src/window.py          | 9 +++------
 src/zeroconf.py        | 2 +-
 10 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py
index 2a8a7e1..2f0b40b 100644
--- a/src/albumheaderbar.py
+++ b/src/albumheaderbar.py
@@ -4,7 +4,6 @@ import gi
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-
 from gi.repository import Gtk, GObject, Adw
 
 
diff --git a/src/application.py b/src/application.py
index 187793e..23f482e 100644
--- a/src/application.py
+++ b/src/application.py
@@ -5,7 +5,7 @@ import gi
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-from gi.repository import Gio, Gtk, Gdk, GLib, Adw
+from gi.repository import Gio, Gtk, Gdk, Adw
 from .window import Window
 
 
diff --git a/src/connectionpanel.py b/src/connectionpanel.py
index 4286e6a..a4060ed 100644
--- a/src/connectionpanel.py
+++ b/src/connectionpanel.py
@@ -1,13 +1,11 @@
 #!/usr/bin/env python3
 
 import gi
+import locale
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-import locale
-
-from gi.repository import Gtk, Gio, GObject, Adw
-
+from gi.repository import Gtk, GObject, Adw
 from mcg.zeroconf import ZeroconfProvider
 
 
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 9ac970b..88988b5 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-import logging
 import math
 
+gi.require_version('Gtk', '4.0')
 from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
 from mcg.utils import Utils
 
diff --git a/src/librarypanel.py b/src/librarypanel.py
index 27f8e60..8027620 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
 import locale
 import logging
 import math
 import threading
 
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index dc5e3e5..02526e0 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -1,13 +1,11 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-import logging
 import math
 import threading
 
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
diff --git a/src/serverpanel.py b/src/serverpanel.py
index e52e45d..be7bd97 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -4,7 +4,6 @@ import gi
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-
 from gi.repository import Gtk, Adw, GObject
 
 
diff --git a/src/utils.py b/src/utils.py
index 1b16308..1a9e6e7 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,13 +1,11 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
 import hashlib
 import locale
 import os
-import urllib
 
+gi.require_version('Gtk', '4.0')
 from gi.repository import Gdk, GdkPixbuf, GObject, Gtk
 
 
diff --git a/src/window.py b/src/window.py
index 2024894..1c6d25c 100644
--- a/src/window.py
+++ b/src/window.py
@@ -1,20 +1,17 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
 try:
     import keyring
     use_keyring = True
-except:
+except ImportError:
     use_keyring = False
 use_keyring = False
 import locale
-import logging
 
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio
-
 from . import client
 from .shortcutsdialog import ShortcutsDialog
 from .connectionpanel import ConnectionPanel
diff --git a/src/zeroconf.py b/src/zeroconf.py
index cdb0bd2..5fa3363 100644
--- a/src/zeroconf.py
+++ b/src/zeroconf.py
@@ -5,7 +5,7 @@ try:
     gi.require_version('Avahi', '0.6')
     from gi.repository import Avahi
     use_avahi = True
-except:
+except ValueError | ImportError:
     use_avahi = False
 import logging
 

From 54fe825acfa493b17c173e149ad72b09a7791203 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Tue, 28 May 2024 12:02:43 +0200
Subject: [PATCH 07/33] Improve variable names to match Code Style Guide (see
 #103)

---
 src/application.py   |  6 +++---
 src/client.py        | 24 ++++++++++++------------
 src/coverpanel.py    | 22 +++++++++++-----------
 src/librarypanel.py  | 32 ++++++++++++++++----------------
 src/playlistpanel.py | 10 +++++-----
 src/window.py        | 42 ++++++++++++++++++++++++------------------
 6 files changed, 71 insertions(+), 65 deletions(-)

diff --git a/src/application.py b/src/application.py
index 23f482e..ee68b4b 100644
--- a/src/application.py
+++ b/src/application.py
@@ -77,10 +77,10 @@ albums instead of single tracks.""")
         style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK)
 
     def _load_css(self):
-        styleProvider = Gtk.CssProvider()
-        styleProvider.load_from_resource(self._get_resource_path('gtk.css'))
+        style_provider = Gtk.CssProvider()
+        style_provider.load_from_resource(self._get_resource_path('gtk.css'))
         Gtk.StyleContext.add_provider_for_display(
-            Gdk.Display.get_default(), styleProvider,
+            Gdk.Display.get_default(), style_provider,
             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 
     def _setup_actions(self):
diff --git a/src/client.py b/src/client.py
index ac7235b..81dbc42 100644
--- a/src/client.py
+++ b/src/client.py
@@ -831,12 +831,12 @@ class Client(Base):
         self._buffer = buf
 
     def _parse_dict(self, response):
-        dict = {}
+        dictionary = {}
         if response:
             for line in response:
                 key, value = self._split_line(line)
-                dict[key] = value
-        return dict
+                dictionary[key] = value
+        return dictionary
 
     def _parse_list(self, response, delimiters):
         entry = {}
@@ -863,13 +863,13 @@ class Client(Base):
         album = None
         if 'album' not in song:
             song['album'] = MCGAlbum.DEFAULT_ALBUM
-        id = Utils.generate_id(song['album'])
-        if lookup and id in self._albums.keys():
-            album = self._albums[id]
+        album_id = Utils.generate_id(song['album'])
+        if lookup and album_id in self._albums.keys():
+            album = self._albums[album_id]
         else:
             album = MCGAlbum(song['album'], self._host)
         if lookup:
-            self._albums[id] = album
+            self._albums[album_id] = album
         return album
 
     def _extract_track(self, song):
@@ -1047,22 +1047,22 @@ class MCGAlbum:
         elif criterion == SortOrder.MODIFIED:
             value_function = "get_last_modified"
 
-        reverseMultiplier = -1 if reverse else 1
+        reverse_multiplier = -1 if reverse else 1
 
         value1 = getattr(album1, value_function)()
         value2 = getattr(album2, value_function)()
         if value1 is None and value2 is None:
             return 0
         elif value1 is None:
-            return -1 * reverseMultiplier
+            return -1 * reverse_multiplier
         elif value2 is None:
-            return 1 * reverseMultiplier
+            return 1 * reverse_multiplier
         if value1 < value2:
-            return -1 * reverseMultiplier
+            return -1 * reverse_multiplier
         elif value1 == value2:
             return 0
         else:
-            return 1 * reverseMultiplier
+            return 1 * reverse_multiplier
 
 
 class MCGTrack:
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 88988b5..803e1a4 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -54,16 +54,16 @@ class CoverPanel(Gtk.Overlay):
         GObject.idle_add(self._enable_tracklist)
 
         # Click handler for image
-        clickController = Gtk.GestureClick()
-        clickController.connect('pressed', self.on_cover_box_pressed)
-        self.cover_box.add_controller(clickController)
+        click_controller = Gtk.GestureClick()
+        click_controller.connect('pressed', self.on_cover_box_pressed)
+        self.cover_box.add_controller(click_controller)
 
         # Button controller for songs scale
-        buttonController = Gtk.GestureClick()
-        buttonController.connect('pressed', self.on_songs_scale_pressed)
-        buttonController.connect('unpaired-release',
-                                 self.on_songs_scale_released)
-        self.songs_scale.add_controller(buttonController)
+        button_controller = Gtk.GestureClick()
+        button_controller.connect('pressed', self.on_songs_scale_pressed)
+        button_controller.connect('unpaired-release',
+                                  self.on_songs_scale_released)
+        self.songs_scale.add_controller(button_controller)
 
     def get_toolbar(self):
         return self.toolbar
@@ -226,10 +226,10 @@ class CoverPanel(Gtk.Overlay):
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
-        ratioW = float(size_width) / float(pixbuf.get_width())
-        ratioH = float(size_height) / float(pixbuf.get_height())
+        ratio_w = float(size_width) / float(pixbuf.get_width())
+        ratio_h = float(size_height) / float(pixbuf.get_height())
         # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
-        ratio = min(ratioW, ratioH)
+        ratio = min(ratio_w, ratio_h)
         ratio = min(ratio, 1)
         # Neue Breite und Höhe berechnen
         width = int(math.floor(pixbuf.get_width() * ratio))
diff --git a/src/librarypanel.py b/src/librarypanel.py
index 8027620..f595d4e 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -116,10 +116,10 @@ class LibraryPanel(Adw.Bin):
         }
 
         # Button controller for grid scale
-        buttonController = Gtk.GestureClick()
-        buttonController.connect('unpaired-release',
-                                 self.on_grid_scale_released)
-        self.grid_scale.add_controller(buttonController)
+        button_controller = Gtk.GestureClick()
+        button_controller.connect('unpaired-release',
+                                  self.on_grid_scale_released)
+        self.grid_scale.add_controller(button_controller)
 
     def get_headerbar_standalone(self):
         return self._headerbar_standalone
@@ -151,8 +151,8 @@ class LibraryPanel(Adw.Bin):
 
     def on_grid_scale_released(self, widget, x, y, npress, sequence):
         size = math.floor(self.grid_scale.get_value())
-        range = self.grid_scale.get_adjustment()
-        if size < range.get_lower() or size > range.get_upper():
+        grid_range = self.grid_scale.get_adjustment()
+        if size < grid_range.get_lower() or size > grid_range.get_upper():
             return
         self._item_size = size
         self.emit('item-size-changed', size)
@@ -162,8 +162,8 @@ class LibraryPanel(Adw.Bin):
     @Gtk.Template.Callback()
     def on_grid_scale_changed(self, widget):
         size = math.floor(self.grid_scale.get_value())
-        range = widget.get_adjustment()
-        if size < range.get_lower() or size > range.get_upper():
+        grid_range = widget.get_adjustment()
+        if size < grid_range.get_lower() or size > grid_range.get_upper():
             return
         self._set_widget_grid_size(self.library_grid, size, True)
 
@@ -200,9 +200,9 @@ class LibraryPanel(Adw.Bin):
         # Get selected album
         item = self._library_grid_filter.get_item(position)
         album = item.get_album()
-        id = album.get_id()
+        album_id = album.get_id()
         self._selected_albums = [album]
-        self.emit('albumart', id)
+        self.emit('albumart', album_id)
 
         # Show standalone album
         if widget.get_model() == self._library_grid_selection_single:
@@ -415,9 +415,9 @@ class LibraryPanel(Adw.Bin):
 
         lower = int(self.grid_scale.get_adjustment().get_lower())
         upper = int(self.grid_scale.get_adjustment().get_upper())
-        countMin = max(int(width / upper), 1)
-        countMax = max(int(width / lower), 1)
-        for index in range(countMin, countMax):
+        count_min = max(int(width / upper), 1)
+        count_max = max(int(width / lower), 1)
+        for index in range(count_min, count_max):
             pixel = int(width / index)
             pixel = pixel - (2 * int(pixel / 100))
             self.grid_scale.add_mark(pixel, Gtk.PositionType.BOTTOM, None)
@@ -445,10 +445,10 @@ class LibraryPanel(Adw.Bin):
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
-        ratioW = float(size_width) / float(pixbuf.get_width())
-        ratioH = float(size_height) / float(pixbuf.get_height())
+        ratio_w = float(size_width) / float(pixbuf.get_width())
+        ratio_h = float(size_height) / float(pixbuf.get_height())
         # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
-        ratio = min(ratioW, ratioH)
+        ratio = min(ratio_w, ratio_h)
         ratio = min(ratio, 1)
         # Neue Breite und Höhe berechnen
         width = int(math.floor(pixbuf.get_width() * ratio))
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index 02526e0..1365b32 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -110,9 +110,9 @@ class PlaylistPanel(Adw.Bin):
         # Get selected album
         item = self._playlist_grid_model.get_item(position)
         album = item.get_album()
-        id = album.get_id()
+        album_id = album.get_id()
         self._selected_albums = [album]
-        self.emit('albumart', id)
+        self.emit('albumart', album_id)
 
         # Show standalone album
         if widget.get_model() == self._playlist_grid_selection_single:
@@ -253,10 +253,10 @@ class PlaylistPanel(Adw.Bin):
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
-        ratioW = float(size_width) / float(pixbuf.get_width())
-        ratioH = float(size_height) / float(pixbuf.get_height())
+        ratio_w = float(size_width) / float(pixbuf.get_width())
+        ratio_h = float(size_height) / float(pixbuf.get_height())
         # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
-        ratio = min(ratioW, ratioH)
+        ratio = min(ratio_w, ratio_h)
         ratio = min(ratio, 1)
         # Neue Breite und Höhe berechnen
         width = int(math.floor(pixbuf.get_width() * ratio))
diff --git a/src/window.py b/src/window.py
index 1c6d25c..648853d 100644
--- a/src/window.py
+++ b/src/window.py
@@ -23,10 +23,10 @@ from .zeroconf import ZeroconfProvider
 
 
 class WindowState(GObject.Object):
-    WIDTH = 'width'
-    HEIGHT = 'height'
-    IS_MAXIMIZED = 'is_maximized'
-    IS_FULLSCREENED = 'is_fullscreened'
+    PROP_WIDTH = 'width'
+    PROP_HEIGHT = 'height'
+    PROP_MAXIMIZED = 'is_maximized'
+    PROP_FULLSCREENED = 'is_fullscreened'
     width = GObject.Property(type=int, default=800)
     height = GObject.Property(type=int, default=600)
     is_maximized = GObject.Property(type=bool, default=False)
@@ -206,16 +206,18 @@ class Window(Adw.ApplicationWindow):
         self._settings.connect('changed::' + Window.SETTING_SORT_TYPE,
                                self.on_settings_sort_type_changed)
         self._settings.bind(Window.SETTING_WINDOW_WIDTH, self._state,
-                            WindowState.WIDTH, Gio.SettingsBindFlags.DEFAULT)
+                            WindowState.PROP_WIDTH,
+                            Gio.SettingsBindFlags.DEFAULT)
         self._settings.bind(Window.SETTING_WINDOW_HEIGHT, self._state,
-                            WindowState.HEIGHT, Gio.SettingsBindFlags.DEFAULT)
+                            WindowState.PROP_HEIGHT,
+                            Gio.SettingsBindFlags.DEFAULT)
         self._settings.bind(Window.SETTING_WINDOW_MAXIMIZED, self._state,
-                            WindowState.IS_MAXIMIZED,
+                            WindowState.PROP_MAXIMIZED,
                             Gio.SettingsBindFlags.DEFAULT)
 
         # Actions
         self.set_default_size(self._state.width, self._state.height)
-        if self._state.get_property(WindowState.IS_MAXIMIZED):
+        if self._state.get_property(WindowState.PROP_MAXIMIZED):
             self.maximize()
         self.content_stack.set_visible_child(self._connection_panel)
         if self._settings.get_boolean(Window.SETTING_CONNECTED):
@@ -274,7 +276,7 @@ class Window(Adw.ApplicationWindow):
 
     def on_menu_toggle_fullscreen(self, action, value):
         self.panel_stack.set_visible_child(self._cover_panel)
-        if not self._state.get_property(WindowState.IS_FULLSCREENED):
+        if not self._state.get_property(WindowState.PROP_FULLSCREENED):
             self.fullscreen()
         else:
             self.unfullscreen()
@@ -290,14 +292,14 @@ class Window(Adw.ApplicationWindow):
         height = self.get_size(Gtk.Orientation.VERTICAL)
         if width > 0:
             self._cover_panel.set_width(width)
-            if not self._state.get_property(WindowState.IS_MAXIMIZED):
-                self._state.set_property(WindowState.WIDTH, width)
-                self._state.set_property(WindowState.HEIGHT, height)
+            if not self._state.get_property(WindowState.PROP_MAXIMIZED):
+                self._state.set_property(WindowState.PROP_WIDTH, width)
+                self._state.set_property(WindowState.PROP_HEIGHT, height)
             GObject.idle_add(self._playlist_panel.set_size, width, height)
             GObject.idle_add(self._library_panel.set_size, width, height)
 
     def on_maximized(self, widget, maximized):
-        self._state.set_property(WindowState.IS_MAXIMIZED, maximized is True)
+        self._state.set_property(WindowState.PROP_MAXIMIZED, maximized is True)
 
     def on_fullscreened(self, widget, fullscreened):
         self._fullscreen(self.is_fullscreen())
@@ -371,7 +373,7 @@ class Window(Adw.ApplicationWindow):
         self._mcg.enable_output_device(device, enabled)
 
     def on_cover_panel_toggle_fullscreen(self, widget):
-        if not self._state.get_property(WindowState.IS_FULLSCREENED):
+        if not self._state.get_property(WindowState.PROP_FULLSCREENED):
             self.fullscreen()
         else:
             self.unfullscreen()
@@ -433,7 +435,10 @@ class Window(Adw.ApplicationWindow):
                       bitrate, error):
         # Album
         GObject.idle_add(self._cover_panel.set_album, album)
-        if not album and self._state.get_property(WindowState.IS_FULLSCREENED):
+        if (
+            not album
+            and self._state.get_property(WindowState.PROP_FULLSCREENED)
+        ):
             self._fullscreen(False)
         # State
         if state == 'play':
@@ -534,10 +539,11 @@ class Window(Adw.ApplicationWindow):
 
     def _fullscreen(self, fullscreened_new):
         if fullscreened_new != self._state.get_property(
-                WindowState.IS_FULLSCREENED):
-            self._state.set_property(WindowState.IS_FULLSCREENED,
+            WindowState.PROP_FULLSCREENED
+        ):
+            self._state.set_property(WindowState.PROP_FULLSCREENED,
                                      fullscreened_new)
-            if self._state.get_property(WindowState.IS_FULLSCREENED):
+            if self._state.get_property(WindowState.PROP_FULLSCREENED):
                 self.headerbar.hide()
                 self._cover_panel.set_fullscreen(True)
                 self.set_cursor(Gdk.Cursor.new_from_name("none", None))

From 420946d7d435983e86af81fe5500891070acbcec Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 3 Nov 2024 10:42:29 +0100
Subject: [PATCH 08/33] Declare static methods with annotation (see #103)

---
 src/client.py | 1 +
 src/utils.py  | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/client.py b/src/client.py
index 81dbc42..79c5eec 100644
--- a/src/client.py
+++ b/src/client.py
@@ -1035,6 +1035,7 @@ class MCGAlbum:
                 return False
         return True
 
+    @staticmethod
     def compare(album1, album2, criterion=None, reverse=False):
         if criterion == None:
             criterion = SortOrder.TITLE
diff --git a/src/utils.py b/src/utils.py
index 1a9e6e7..ed8a04f 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -13,6 +13,7 @@ class Utils:
     CSS_SELECTION = 'selection'
     STOCK_ICON_DEFAULT = 'image-x-generic-symbolic'
 
+    @staticmethod
     def load_pixbuf(data):
         loader = GdkPixbuf.PixbufLoader()
         try:
@@ -21,6 +22,7 @@ class Utils:
             loader.close()
         return loader.get_pixbuf()
 
+    @staticmethod
     def load_thumbnail(cache, client, album, size):
         cache_url = cache.create_filename(album)
         pixbuf = None
@@ -38,6 +40,7 @@ class Utils:
                 pixbuf.savev(cache_url, 'jpeg', [], [])
         return pixbuf
 
+    @staticmethod
     def create_artists_label(album):
         label = ', '.join(album.get_albumartists())
         if album.get_artists():
@@ -45,12 +48,14 @@ class Utils:
                 label, ", ".join(album.get_artists()))
         return label
 
+    @staticmethod
     def create_length_label(album):
         minutes = album.get_length() // 60
         seconds = album.get_length() - minutes * 60
 
         return locale.gettext("{}:{} minutes").format(minutes, seconds)
 
+    @staticmethod
     def create_track_title(track):
         title = track.get_title()
         if track.get_artists():
@@ -58,6 +63,7 @@ class Utils:
                 title, ", ".join(track.get_artists()))
         return title
 
+    @staticmethod
     def generate_id(values):
         if type(values) is not list:
             values = [values]

From bcfd17a8ae97b87704480873d476acfd545df741 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 3 Nov 2024 10:44:11 +0100
Subject: [PATCH 09/33] Remove unused variables (see #103)

---
 src/client.py        | 7 +++----
 src/coverpanel.py    | 2 +-
 src/librarypanel.py  | 2 +-
 src/playlistpanel.py | 2 +-
 src/serverpanel.py   | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/client.py b/src/client.py
index 79c5eec..7c478f1 100644
--- a/src/client.py
+++ b/src/client.py
@@ -298,7 +298,7 @@ class Client(Base):
         resources = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
                                        socket.SOCK_STREAM, socket.IPPROTO_TCP)
         for res in resources:
-            af, socktype, proto, canonname, sa = res
+            af, socktype, proto, _, sa = res
             try:
                 sock = socket.socket(af, socktype, proto)
                 sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
@@ -754,7 +754,6 @@ class Client(Base):
         data = None
         size = 1
         offset = 0
-        index = 0
 
         # Read data until size is reached
         while offset < size:
@@ -775,7 +774,7 @@ class Client(Base):
             self._logger.debug("size: %d", size)
             # For some commands the second line is the mimetype
             if has_mimetype:
-                mimetype = self._parse_dict([self._read_line()])['type']
+                self._parse_dict([self._read_line()])['type']
             # Next line is the count of bytes read
             binary = int(self._parse_dict([self._read_line()])['binary'])
             self._logger.debug("binary: %d", binary)
@@ -1148,7 +1147,7 @@ class MCGTrack:
         if date_string:
             try:
                 self._last_modified = dateutil.parser.isoparse(date_string)
-            except ValueError as e:
+            except ValueError:
                 self._logger.debug("Invalid date format: %s", date_string)
 
     def get_last_modified(self):
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 803e1a4..89a6388 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -152,7 +152,7 @@ class CoverPanel(Gtk.Overlay):
                 # Load image and draw it
                 try:
                     self._cover_pixbuf = Utils.load_pixbuf(data)
-                except Exception as e:
+                except Exception:
                     self._logger.exception("Failed to set albumart")
                     self._cover_pixbuf = None
             else:
diff --git a/src/librarypanel.py b/src/librarypanel.py
index f595d4e..cc4ecc2 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -297,7 +297,7 @@ class LibraryPanel(Adw.Bin):
                 # Load image and draw it
                 try:
                     self._standalone_pixbuf = Utils.load_pixbuf(data)
-                except Exception as e:
+                except Exception:
                     self._logger.exception("Failed to set albumart")
                     self._standalone_pixbuf = self._get_default_image()
             else:
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index 1365b32..920b1bb 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -175,7 +175,7 @@ class PlaylistPanel(Adw.Bin):
                 # Load image and draw it
                 try:
                     self._standalone_pixbuf = Utils.load_pixbuf(data)
-                except Exception as e:
+                except Exception:
                     self._logger.exception("Failed to set albumart")
                     self._cover_pixbuf = self._get_default_image()
             else:
diff --git a/src/serverpanel.py b/src/serverpanel.py
index be7bd97..aceaa60 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -103,8 +103,8 @@ class ServerPanel(Adw.Bin):
                 button = Gtk.CheckButton.new_with_label(device.get_name())
                 if device.is_enabled():
                     button.set_active(True)
-                handler = button.connect('toggled',
-                                         self.on_output_device_toggled, device)
+                button.connect('toggled', self.on_output_device_toggled,
+                               device)
                 self.output_devices.insert(button, -1)
                 self._output_buttons[device.get_id()] = button
 

From 99958eabc989afa563803d51b0e762b72a0d609b Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 3 Nov 2024 10:55:52 +0100
Subject: [PATCH 10/33] Fix some comments and remove German ones

---
 src/client.py        | 6 ++----
 src/coverpanel.py    | 4 +---
 src/librarypanel.py  | 3 ---
 src/playlistpanel.py | 3 ---
 src/serverpanel.py   | 2 +-
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/client.py b/src/client.py
index 7c478f1..e5ffce2 100644
--- a/src/client.py
+++ b/src/client.py
@@ -542,8 +542,6 @@ class Client(Base):
 
     def _playpause(self):
         """Action: Perform the real play/pause command."""
-        #status = self._parse_dict(self._call('status'))
-        #if 'state' in status:
         if self._state == 'play':
             self._call('pause')
         else:
@@ -653,7 +651,7 @@ class Client(Base):
         return future
 
     def _add_action_future(self, future, method, *args):
-        """Add an action to the action list based on a futre."""
+        """Add an action to the action list based on a future."""
         self._logger.debug("add action future %r (%r)", method.__name__, args)
         action = (future, method, args)
         self._actions.put(action)
@@ -787,7 +785,7 @@ class Client(Base):
             # Read actual bytes
             self._read_bytes(data_view, binary)
             offset += binary
-            # Read line break to complete previous repsonse
+            # Read line break to complete previous response
             self._read_line()
             # Read command completion
             end = self._read_line()
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 89a6388..ba09e16 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -69,6 +69,7 @@ class CoverPanel(Gtk.Overlay):
         return self.toolbar
 
     def set_selected(self, selected):
+        """The cover panel does not use selections"""
         pass
 
     def on_cover_box_pressed(self, widget, npress, x, y):
@@ -203,9 +204,6 @@ class CoverPanel(Gtk.Overlay):
         self.cover_spinner.stop()
 
     def _resize_image(self):
-        """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
-        auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
-        """
         # Get size
         size_width = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL)
         size_height = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL)
diff --git a/src/librarypanel.py b/src/librarypanel.py
index cc4ecc2..488528b 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -431,9 +431,6 @@ class LibraryPanel(Adw.Bin):
         self.emit('close-standalone')
 
     def _resize_standalone_image(self):
-        """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
-        auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
-        """
         # Get size
         size_width = self.standalone_stack.get_width()
         size_height = self.standalone_stack.get_height()
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index 920b1bb..34abfee 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -239,9 +239,6 @@ class PlaylistPanel(Adw.Bin):
         self.emit('close-standalone')
 
     def _resize_standalone_image(self):
-        """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
-        auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
-        """
         # Get size
         size_width = self.standalone_stack.get_width()
         size_height = self.standalone_stack.get_height()
diff --git a/src/serverpanel.py b/src/serverpanel.py
index aceaa60..6fa7e39 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -31,7 +31,7 @@ class ServerPanel(Adw.Bin):
     stats_dbplaytime = Gtk.Template.Child()
     stats_playtime = Gtk.Template.Child()
     stats_uptime = Gtk.Template.Child()
-    # Audio ouptut devices widgets
+    # Audio output devices widgets
     output_devices = Gtk.Template.Child()
 
     def __init__(self, **kwargs):

From 188dcb4ef86f517056ac605ed036c40596c3c90b Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 3 Nov 2024 10:56:25 +0100
Subject: [PATCH 11/33] fixup! Improve variable names to match Code Style Guide
 (see #103)

---
 src/client.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client.py b/src/client.py
index e5ffce2..e761078 100644
--- a/src/client.py
+++ b/src/client.py
@@ -924,7 +924,7 @@ class MCGAlbum:
     def __init__(self, title, host):
         self._artists = []
         self._albumartists = []
-        self._pathes = []
+        self._paths = []
         if type(title) is list:
             title = title[0]
         self._title = title
@@ -986,8 +986,8 @@ class MCGAlbum:
         ):
             self._dates.append(track.get_date())
         path = os.path.dirname(track.get_file())
-        if path not in self._pathes:
-            self._pathes.append(path)
+        if path not in self._paths:
+            self._paths.append(path)
         if track.get_last_modified():
             if (
                 not self._last_modified

From 4586494f8d3462895bed8f4826de3e98af069250 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sat, 23 Nov 2024 16:26:13 +0100
Subject: [PATCH 12/33] Pass version to application (see #103)

---
 src/application.py | 5 +++--
 src/main.py        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/application.py b/src/application.py
index ee68b4b..c39b929 100644
--- a/src/application.py
+++ b/src/application.py
@@ -14,11 +14,12 @@ class Application(Gtk.Application):
     ID = 'xyz.suruatoel.mcg'
     DOMAIN = 'mcg'
 
-    def __init__(self):
+    def __init__(self, version):
         super().__init__(application_id=Application.ID,
                          flags=Gio.ApplicationFlags.FLAGS_NONE)
         self._window = None
         self._info_dialog = None
+        self._version = version
         self._verbosity = logging.WARNING
         self.set_accels_for_action('window.close', ['<primary>q'])
         self.set_accels_for_action('win.show-help-overlay', ['<primary>k'])
@@ -52,7 +53,7 @@ class Application(Gtk.Application):
         self._info_dialog = Adw.AboutDialog()
         self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
         self._info_dialog.set_application_name("CoverGrid")
-        self._info_dialog.set_version("3.2.1")
+        self._info_dialog.set_version(self._version)
         self._info_dialog.set_comments(
             """CoverGrid is a client for the Music Player Daemon, focusing on \
 albums instead of single tracks.""")
diff --git a/src/main.py b/src/main.py
index bc1476c..319beff 100644
--- a/src/main.py
+++ b/src/main.py
@@ -4,5 +4,5 @@ from .application import Application
 
 
 def main(version):
-    app = Application()
+    app = Application(version)
     return app.run(sys.argv)

From 2b1edc715fe00e8efc5620db7874778b52d1fa1b Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sat, 23 Nov 2024 16:29:35 +0100
Subject: [PATCH 13/33] Mark strings as Regular Expressions (see #103)

---
 src/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client.py b/src/client.py
index e761078..5773944 100644
--- a/src/client.py
+++ b/src/client.py
@@ -22,7 +22,7 @@ class MPDException(Exception):
 
     def _parse_error(self, error):
         if error:
-            parts = re.match("\[(\d+)@(\d+)\]\s\{(\w+)\}\s(.*)", error)
+            parts = re.match(r"\[(\d+)@(\d+)\]\s\{(\w+)\}\s(.*)", error)
             if parts:
                 self._error_number = int(parts.group(1))
                 self._command_number = int(parts.group(2))

From ccf68deff7228640fc78e25b9d99f3a757c546f4 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sat, 23 Nov 2024 16:35:19 +0100
Subject: [PATCH 14/33] Remove unused (commented out) code (see #103)

---
 src/__init__.py    | 13 -------------
 src/client.py      |  5 -----
 src/serverpanel.py |  1 -
 src/zeroconf.py    |  1 -
 4 files changed, 20 deletions(-)

diff --git a/src/__init__.py b/src/__init__.py
index aae3b90..c498e0f 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -17,16 +17,3 @@ if os.path.exists(localedirdev):
 # Set GSettings schema dir (if not set already)
 if not os.environ.get('GSETTINGS_SCHEMA_DIR'):
     os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev
-
-
-class Environment:
-    """Wrapper class to access environment settings."""
-
-    def get_srcdir():
-        return srcdir
-
-    def get_data(subdir):
-        return os.path.join(datadir, subdir)
-
-    def get_locale():
-        return localedir
diff --git a/src/client.py b/src/client.py
index 5773944..87c71b5 100644
--- a/src/client.py
+++ b/src/client.py
@@ -843,11 +843,6 @@ class Client(Base):
                 if entry and key in delimiters:
                     yield entry
                     entry = {}
-                #if key in entry.keys():
-                #    if entry[key] is not list:
-                #        entry[key] = [entry[key]]
-                #    entry[key].append(value)
-                #else:
                 entry[key] = value
         if entry:
             yield entry
diff --git a/src/serverpanel.py b/src/serverpanel.py
index 6fa7e39..f29c7c4 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -113,4 +113,3 @@ class ServerPanel(Adw.Bin):
             if id not in device_ids:
                 self.output_devices.remove(
                     self._output_buttons[id].get_parent())
-
diff --git a/src/zeroconf.py b/src/zeroconf.py
index 5fa3363..6dc1f00 100644
--- a/src/zeroconf.py
+++ b/src/zeroconf.py
@@ -29,7 +29,6 @@ class ZeroconfProvider(client.Base):
 
     def on_new_service(self, browser, interface, protocol, name, type, domain,
                        flags):
-        #if not (flags & Avahi.LookupResultFlags.GA_LOOKUP_RESULT_LOCAL):
         service_resolver = Avahi.ServiceResolver(
             interface=interface,
             protocol=protocol,

From 84103229f1f5d4861cf77b3ca769c439efbf16dd Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sat, 23 Nov 2024 16:35:44 +0100
Subject: [PATCH 15/33] Fix conditions using None (see #103)

---
 src/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client.py b/src/client.py
index 87c71b5..17b7522 100644
--- a/src/client.py
+++ b/src/client.py
@@ -1029,7 +1029,7 @@ class MCGAlbum:
 
     @staticmethod
     def compare(album1, album2, criterion=None, reverse=False):
-        if criterion == None:
+        if criterion is None:
             criterion = SortOrder.TITLE
         if criterion == SortOrder.ARTIST:
             value_function = "get_artists"

From f3e3f920a5621e0c1a10af965ece6ab1cbe6ffa7 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 24 Nov 2024 14:33:55 +0100
Subject: [PATCH 16/33] Bump version to 4.0

---
 README.md   | 3 ++-
 meson.build | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 083b151..59cfc3e 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,8 @@ Dependencies:
 
 * [Python](http://www.python.org) 3
 * [python-dateutil](https://pypi.org/project/python-dateutil/)
-* [GTK](http://www.gtk.org) 3 (>= 3.22) ([python-gobject](https://live.gnome.org/PyGObject))
+* [GTK](http://www.gtk.org) 4 (>= 4.18) ([python-gobject](https://live.gnome.org/PyGObject))
+* [libadwaita](https://gnome.pages.gitlab.gnome.org/libadwaita/) (>= 1.2)
 * [Avahi](http://www.avahi.org) (optional)
 * [python-keyring](http://pypi.python.org/pypi/keyring) (optional)
 * [meson](https://mesonbuild.com/) and [ninja](https://ninja-build.org/) (building)
diff --git a/meson.build b/meson.build
index 5a6d445..cdc1224 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('mcg',
-    version: '3.2.1',
+    version: '4.0',
     meson_version: '>= 0.59.0',
     default_options: [
         'warning_level=2',

From 79b3111fb0bde3c938cf1ff2d37f6e3e6abb52db Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 6 Apr 2025 16:03:39 +0200
Subject: [PATCH 17/33] Fix reacting to window resizing (close #107)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the handlers for the “default-width” and “default-height” with an
override to the virtual “size_allocate” method to reliably react to Window
resizing.
---
 src/window.py | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/window.py b/src/window.py
index 648853d..db10c23 100644
--- a/src/window.py
+++ b/src/window.py
@@ -75,6 +75,8 @@ class Window(Adw.ApplicationWindow):
         self._setting_volume = False
         self._headerbar_connection_button_active = True
         self._headerbar_playpause_button_active = True
+        self._width = 0
+        self._height = 0
 
         # Help/Shortcuts dialog
         self.set_help_overlay(ShortcutsDialog())
@@ -144,8 +146,6 @@ class Window(Adw.ApplicationWindow):
             self._settings.get_boolean(Window.SETTING_SORT_TYPE))
 
         # Signals
-        self.connect("notify::default-width", self.on_resize)
-        self.connect("notify::default-height", self.on_resize)
         self.connect("notify::maximized", self.on_maximized)
         self.connect("notify::fullscreened", self.on_fullscreened)
         self._connection_panel.connect(
@@ -258,6 +258,22 @@ class Window(Adw.ApplicationWindow):
                                             self.on_menu_search_library)
         self.add_action(self._search_library_action)
 
+    def do_size_allocate(self, width, height, baseline):
+        Gtk.ApplicationWindow().do_size_allocate(self, width, height, baseline)
+
+        if self._width == width and self._height == height:
+            return
+        self._width = width
+        self._height = height
+
+        if width > 0:
+            self._cover_panel.set_width(width)
+            if not self._state.get_property(WindowState.PROP_MAXIMIZED):
+                self._state.set_property(WindowState.PROP_WIDTH, width)
+                self._state.set_property(WindowState.PROP_HEIGHT, height)
+            GObject.idle_add(self._playlist_panel.set_size, width, height)
+            GObject.idle_add(self._library_panel.set_size, width, height)
+
     # Menu callbacks
 
     def on_menu_connect(self, action, value):
@@ -287,17 +303,6 @@ class Window(Adw.ApplicationWindow):
 
     # Window callbacks
 
-    def on_resize(self, widget, event):
-        width = self.get_size(Gtk.Orientation.HORIZONTAL)
-        height = self.get_size(Gtk.Orientation.VERTICAL)
-        if width > 0:
-            self._cover_panel.set_width(width)
-            if not self._state.get_property(WindowState.PROP_MAXIMIZED):
-                self._state.set_property(WindowState.PROP_WIDTH, width)
-                self._state.set_property(WindowState.PROP_HEIGHT, height)
-            GObject.idle_add(self._playlist_panel.set_size, width, height)
-            GObject.idle_add(self._library_panel.set_size, width, height)
-
     def on_maximized(self, widget, maximized):
         self._state.set_property(WindowState.PROP_MAXIMIZED, maximized is True)
 

From cd4f32e7f21e6dea16ec4b5ce78efb5509a81b5e Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 6 Apr 2025 16:48:11 +0200
Subject: [PATCH 18/33] Fix alignment of tracks on Cover panel (close #106)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GTK 4 centers marks of the Scale widget even when the scale has a vertical
orientation. Unfortunately, the Scale widget does not provide a way to set the
alignment or to access the internal Label widget in any way. To left-align the
labels this commit add a method that traverses the all children of the songs
scale recursively and adjusts the alignment if it is a Label widget.
---
 data/ui/cover-panel.ui |  2 +-
 src/coverpanel.py      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/data/ui/cover-panel.ui b/data/ui/cover-panel.ui
index 75c8530..d869e76 100644
--- a/data/ui/cover-panel.ui
+++ b/data/ui/cover-panel.ui
@@ -141,6 +141,7 @@
                     <child>
                       <object class="GtkScale" id="songs_scale">
                         <property name="orientation">vertical</property>
+                        <property name="halign">start</property>
                         <property name="valign">fill</property>
                         <property name="vexpand">true</property>
                         <property name="restrict-to-fill-level">False</property>
@@ -158,4 +159,3 @@
     </child>
   </template>
 </interface>
-
diff --git a/src/coverpanel.py b/src/coverpanel.py
index ba09e16..d9c5d31 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -180,6 +180,21 @@ class CoverPanel(Gtk.Overlay):
             length, Gtk.PositionType.RIGHT,
             "{0[0]:02d}:{0[1]:02d} minutes".format(divmod(length, 60)))
 
+        # Align marks
+        self._align_songs_scale_marks()
+
+    def _align_songs_scale_marks(self):
+        self._align_songs_scale_mark(self.songs_scale)
+
+    def _align_songs_scale_mark(self, widget):
+        child = widget.get_first_child()
+        while child:
+            if type(child) is Gtk.Label:
+                child.set_halign(Gtk.Align.START)
+            else:
+                self._align_songs_scale_mark(child)
+            child = child.get_next_sibling()
+
     def _enable_tracklist(self):
         if self._current_album:
             # enable

From dce1c441a03a2b874383a6316b332f1f532ce014 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 6 Apr 2025 16:55:05 +0200
Subject: [PATCH 19/33] =?UTF-8?q?Fix=20READMe=20to=20call=20meson=E2=80=99?=
 =?UTF-8?q?s=20=E2=80=9Csetup=E2=80=9D=20command=20explicitly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 59cfc3e..f37f2db 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ For testing the application and running it without (system-wide) installation,
 donwload/clone the code, build it with the `--prefix` option and install it
 with `ninja`:
 
-    $ meson --prefix $(pwd)/install build
+    $ meson setup --prefix $(pwd)/install build
     $ ninja -C build
     $ ninja -C build install
 

From 3d91ab1b3543ca3a37ffd3656f226f7c65e1d213 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 6 Apr 2025 17:33:16 +0200
Subject: [PATCH 20/33] Scroll library to the beginning after loading items
 (close #108)

---
 src/librarypanel.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/librarypanel.py b/src/librarypanel.py
index 488528b..e2ae1fb 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -361,6 +361,7 @@ class LibraryPanel(Adw.Bin):
         self._library_lock.release()
         GObject.idle_add(self.stack.set_visible_child, self.scroll)
         self._sort_grid_model()
+        GObject.idle_add(self.library_grid.scroll_to, 0, Gtk.ListScrollFlags.NONE, None)
 
     def _set_widget_grid_size(self, grid_widget, size, vertical):
         self._library_stop.set()

From 099adbab8c0742912176ca9d97a6e090c9b75f20 Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Sun, 6 Apr 2025 17:36:02 +0200
Subject: [PATCH 21/33] Bump version to 4.0.1

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index cdc1224..a8e88cc 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('mcg',
-    version: '4.0',
+    version: '4.0.1',
     meson_version: '>= 0.59.0',
     default_options: [
         'warning_level=2',

From 08cd9dbe6593219820fb93e78e7136d74f867629 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Sat, 10 Jan 2026 15:26:49 +0100
Subject: [PATCH 22/33] =?UTF-8?q?Set=20pixel=20size=20for=20=E2=80=9Cstand?=
 =?UTF-8?q?alone=E2=80=9D=20images=20(close=20#109)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/coverpanel.py    | 1 +
 src/librarypanel.py  | 1 +
 src/playlistpanel.py | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/coverpanel.py b/src/coverpanel.py
index d9c5d31..312d4da 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -251,4 +251,5 @@ class CoverPanel(Gtk.Overlay):
             return
         self.cover_image.set_from_pixbuf(
             pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
+        self.cover_image.set_pixel_size(min(width, height))
         self.cover_image.show()
diff --git a/src/librarypanel.py b/src/librarypanel.py
index e2ae1fb..fd56f9f 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -456,6 +456,7 @@ class LibraryPanel(Adw.Bin):
         # Pixelpuffer auf Oberfläche zeichnen
         self.standalone_image.set_from_pixbuf(
             pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
+        self.standalone_image.set_pixel_size(min(width, height))
         self.standalone_image.show()
 
     def _get_default_image(self):
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index 34abfee..a9b1d8a 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -263,6 +263,7 @@ class PlaylistPanel(Adw.Bin):
         # Pixelpuffer auf Oberfläche zeichnen
         self.standalone_image.set_from_pixbuf(
             pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
+        self.standalone_image.set_pixel_size(min(width, height))
         self.standalone_image.show()
 
     def _get_default_image(self):

From 9311f9974a1610c310fd10b9b7e925c1714596c7 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Sat, 10 Jan 2026 15:42:24 +0100
Subject: [PATCH 23/33] Do not try to convert default icon to GDK pixbuf (close
 #110)

---
 src/coverpanel.py    |  1 +
 src/librarypanel.py  | 27 +++++++++++++++------------
 src/playlistpanel.py | 26 +++++++++++++++-----------
 src/utils.py         |  7 ++++---
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/coverpanel.py b/src/coverpanel.py
index 312d4da..b6f3c67 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -236,6 +236,7 @@ class CoverPanel(Gtk.Overlay):
         pixbuf = self._cover_pixbuf
         # Check pixelbuffer
         if pixbuf is None:
+            self.cover_default.set_pixel_size(min(size_width, size_height)/2)
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
diff --git a/src/librarypanel.py b/src/librarypanel.py
index fd56f9f..83cafe2 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -293,15 +293,13 @@ class LibraryPanel(Adw.Bin):
 
     def set_albumart(self, album, data):
         if album in self._selected_albums:
+            self._standalone_pixbuf = None
             if data:
                 # Load image and draw it
                 try:
                     self._standalone_pixbuf = Utils.load_pixbuf(data)
                 except Exception:
                     self._logger.exception("Failed to set albumart")
-                    self._standalone_pixbuf = self._get_default_image()
-            else:
-                self._standalone_pixbuf = self._get_default_image()
             # Show image
             GObject.idle_add(self._show_image)
 
@@ -335,6 +333,8 @@ class LibraryPanel(Adw.Bin):
         self._grid_pixbufs.clear()
         for album_id in albums.keys():
             album = albums[album_id]
+            grid_item = GridItem(album)
+
             pixbuf = None
             try:
                 pixbuf = Utils.load_thumbnail(cache, self._client, album, size)
@@ -344,14 +344,13 @@ class LibraryPanel(Adw.Bin):
             except Exception as e:
                 self._logger.exception("Failed to load albumart", e)
             if pixbuf is None:
-                pixbuf = self._icon_theme.lookup_icon(
-                    Utils.STOCK_ICON_DEFAULT, None, self._item_size,
-                    self._item_size, Gtk.TextDirection.LTR,
-                    Gtk.IconLookupFlags.FORCE_SYMBOLIC)
-            if pixbuf is not None:
+                icon = self._get_default_icon(self._item_size, self._item_size)
+                grid_item.set_icon(icon)
+            else:
                 self._grid_pixbufs[album.get_id()] = pixbuf
-                GObject.idle_add(self._library_grid_model.append,
-                                 GridItem(album, pixbuf))
+                grid_item.set_cover(pixbuf)
+
+            GObject.idle_add(self._library_grid_model.append, grid_item)
 
             i += 1
             GObject.idle_add(self.progress_bar.set_fraction, i / n)
@@ -440,6 +439,9 @@ class LibraryPanel(Adw.Bin):
         pixbuf = self._standalone_pixbuf
         # Check pixelbuffer
         if pixbuf is None:
+            icon = self._get_default_icon(size_width, size_height)
+            self.standalone_image.set_from_paintable(icon)
+            self.standalone_image.set_pixel_size(min(size_width, size_height)/2)
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
@@ -459,9 +461,10 @@ class LibraryPanel(Adw.Bin):
         self.standalone_image.set_pixel_size(min(width, height))
         self.standalone_image.show()
 
-    def _get_default_image(self):
+    def _get_default_icon(self, width, height):
         return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None,
-                                            512, 512, Gtk.TextDirection.LTR,
+                                            width, height,
+                                            Gtk.TextDirection.LTR,
                                             Gtk.IconLookupFlags.FORCE_SYMBOLIC)
 
     def _get_selected_albums(self):
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index a9b1d8a..3c18e9c 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -171,15 +171,13 @@ class PlaylistPanel(Adw.Bin):
 
     def set_albumart(self, album, data):
         if album in self._selected_albums:
+            self._standalone_pixbuf = None
             if data:
                 # Load image and draw it
                 try:
                     self._standalone_pixbuf = Utils.load_pixbuf(data)
                 except Exception:
                     self._logger.exception("Failed to set albumart")
-                    self._cover_pixbuf = self._get_default_image()
-            else:
-                self._cover_pixbuf = self._get_default_image()
             # Show image
             GObject.idle_add(self._show_image)
 
@@ -197,6 +195,8 @@ class PlaylistPanel(Adw.Bin):
 
         cache = client.MCGCache(host, size)
         for album in playlist:
+            grid_item = GridItem(album)
+
             pixbuf = None
             # Load albumart thumbnail
             try:
@@ -207,12 +207,12 @@ class PlaylistPanel(Adw.Bin):
             except Exception:
                 self._logger.exception("Failed to load albumart")
             if pixbuf is None:
-                pixbuf = self._icon_theme.lookup_icon(
-                    Utils.STOCK_ICON_DEFAULT, None, self._item_size,
-                    self._item_size, Gtk.TextDirection.LTR,
-                    Gtk.IconLookupFlags.FORCE_SYMBOLIC)
-            if pixbuf is not None:
-                self._playlist_grid_model.append(GridItem(album, pixbuf))
+                icon = self._get_default_icon(self._item_size, self._item_size)
+                grid_item.set_icon(icon)
+            else:
+                grid_item.set_cover(pixbuf)
+
+            GObject.idle_add(self._playlist_grid_model.append, grid_item)
 
             if self._playlist_stop.is_set():
                 self._playlist_lock.release()
@@ -247,6 +247,9 @@ class PlaylistPanel(Adw.Bin):
         pixbuf = self._standalone_pixbuf
         # Check pixelbuffer
         if pixbuf is None:
+            icon = self._get_default_icon(size_width, size_height)
+            self.standalone_image.set_from_paintable(icon)
+            self.standalone_image.set_pixel_size(min(size_width, size_height)/2)
             return
 
         # Skalierungswert für Breite und Höhe ermitteln
@@ -266,9 +269,10 @@ class PlaylistPanel(Adw.Bin):
         self.standalone_image.set_pixel_size(min(width, height))
         self.standalone_image.show()
 
-    def _get_default_image(self):
+    def _get_default_icon(self, width, height):
         return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None,
-                                            512, 512, Gtk.TextDirection.LTR,
+                                            width, height,
+                                            Gtk.TextDirection.LTR,
                                             Gtk.IconLookupFlags.FORCE_SYMBOLIC)
 
     def _get_selected_albums(self):
diff --git a/src/utils.py b/src/utils.py
index ed8a04f..89b33af 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -86,11 +86,9 @@ class GridItem(GObject.GObject):
     tooltip = GObject.Property(type=str, default=None)
     cover = GObject.Property(type=Gdk.Paintable, default=None)
 
-    def __init__(self, album, cover):
+    def __init__(self, album):
         super().__init__()
         self._album = album
-        if cover:
-            self.cover = Gdk.Texture.new_for_pixbuf(cover)
         self.tooltip = GObject.markup_escape_text("\n".join([
             album.get_title(), ', '.join(album.get_dates()),
             Utils.create_artists_label(album),
@@ -103,6 +101,9 @@ class GridItem(GObject.GObject):
     def set_cover(self, cover):
         self.cover = Gdk.Texture.new_for_pixbuf(cover)
 
+    def set_icon(self, icon):
+        self.cover = icon
+
 
 class SearchFilter(Gtk.Filter):
 

From 0a109bc886a0b69824c26ea84358576fbc872d85 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Sat, 10 Jan 2026 16:04:43 +0100
Subject: [PATCH 24/33] Fix handling and logging of thumbnail save failures

---
 src/librarypanel.py | 4 ++--
 src/utils.py        | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/librarypanel.py b/src/librarypanel.py
index 83cafe2..22a8b43 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -341,8 +341,8 @@ class LibraryPanel(Adw.Bin):
             except client.CommandException:
                 # Exception is handled by client
                 pass
-            except Exception as e:
-                self._logger.exception("Failed to load albumart", e)
+            except Exception:
+                self._logger.exception("Failed to load albumart")
             if pixbuf is None:
                 icon = self._get_default_icon(self._item_size, self._item_size)
                 grid_item.set_icon(icon)
diff --git a/src/utils.py b/src/utils.py
index 89b33af..4b58fb9 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -3,6 +3,7 @@
 import gi
 import hashlib
 import locale
+import logging
 import os
 
 gi.require_version('Gtk', '4.0')
@@ -37,7 +38,12 @@ class Utils:
             if pixbuf is not None:
                 pixbuf = pixbuf.scale_simple(size, size,
                                              GdkPixbuf.InterpType.HYPER)
-                pixbuf.savev(cache_url, 'jpeg', [], [])
+                try:
+                    pixbuf.savev(cache_url, 'jpeg', [], [])
+                except Exception as e:
+                    logger = logging.getLogger(__name__)
+                    logger.warning("Failed to save thumbnail for album\"%s\": "
+                        "%s", album.get_title(), e)
         return pixbuf
 
     @staticmethod

From 9b29f7b274d8553ade36313b6ff4ed271c35b9b3 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Sat, 10 Jan 2026 16:22:03 +0100
Subject: [PATCH 25/33] Preserve aspect ratio of album covers in grid views
 (close #111)

---
 src/librarypanel.py  | 12 +++---------
 src/playlistpanel.py | 12 +++---------
 src/utils.py         | 19 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/librarypanel.py b/src/librarypanel.py
index 22a8b43..02d8c08 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -444,15 +444,9 @@ class LibraryPanel(Adw.Bin):
             self.standalone_image.set_pixel_size(min(size_width, size_height)/2)
             return
 
-        # Skalierungswert für Breite und Höhe ermitteln
-        ratio_w = float(size_width) / float(pixbuf.get_width())
-        ratio_h = float(size_height) / float(pixbuf.get_height())
-        # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
-        ratio = min(ratio_w, ratio_h)
-        ratio = min(ratio, 1)
-        # Neue Breite und Höhe berechnen
-        width = int(math.floor(pixbuf.get_width() * ratio))
-        height = int(math.floor(pixbuf.get_height() * ratio))
+        (width, height) = Utils.calculate_size(pixbuf.get_width(),
+                                               pixbuf.get_height(), size_width,
+                                               size_height)
         if width <= 0 or height <= 0:
             return
         # Pixelpuffer auf Oberfläche zeichnen
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index 3c18e9c..9f59e93 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -252,15 +252,9 @@ class PlaylistPanel(Adw.Bin):
             self.standalone_image.set_pixel_size(min(size_width, size_height)/2)
             return
 
-        # Skalierungswert für Breite und Höhe ermitteln
-        ratio_w = float(size_width) / float(pixbuf.get_width())
-        ratio_h = float(size_height) / float(pixbuf.get_height())
-        # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
-        ratio = min(ratio_w, ratio_h)
-        ratio = min(ratio, 1)
-        # Neue Breite und Höhe berechnen
-        width = int(math.floor(pixbuf.get_width() * ratio))
-        height = int(math.floor(pixbuf.get_height() * ratio))
+        (width, height) = Utils.calculate_size(pixbuf.get_width(),
+                                               pixbuf.get_height(), size_width,
+                                               size_height)
         if width <= 0 or height <= 0:
             return
         # Pixelpuffer auf Oberfläche zeichnen
diff --git a/src/utils.py b/src/utils.py
index 4b58fb9..544e415 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -2,6 +2,7 @@
 
 import gi
 import hashlib
+import math
 import locale
 import logging
 import os
@@ -36,7 +37,10 @@ class Utils:
             if albumart:
                 pixbuf = Utils.load_pixbuf(albumart)
             if pixbuf is not None:
-                pixbuf = pixbuf.scale_simple(size, size,
+                (width, height) = Utils.calculate_size(pixbuf.get_width(),
+                                                       pixbuf.get_height(),
+                                                       size, size)
+                pixbuf = pixbuf.scale_simple(width, height,
                                              GdkPixbuf.InterpType.HYPER)
                 try:
                     pixbuf.savev(cache_url, 'jpeg', [], [])
@@ -78,6 +82,19 @@ class Utils:
             m.update(value.encode('utf-8'))
         return m.hexdigest()
 
+    @staticmethod
+    def calculate_size(src_width, src_height, dest_width, dest_height):
+        ratio_w = float(dest_width) / float(src_width)
+        ratio_h = float(dest_height) / float(src_height)
+        ratio = min(min(ratio_w, ratio_h), 1)
+        if ratio == 1:
+            return (src_width, src_height)
+
+        width = int(math.floor(src_width * ratio))
+        height = int(math.floor(src_height * ratio))
+
+        return (width, height)
+
 
 class SortOrder:
     ARTIST = 0

From 7d474598e393e2fb4486c1e70b6b1c57cb507321 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Sat, 10 Jan 2026 16:34:13 +0100
Subject: [PATCH 26/33] Center non-square album covers on grid views (close
 #112)

---
 data/ui/library-panel.ui | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/ui/library-panel.ui b/data/ui/library-panel.ui
index b5512e3..b835e3f 100644
--- a/data/ui/library-panel.ui
+++ b/data/ui/library-panel.ui
@@ -221,10 +221,14 @@
       <property name="child">
         <object class="GtkBox">
           <property name="orientation">vertical</property>
+          <property name="vexpand">true</property>
+          <property name="hexpand">true</property>
           <child>
             <object class="GtkPicture">
               <property name="content-fit">contain</property>
               <property name="can-shrink">false</property>
+              <property name="vexpand">true</property>
+              <property name="hexpand">true</property>
               <binding name="tooltip-markup">
                 <lookup name="tooltip" type="GridItem">
                   <lookup name="item">GtkListItem</lookup>

From 345e7697ff99192f98790e74344a2dd5b01ca90e Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Sat, 10 Jan 2026 16:35:46 +0100
Subject: [PATCH 27/33] Bump version to 4.0.2

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index a8e88cc..67b6caf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('mcg',
-    version: '4.0.1',
+    version: '4.0.2',
     meson_version: '>= 0.59.0',
     default_options: [
         'warning_level=2',

From 377e57ee43ddb35eb74568f4ea811bc9d3458669 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Thu, 26 Feb 2026 10:36:41 +0100
Subject: [PATCH 28/33] Add basic go application and remove python code

---
 .gitignore             |    8 +-
 CONTRIBUTING.md        |   26 +
 CONTRIBUTING.textile   |   22 -
 LICENSE                |    2 +-
 README.md              |   49 +-
 go.mod                 |    5 +
 go.sum                 |    0
 main.go                |    4 +
 meson.build            |   19 -
 src/__init__.py        |   19 -
 src/albumheaderbar.py  |   28 -
 src/application.py     |  108 ----
 src/client.py          | 1240 ----------------------------------------
 src/connectionpanel.py |   89 ---
 src/coverpanel.py      |  256 ---------
 src/librarypanel.py    |  470 ---------------
 src/main.py            |    8 -
 src/mcg.in             |   25 -
 src/meson.build        |   37 --
 src/playlistpanel.py   |  278 ---------
 src/serverpanel.py     |  115 ----
 src/shortcutsdialog.py |   15 -
 src/utils.py           |  138 -----
 src/window.py          |  615 --------------------
 src/zeroconf.py        |   72 ---
 25 files changed, 57 insertions(+), 3591 deletions(-)
 create mode 100644 CONTRIBUTING.md
 delete mode 100644 CONTRIBUTING.textile
 create mode 100644 go.mod
 create mode 100644 go.sum
 create mode 100644 main.go
 delete mode 100644 meson.build
 delete mode 100644 src/__init__.py
 delete mode 100644 src/albumheaderbar.py
 delete mode 100644 src/application.py
 delete mode 100644 src/client.py
 delete mode 100644 src/connectionpanel.py
 delete mode 100644 src/coverpanel.py
 delete mode 100644 src/librarypanel.py
 delete mode 100644 src/main.py
 delete mode 100755 src/mcg.in
 delete mode 100644 src/meson.build
 delete mode 100644 src/playlistpanel.py
 delete mode 100644 src/serverpanel.py
 delete mode 100644 src/shortcutsdialog.py
 delete mode 100644 src/utils.py
 delete mode 100644 src/window.py
 delete mode 100644 src/zeroconf.py

diff --git a/.gitignore b/.gitignore
index f42fdfe..8a28ddc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-/build/
-/install/
+/mcg*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..bacb769
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,26 @@
+# Contributing
+
+There are multiple ways to contribute code to this project:
+
+* Submit a Pull Request on
+[https://git.suruatoel.xyz/coderkun/mcg](git.suruatoel.xyz/coderkun/mcg) or
+[https://codeberg.org/suruatoel/mcg](codeberg.org/suruatoel/mcg)
+* Send a git pull request via eMail
+* Send a patch via eMail
+
+## Internationalization
+
+Update `.pot` files:
+
+    $ xgettext --language=Go --keyword=T --from-code=UTF-8 --package-name=mcg --output=po/mcg-go.pot $(git ls-files '*.go')
+    $ xgettext --language=Glade --from-code=UTF-8 --output=po/mcg-ui.pot $(git ls-files '*.ui')
+    $ msgcat --use-first -o po/mcg.pot po/mcg-go.pot po/mcg-ui.pot
+
+Use a tool like [Poedit](https://poedit.net/) to create or update translations
+in the `locale/` folder.
+
+## AI Policy
+
+This project uses a _No AI policy_. Any code you submit to this project has to
+be written by yourself. If you put this project’s code into any AI tool, you
+will be banned from this project.
diff --git a/CONTRIBUTING.textile b/CONTRIBUTING.textile
deleted file mode 100644
index f5b11fb..0000000
--- a/CONTRIBUTING.textile
+++ /dev/null
@@ -1,22 +0,0 @@
-h1. Contributing
-
-There are several ways to participate in this project. This guide covers only the contribution of code (i. e. any change to any file in the repository).
-
-There are basically two ways to contribute code to this project: Either via GitLab or via e‑mail. The first one is probably easier for most people. However
-it requires a account at GitLab.com. For people who don’t want to create an account—or have any other reason to not use GitLab—e‑mail is an alternative option.
-
-h2. Contributing via GitLab
-
-Create an account on GitLab.com or use your already existing account. Fork this repository inside GitLab, add changes to your fork and finally create a Merge Request to contribute your changes back to this repository.
-
-h2. Contributing via E‑mail
-
-To contribute via e‑mail, first clone this repository to your local harddrive. After adding changes to your local copy you have two options to send them back to this repository: as patch or as Pull Request
-
-h3. E‑mail Patch
-
-To send a patch with your changes, use git’s @send-email@ option as explained in "Public Project over Email":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_project_over_email of section "5.2 Distributed Git - Contributing to a Project":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project of the "Git Pro Book":https://git-scm.com/book/en/v2/. You will find the e‑mail address at "suruatoel.xyz":https://www.suruatoel.xyz.
-
-h3. E‑mail Pull Request
-
-Sending a Pull Request via e‑mail requires to publish your copy of the repository (that includes your changes) at a publicly available URL (it is your responsibility to choose a trusted host). Then use git’s @request-pull@ command to send an e‑mail with your pull request. The e‑mail will contain a link to the public repository which can be used to pull your changes from. You will find the e‑mail address at "suruatoel.xyz":https://www.suruatoel.xyz. For more details, please take a look at "Forked Public Project":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_public_project of section "5.2 Distributed Git - Contributing to a Project":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project of the "Git Pro Book":https://git-scm.com/book/en/v2.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index bb13eb5..1f5cef4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 CoverGrid (mcg) is a client for the Music Player Daemon, focusing on albums instead of single tracks.
-Copyright ® 2013 – 2017  coderkun <olli@suruatoel.xyz>
+Copyright ® 2013 – 2026 Olli <olli@suruatoel.xyz>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/README.md b/README.md
index f37f2db..c65ad22 100644
--- a/README.md
+++ b/README.md
@@ -5,60 +5,51 @@ Daemon](http://www.musicpd.org) (MPD), focusing on albums instead of single
 tracks. It is not intended to be a replacement for your favorite MPD client but
 an addition to get a better album-experience.
 
-Website: https://www.suruatoel.xyz/codes/mcg
+Website: [https://www.suruatoel.xyz/codes/mcg](www.suruatoel.xyz/codes/mcg)
 
 License: [GPL](http://www.gnu.org/licenses/gpl.html) v3
 
 Dependencies:
 
-* [Python](http://www.python.org) 3
-* [python-dateutil](https://pypi.org/project/python-dateutil/)
-* [GTK](http://www.gtk.org) 4 (>= 4.18) ([python-gobject](https://live.gnome.org/PyGObject))
+* [GTK](http://www.gtk.org) 4 (>= 4.18)
 * [libadwaita](https://gnome.pages.gitlab.gnome.org/libadwaita/) (>= 1.2)
-* [Avahi](http://www.avahi.org) (optional)
-* [python-keyring](http://pypi.python.org/pypi/keyring) (optional)
-* [meson](https://mesonbuild.com/) and [ninja](https://ninja-build.org/) (building)
+* [go](https://go.dev/) (build only)
 
-Additionally a [MPD](http://www.musicpd.org) server (version >= 0.21.0) is
+Additionally, an [MPD](http://www.musicpd.org) server (version >= 0.21.0) is
 required at runtime.
 
 
 ## Building
 
-Build the application with _meson_ and _ninja_:
+Build the application with _go_:
 
-    $ meson build
-    $ ninja -C build
+    $ go build .
 
-## Running/Testing
+## Running
 
-For testing the application and running it without (system-wide) installation,
-donwload/clone the code, build it with the `--prefix` option and install it
-with `ninja`:
+Run the application for testing purposes:
 
-    $ meson setup --prefix $(pwd)/install build
-    $ ninja -C build
-    $ ninja -C build install
+    $ go run .
 
-After that you can run it with _meson’s_ `devenv` command:
+Run the application:
 
-    $ meson devenv -C build src/mcg
+    $ ./mcg
 
-## Installing
+## Packaging
 
-Install the application system-wide with _meson_ (after building):
+The suggested package name for this project is “mcg”. To build a production
+binary, please use the following command:
 
-    $ ninja -C build install
+    $ go build --ldflags="-s -w -X main.Version=$(git describe)" -trimpath ./...
 
-Note: _On Linux using the distribution’s package manager is the preferred way
-of installing applications system-wide._
+In the “data/” folder you will find a `.desktop` file and an SVG icon.
 
 ## Screenshots
 
-![CoverGrid’s cover panel with album details and track list.](https://suruatoel.xyz/images/mcg-cover-s.png "CoverGrid’s cover panel with album details and track list.")
+![CoverGrid’s cover panel with album details and track list.](https://www.suruatoel.xyz/images/mcg-cover-s.png "CoverGrid’s cover panel with album details and track list.")
 
-![CoverGrid’s playlist panel with queued albums.](https://suruatoel.xyz/images/mcg-playlist.png "CoverGrid’s playlist panel with queued albums.")
+![CoverGrid’s playlist panel with queued albums.](https://www.suruatoel.xyz/images/mcg-playlist.png "CoverGrid’s playlist panel with queued albums.")
 
-![CoverGrid’s library panel showing the albums middle-sized.](https://suruatoel.xyz/images/mcg-library-m.png "CoverGrid’s library panel showing the albums middle-sized.")
+![CoverGrid’s library panel showing the albums middle-sized.](https://www.suruatoel.xyz/images/mcg-library-m.png "CoverGrid’s library panel showing the albums middle-sized.")
 
-![CoverGrid’s library panel showing the albums small-sized.](https://suruatoel.xyz/images/mcg-library-s.png "CoverGrid’s library panel showing the albums small-sized.")
+![CoverGrid’s library panel showing the albums small-sized.](https://www.suruatoel.xyz/images/mcg-library-s.png "CoverGrid’s library panel showing the albums small-sized.")
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..7842f03
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,5 @@
+module suruatoel.xyz/mcg
+
+go 1.25.0
+
+toolchain go1.26.0
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..e69de29
diff --git a/main.go b/main.go
new file mode 100644
index 0000000..da29a2c
--- /dev/null
+++ b/main.go
@@ -0,0 +1,4 @@
+package main
+
+func main() {
+}
diff --git a/meson.build b/meson.build
deleted file mode 100644
index 67b6caf..0000000
--- a/meson.build
+++ /dev/null
@@ -1,19 +0,0 @@
-project('mcg',
-    version: '4.0.2',
-    meson_version: '>= 0.59.0',
-    default_options: [
-        'warning_level=2',
-        'werror=false',
-    ],
-)
-
-subdir('data')
-subdir('src')
-subdir('po')
-
-gnome = import('gnome')
-gnome.post_install(
-    glib_compile_schemas: true,
-    gtk_update_icon_cache: true,
-    update_desktop_database: true,
-)
diff --git a/src/__init__.py b/src/__init__.py
deleted file mode 100644
index c498e0f..0000000
--- a/src/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import os
-
-# Set environment
-srcdir = os.path.abspath(os.path.dirname(__file__))
-datadir = os.path.join(srcdir, 'data')
-datadirdev = os.path.join(srcdir, '..', 'data')
-if os.path.exists(datadirdev):
-    datadir = datadirdev
-localedir = None
-localedirdev = os.path.join(srcdir, '..', 'locale')
-if os.path.exists(localedirdev):
-    localedir = localedirdev
-
-# Set GSettings schema dir (if not set already)
-if not os.environ.get('GSETTINGS_SCHEMA_DIR'):
-    os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev
diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py
deleted file mode 100644
index 2f0b40b..0000000
--- a/src/albumheaderbar.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk, GObject, Adw
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/album-headerbar.ui')
-class AlbumHeaderbar(Adw.Bin):
-    __gtype_name__ = 'McgAlbumHeaderbar'
-    __gsignals__ = {'close': (GObject.SIGNAL_RUN_FIRST, None, ())}
-
-    # Widgets
-    standalone_title = Gtk.Template.Child()
-    standalone_artist = Gtk.Template.Child()
-
-    def __init__(self):
-        super().__init__()
-
-    @Gtk.Template.Callback()
-    def on_close_clicked(self, widget):
-        self.emit('close')
-
-    def set_album(self, album):
-        self.standalone_title.set_text(album.get_title())
-        self.standalone_artist.set_text(", ".join(album.get_albumartists()))
diff --git a/src/application.py b/src/application.py
deleted file mode 100644
index c39b929..0000000
--- a/src/application.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env python3
-
-import logging
-import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gio, Gtk, Gdk, Adw
-from .window import Window
-
-
-class Application(Gtk.Application):
-    TITLE = "CoverGrid"
-    ID = 'xyz.suruatoel.mcg'
-    DOMAIN = 'mcg'
-
-    def __init__(self, version):
-        super().__init__(application_id=Application.ID,
-                         flags=Gio.ApplicationFlags.FLAGS_NONE)
-        self._window = None
-        self._info_dialog = None
-        self._version = version
-        self._verbosity = logging.WARNING
-        self.set_accels_for_action('window.close', ['<primary>q'])
-        self.set_accels_for_action('win.show-help-overlay', ['<primary>k'])
-        self.set_accels_for_action('app.info', ['<primary>i'])
-        self.set_accels_for_action('win.connect', ['<primary>c'])
-        self.set_accels_for_action('win.play', ['<primary>p'])
-        self.set_accels_for_action('win.clear-playlist', ['<primary>r'])
-        self.set_accels_for_action('win.toggle-fullscreen', ['F11'])
-        self.set_accels_for_action('win.search-library', ['<primary>f'])
-        self.set_accels_for_action('win.panel("0")', ['<primary>KP_1'])
-        self.set_accels_for_action('win.panel("1")', ['<primary>KP_2'])
-        self.set_accels_for_action('win.panel("2")', ['<primary>KP_3'])
-        self.set_accels_for_action('win.panel("3")', ['<primary>KP_4'])
-
-    def do_startup(self):
-        Gtk.Application.do_startup(self)
-        self._setup_logging()
-        self._load_settings()
-        self._set_default_settings()
-        self._load_css()
-        self._setup_actions()
-        self._setup_adw()
-
-    def do_activate(self):
-        Gtk.Application.do_activate(self)
-        if not self._window:
-            self._window = Window(self, Application.TITLE, self._settings)
-        self._window.present()
-
-    def on_menu_info(self, action, value):
-        self._info_dialog = Adw.AboutDialog()
-        self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
-        self._info_dialog.set_application_name("CoverGrid")
-        self._info_dialog.set_version(self._version)
-        self._info_dialog.set_comments(
-            """CoverGrid is a client for the Music Player Daemon, focusing on \
-albums instead of single tracks.""")
-        self._info_dialog.set_website("https://www.suruatoel.xyz/codes/mcg")
-        self._info_dialog.set_license_type(Gtk.License.GPL_3_0)
-        self._info_dialog.set_issue_url(
-            "https://git.suruatoel.xyz/coderkun/mcg")
-        self._info_dialog.present()
-
-    def on_menu_quit(self, action, value):
-        self.quit()
-
-    def _setup_logging(self):
-        logging.basicConfig(level=self._verbosity,
-                            format="%(asctime)s %(levelname)s: %(message)s")
-
-    def _load_settings(self):
-        self._settings = Gio.Settings.new(Application.ID)
-
-    def _set_default_settings(self):
-        style_manager = Adw.StyleManager.get_default()
-        style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK)
-
-    def _load_css(self):
-        style_provider = Gtk.CssProvider()
-        style_provider.load_from_resource(self._get_resource_path('gtk.css'))
-        Gtk.StyleContext.add_provider_for_display(
-            Gdk.Display.get_default(), style_provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-
-    def _setup_actions(self):
-        action = Gio.SimpleAction.new("info", None)
-        action.connect('activate', self.on_menu_info)
-        self.add_action(action)
-        action = Gio.SimpleAction.new("quit", None)
-        action.connect('activate', self.on_menu_quit)
-        self.add_action(action)
-
-    def _get_resource_path(self, path):
-        return "/{}/{}".format(Application.ID.replace('.', '/'), path)
-
-    def _setup_adw(self):
-        Adw.HeaderBar()
-        Adw.ToolbarView()
-        Adw.ViewSwitcherTitle()
-        Adw.ViewSwitcherBar()
-        Adw.ViewStackPage()
-        Adw.ToastOverlay()
-        Adw.StatusPage()
-        Adw.Flap()
-        Adw.EntryRow()
-        Adw.PasswordEntryRow()
diff --git a/src/client.py b/src/client.py
deleted file mode 100644
index 17b7522..0000000
--- a/src/client.py
+++ /dev/null
@@ -1,1240 +0,0 @@
-#!/usr/bin/env python3
-
-import concurrent.futures
-import configparser
-import dateutil.parser
-import logging
-import os
-import queue
-import re
-import socket
-import threading
-
-from mcg.utils import SortOrder
-from mcg.utils import Utils
-
-
-class MPDException(Exception):
-
-    def __init__(self, error):
-        super(MPDException, self).__init__(self._parse_error(error))
-        self._error = error
-
-    def _parse_error(self, error):
-        if error:
-            parts = re.match(r"\[(\d+)@(\d+)\]\s\{(\w+)\}\s(.*)", error)
-            if parts:
-                self._error_number = int(parts.group(1))
-                self._command_number = int(parts.group(2))
-                self._command_name = parts.group(3)
-                return parts.group(4)
-        return error
-
-    def get_error(self):
-        return self._error
-
-    def get_error_number(self):
-        return self._error_number
-
-    def get_command_number(self):
-        return self._command_number
-
-    def get_command_name(self):
-        return self._command_name
-
-
-class ConnectionException(MPDException):
-    pass
-
-
-class ProtocolException(MPDException):
-    pass
-
-
-class CommandException(MPDException):
-    pass
-
-
-class Future(concurrent.futures.Future):
-
-    def __init__(self, signal):
-        concurrent.futures.Future.__init__(self)
-        self._signal = signal
-
-    def get_signal(self):
-        return self._signal
-
-
-class Base():
-
-    def __init__(self):
-        self._callbacks = {}
-
-    def connect_signal(self, signal, callback):
-        """Connect a callback function to a signal (event)."""
-        self._callbacks[signal] = callback
-
-    def disconnect_signal(self, signal):
-        """Disconnect a callback function from a signal (event)."""
-        if self._has_callback(signal):
-            del self._callbacks[signal]
-
-    def _has_callback(self, signal):
-        """Check if there is a registered callback function for a signal."""
-        return signal in self._callbacks
-
-    def _callback(self, signal, *data):
-        if signal in self._callbacks:
-            callback = self._callbacks[signal]
-            callback(*data)
-
-    def _callback_future(self, future):
-        self._callback(future.get_signal(), *future.result())
-
-
-class Client(Base):
-    """Client library for handling the connection to the Music Player Daemon.
-
-    This class implements an album-based MPD client. It offers a non-blocking
-    threaded worker model for use in graphical environments.
-    """
-    # Protocol: greeting mark
-    PROTOCOL_GREETING = 'OK MPD '
-    # Protocol: completion mark
-    PROTOCOL_COMPLETION = 'OK'
-    # Protocol: error mark
-    PROTOCOL_ERROR = 'ACK '
-    # Protocol: error: permission
-    PROTOCOL_ERROR_PERMISSION = 4
-    # Protocol: error: no exists
-    PROTOCOL_ERROR_NOEXISTS = 50
-    # Signal: connection status
-    SIGNAL_CONNECTION = 'connection'
-    # Signal: status
-    SIGNAL_STATUS = 'status'
-    # Signal: stats
-    SIGNAL_STATS = 'stats'
-    # Signal: init loading of albums
-    SIGNAL_INIT_ALBUMS = 'init-albums'
-    # Signal: pulse loading of albums
-    SIGNAL_PULSE_ALBUMS = 'pulse-albums'
-    # Signal: load albums
-    SIGNAL_LOAD_ALBUMS = 'load-albums'
-    # Signal: load playlist
-    SIGNAL_LOAD_PLAYLIST = 'load-playlist'
-    # Signal: load audio output devices
-    SIGNAL_LOAD_OUTPUT_DEVICES = 'load-output-devices'
-    # Signal: load albumart
-    SIGNAL_LOAD_ALBUMART = 'albumart'
-    # Signal: error
-    SIGNAL_ERROR = 'error'
-    # Buffer size for reading from socket
-    SOCKET_BUFSIZE = 4096
-
-    def __init__(self):
-        """Set class variables and instantiates the Client."""
-        Base.__init__(self)
-        self._logger = logging.getLogger(__name__)
-        self._sock = None
-        self._buffer = bytearray()
-        self._sock_write = None
-        self._stop = threading.Event()
-        self._actions = queue.Queue()
-        self._worker = None
-        self._idling = False
-        self._host = None
-        self._albums = {}
-        self._playlist = []
-        self._state = None
-
-    def get_logger(self):
-        return self._logger
-
-    # Client commands
-
-    def connect(self, host, port, password=None):
-        """Connect to MPD with the given host, port and password or with
-        standard values.
-        """
-        self._logger.info("connect")
-        self._host = host
-        self._add_action(self._connect, host, port, password)
-        self._stop.clear()
-        self._start_worker()
-
-    def is_connected(self):
-        """Return the connection status."""
-        return self._worker is not None and self._worker.is_alive()
-
-    def disconnect(self):
-        """Disconnect from the connected MPD."""
-        self._logger.info("disconnect")
-        self._stop.set()
-        self._add_action(self._disconnect)
-
-    def join(self):
-        self._actions.join()
-
-    def get_status(self):
-        """Determine the current status."""
-        self._logger.info("get status")
-        self._add_action_signal(Client.SIGNAL_STATUS, self._get_status)
-
-    def get_stats(self):
-        """Load statistics."""
-        self._logger.info("get stats")
-        self._add_action_signal(Client.SIGNAL_STATS, self._get_stats)
-
-    def get_output_devices(self):
-        """Determine the list of audio output devices."""
-        self._logger.info("get output devices")
-        self._add_action_signal(Client.SIGNAL_LOAD_OUTPUT_DEVICES,
-                                self._get_output_devices)
-
-    def enable_output_device(self, device, enabled):
-        """Enable/disable an audio output device."""
-        self._logger.info("enable output device")
-        self._add_action(self._enable_output_device, device, enabled)
-
-    def load_albums(self):
-        self._logger.info("load albums")
-        self._add_action_signal(Client.SIGNAL_LOAD_ALBUMS, self._load_albums)
-
-    def update(self):
-        self._logger.info("update")
-        self._add_action(self._update)
-
-    def load_playlist(self):
-        self._logger.info("load playlist")
-        self._add_action_signal(Client.SIGNAL_LOAD_PLAYLIST,
-                                self._load_playlist)
-
-    def clear_playlist(self):
-        """Clear the current playlist"""
-        self._logger.info("clear playlist")
-        self._add_action(self._clear_playlist)
-
-    def remove_album_from_playlist(self, album):
-        """Remove the given album from the playlist."""
-        self._logger.info("remove album from playlist")
-        self._add_action(self._remove_album_from_playlist, album)
-
-    def remove_albums_from_playlist(self, albums):
-        """Remove multiple albums from the playlist in one step."""
-        self._logger.info("remove multiple albums from playlist")
-        self._add_action(self._remove_albums_from_playlist, albums)
-
-    def play_album_from_playlist(self, album):
-        """Play the given album from the playlist."""
-        self._logger.info("play album from playlist")
-        self._add_action(self._play_album_from_playlist, album)
-
-    def playpause(self):
-        """Play or pauses the current state."""
-        self._logger.info("playpause")
-        self._add_action(self._playpause)
-
-    def play_album(self, album):
-        """Add the given album to the queue and play it immediately."""
-        self._logger.info("play album")
-        self._add_action(self._play_album, album)
-
-    def queue_album(self, album):
-        """Add the given album to the queue."""
-        self._logger.info("play album")
-        self._add_action(self._queue_album, album)
-
-    def queue_albums(self, albums):
-        """Add the given albums to the queue."""
-        self._logger.info("play albums")
-        self._add_action(self._queue_albums, albums)
-
-    def seek(self, pos, time):
-        """Seeks to a song at a position"""
-        self._logger.info("seek")
-        self._add_action(self._seek, pos, time)
-
-    def stop(self):
-        self._logger.info("stop")
-        self._add_action(self._stop)
-
-    def set_volume(self, volume):
-        self._logger.info("set volume")
-        self._add_action(self._set_volume, volume)
-
-    def get_albumart(self, album):
-        self._logger.info("get albumart")
-        self._add_action_signal(Client.SIGNAL_LOAD_ALBUMART,
-                                self._get_albumart, album)
-
-    def get_albumart_now(self, album):
-        self._logger.info("get albumart now")
-        future = concurrent.futures.Future()
-        self._add_action_future(future, self._get_albumart, album)
-        (_, albumart) = future.result()
-        return albumart
-
-    # Private methods
-
-    def _connect(self, host, port, password):
-        self._logger.info("connecting to host %r, port %r", host, port)
-        if self._sock is not None:
-            return
-        try:
-            self._sock = self._connect_socket(host, port)
-            self._sock_write = self._sock.makefile("w", encoding="utf-8")
-            self._greet()
-            self._logger.info("connected")
-            if password:
-                self._logger.info("setting password")
-                self._call("password", password)
-            self._set_connection_status(True)
-        except OSError as e:
-            raise ConnectionException("connection failed: {}".format(e))
-
-    def _connect_socket(self, host, port):
-        sock = None
-        error = None
-        resources = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
-                                       socket.SOCK_STREAM, socket.IPPROTO_TCP)
-        for res in resources:
-            af, socktype, proto, _, sa = res
-            try:
-                sock = socket.socket(af, socktype, proto)
-                sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-                sock.connect(sa)
-                return sock
-            except Exception as e:
-                error = e
-                if sock is not None:
-                    sock.close()
-                break
-        if error is not None:
-            raise ConnectionException("connection failed: {}".format(error))
-        else:
-            raise ConnectionException("no suitable socket")
-
-    def _greet(self):
-        greeting = self._read_line()
-        self._logger.debug("greeting: %s", greeting.strip())
-        if not greeting.startswith(Client.PROTOCOL_GREETING):
-            self._disconnect_socket()
-            raise ProtocolException("invalid greeting: {}".format(greeting))
-        self._protocol_version = greeting[len(Client.PROTOCOL_GREETING
-                                              ):].strip()
-        self._logger.debug("protocol version: %s", self._protocol_version)
-
-    def _disconnect(self):
-        self._logger.info("disconnecting")
-        self._disconnect_socket()
-
-    def _disconnect_socket(self):
-        if self._sock_write is not None:
-            self._sock_write.close()
-        self._sock_write = None
-        if self._sock is not None:
-            self._sock.close()
-        self._sock = None
-        self._logger.info("disconnected")
-        self._set_connection_status(False)
-
-    def _idle(self):
-        """React to idle events from MPD."""
-        self._logger.info("idle")
-        self._idling = True
-        subsystems = self._parse_dict(self._call("idle"))
-        self._idling = False
-        self._logger.info("idle subsystems: %r", subsystems)
-        if subsystems:
-            if subsystems['changed'] == 'player':
-                self.load_playlist()
-                self.get_status()
-            if subsystems['changed'] == 'mixer':
-                self.get_status()
-            if subsystems['changed'] == 'playlist':
-                self.load_playlist()
-            if subsystems['changed'] == 'database':
-                self.load_albums()
-                self.load_playlist()
-                self.get_status()
-            if subsystems['changed'] == 'update':
-                self.load_albums()
-                self.load_playlist()
-                self.get_status()
-            if subsystems['changed'] == 'output':
-                self.get_output_devices()
-                self.get_status()
-
-    def _noidle(self):
-        if self._idling:
-            self._logger.debug("noidle")
-            self._write("noidle")
-
-    def _get_status(self):
-        """Action: Perform the real status determination."""
-        self._logger.info("getting status")
-        status = self._parse_dict(self._call("status"))
-        self._logger.debug("status: %r", status)
-
-        # State
-        state = None
-        if 'state' in status:
-            state = status['state']
-        self._state = state
-        # Time
-        time = 0
-        if 'time' in status:
-            time = int(status['time'].split(':')[0])
-        # Volume
-        volume = -1
-        if 'volume' in status:
-            volume = int(status['volume'])
-        # Error
-        error = None
-        if 'error' in status:
-            error = status['error']
-        # Album
-        file = None
-        album = None
-        pos = 0
-        song = self._parse_dict(self._call("currentsong"))
-        if song:
-            # File
-            if 'file' in song:
-                file = song['file']
-            # Track
-            track = self._extract_playlist_track(song)
-            if track:
-                # Album
-                album = self._extract_album(song)
-                # Position
-                pos = track.get_pos()
-                for palbum in self._playlist:
-                    if palbum == album and len(palbum.get_tracks()) >= pos:
-                        album = palbum
-                        break
-                    pos = pos - len(palbum.get_tracks())
-        # Audio
-        audio = None
-        if 'audio' in status:
-            audio = status['audio']
-        # Bitrate
-        bitrate = None
-        if 'bitrate' in status:
-            bitrate = status['bitrate']
-        return (state, album, pos, time, volume, file, audio, bitrate, error)
-
-    def _get_stats(self):
-        """Action: Perform the real statistics gathering."""
-        self._logger.info("getting statistics")
-        stats = self._parse_dict(self._call("stats"))
-        self._logger.debug("stats: %r", stats)
-
-        # Artists
-        artists = 0
-        if 'artists' in stats:
-            artists = int(stats['artists'])
-        # Albums
-        albums = 0
-        if 'albums' in stats:
-            albums = int(stats['albums'])
-        # Songs
-        songs = 0
-        if 'songs' in stats:
-            songs = int(stats['songs'])
-        # Database playtime
-        dbplaytime = 0
-        if 'db_playtime' in stats:
-            dbplaytime = stats['db_playtime']
-        # Playtime
-        playtime = 0
-        if 'playtime' in stats:
-            playtime = stats['playtime']
-        # Uptime
-        uptime = 0
-        if 'uptime' in stats:
-            uptime = stats['uptime']
-        return (artists, albums, songs, dbplaytime, playtime, uptime)
-
-    def _get_output_devices(self):
-        """Action: Perform the real loading of output devices."""
-        devices = []
-        for output in self._parse_list(self._call('outputs'), ['outputid']):
-            device = OutputDevice(output['outputid'], output['outputname'])
-            device.set_enabled(int(output['outputenabled']) == 1)
-            devices.append(device)
-        return (devices, )
-
-    def _enable_output_device(self, device, enabled):
-        """Action: Perform the real enabling/disabling of an output device."""
-        if enabled:
-            self._call('enableoutput ', device.get_id())
-        else:
-            self._call('disableoutput ', device.get_id())
-
-    def _load_albums(self):
-        """Action: Perform the real update."""
-        self._callback(Client.SIGNAL_INIT_ALBUMS)
-        self._albums = {}
-        # Albums
-        for album in self._parse_list(self._call('list album'), ['album']):
-            self._callback(Client.SIGNAL_PULSE_ALBUMS)
-
-            # Album
-            album = self._extract_album(album)
-            self._logger.debug("album: %r", album)
-            # Tracks
-            songs = self._parse_list(
-                self._call('find album ', album.get_title()), ['file'])
-            for song in songs:
-                track = self._extract_track(song)
-                if track:
-                    self._logger.debug("track: %r", track)
-                    album.add_track(track)
-        return (self._albums, )
-
-    def _update(self):
-        self._call('update')
-
-    def _load_playlist(self):
-        self._playlist = []
-        songs = self._parse_list(self._call('playlistinfo'),
-                                 ['file', 'playlist'])
-        for song in songs:
-            self._logger.debug("song: %r", song)
-            # Track
-            track = self._extract_playlist_track(song)
-            self._logger.debug("track: %r", track)
-            # Album
-            album = self._extract_album(song, lookup=False)
-            if (
-                len(self._playlist) == 0
-                or self._playlist[len(self._playlist) - 1] != album
-            ):
-                self._playlist.append(album)
-            else:
-                album = self._playlist[len(self._playlist) - 1]
-            self._logger.debug("album: %r", album)
-            if track:
-                album.add_track(track)
-        return (self._playlist, )
-
-    def _clear_playlist(self):
-        """Action: Perform the real clearing of the current playlist."""
-        self._call('clear')
-
-    def _remove_album_from_playlist(self, album):
-        self._call_list('command_list_begin')
-        for track in album.get_tracks():
-            self._call_list('deleteid', track.get_id())
-        self._call('command_list_end')
-
-    def _remove_albums_from_playlist(self, albums):
-        self._call_list('command_list_begin')
-        for album in albums:
-            for track in album.get_tracks():
-                self._call_list('deleteid', track.get_id())
-        self._call('command_list_end')
-
-    def _play_album_from_playlist(self, album):
-        if album.get_tracks():
-            self._call('playid', album.get_tracks()[0].get_id())
-
-    def _playpause(self):
-        """Action: Perform the real play/pause command."""
-        if self._state == 'play':
-            self._call('pause')
-        else:
-            self._call('play')
-
-    def _play_album(self, album):
-        track_ids = self._queue_album(album)
-        if track_ids:
-            self._logger.info("play track %d", track_ids[0])
-            self._call('playid', track_ids[0])
-
-    def _queue_album(self, album):
-        track_ids = []
-        if album in self._albums:
-            self._logger.info("add album %s", album)
-            for track in self._albums[album].get_tracks():
-                self._logger.info("addid: %r", track.get_file())
-                track_id = None
-                track_id_response = self._parse_dict(
-                    self._call('addid', track.get_file()))
-                if 'id' in track_id_response:
-                    track_id = track_id_response['id']
-                self._logger.debug("track id: %r", track_id)
-                if track_id is not None:
-                    track_ids.append(track_id)
-        return track_ids
-
-    def _queue_albums(self, albums):
-        track_ids = []
-        for album in albums:
-            track_ids.extend(self._queue_album(album))
-
-    def _seek(self, pos, time):
-        self._call('seek', pos, time)
-
-    def _stop(self):
-        self._call('stop')
-
-    def _set_volume(self, volume):
-        self._call('setvol', volume)
-
-    def _get_albumart(self, album):
-        if album in self._albums:
-            album = self._albums[album]
-            self._logger.debug("get albumart for album \"%s\"",
-                               album.get_title())
-
-            # Use "albumart" command
-            if album.get_tracks():
-                try:
-                    return (album,
-                            self._read_binary('albumart',
-                                              album.get_tracks()[0].get_file(),
-                                              False))
-                except CommandException as e:
-                    # The "albumart" command throws an exception if not found
-                    if e.get_error_number() != Client.PROTOCOL_ERROR_NOEXISTS:
-                        raise e
-                    # If no albumart can be found, use "readpicture" command
-                    for track in album.get_tracks():
-                        data = self._read_binary('readpicture',
-                                                 track.get_file(), True)
-                        if data:
-                            return (album, data)
-
-        return (album, None)
-
-    def _start_worker(self):
-        """Start the worker thread which waits for action to be performed."""
-        self._logger.debug("start worker")
-        self._worker = threading.Thread(target=self._run,
-                                        name='mcg-worker',
-                                        args=())
-        self._worker.setDaemon(True)
-        self._worker.start()
-        self._logger.debug("worker started")
-
-    def _run(self):
-        while not self._stop.is_set() or not self._actions.empty():
-            if self._sock is not None and self._actions.empty():
-                self._add_action(self._idle)
-            action = self._actions.get()
-            self._logger.debug("next action: %r", action)
-            self._work(action)
-            self._actions.task_done()
-            self._logger.debug("action done")
-        self._logger.debug("worker finished")
-
-    def _add_action(self, method, *args):
-        """Add an action to the action list."""
-        self._logger.debug("add action %r (%r)", method.__name__, args)
-        future = concurrent.futures.Future()
-        action = (future, method, args)
-        self._actions.put(action)
-        self._noidle()
-
-        return future
-
-    def _add_action_signal(self, signal, method, *args):
-        """Add an action to the action list that triggers a callback."""
-        self._logger.debug("add action signal %r: %r (%r)", signal,
-                           method.__name__, args)
-        future = Future(signal)
-        future.add_done_callback(self._callback_future)
-        self._add_action_future(future, method, *args)
-
-        return future
-
-    def _add_action_future(self, future, method, *args):
-        """Add an action to the action list based on a future."""
-        self._logger.debug("add action future %r (%r)", method.__name__, args)
-        action = (future, method, args)
-        self._actions.put(action)
-        self._noidle()
-
-    def _work(self, action):
-        (future, method, args) = action
-        self._logger.debug("work: %r", method.__name__)
-        try:
-            result = method(*args)
-            future.set_result(result)
-        except ConnectionException as e:
-            self._logger.exception(e)
-            future.set_exception(e)
-            self._callback(Client.SIGNAL_ERROR, e)
-            self._disconnect_socket()
-        except Exception as e:
-            self._logger.exception(e)
-            future.set_exception(e)
-            self._callback(Client.SIGNAL_ERROR, e)
-
-    def _call(self, command, *args):
-        try:
-            self._write(command, args)
-            return self._read()
-        except MPDException as e:
-            if (
-                command == 'idle'
-                and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION
-            ):
-                self.disconnect()
-            self._callback(Client.SIGNAL_ERROR, e)
-
-    def _call_list(self, command, *args):
-        try:
-            self._write(command, args)
-        except MPDException as e:
-            if (
-                command == 'idle'
-                and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION
-            ):
-                self.disconnect()
-            self._callback(Client.SIGNAL_ERROR, e)
-
-    def _write(self, command, args=None):
-        if args is not None and len(args) > 0:
-            line = '{} "{}"\n'.format(
-                command, '" "'.join(str(x).replace('"', '\\\"') for x in args))
-        else:
-            line = '{}\n'.format(command)
-        self._logger.debug("write: %r", line)
-        self._sock_write.write(line)
-        self._sock_write.flush()
-
-    def _read(self):
-        self._logger.debug("reading response")
-        response = []
-        line = self._read_line()
-        while (
-            not line.startswith(Client.PROTOCOL_COMPLETION)
-            and not line.startswith(Client.PROTOCOL_ERROR)
-        ):
-            response.append(line.strip())
-            line = self._read_line()
-        if line.startswith(Client.PROTOCOL_COMPLETION):
-            self._logger.debug("response complete")
-        if line.startswith(Client.PROTOCOL_ERROR):
-            error = line[len(Client.PROTOCOL_ERROR):].strip()
-            self._logger.debug("command failed: %r", error)
-            raise CommandException(error)
-        self._logger.debug("response: %r", response)
-        return response
-
-    def _read_line(self):
-        self._logger.debug("reading line")
-
-        # Read from the buffer
-        data = self._buffer_get_char(b'\x0A')
-        if not data.endswith(b'\x0A'):
-            # Read more from socket until next line break
-            while b'\x0A' not in data:
-                buf = self._sock.recv(Client.SOCKET_BUFSIZE)
-                if buf:
-                    data += buf
-                else:
-                    break
-
-            # Get first line from data, add rest to buffer
-            if data:
-                lines = data.split(b'\x0A', 1)
-                data = lines[0]
-                self._buffer_set(lines[1])
-        if data:
-            return data.decode('utf-8')
-        return None
-
-    def _read_binary(self, command, filename, has_mimetype):
-        data = None
-        size = 1
-        offset = 0
-
-        # Read data until size is reached
-        while offset < size:
-            self._write(command, args=[filename, offset])
-
-            # Read first line
-            line = self._read_line()
-            # Check first line for error
-            if line.startswith(Client.PROTOCOL_ERROR):
-                error = line[len(Client.PROTOCOL_ERROR):].strip()
-                self._logger.debug("command failed: %r", error)
-                raise CommandException(error)
-            # Check first line for completion
-            if line.startswith(Client.PROTOCOL_COMPLETION):
-                break
-            # First line is the file size
-            size = int(self._parse_dict([line])['size'])
-            self._logger.debug("size: %d", size)
-            # For some commands the second line is the mimetype
-            if has_mimetype:
-                self._parse_dict([self._read_line()])['type']
-            # Next line is the count of bytes read
-            binary = int(self._parse_dict([self._read_line()])['binary'])
-            self._logger.debug("binary: %d", binary)
-
-            # Create new data array on the first iteration
-            if not data:
-                data = bytearray(size)
-            # Create a view for the current chunk of data
-            data_view = memoryview(data)[offset:offset + binary]
-            # Read actual bytes
-            self._read_bytes(data_view, binary)
-            offset += binary
-            # Read line break to complete previous response
-            self._read_line()
-            # Read command completion
-            end = self._read_line()
-            if not end.startswith(Client.PROTOCOL_COMPLETION):
-                self._logger.debug("albumart not completed")
-                data = None
-                break
-        return data
-
-    def _read_bytes(self, buf, nbytes):
-        self._logger.debug("reading bytes")
-        # Use already buffered data
-        buf_read = self._buffer_get_size(nbytes)
-        nbytes_read = len(buf_read)
-        buf[0:nbytes_read] = buf_read
-        # Read additional data from socket
-        nbytes = nbytes - nbytes_read
-        if nbytes > 0:
-            buf_view = memoryview(buf)[nbytes_read:]
-            nbytes_read += self._sock.recv_into(buf_view, nbytes)
-        return nbytes_read
-
-    def _buffer_get_char(self, char):
-        pos = self._buffer.find(char)
-        if pos < 0:
-            pos = len(self._buffer) - 1
-        buf = self._buffer[0:pos + 1]
-        self._buffer = self._buffer[pos + 1:]
-        return buf
-
-    def _buffer_get_size(self, size):
-        buf = self._buffer[0:size]
-        self._logger.debug("get %d bytes from buffer", len(buf))
-        self._buffer = self._buffer[size:]
-        self._logger.debug("leaving %d in the buffer", len(self._buffer))
-        return buf
-
-    def _buffer_set(self, buf):
-        self._logger.debug("set %d %s as buffer", len(buf), type(buf))
-        self._buffer = buf
-
-    def _parse_dict(self, response):
-        dictionary = {}
-        if response:
-            for line in response:
-                key, value = self._split_line(line)
-                dictionary[key] = value
-        return dictionary
-
-    def _parse_list(self, response, delimiters):
-        entry = {}
-        if response:
-            for line in response:
-                key, value = self._split_line(line)
-                if entry and key in delimiters:
-                    yield entry
-                    entry = {}
-                entry[key] = value
-        if entry:
-            yield entry
-
-    def _split_line(self, line):
-        parts = line.split(':')
-        return parts[0].lower(), ':'.join(parts[1:]).lstrip()
-
-    def _extract_album(self, song, lookup=True):
-        album = None
-        if 'album' not in song:
-            song['album'] = MCGAlbum.DEFAULT_ALBUM
-        album_id = Utils.generate_id(song['album'])
-        if lookup and album_id in self._albums.keys():
-            album = self._albums[album_id]
-        else:
-            album = MCGAlbum(song['album'], self._host)
-        if lookup:
-            self._albums[album_id] = album
-        return album
-
-    def _extract_track(self, song):
-        track = None
-        if 'artist' in song and 'title' in song and 'file' in song:
-            track = MCGTrack(song['artist'], song['title'], song['file'])
-            if 'track' in song:
-                track.set_track(song['track'])
-            if 'time' in song:
-                track.set_length(song['time'])
-            if 'date' in song:
-                track.set_date(song['date'])
-            if 'albumartist' in song:
-                track.set_albumartists(song['albumartist'])
-            if 'last-modified' in song:
-                track.set_last_modified(song['last-modified'])
-        return track
-
-    def _extract_playlist_track(self, song):
-        track = self._extract_track(song)
-        if track and 'id' in song and 'pos' in song:
-            track = MCGPlaylistTrack(track, song['id'], song['pos'])
-        return track
-
-    def _set_connection_status(self, status):
-        self._callback(Client.SIGNAL_CONNECTION, status)
-
-
-class OutputDevice:
-
-    def __init__(self, id, name):
-        self._id = id
-        self._name = name
-        self._enabled = None
-
-    def get_id(self):
-        return self._id
-
-    def get_name(self):
-        return self._name
-
-    def set_enabled(self, enabled):
-        self._enabled = enabled
-
-    def is_enabled(self):
-        return self._enabled
-
-
-class MCGAlbum:
-    DEFAULT_ALBUM = 'Various'
-    _FILE_NAMES = ['cover', 'folder']
-    _FILE_EXTS = ['jpg', 'png', 'jpeg']
-    _FILTER_DELIMITER = ' '
-
-    def __init__(self, title, host):
-        self._artists = []
-        self._albumartists = []
-        self._paths = []
-        if type(title) is list:
-            title = title[0]
-        self._title = title
-        self._dates = []
-        self._host = host
-        self._tracks = []
-        self._length = 0
-        self._last_modified = None
-        self._id = Utils.generate_id(title)
-
-    def __eq__(self, other):
-        return (other and self.get_id() == other.get_id())
-
-    def __hash__(self):
-        return hash(self._title)
-
-    def get_id(self):
-        return self._id
-
-    def get_artists(self):
-        if self._albumartists:
-            return [
-                artist for artist in self._artists
-                if artist not in self._albumartists
-            ]
-        return self._artists
-
-    def get_albumartists(self):
-        if self._albumartists:
-            return self._albumartists
-        return self._artists
-
-    def get_title(self):
-        return self._title
-
-    def get_dates(self):
-        return self._dates
-
-    def get_date(self):
-        if len(self._dates) == 0:
-            return None
-        return self._dates[0]
-
-    def get_path(self):
-        return self._path
-
-    def add_track(self, track):
-        self._tracks.append(track)
-        self._length = self._length + track.get_length()
-        for artist in track.get_artists():
-            if artist not in self._artists:
-                self._artists.append(artist)
-        for artist in track.get_albumartists():
-            if artist not in self._albumartists:
-                self._albumartists.append(artist)
-        if (
-            track.get_date() is not None
-            and track.get_date() not in self._dates
-        ):
-            self._dates.append(track.get_date())
-        path = os.path.dirname(track.get_file())
-        if path not in self._paths:
-            self._paths.append(path)
-        if track.get_last_modified():
-            if (
-                not self._last_modified
-                or track.get_last_modified() > self._last_modified
-            ):
-                self._last_modified = track.get_last_modified()
-
-    def get_tracks(self):
-        return self._tracks
-
-    def get_length(self):
-        return self._length
-
-    def get_last_modified(self):
-        return self._last_modified
-
-    def filter(self, filter_string):
-        if len(filter_string) == 0:
-            return True
-        keywords = filter_string.split(MCGAlbum._FILTER_DELIMITER)
-        for keyword in keywords:
-            if len(keyword) == 0:
-                continue
-            result = False
-            keyword = keyword.lower()
-            # Search in album data
-            for value in self._artists + [self._title] + self._dates:
-                if keyword in value.lower():
-                    result = True
-                    break
-            if result:
-                continue
-            # Search in track data
-            for track in self._tracks:
-                if (
-                    keyword in track.get_title().lower()
-                    or keyword in track.get_file().lower()
-                ):
-                    result = True
-                    break
-            if not result:
-                return False
-        return True
-
-    @staticmethod
-    def compare(album1, album2, criterion=None, reverse=False):
-        if criterion is None:
-            criterion = SortOrder.TITLE
-        if criterion == SortOrder.ARTIST:
-            value_function = "get_artists"
-        elif criterion == SortOrder.TITLE:
-            value_function = "get_title"
-        elif criterion == SortOrder.YEAR:
-            value_function = "get_date"
-        elif criterion == SortOrder.MODIFIED:
-            value_function = "get_last_modified"
-
-        reverse_multiplier = -1 if reverse else 1
-
-        value1 = getattr(album1, value_function)()
-        value2 = getattr(album2, value_function)()
-        if value1 is None and value2 is None:
-            return 0
-        elif value1 is None:
-            return -1 * reverse_multiplier
-        elif value2 is None:
-            return 1 * reverse_multiplier
-        if value1 < value2:
-            return -1 * reverse_multiplier
-        elif value1 == value2:
-            return 0
-        else:
-            return 1 * reverse_multiplier
-
-
-class MCGTrack:
-
-    def __init__(self, artists, title, file):
-        if type(artists) is not list:
-            artists = [artists]
-        self._artists = artists
-        if type(title) is list:
-            title = title[0]
-        self._title = title
-        if type(file) is list:
-            file = file[0]
-        self._file = file
-
-        self._albumartists = []
-        self._track = None
-        self._length = 0
-        self._date = None
-        self._last_modified = None
-
-    def __eq__(self, other):
-        return self._file == other.get_file()
-
-    def __hash__(self):
-        return hash(self._file)
-
-    def get_artists(self):
-        if self._albumartists:
-            return [
-                artist for artist in self._artists
-                if artist not in self._albumartists
-            ]
-        return self._artists
-
-    def set_albumartists(self, artists):
-        if type(artists) is not list:
-            artists = [artists]
-        self._albumartists = artists
-
-    def get_albumartists(self):
-        if self._albumartists:
-            return self._albumartists
-        return self._artists
-
-    def get_title(self):
-        return self._title
-
-    def get_track(self):
-        return self._track
-
-    def set_track(self, track):
-        if type(track) is list:
-            track = track[0]
-        if type(track) is str and '/' in track:
-            track = track[0:track.index('/')]
-        if track is not None:
-            try:
-                track = int(track)
-            except ValueError:
-                track = 0
-        self._track = track
-
-    def get_length(self):
-        return self._length
-
-    def set_length(self, length):
-        self._length = int(length)
-
-    def get_date(self):
-        return self._date
-
-    def set_date(self, date):
-        if type(date) is list:
-            date = date[0]
-        self._date = date
-
-    def get_file(self):
-        return self._file
-
-    def set_last_modified(self, date_string):
-        if date_string:
-            try:
-                self._last_modified = dateutil.parser.isoparse(date_string)
-            except ValueError:
-                self._logger.debug("Invalid date format: %s", date_string)
-
-    def get_last_modified(self):
-        return self._last_modified
-
-
-class MCGPlaylistTrack(MCGTrack):
-
-    def __init__(self, track, id, pos):
-        MCGTrack.__init__(self, track.get_artists(), track.get_title(),
-                          track.get_file())
-        self.set_albumartists(track.get_albumartists())
-        self.set_track(track.get_track())
-        self.set_length(track.get_length())
-        self.set_date(track.get_date())
-        self._id = int(id)
-        self._pos = int(pos)
-
-    def get_id(self):
-        return self._id
-
-    def get_pos(self):
-        return self._pos
-
-
-class MCGConfig(configparser.ConfigParser):
-    CONFIG_DIR = '~/.config/mcg/'
-
-    def __init__(self, filename):
-        configparser.ConfigParser.__init__(self)
-        self._filename = os.path.expanduser(
-            os.path.join(MCGConfig.CONFIG_DIR, filename))
-        self._create_dir()
-
-    def load(self):
-        if os.path.isfile(self._filename):
-            self.read(self._filename)
-
-    def save(self):
-        with open(self._filename, 'w') as configfile:
-            self.write(configfile)
-
-    def _create_dir(self):
-        dirname = os.path.dirname(self._filename)
-        if not os.path.exists(dirname):
-            os.makedirs(dirname)
-
-
-class MCGCache():
-    DIRNAME = '~/.cache/mcg/'
-    SIZE_FILENAME = 'size'
-    _lock = threading.Lock()
-
-    def __init__(self, host, size):
-        self._logger = logging.getLogger(__name__)
-        self._host = host
-        self._size = size
-        self._dirname = os.path.expanduser(os.path.join(
-            MCGCache.DIRNAME, host))
-        if not os.path.exists(self._dirname):
-            os.makedirs(self._dirname)
-        self._read_size()
-
-    def create_filename(self, album):
-        return os.path.join(self._dirname, '-'.join([album.get_id()]))
-
-    def _read_size(self):
-        size = 100
-        MCGCache._lock.acquire()
-        # Read old size
-        filename = os.path.join(self._dirname, MCGCache.SIZE_FILENAME)
-        if os.path.exists(filename):
-            with open(filename, 'r') as f:
-                try:
-                    size = int(f.readline())
-                except:
-                    self._logger.warning(
-                        "invalid cache file: %s, deleting file",
-                        filename,
-                        exc_info=True)
-                    size = None
-        # Clear cache if size has changed
-        if size != self._size:
-            self._clear()
-        # Write new size
-        with open(filename, 'w') as f:
-            f.write(str(self._size))
-        MCGCache._lock.release()
-
-    def _clear(self):
-        for filename in os.listdir(self._dirname):
-            path = os.path.join(self._dirname, filename)
-            if os.path.isfile(path):
-                try:
-                    os.unlink(path)
-                except Exception as e:
-                    print("clear:", e)
diff --git a/src/connectionpanel.py b/src/connectionpanel.py
deleted file mode 100644
index a4060ed..0000000
--- a/src/connectionpanel.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-import locale
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk, GObject, Adw
-from mcg.zeroconf import ZeroconfProvider
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui')
-class ConnectionPanel(Adw.Bin):
-    __gtype_name__ = 'McgConnectionPanel'
-    __gsignals__ = {
-        'connection-changed': (GObject.SIGNAL_RUN_FIRST, None, (str, int, str))
-    }
-
-    # Widgets
-    toolbar = Gtk.Template.Child()
-    zeroconf_list = Gtk.Template.Child()
-    host_row = Gtk.Template.Child()
-    port_spinner = Gtk.Template.Child()
-    password_row = Gtk.Template.Child()
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-        # Zeroconf provider
-        self._zeroconf_provider = ZeroconfProvider()
-        self._zeroconf_provider.connect_signal(
-            ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service)
-
-    def on_new_service(self, service):
-        name, host, port = service
-
-        row_button = Gtk.Button()
-        row_button.set_label(locale.gettext("use"))
-        row_button.connect("clicked", self.on_service_selected, host, port)
-
-        row = Adw.ActionRow()
-        row.set_title(name)
-        row.set_subtitle("{} ({})".format(host, port))
-        row.add_suffix(row_button)
-
-        self.zeroconf_list.insert(row, -1)
-
-    def on_service_selected(self, widget, host, port):
-        self.set_host(host)
-        self.set_port(port)
-
-    @Gtk.Template.Callback()
-    def on_host_entry_apply(self, widget):
-        self._call_back()
-
-    @Gtk.Template.Callback()
-    def on_port_spinner_value_changed(self, widget):
-        self._call_back()
-
-    def set_host(self, host):
-        self.host_row.set_text(host)
-
-    def get_host(self):
-        return self.host_row.get_text()
-
-    def set_port(self, port):
-        self.port_spinner.set_value(port)
-
-    def get_port(self):
-        return self.port_spinner.get_value_as_int()
-
-    def set_password(self, password):
-        if password is None:
-            password = ""
-        self.password_row.set_text(password)
-
-    def get_password(self):
-        if self.password_row.get_text() == "":
-            return None
-        else:
-            return self.password_entry.get_text()
-
-    def _call_back(self):
-        self.emit(
-            'connection-changed',
-            self.get_host(),
-            self.get_port(),
-            self.get_password(),
-        )
diff --git a/src/coverpanel.py b/src/coverpanel.py
deleted file mode 100644
index b6f3c67..0000000
--- a/src/coverpanel.py
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-import math
-
-gi.require_version('Gtk', '4.0')
-from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
-from mcg.utils import Utils
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-panel.ui')
-class CoverPanel(Gtk.Overlay):
-    __gtype_name__ = 'McgCoverPanel'
-    __gsignals__ = {
-        'toggle-fullscreen': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'set-song': (GObject.SIGNAL_RUN_FIRST, None, (int, int, )),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, ))
-    }
-
-    # Widgets
-    # Toolbar
-    toolbar = Gtk.Template.Child()
-    fullscreen_button = Gtk.Template.Child()
-    # Cover
-    cover_stack = Gtk.Template.Child()
-    cover_spinner = Gtk.Template.Child()
-    cover_default = Gtk.Template.Child()
-    cover_scroll = Gtk.Template.Child()
-    cover_box = Gtk.Template.Child()
-    cover_image = Gtk.Template.Child()
-    # Album Infos
-    cover_info_scroll = Gtk.Template.Child()
-    info_revealer = Gtk.Template.Child()
-    album_title_label = Gtk.Template.Child()
-    album_date_label = Gtk.Template.Child()
-    album_artist_label = Gtk.Template.Child()
-    # Songs
-    songs_scale = Gtk.Template.Child()
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-        self._current_album = None
-        self._current_cover_album = None
-        self._cover_pixbuf = None
-        self._timer = None
-        self._properties = {}
-        self._icon_theme = Gtk.IconTheme.get_for_display(
-            Gdk.Display.get_default())
-        self._fullscreened = False
-        self._current_size = None
-
-        # Initial actions
-        GObject.idle_add(self._enable_tracklist)
-
-        # Click handler for image
-        click_controller = Gtk.GestureClick()
-        click_controller.connect('pressed', self.on_cover_box_pressed)
-        self.cover_box.add_controller(click_controller)
-
-        # Button controller for songs scale
-        button_controller = Gtk.GestureClick()
-        button_controller.connect('pressed', self.on_songs_scale_pressed)
-        button_controller.connect('unpaired-release',
-                                  self.on_songs_scale_released)
-        self.songs_scale.add_controller(button_controller)
-
-    def get_toolbar(self):
-        return self.toolbar
-
-    def set_selected(self, selected):
-        """The cover panel does not use selections"""
-        pass
-
-    def on_cover_box_pressed(self, widget, npress, x, y):
-        if self._current_album and npress == 2:
-            self.emit('toggle-fullscreen')
-
-    def set_width(self, width):
-        GObject.idle_add(self._resize_image)
-        self.cover_info_scroll.set_max_content_width(width // 2)
-
-    def on_songs_scale_pressed(self, widget, npress, x, y):
-        if self._timer:
-            GObject.source_remove(self._timer)
-            self._timer = None
-
-    def on_songs_scale_released(self, widget, x, y, npress, sequence):
-        value = int(self.songs_scale.get_value())
-        time = self._current_album.get_length()
-        tracks = self._current_album.get_tracks()
-        pos = 0
-        for index in range(len(tracks) - 1, -1, -1):
-            time = time - tracks[index].get_length()
-            pos = tracks[index].get_pos()
-            if time < value:
-                break
-        time = max(value - time - 1, 0)
-        self.emit('set-song', pos, time)
-
-    def set_album(self, album):
-        if album:
-            # Set labels
-            self.album_title_label.set_label(album.get_title())
-            self.album_date_label.set_label(', '.join(album.get_dates()))
-            self.album_artist_label.set_label(', '.join(
-                album.get_albumartists()))
-
-            # Set tracks
-            self._set_tracks(album)
-
-        # Load cover
-        if album != self._current_cover_album:
-            self.cover_stack.set_visible_child(self.cover_spinner)
-            self.cover_spinner.start()
-            self.emit('albumart', album.get_id() if album else None)
-
-        # Set current album
-        self._current_album = album
-        self._enable_tracklist()
-        self.fullscreen_button.set_sensitive(self._current_album is not None)
-
-    def set_play(self, pos, time):
-        if self._timer is not None:
-            GObject.source_remove(self._timer)
-            self._timer = None
-        tracks = self._current_album.get_tracks()
-        for index in range(0, pos):
-            time = time + tracks[index].get_length()
-
-        self.songs_scale.set_value(time + 1)
-        self._timer = GObject.timeout_add(1000, self._playing)
-
-    def set_pause(self):
-        if self._timer is not None:
-            GObject.source_remove(self._timer)
-            self._timer = None
-
-    def set_fullscreen(self, active):
-        if active:
-            self.info_revealer.set_reveal_child(False)
-            GObject.idle_add(self._resize_image)
-            self._fullscreened = True
-        else:
-            self._fullscreened = False
-            if self._current_album:
-                self.info_revealer.set_reveal_child(True)
-            GObject.idle_add(self._resize_image)
-
-    def set_albumart(self, album, data):
-        if album == self._current_album:
-            if data:
-                # Load image and draw it
-                try:
-                    self._cover_pixbuf = Utils.load_pixbuf(data)
-                except Exception:
-                    self._logger.exception("Failed to set albumart")
-                    self._cover_pixbuf = None
-            else:
-                # Reset image
-                self._cover_pixbuf = None
-            self._current_size = None
-            self._current_cover_album = album
-            # Show image
-            GObject.idle_add(self._show_image)
-
-    def _set_tracks(self, album):
-        self.songs_scale.clear_marks()
-        self.songs_scale.set_range(0, album.get_length())
-        length = 0
-        for track in album.get_tracks():
-            cur_length = length
-            if length > 0 and length < album.get_length():
-                cur_length = cur_length + 1
-            self.songs_scale.add_mark(
-                cur_length, Gtk.PositionType.RIGHT,
-                GObject.markup_escape_text(Utils.create_track_title(track)))
-            length = length + track.get_length()
-        self.songs_scale.add_mark(
-            length, Gtk.PositionType.RIGHT,
-            "{0[0]:02d}:{0[1]:02d} minutes".format(divmod(length, 60)))
-
-        # Align marks
-        self._align_songs_scale_marks()
-
-    def _align_songs_scale_marks(self):
-        self._align_songs_scale_mark(self.songs_scale)
-
-    def _align_songs_scale_mark(self, widget):
-        child = widget.get_first_child()
-        while child:
-            if type(child) is Gtk.Label:
-                child.set_halign(Gtk.Align.START)
-            else:
-                self._align_songs_scale_mark(child)
-            child = child.get_next_sibling()
-
-    def _enable_tracklist(self):
-        if self._current_album:
-            # enable
-            if not self._fullscreened:
-                self.info_revealer.set_reveal_child(True)
-        else:
-            # disable
-            self.info_revealer.set_reveal_child(False)
-
-    def _playing(self):
-        value = self.songs_scale.get_value() + 1
-        self.songs_scale.set_value(value)
-
-        return True
-
-    def _show_image(self):
-        if self._cover_pixbuf:
-            self._resize_image()
-            self.cover_stack.set_visible_child(self.cover_scroll)
-        else:
-            self.cover_stack.set_visible_child(self.cover_default)
-        self.cover_spinner.stop()
-
-    def _resize_image(self):
-        # Get size
-        size_width = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL)
-        size_height = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL)
-        # Abort if size is the same
-        if self._current_size:
-            current_width, current_height = self._current_size
-            if size_width == current_width and size_height == current_height:
-                return
-        self._current_size = (
-            size_width,
-            size_height,
-        )
-
-        # Get pixelbuffer
-        pixbuf = self._cover_pixbuf
-        # Check pixelbuffer
-        if pixbuf is None:
-            self.cover_default.set_pixel_size(min(size_width, size_height)/2)
-            return
-
-        # Skalierungswert für Breite und Höhe ermitteln
-        ratio_w = float(size_width) / float(pixbuf.get_width())
-        ratio_h = float(size_height) / float(pixbuf.get_height())
-        # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren
-        ratio = min(ratio_w, ratio_h)
-        ratio = min(ratio, 1)
-        # Neue Breite und Höhe berechnen
-        width = int(math.floor(pixbuf.get_width() * ratio))
-        height = int(math.floor(pixbuf.get_height() * ratio))
-        if width <= 0 or height <= 0:
-            return
-        self.cover_image.set_from_pixbuf(
-            pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
-        self.cover_image.set_pixel_size(min(width, height))
-        self.cover_image.show()
diff --git a/src/librarypanel.py b/src/librarypanel.py
deleted file mode 100644
index 02d8c08..0000000
--- a/src/librarypanel.py
+++ /dev/null
@@ -1,470 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-import locale
-import logging
-import math
-import threading
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw
-from mcg import client
-from mcg.albumheaderbar import AlbumHeaderbar
-from mcg.utils import SortOrder
-from mcg.utils import Utils
-from mcg.utils import GridItem
-from mcg.utils import SearchFilter
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui')
-class LibraryPanel(Adw.Bin):
-    __gtype_name__ = 'McgLibraryPanel'
-    __gsignals__ = {
-        'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'update': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'play': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
-        'queue': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
-        'queue-multiple':
-        (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
-        'item-size-changed': (GObject.SIGNAL_RUN_FIRST, None, (int, )),
-        'sort-order-changed': (GObject.SIGNAL_RUN_FIRST, None, (int, )),
-        'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool, )),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
-    }
-
-    # Widgets
-    library_stack = Gtk.Template.Child()
-    panel_normal = Gtk.Template.Child()
-    panel_standalone = Gtk.Template.Child()
-    actionbar_revealer = Gtk.Template.Child()
-    # Toolbar
-    toolbar = Gtk.Template.Child()
-    select_button = Gtk.Template.Child()
-    toolbar_search_bar = Gtk.Template.Child()
-    toolbar_popover = Gtk.Template.Child()
-    toolbar_sort_order_button = Gtk.Template.Child()
-    sort_artist = Gtk.Template.Child()
-    sort_title = Gtk.Template.Child()
-    sort_year = Gtk.Template.Child()
-    sort_modified = Gtk.Template.Child()
-    grid_scale = Gtk.Template.Child()
-    # Filter/search bar
-    filter_bar = Gtk.Template.Child()
-    filter_entry = Gtk.Template.Child()
-    # Progress Bar
-    stack = Gtk.Template.Child()
-    progress_box = Gtk.Template.Child()
-    progress_image = Gtk.Template.Child()
-    progress_bar = Gtk.Template.Child()
-    scroll = Gtk.Template.Child()
-    # Library Grid
-    library_grid = Gtk.Template.Child()
-    # Action bar (normal)
-    actionbar = Gtk.Template.Child()
-    actionbar_standalone = Gtk.Template.Child()
-    # Standalone Image
-    standalone_stack = Gtk.Template.Child()
-    standalone_spinner = Gtk.Template.Child()
-    standalone_scroll = Gtk.Template.Child()
-    standalone_image = Gtk.Template.Child()
-
-    def __init__(self, client, **kwargs):
-        super().__init__(**kwargs)
-        self._logger = logging.getLogger(__name__)
-        self._client = client
-        self._buttons = {}
-        self._albums = None
-        self._host = "localhost"
-        self._item_size = 150
-        self._sort_order = SortOrder.YEAR
-        self._sort_type = Gtk.SortType.DESCENDING
-        self._grid_pixbufs = {}
-        self._grid_width = 0
-        self._old_ranges = {}
-        self._library_lock = threading.Lock()
-        self._library_stop = threading.Event()
-        self._icon_theme = Gtk.IconTheme.get_for_display(
-            Gdk.Display.get_default())
-        self._standalone_pixbuf = None
-        self._selected_albums = []
-        self._is_selected = False
-
-        # Widgets
-        # Header bar
-        self._headerbar_standalone = AlbumHeaderbar()
-        self._headerbar_standalone.connect('close',
-                                           self.on_standalone_close_clicked)
-        # Library Grid: Model
-        self._library_grid_model = Gio.ListStore()
-        self._library_grid_filter = Gtk.FilterListModel()
-        self._library_grid_filter.set_model(self._library_grid_model)
-        self._library_grid_selection_multi = Gtk.MultiSelection.new(
-            self._library_grid_filter)
-        self._library_grid_selection_single = Gtk.SingleSelection.new(
-            self._library_grid_filter)
-        # Library Grid
-        self.library_grid.set_model(self._library_grid_selection_single)
-        # Toolbar menu
-        self.grid_scale.set_value(self._item_size)
-        self._toolbar_sort_buttons = {
-            SortOrder.ARTIST: self.sort_artist,
-            SortOrder.TITLE: self.sort_title,
-            SortOrder.YEAR: self.sort_year,
-            SortOrder.MODIFIED: self.sort_modified
-        }
-
-        # Button controller for grid scale
-        button_controller = Gtk.GestureClick()
-        button_controller.connect('unpaired-release',
-                                  self.on_grid_scale_released)
-        self.grid_scale.add_controller(button_controller)
-
-    def get_headerbar_standalone(self):
-        return self._headerbar_standalone
-
-    def get_toolbar(self):
-        return self.toolbar
-
-    def set_selected(self, selected):
-        self._is_selected = selected
-
-    @Gtk.Template.Callback()
-    def on_select_toggled(self, widget):
-        if self.select_button.get_active():
-            self.actionbar_revealer.set_reveal_child(True)
-            self.library_grid.set_model(self._library_grid_selection_multi)
-            self.library_grid.set_single_click_activate(False)
-            self.library_grid.get_style_context().add_class(
-                Utils.CSS_SELECTION)
-        else:
-            self.actionbar_revealer.set_reveal_child(False)
-            self.library_grid.set_model(self._library_grid_selection_single)
-            self.library_grid.set_single_click_activate(True)
-            self.library_grid.get_style_context().remove_class(
-                Utils.CSS_SELECTION)
-
-    @Gtk.Template.Callback()
-    def on_update_clicked(self, widget):
-        self.emit('update')
-
-    def on_grid_scale_released(self, widget, x, y, npress, sequence):
-        size = math.floor(self.grid_scale.get_value())
-        grid_range = self.grid_scale.get_adjustment()
-        if size < grid_range.get_lower() or size > grid_range.get_upper():
-            return
-        self._item_size = size
-        self.emit('item-size-changed', size)
-        self._redraw()
-        GObject.idle_add(self.toolbar_popover.popdown)
-
-    @Gtk.Template.Callback()
-    def on_grid_scale_changed(self, widget):
-        size = math.floor(self.grid_scale.get_value())
-        grid_range = widget.get_adjustment()
-        if size < grid_range.get_lower() or size > grid_range.get_upper():
-            return
-        self._set_widget_grid_size(self.library_grid, size, True)
-
-    @Gtk.Template.Callback()
-    def on_sort_toggled(self, widget):
-        if widget.get_active():
-            self._sort_order = [
-                key for key, value in self._toolbar_sort_buttons.items()
-                if value is widget
-            ][0]
-            self._sort_grid_model()
-            self.emit('sort-order-changed', self._sort_order)
-
-    @Gtk.Template.Callback()
-    def on_sort_order_toggled(self, button):
-        if button.get_active():
-            self._sort_type = Gtk.SortType.DESCENDING
-        else:
-            self._sort_type = Gtk.SortType.ASCENDING
-        self._sort_grid_model()
-        self.emit('sort-type-changed', button.get_active())
-
-    def set_size(self, width, height):
-        self._set_marks()
-        self._resize_standalone_image()
-
-    @Gtk.Template.Callback()
-    def on_filter_entry_changed(self, widget):
-        self._library_grid_filter.set_filter(
-            SearchFilter(self.filter_entry.get_text()))
-
-    @Gtk.Template.Callback()
-    def on_library_grid_clicked(self, widget, position):
-        # Get selected album
-        item = self._library_grid_filter.get_item(position)
-        album = item.get_album()
-        album_id = album.get_id()
-        self._selected_albums = [album]
-        self.emit('albumart', album_id)
-
-        # Show standalone album
-        if widget.get_model() == self._library_grid_selection_single:
-            # Set labels
-            self._headerbar_standalone.set_album(album)
-
-            # Show panel
-            self._open_standalone()
-
-            # Set cover loading indicator
-            self.standalone_stack.set_visible_child(self.standalone_spinner)
-            self.standalone_spinner.start()
-
-    @Gtk.Template.Callback()
-    def on_selection_cancel_clicked(self, widget):
-        self.select_button.set_active(False)
-
-    @Gtk.Template.Callback()
-    def on_selection_add_clicked(self, widget):
-        self.emit('queue-multiple', self._get_selected_albums())
-        self.select_button.set_active(False)
-
-    @Gtk.Template.Callback()
-    def on_standalone_play_clicked(self, widget):
-        self.emit('play', self._selected_albums[0].get_id())
-        self._close_standalone()
-
-    @Gtk.Template.Callback()
-    def on_standalone_queue_clicked(self, widget):
-        self.emit('queue', self._selected_albums[0].get_id())
-        self._close_standalone()
-
-    def on_standalone_close_clicked(self, widget):
-        self._close_standalone()
-
-    def show_search(self):
-        self.filter_bar.set_search_mode(True)
-
-    def set_item_size(self, item_size):
-        if self._item_size != item_size:
-            self._item_size = item_size
-            self.grid_scale.set_value(item_size)
-            self._redraw()
-
-    def get_item_size(self):
-        return self._item_size
-
-    def set_sort_order(self, sort):
-        button = self._toolbar_sort_buttons[sort]
-        if button:
-            self._sort_order = [
-                key for key, value in self._toolbar_sort_buttons.items()
-                if value is button
-            ][0]
-            if not button.get_active():
-                button.set_active(True)
-            self._sort_grid_model()
-
-    def set_sort_type(self, sort_type):
-        if sort_type:
-            sort_type_gtk = Gtk.SortType.DESCENDING
-        else:
-            sort_type_gtk = Gtk.SortType.ASCENDING
-
-        if sort_type_gtk != self._sort_type:
-            self._sort_type = sort_type_gtk
-            self.toolbar_sort_order_button.set_active(sort_type)
-            self._sort_grid_model()
-
-    def get_sort_type(self):
-        return (self._sort_type != Gtk.SortType.ASCENDING)
-
-    def init_albums(self):
-        self.progress_bar.set_text(locale.gettext("Loading albums"))
-
-    def load_albums(self):
-        self.progress_bar.pulse()
-
-    def set_albums(self, host, albums):
-        self._host = host
-        self._library_stop.set()
-        threading.Thread(target=self._set_albums,
-                         args=(
-                             host,
-                             albums,
-                             self._item_size,
-                         )).start()
-
-    def set_albumart(self, album, data):
-        if album in self._selected_albums:
-            self._standalone_pixbuf = None
-            if data:
-                # Load image and draw it
-                try:
-                    self._standalone_pixbuf = Utils.load_pixbuf(data)
-                except Exception:
-                    self._logger.exception("Failed to set albumart")
-            # Show image
-            GObject.idle_add(self._show_image)
-
-    def _sort_grid_model(self):
-        GObject.idle_add(self._library_grid_model.sort,
-                         self._grid_model_compare_func, self._sort_order,
-                         self._sort_type)
-
-    def _grid_model_compare_func(self, item1, item2, criterion, order):
-        return client.MCGAlbum.compare(item1.get_album(), item2.get_album(),
-                                       criterion,
-                                       (order == Gtk.SortType.DESCENDING))
-
-    def stop_threads(self):
-        self._library_stop.set()
-
-    def _set_albums(self, host, albums, size):
-        self._library_lock.acquire()
-        self._albums = albums
-        stack_transition_type = self.stack.get_transition_type()
-        GObject.idle_add(self.stack.set_transition_type,
-                         Gtk.StackTransitionType.NONE)
-        GObject.idle_add(self.stack.set_visible_child, self.progress_box)
-        GObject.idle_add(self.progress_bar.set_fraction, 0.0)
-        GObject.idle_add(self.stack.set_transition_type, stack_transition_type)
-        GObject.idle_add(self._library_grid_model.remove_all)
-
-        i = 0
-        n = len(albums)
-        cache = client.MCGCache(host, size)
-        self._grid_pixbufs.clear()
-        for album_id in albums.keys():
-            album = albums[album_id]
-            grid_item = GridItem(album)
-
-            pixbuf = None
-            try:
-                pixbuf = Utils.load_thumbnail(cache, self._client, album, size)
-            except client.CommandException:
-                # Exception is handled by client
-                pass
-            except Exception:
-                self._logger.exception("Failed to load albumart")
-            if pixbuf is None:
-                icon = self._get_default_icon(self._item_size, self._item_size)
-                grid_item.set_icon(icon)
-            else:
-                self._grid_pixbufs[album.get_id()] = pixbuf
-                grid_item.set_cover(pixbuf)
-
-            GObject.idle_add(self._library_grid_model.append, grid_item)
-
-            i += 1
-            GObject.idle_add(self.progress_bar.set_fraction, i / n)
-            GObject.idle_add(self.progress_bar.set_text,
-                             locale.gettext("Loading images"))
-
-        self._library_lock.release()
-        GObject.idle_add(self.stack.set_visible_child, self.scroll)
-        self._sort_grid_model()
-        GObject.idle_add(self.library_grid.scroll_to, 0, Gtk.ListScrollFlags.NONE, None)
-
-    def _set_widget_grid_size(self, grid_widget, size, vertical):
-        self._library_stop.set()
-        threading.Thread(target=self._set_widget_grid_size_thread,
-                         args=(
-                             grid_widget,
-                             size,
-                             vertical,
-                         )).start()
-
-    def _set_widget_grid_size_thread(self, grid_widget, size, vertical):
-        self._library_lock.acquire()
-        self._library_stop.clear()
-        if size == self._item_size:
-            self._library_lock.release()
-            return
-        for i in range(self._library_grid_model.get_n_items()):
-            grid_item = self._library_grid_model.get_item(i)
-            album_id = grid_item.get_album().get_id()
-
-            pixbuf = self._grid_pixbufs[album_id]
-            if pixbuf is not None:
-                pixbuf = pixbuf.scale_simple(size, size,
-                                             GdkPixbuf.InterpType.NEAREST)
-            else:
-                pixbuf = self._icon_theme.lookup_icon(
-                    Utils.STOCK_ICON_DEFAULT, None, size, size,
-                    Gtk.TextDirection.LTR, Gtk.IconLookupFlags.FORCE_SYMBOLIC)
-            GObject.idle_add(grid_item.set_cover, pixbuf)
-
-            if self._library_stop.is_set():
-                self._library_lock.release()
-                return
-
-        self._library_lock.release()
-
-    def _show_image(self):
-        self._resize_standalone_image()
-        self.standalone_stack.set_visible_child(self.standalone_scroll)
-        self.standalone_spinner.stop()
-
-    def _redraw(self):
-        if self._albums is not None:
-            self.set_albums(self._host, self._albums)
-
-    def _set_marks(self):
-        width = self.scroll.get_width()
-        if width == self._grid_width:
-            return
-        self._grid_width = width
-        self.grid_scale.clear_marks()
-
-        lower = int(self.grid_scale.get_adjustment().get_lower())
-        upper = int(self.grid_scale.get_adjustment().get_upper())
-        count_min = max(int(width / upper), 1)
-        count_max = max(int(width / lower), 1)
-        for index in range(count_min, count_max):
-            pixel = int(width / index)
-            pixel = pixel - (2 * int(pixel / 100))
-            self.grid_scale.add_mark(pixel, Gtk.PositionType.BOTTOM, None)
-
-    def _open_standalone(self):
-        self.library_stack.set_visible_child(self.panel_standalone)
-        self.emit('open-standalone')
-
-    def _close_standalone(self):
-        self.library_stack.set_visible_child(self.panel_normal)
-        self.emit('close-standalone')
-
-    def _resize_standalone_image(self):
-        # Get size
-        size_width = self.standalone_stack.get_width()
-        size_height = self.standalone_stack.get_height()
-
-        # Get pixelbuffer
-        pixbuf = self._standalone_pixbuf
-        # Check pixelbuffer
-        if pixbuf is None:
-            icon = self._get_default_icon(size_width, size_height)
-            self.standalone_image.set_from_paintable(icon)
-            self.standalone_image.set_pixel_size(min(size_width, size_height)/2)
-            return
-
-        (width, height) = Utils.calculate_size(pixbuf.get_width(),
-                                               pixbuf.get_height(), size_width,
-                                               size_height)
-        if width <= 0 or height <= 0:
-            return
-        # Pixelpuffer auf Oberfläche zeichnen
-        self.standalone_image.set_from_pixbuf(
-            pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
-        self.standalone_image.set_pixel_size(min(width, height))
-        self.standalone_image.show()
-
-    def _get_default_icon(self, width, height):
-        return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None,
-                                            width, height,
-                                            Gtk.TextDirection.LTR,
-                                            Gtk.IconLookupFlags.FORCE_SYMBOLIC)
-
-    def _get_selected_albums(self):
-        albums = []
-        for i in range(self.library_grid.get_model().get_n_items()):
-            if self.library_grid.get_model().is_selected(i):
-                albums.append(self.library_grid.get_model().get_item(
-                    i).get_album().get_id())
-        return albums
diff --git a/src/main.py b/src/main.py
deleted file mode 100644
index 319beff..0000000
--- a/src/main.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import sys
-
-from .application import Application
-
-
-def main(version):
-    app = Application(version)
-    return app.run(sys.argv)
diff --git a/src/mcg.in b/src/mcg.in
deleted file mode 100755
index 5166fe0..0000000
--- a/src/mcg.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!@PYTHON@
-
-import os
-import sys
-import signal
-import locale
-
-VERSION = '@VERSION@'
-pkgdatadir = '@pkgdatadir@'
-localedir = '@localedir@'
-
-sys.path.insert(1, pkgdatadir)
-signal.signal(signal.SIGINT, signal.SIG_DFL)
-locale.bindtextdomain('mcg', localedir)
-locale.textdomain('mcg')
-
-if __name__ == '__main__':
-    import gi
-
-    from gi.repository import Gio
-    resource = Gio.Resource.load(os.path.join(pkgdatadir, 'mcg.gresource'))
-    resource._register()
-
-    from mcg import main
-    sys.exit(main.main(VERSION))
diff --git a/src/meson.build b/src/meson.build
deleted file mode 100644
index d30b1c7..0000000
--- a/src/meson.build
+++ /dev/null
@@ -1,37 +0,0 @@
-pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
-moduledir = join_paths(pkgdatadir, 'mcg')
-
-python = import('python')
-
-conf = configuration_data()
-conf.set('PYTHON', python.find_installation('python3').full_path())
-conf.set('VERSION', meson.project_version())
-conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
-conf.set('pkgdatadir', pkgdatadir)
-
-configure_file(
-    input: 'mcg.in',
-    output: 'mcg',
-    configuration: conf,
-    install: true,
-    install_dir: get_option('bindir')
-)
-
-mcg_sources = [
-    '__init__.py',
-    'main.py',
-    'albumheaderbar.py',
-    'application.py',
-    'client.py',
-    'connectionpanel.py',
-    'coverpanel.py',
-    'librarypanel.py',
-    'playlistpanel.py',
-    'serverpanel.py',
-    'shortcutsdialog.py',
-    'utils.py',
-    'window.py',
-    'zeroconf.py',
-]
-
-install_data(mcg_sources, install_dir: moduledir)
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
deleted file mode 100644
index 9f59e93..0000000
--- a/src/playlistpanel.py
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-import math
-import threading
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw
-from mcg import client
-from mcg.albumheaderbar import AlbumHeaderbar
-from mcg.utils import Utils
-from mcg.utils import GridItem
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-panel.ui')
-class PlaylistPanel(Adw.Bin):
-    __gtype_name__ = 'McgPlaylistPanel'
-    __gsignals__ = {
-        'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'clear-playlist': (GObject.SIGNAL_RUN_FIRST, None, ()),
-        'remove-album':
-        (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
-        'remove-multiple-albums':
-        (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
-        'play': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )),
-        'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, )),
-    }
-
-    # Widgets
-    playlist_stack = Gtk.Template.Child()
-    panel_normal = Gtk.Template.Child()
-    panel_standalone = Gtk.Template.Child()
-    actionbar_revealer = Gtk.Template.Child()
-    # Toolbar
-    toolbar = Gtk.Template.Child()
-    playlist_clear_button = Gtk.Template.Child()
-    select_button = Gtk.Template.Child()
-    # Playlist Grid
-    playlist_grid = Gtk.Template.Child()
-    # Action bar (normal)
-    actionbar = Gtk.Template.Child()
-    actionbar_standalone = Gtk.Template.Child()
-    # Standalone Image
-    standalone_stack = Gtk.Template.Child()
-    standalone_spinner = Gtk.Template.Child()
-    standalone_scroll = Gtk.Template.Child()
-    standalone_image = Gtk.Template.Child()
-
-    def __init__(self, client, **kwargs):
-        super().__init__(**kwargs)
-        self._client = client
-        self._host = None
-        self._item_size = 150
-        self._playlist = None
-        self._playlist_albums = None
-        self._playlist_lock = threading.Lock()
-        self._playlist_stop = threading.Event()
-        self._icon_theme = Gtk.IconTheme.get_for_display(
-            Gdk.Display.get_default())
-        self._standalone_pixbuf = None
-        self._selected_albums = []
-        self._is_selected = False
-
-        # Widgets
-        # Header bar
-        self._headerbar_standalone = AlbumHeaderbar()
-        self._headerbar_standalone.connect('close',
-                                           self.on_headerbar_close_clicked)
-        # Playlist Grid: Model
-        self._playlist_grid_model = Gio.ListStore()
-        self._playlist_grid_selection_multi = Gtk.MultiSelection.new(
-            self._playlist_grid_model)
-        self._playlist_grid_selection_single = Gtk.SingleSelection.new(
-            self._playlist_grid_model)
-        # Playlist Grid
-        self.playlist_grid.set_model(self._playlist_grid_selection_single)
-
-    def get_headerbar_standalone(self):
-        return self._headerbar_standalone
-
-    def get_toolbar(self):
-        return self.toolbar
-
-    def set_selected(self, selected):
-        self._is_selected = selected
-
-    @Gtk.Template.Callback()
-    def on_select_toggled(self, widget):
-        if self.select_button.get_active():
-            self.actionbar_revealer.set_reveal_child(True)
-            self.playlist_grid.set_model(self._playlist_grid_selection_multi)
-            self.playlist_grid.set_single_click_activate(False)
-            self.playlist_grid.get_style_context().add_class(
-                Utils.CSS_SELECTION)
-        else:
-            self.actionbar_revealer.set_reveal_child(False)
-            self.playlist_grid.set_model(self._playlist_grid_selection_single)
-            self.playlist_grid.set_single_click_activate(True)
-            self.playlist_grid.get_style_context().remove_class(
-                Utils.CSS_SELECTION)
-
-    @Gtk.Template.Callback()
-    def on_clear_clicked(self, widget):
-        self.emit('clear-playlist')
-
-    @Gtk.Template.Callback()
-    def on_playlist_grid_clicked(self, widget, position):
-        # Get selected album
-        item = self._playlist_grid_model.get_item(position)
-        album = item.get_album()
-        album_id = album.get_id()
-        self._selected_albums = [album]
-        self.emit('albumart', album_id)
-
-        # Show standalone album
-        if widget.get_model() == self._playlist_grid_selection_single:
-            # Set labels
-            self._headerbar_standalone.set_album(album)
-
-            # Show panel
-            self._open_standalone()
-
-            # Set cover loading indicator
-            self.standalone_stack.set_visible_child(self.standalone_spinner)
-            self.standalone_spinner.start()
-
-    @Gtk.Template.Callback()
-    def on_selection_cancel_clicked(self, widget):
-        self.select_button.set_active(False)
-
-    @Gtk.Template.Callback()
-    def on_selection_remove_clicked(self, widget):
-        self.emit('remove-multiple-albums', self._get_selected_albums())
-        self.select_button.set_active(False)
-
-    def on_headerbar_close_clicked(self, widget):
-        self._close_standalone()
-
-    @Gtk.Template.Callback()
-    def on_standalone_remove_clicked(self, widget):
-        self.emit('remove-album', self._get_selected_albums()[0])
-        self._close_standalone()
-
-    @Gtk.Template.Callback()
-    def on_standalone_play_clicked(self, widget):
-        self.emit('play', self._get_selected_albums()[0])
-        self._close_standalone()
-
-    def set_size(self, width, height):
-        self._resize_standalone_image()
-
-    def set_item_size(self, item_size):
-        if self._item_size != item_size:
-            self._item_size = item_size
-            self._redraw()
-
-    def get_item_size(self):
-        return self._item_size
-
-    def set_playlist(self, host, playlist):
-        self._host = host
-        self._playlist_stop.set()
-        threading.Thread(target=self._set_playlist,
-                         args=(
-                             host,
-                             playlist,
-                             self._item_size,
-                         )).start()
-
-    def set_albumart(self, album, data):
-        if album in self._selected_albums:
-            self._standalone_pixbuf = None
-            if data:
-                # Load image and draw it
-                try:
-                    self._standalone_pixbuf = Utils.load_pixbuf(data)
-                except Exception:
-                    self._logger.exception("Failed to set albumart")
-            # Show image
-            GObject.idle_add(self._show_image)
-
-    def stop_threads(self):
-        self._playlist_stop.set()
-
-    def _set_playlist(self, host, playlist, size):
-        self._playlist_lock.acquire()
-        self._playlist_stop.clear()
-        self._playlist = playlist
-        self._playlist_albums = {}
-        for album in playlist:
-            self._playlist_albums[album.get_id()] = album
-        self._playlist_grid_model.remove_all()
-
-        cache = client.MCGCache(host, size)
-        for album in playlist:
-            grid_item = GridItem(album)
-
-            pixbuf = None
-            # Load albumart thumbnail
-            try:
-                pixbuf = Utils.load_thumbnail(cache, self._client, album, size)
-            except client.CommandException:
-                # Exception is handled by client
-                pass
-            except Exception:
-                self._logger.exception("Failed to load albumart")
-            if pixbuf is None:
-                icon = self._get_default_icon(self._item_size, self._item_size)
-                grid_item.set_icon(icon)
-            else:
-                grid_item.set_cover(pixbuf)
-
-            GObject.idle_add(self._playlist_grid_model.append, grid_item)
-
-            if self._playlist_stop.is_set():
-                self._playlist_lock.release()
-                return
-
-        self.playlist_grid.set_model(self._playlist_grid_selection_single)
-        self._playlist_lock.release()
-
-    def _show_image(self):
-        self._resize_standalone_image()
-        self.standalone_stack.set_visible_child(self.standalone_scroll)
-        self.standalone_spinner.stop()
-
-    def _redraw(self):
-        if self._playlist is not None:
-            self.set_playlist(self._host, self._playlist)
-
-    def _open_standalone(self):
-        self.playlist_stack.set_visible_child(self.panel_standalone)
-        self.emit('open-standalone')
-
-    def _close_standalone(self):
-        self.playlist_stack.set_visible_child(self.panel_normal)
-        self.emit('close-standalone')
-
-    def _resize_standalone_image(self):
-        # Get size
-        size_width = self.standalone_stack.get_width()
-        size_height = self.standalone_stack.get_height()
-
-        # Get pixelbuffer
-        pixbuf = self._standalone_pixbuf
-        # Check pixelbuffer
-        if pixbuf is None:
-            icon = self._get_default_icon(size_width, size_height)
-            self.standalone_image.set_from_paintable(icon)
-            self.standalone_image.set_pixel_size(min(size_width, size_height)/2)
-            return
-
-        (width, height) = Utils.calculate_size(pixbuf.get_width(),
-                                               pixbuf.get_height(), size_width,
-                                               size_height)
-        if width <= 0 or height <= 0:
-            return
-        # Pixelpuffer auf Oberfläche zeichnen
-        self.standalone_image.set_from_pixbuf(
-            pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
-        self.standalone_image.set_pixel_size(min(width, height))
-        self.standalone_image.show()
-
-    def _get_default_icon(self, width, height):
-        return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None,
-                                            width, height,
-                                            Gtk.TextDirection.LTR,
-                                            Gtk.IconLookupFlags.FORCE_SYMBOLIC)
-
-    def _get_selected_albums(self):
-        albums = []
-        for i in range(self.playlist_grid.get_model().get_n_items()):
-            if self.playlist_grid.get_model().is_selected(i):
-                albums.append(
-                    self.playlist_grid.get_model().get_item(i).get_album())
-        return albums
diff --git a/src/serverpanel.py b/src/serverpanel.py
deleted file mode 100644
index f29c7c4..0000000
--- a/src/serverpanel.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk, Adw, GObject
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-panel.ui')
-class ServerPanel(Adw.Bin):
-    __gtype_name__ = 'McgServerPanel'
-    __gsignals__ = {
-        'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, (
-            GObject.TYPE_PYOBJECT,
-            bool,
-        )),
-    }
-
-    # Widgets
-    toolbar = Gtk.Template.Child()
-    # Status widgets
-    status_file = Gtk.Template.Child()
-    status_audio = Gtk.Template.Child()
-    status_bitrate = Gtk.Template.Child()
-    status_error = Gtk.Template.Child()
-    # Stats widgets
-    stats_artists = Gtk.Template.Child()
-    stats_albums = Gtk.Template.Child()
-    stats_songs = Gtk.Template.Child()
-    stats_dbplaytime = Gtk.Template.Child()
-    stats_playtime = Gtk.Template.Child()
-    stats_uptime = Gtk.Template.Child()
-    # Audio output devices widgets
-    output_devices = Gtk.Template.Child()
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self._none_label = ""
-        self._output_buttons = {}
-        self._is_selected = False
-
-        # Widgets
-        self._none_label = self.status_file.get_label()
-
-    def set_selected(self, selected):
-        self._is_selected = selected
-
-    def get_toolbar(self):
-        return self.toolbar
-
-    def on_output_device_toggled(self, widget, device):
-        self.emit('change-output-device', device, widget.get_active())
-
-    def set_status(self, file, audio, bitrate, error):
-        if file:
-            file = GObject.markup_escape_text(file)
-        else:
-            file = self._none_label
-        self.status_file.set_markup(file)
-        # Audio information
-        if audio:
-            parts = audio.split(":")
-            if len(parts) == 3:
-                audio = "{} Hz, {} bit, {} channels".format(
-                    parts[0], parts[1], parts[2])
-        else:
-            audio = self._none_label
-        self.status_audio.set_markup(audio)
-        # Bitrate
-        if bitrate:
-            bitrate = bitrate + " kb/s"
-        else:
-            bitrate = self._none_label
-        self.status_bitrate.set_markup(bitrate)
-        # Error
-        if error:
-            error = GObject.markup_escape_text(error)
-        else:
-            error = self._none_label
-        self.status_error.set_markup(error)
-
-    def set_stats(self, artists, albums, songs, dbplaytime, playtime, uptime):
-        self.stats_artists.set_text(str(artists))
-        self.stats_albums.set_text(str(albums))
-        self.stats_songs.set_text(str(songs))
-        self.stats_dbplaytime.set_text(str(dbplaytime))
-        self.stats_playtime.set_text(str(playtime))
-        self.stats_uptime.set_text(str(uptime))
-
-    def set_output_devices(self, devices):
-        device_ids = []
-
-        # Add devices
-        for device in devices:
-            device_ids.append(device.get_id())
-            if device.get_id() in self._output_buttons.keys():
-                self._output_buttons[device.get_id()].freeze_notify()
-                self._output_buttons[device.get_id()].set_active(
-                    device.is_enabled())
-                self._output_buttons[device.get_id()].thaw_notify()
-            else:
-                button = Gtk.CheckButton.new_with_label(device.get_name())
-                if device.is_enabled():
-                    button.set_active(True)
-                button.connect('toggled', self.on_output_device_toggled,
-                               device)
-                self.output_devices.insert(button, -1)
-                self._output_buttons[device.get_id()] = button
-
-        # Remove devices
-        for id in self._output_buttons.keys():
-            if id not in device_ids:
-                self.output_devices.remove(
-                    self._output_buttons[id].get_parent())
diff --git a/src/shortcutsdialog.py b/src/shortcutsdialog.py
deleted file mode 100644
index 2db83e3..0000000
--- a/src/shortcutsdialog.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/shortcuts-dialog.ui')
-class ShortcutsDialog(Gtk.ShortcutsWindow):
-    __gtype_name__ = 'McgShortcutsDialog'
-
-    def __init__(self):
-        super().__init__()
diff --git a/src/utils.py b/src/utils.py
deleted file mode 100644
index 544e415..0000000
--- a/src/utils.py
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-import hashlib
-import math
-import locale
-import logging
-import os
-
-gi.require_version('Gtk', '4.0')
-from gi.repository import Gdk, GdkPixbuf, GObject, Gtk
-
-
-class Utils:
-    CSS_SELECTION = 'selection'
-    STOCK_ICON_DEFAULT = 'image-x-generic-symbolic'
-
-    @staticmethod
-    def load_pixbuf(data):
-        loader = GdkPixbuf.PixbufLoader()
-        try:
-            loader.write(data)
-        finally:
-            loader.close()
-        return loader.get_pixbuf()
-
-    @staticmethod
-    def load_thumbnail(cache, client, album, size):
-        cache_url = cache.create_filename(album)
-        pixbuf = None
-
-        if os.path.isfile(cache_url):
-            pixbuf = GdkPixbuf.Pixbuf.new_from_file(cache_url)
-        else:
-            # Load cover from server
-            albumart = client.get_albumart_now(album.get_id())
-            if albumart:
-                pixbuf = Utils.load_pixbuf(albumart)
-            if pixbuf is not None:
-                (width, height) = Utils.calculate_size(pixbuf.get_width(),
-                                                       pixbuf.get_height(),
-                                                       size, size)
-                pixbuf = pixbuf.scale_simple(width, height,
-                                             GdkPixbuf.InterpType.HYPER)
-                try:
-                    pixbuf.savev(cache_url, 'jpeg', [], [])
-                except Exception as e:
-                    logger = logging.getLogger(__name__)
-                    logger.warning("Failed to save thumbnail for album\"%s\": "
-                        "%s", album.get_title(), e)
-        return pixbuf
-
-    @staticmethod
-    def create_artists_label(album):
-        label = ', '.join(album.get_albumartists())
-        if album.get_artists():
-            label = locale.gettext("{} feat. {}").format(
-                label, ", ".join(album.get_artists()))
-        return label
-
-    @staticmethod
-    def create_length_label(album):
-        minutes = album.get_length() // 60
-        seconds = album.get_length() - minutes * 60
-
-        return locale.gettext("{}:{} minutes").format(minutes, seconds)
-
-    @staticmethod
-    def create_track_title(track):
-        title = track.get_title()
-        if track.get_artists():
-            title = locale.gettext("{} feat. {}").format(
-                title, ", ".join(track.get_artists()))
-        return title
-
-    @staticmethod
-    def generate_id(values):
-        if type(values) is not list:
-            values = [values]
-        m = hashlib.md5()
-        for value in values:
-            m.update(value.encode('utf-8'))
-        return m.hexdigest()
-
-    @staticmethod
-    def calculate_size(src_width, src_height, dest_width, dest_height):
-        ratio_w = float(dest_width) / float(src_width)
-        ratio_h = float(dest_height) / float(src_height)
-        ratio = min(min(ratio_w, ratio_h), 1)
-        if ratio == 1:
-            return (src_width, src_height)
-
-        width = int(math.floor(src_width * ratio))
-        height = int(math.floor(src_height * ratio))
-
-        return (width, height)
-
-
-class SortOrder:
-    ARTIST = 0
-    TITLE = 1
-    YEAR = 2
-    MODIFIED = 3
-
-
-class GridItem(GObject.GObject):
-    __gtype_name__ = "GridItem"
-
-    tooltip = GObject.Property(type=str, default=None)
-    cover = GObject.Property(type=Gdk.Paintable, default=None)
-
-    def __init__(self, album):
-        super().__init__()
-        self._album = album
-        self.tooltip = GObject.markup_escape_text("\n".join([
-            album.get_title(), ', '.join(album.get_dates()),
-            Utils.create_artists_label(album),
-            Utils.create_length_label(album)
-        ]))
-
-    def get_album(self):
-        return self._album
-
-    def set_cover(self, cover):
-        self.cover = Gdk.Texture.new_for_pixbuf(cover)
-
-    def set_icon(self, icon):
-        self.cover = icon
-
-
-class SearchFilter(Gtk.Filter):
-
-    def __init__(self, search_string):
-        super().__init__()
-        self._search_string = search_string
-
-    def do_match(self, grid_item):
-        return grid_item.get_album().filter(self._search_string)
diff --git a/src/window.py b/src/window.py
deleted file mode 100644
index db10c23..0000000
--- a/src/window.py
+++ /dev/null
@@ -1,615 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-try:
-    import keyring
-    use_keyring = True
-except ImportError:
-    use_keyring = False
-use_keyring = False
-import locale
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio
-from . import client
-from .shortcutsdialog import ShortcutsDialog
-from .connectionpanel import ConnectionPanel
-from .serverpanel import ServerPanel
-from .coverpanel import CoverPanel
-from .playlistpanel import PlaylistPanel
-from .librarypanel import LibraryPanel
-from .zeroconf import ZeroconfProvider
-
-
-class WindowState(GObject.Object):
-    PROP_WIDTH = 'width'
-    PROP_HEIGHT = 'height'
-    PROP_MAXIMIZED = 'is_maximized'
-    PROP_FULLSCREENED = 'is_fullscreened'
-    width = GObject.Property(type=int, default=800)
-    height = GObject.Property(type=int, default=600)
-    is_maximized = GObject.Property(type=bool, default=False)
-    is_fullscreened = GObject.Property(type=bool, default=False)
-
-    def __init__(self):
-        super().__init__()
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/window.ui')
-class Window(Adw.ApplicationWindow):
-    __gtype_name__ = 'McgAppWindow'
-    SETTING_HOST = 'host'
-    SETTING_PORT = 'port'
-    SETTING_CONNECTED = 'connected'
-    SETTING_WINDOW_WIDTH = 'width'
-    SETTING_WINDOW_HEIGHT = 'height'
-    SETTING_WINDOW_MAXIMIZED = 'is-maximized'
-    SETTING_PANEL = 'panel'
-    SETTING_ITEM_SIZE = 'item-size'
-    SETTING_SORT_ORDER = 'sort-order'
-    SETTING_SORT_TYPE = 'sort-type'
-
-    # Widgets
-    toolbar_view = Gtk.Template.Child()
-    content_stack = Gtk.Template.Child()
-    panel_stack = Gtk.Template.Child()
-    toolbar_stack = Gtk.Template.Child()
-    # Headerbar
-    headerbar = Gtk.Template.Child()
-    headerbar_panel_switcher = Gtk.Template.Child()
-    headerbar_button_connect = Gtk.Template.Child()
-    headerbar_button_playpause = Gtk.Template.Child()
-    headerbar_button_volume = Gtk.Template.Child()
-    # Infobar
-    info_toast = Gtk.Template.Child()
-
-    def __init__(self, app, title, settings, **kwargs):
-        super().__init__(**kwargs)
-        self.set_application(app)
-        self.set_title(title)
-        self._settings = settings
-        self._panels = []
-        self._mcg = client.Client()
-        self._state = WindowState()
-        self._setting_volume = False
-        self._headerbar_connection_button_active = True
-        self._headerbar_playpause_button_active = True
-        self._width = 0
-        self._height = 0
-
-        # Help/Shortcuts dialog
-        self.set_help_overlay(ShortcutsDialog())
-
-        # Login screen
-        self._connection_panel = ConnectionPanel()
-        # Server panel
-        self._server_panel = ServerPanel()
-        self._panels.append(self._server_panel)
-        # Cover panel
-        self._cover_panel = CoverPanel()
-        self._panels.append(self._cover_panel)
-        # Playlist panel
-        self._playlist_panel = PlaylistPanel(self._mcg)
-        self._playlist_panel.connect('open-standalone',
-                                     self.on_panel_open_standalone)
-        self._playlist_panel.connect('close-standalone',
-                                     self.on_panel_close_standalone)
-        self._panels.append(self._playlist_panel)
-        # Library panel
-        self._library_panel = LibraryPanel(self._mcg)
-        self._library_panel.connect('open-standalone',
-                                    self.on_panel_open_standalone)
-        self._library_panel.connect('close-standalone',
-                                    self.on_panel_close_standalone)
-        self._panels.append(self._library_panel)
-        # Stack
-        self.content_stack.add_child(self._connection_panel)
-        self.panel_stack.add_titled_with_icon(self._server_panel,
-                                              'server-panel',
-                                              locale.gettext("Server"),
-                                              "network-wired-symbolic")
-        self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel',
-                                              locale.gettext("Cover"),
-                                              "image-x-generic-symbolic")
-        self.panel_stack.add_titled_with_icon(self._playlist_panel,
-                                              'playlist-panel',
-                                              locale.gettext("Playlist"),
-                                              "view-list-symbolic")
-        self.panel_stack.add_titled_with_icon(self._library_panel,
-                                              'library-panel',
-                                              locale.gettext("Library"),
-                                              "emblem-music-symbolic")
-        # Toolbar stack
-        self.toolbar_stack.add_child(self._server_panel.get_toolbar())
-        self.toolbar_stack.add_child(self._cover_panel.get_toolbar())
-        self.toolbar_stack.add_child(self._playlist_panel.get_toolbar())
-        self.toolbar_stack.add_child(self._library_panel.get_toolbar())
-
-        # Properties
-        self._set_headerbar_sensitive(False, False)
-        self._connection_panel.set_host(
-            self._settings.get_string(Window.SETTING_HOST))
-        self._connection_panel.set_port(
-            self._settings.get_int(Window.SETTING_PORT))
-        if use_keyring:
-            self._connection_panel.set_password(
-                keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM,
-                                     ZeroconfProvider.KEYRING_USERNAME))
-        self._playlist_panel.set_item_size(
-            self._settings.get_int(Window.SETTING_ITEM_SIZE))
-        self._library_panel.set_item_size(
-            self._settings.get_int(Window.SETTING_ITEM_SIZE))
-        self._library_panel.set_sort_order(
-            self._settings.get_enum(Window.SETTING_SORT_ORDER))
-        self._library_panel.set_sort_type(
-            self._settings.get_boolean(Window.SETTING_SORT_TYPE))
-
-        # Signals
-        self.connect("notify::maximized", self.on_maximized)
-        self.connect("notify::fullscreened", self.on_fullscreened)
-        self._connection_panel.connect(
-            'connection-changed', self.on_connection_panel_connection_changed)
-        self.panel_stack.connect('notify::visible-child',
-                                 self.on_stack_switched)
-        self._server_panel.connect('change-output-device',
-                                   self.on_server_panel_output_device_changed)
-        self._cover_panel.connect('toggle-fullscreen',
-                                  self.on_cover_panel_toggle_fullscreen)
-        self._cover_panel.connect('set-song', self.on_cover_panel_set_song)
-        self._cover_panel.connect('albumart', self.on_cover_panel_albumart)
-        self._playlist_panel.connect('clear-playlist',
-                                     self.on_playlist_panel_clear_playlist)
-        self._playlist_panel.connect('remove-album',
-                                     self.on_playlist_panel_remove)
-        self._playlist_panel.connect('remove-multiple-albums',
-                                     self.on_playlist_panel_remove_multiple)
-        self._playlist_panel.connect('play', self.on_playlist_panel_play)
-        self._playlist_panel.connect('albumart',
-                                     self.on_playlist_panel_albumart)
-        self._library_panel.connect('update', self.on_library_panel_update)
-        self._library_panel.connect('play', self.on_library_panel_play)
-        self._library_panel.connect('queue', self.on_library_panel_queue)
-        self._library_panel.connect('queue-multiple',
-                                    self.on_library_panel_queue_multiple)
-        self._library_panel.connect('item-size-changed',
-                                    self.on_library_panel_item_size_changed)
-        self._library_panel.connect('sort-order-changed',
-                                    self.on_library_panel_sort_order_changed)
-        self._library_panel.connect('sort-type-changed',
-                                    self.on_library_panel_sort_type_changed)
-        self._library_panel.connect('albumart', self.on_library_panel_albumart)
-        self._mcg.connect_signal(client.Client.SIGNAL_CONNECTION,
-                                 self.on_mcg_connect)
-        self._mcg.connect_signal(client.Client.SIGNAL_STATUS,
-                                 self.on_mcg_status)
-        self._mcg.connect_signal(client.Client.SIGNAL_STATS, self.on_mcg_stats)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_OUTPUT_DEVICES,
-                                 self.on_mcg_load_output_devices)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_PLAYLIST,
-                                 self.on_mcg_load_playlist)
-        self._mcg.connect_signal(client.Client.SIGNAL_PULSE_ALBUMS,
-                                 self.on_mcg_pulse_albums)
-        self._mcg.connect_signal(client.Client.SIGNAL_INIT_ALBUMS,
-                                 self.on_mcg_init_albums)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMS,
-                                 self.on_mcg_load_albums)
-        self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMART,
-                                 self.on_mcg_load_albumart)
-        self._mcg.connect_signal(client.Client.SIGNAL_ERROR, self.on_mcg_error)
-        self._settings.connect('changed::' + Window.SETTING_PANEL,
-                               self.on_settings_panel_changed)
-        self._settings.connect('changed::' + Window.SETTING_ITEM_SIZE,
-                               self.on_settings_item_size_changed)
-        self._settings.connect('changed::' + Window.SETTING_SORT_ORDER,
-                               self.on_settings_sort_order_changed)
-        self._settings.connect('changed::' + Window.SETTING_SORT_TYPE,
-                               self.on_settings_sort_type_changed)
-        self._settings.bind(Window.SETTING_WINDOW_WIDTH, self._state,
-                            WindowState.PROP_WIDTH,
-                            Gio.SettingsBindFlags.DEFAULT)
-        self._settings.bind(Window.SETTING_WINDOW_HEIGHT, self._state,
-                            WindowState.PROP_HEIGHT,
-                            Gio.SettingsBindFlags.DEFAULT)
-        self._settings.bind(Window.SETTING_WINDOW_MAXIMIZED, self._state,
-                            WindowState.PROP_MAXIMIZED,
-                            Gio.SettingsBindFlags.DEFAULT)
-
-        # Actions
-        self.set_default_size(self._state.width, self._state.height)
-        if self._state.get_property(WindowState.PROP_MAXIMIZED):
-            self.maximize()
-        self.content_stack.set_visible_child(self._connection_panel)
-        if self._settings.get_boolean(Window.SETTING_CONNECTED):
-            self._connect()
-
-        # Menu actions
-        self._connect_action = Gio.SimpleAction.new_stateful(
-            "connect", None, GLib.Variant.new_boolean(False))
-        self._connect_action.connect('change-state', self.on_menu_connect)
-        self.add_action(self._connect_action)
-        self._play_action = Gio.SimpleAction.new_stateful(
-            "play", None, GLib.Variant.new_boolean(False))
-        self._play_action.set_enabled(False)
-        self._play_action.connect('change-state', self.on_menu_play)
-        self.add_action(self._play_action)
-        self._clear_playlist_action = Gio.SimpleAction.new(
-            "clear-playlist", None)
-        self._clear_playlist_action.set_enabled(False)
-        self._clear_playlist_action.connect('activate',
-                                            self.on_menu_clear_playlist)
-        self.add_action(self._clear_playlist_action)
-        panel_variant = GLib.Variant.new_string("0")
-        self._panel_action = Gio.SimpleAction.new_stateful(
-            "panel", panel_variant.get_type(), panel_variant)
-        self._panel_action.set_enabled(False)
-        self._panel_action.connect('change-state', self.on_menu_panel)
-        self.add_action(self._panel_action)
-        self._toggle_fullscreen_action = Gio.SimpleAction.new(
-            "toggle-fullscreen", None)
-        self._toggle_fullscreen_action.set_enabled(True)
-        self._toggle_fullscreen_action.connect('activate',
-                                               self.on_menu_toggle_fullscreen)
-        self.add_action(self._toggle_fullscreen_action)
-        self._search_library_action = Gio.SimpleAction.new(
-            "search-library", None)
-        self._search_library_action.set_enabled(True)
-        self._search_library_action.connect('activate',
-                                            self.on_menu_search_library)
-        self.add_action(self._search_library_action)
-
-    def do_size_allocate(self, width, height, baseline):
-        Gtk.ApplicationWindow().do_size_allocate(self, width, height, baseline)
-
-        if self._width == width and self._height == height:
-            return
-        self._width = width
-        self._height = height
-
-        if width > 0:
-            self._cover_panel.set_width(width)
-            if not self._state.get_property(WindowState.PROP_MAXIMIZED):
-                self._state.set_property(WindowState.PROP_WIDTH, width)
-                self._state.set_property(WindowState.PROP_HEIGHT, height)
-            GObject.idle_add(self._playlist_panel.set_size, width, height)
-            GObject.idle_add(self._library_panel.set_size, width, height)
-
-    # Menu callbacks
-
-    def on_menu_connect(self, action, value):
-        self._connect()
-
-    def on_menu_play(self, action, value):
-        self._mcg.playpause()
-
-    def on_menu_clear_playlist(self, action, value):
-        self._mcg.clear_playlist()
-
-    def on_menu_panel(self, action, value):
-        action.set_state(value)
-        self.panel_stack.set_visible_child(self._panels[int(
-            value.get_string())])
-
-    def on_menu_toggle_fullscreen(self, action, value):
-        self.panel_stack.set_visible_child(self._cover_panel)
-        if not self._state.get_property(WindowState.PROP_FULLSCREENED):
-            self.fullscreen()
-        else:
-            self.unfullscreen()
-
-    def on_menu_search_library(self, action, value):
-        self.panel_stack.set_visible_child(self.library_panel_page)
-        self._library_panel.show_search()
-
-    # Window callbacks
-
-    def on_maximized(self, widget, maximized):
-        self._state.set_property(WindowState.PROP_MAXIMIZED, maximized is True)
-
-    def on_fullscreened(self, widget, fullscreened):
-        self._fullscreen(self.is_fullscreen())
-
-    # HeaderBar callbacks
-
-    @Gtk.Template.Callback()
-    def on_headerbar_connection_state_set(self, widget, state):
-        if self._headerbar_connection_button_active:
-            self._connect()
-
-    @Gtk.Template.Callback()
-    def on_headerbar_volume_changed(self, widget, value):
-        if not self._setting_volume:
-            self._mcg.set_volume(int(value * 100))
-
-    @Gtk.Template.Callback()
-    def on_headerbar_playpause_toggled(self, widget):
-        if self._headerbar_playpause_button_active:
-            self._mcg.playpause()
-            self._mcg.get_status()
-
-    # Panel callbacks
-
-    def on_stack_switched(self, widget, prop):
-        self._set_visible_toolbar()
-        self._save_visible_panel()
-        self._set_menu_visible_panel()
-        for panel in self._panels:
-            panel.set_selected(panel == self.panel_stack.get_visible_child())
-
-    def on_panel_open_standalone(self, panel):
-        self.toolbar_view.add_top_bar(panel.get_headerbar_standalone())
-        self.toolbar_view.remove(self.headerbar)
-
-    def on_panel_close_standalone(self, panel):
-        self.toolbar_view.add_top_bar(self.headerbar)
-        self.toolbar_view.remove(panel.get_headerbar_standalone())
-
-    def on_connection_panel_connection_changed(self, widget, host, port,
-                                               password):
-        self._settings.set_string(Window.SETTING_HOST, host)
-        self._settings.set_int(Window.SETTING_PORT, port)
-        if use_keyring:
-            if password:
-                keyring.set_password(ZeroconfProvider.KEYRING_SYSTEM,
-                                     ZeroconfProvider.KEYRING_USERNAME,
-                                     password)
-            else:
-                if keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM,
-                                        ZeroconfProvider.KEYRING_USERNAME):
-                    keyring.delete_password(ZeroconfProvider.KEYRING_SYSTEM,
-                                            ZeroconfProvider.KEYRING_USERNAME)
-
-    def on_playlist_panel_clear_playlist(self, widget):
-        self._mcg.clear_playlist()
-
-    def on_playlist_panel_remove(self, widget, album):
-        self._mcg.remove_album_from_playlist(album)
-
-    def on_playlist_panel_remove_multiple(self, widget, albums):
-        self._mcg.remove_albums_from_playlist(albums)
-
-    def on_playlist_panel_play(self, widget, album):
-        self._mcg.play_album_from_playlist(album)
-
-    def on_playlist_panel_albumart(self, widget, album):
-        self._mcg.get_albumart(album)
-
-    def on_server_panel_output_device_changed(self, widget, device, enabled):
-        self._mcg.enable_output_device(device, enabled)
-
-    def on_cover_panel_toggle_fullscreen(self, widget):
-        if not self._state.get_property(WindowState.PROP_FULLSCREENED):
-            self.fullscreen()
-        else:
-            self.unfullscreen()
-
-    def on_cover_panel_set_song(self, widget, pos, time):
-        self._mcg.seek(pos, time)
-
-    def on_cover_panel_albumart(self, widget, album):
-        self._mcg.get_albumart(album)
-
-    def on_library_panel_update(self, widget):
-        self._mcg.update()
-
-    def on_library_panel_play(self, widget, album):
-        self._mcg.play_album(album)
-
-    def on_library_panel_queue(self, widget, album):
-        self._mcg.queue_album(album)
-
-    def on_library_panel_queue_multiple(self, widget, albums):
-        self._mcg.queue_albums(albums)
-
-    def on_library_panel_item_size_changed(self, widget, size):
-        self._playlist_panel.set_item_size(size)
-        self._settings.set_int(Window.SETTING_ITEM_SIZE,
-                               self._library_panel.get_item_size())
-
-    def on_library_panel_sort_order_changed(self, widget, sort_order):
-        self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order)
-
-    def on_library_panel_sort_type_changed(self, widget, sort_type):
-        self._settings.set_boolean(Window.SETTING_SORT_TYPE, sort_type)
-
-    def on_library_panel_albumart(self, widget, album):
-        self._mcg.get_albumart(album)
-
-    # MCG callbacks
-
-    def on_mcg_connect(self, connected):
-        if connected:
-            GObject.idle_add(self._connect_connected)
-            self._mcg.load_playlist()
-            self._mcg.load_albums()
-            self._mcg.get_status()
-            self._mcg.get_stats()
-            self._mcg.get_output_devices()
-            self._connect_action.set_state(GLib.Variant.new_boolean(True))
-            self._play_action.set_enabled(True)
-            self._clear_playlist_action.set_enabled(True)
-            self._panel_action.set_enabled(True)
-        else:
-            GObject.idle_add(self._connect_disconnected)
-            self._connect_action.set_state(GLib.Variant.new_boolean(False))
-            self._play_action.set_enabled(False)
-            self._clear_playlist_action.set_enabled(False)
-            self._panel_action.set_enabled(False)
-
-    def on_mcg_status(self, state, album, pos, time, volume, file, audio,
-                      bitrate, error):
-        # Album
-        GObject.idle_add(self._cover_panel.set_album, album)
-        if (
-            not album
-            and self._state.get_property(WindowState.PROP_FULLSCREENED)
-        ):
-            self._fullscreen(False)
-        # State
-        if state == 'play':
-            GObject.idle_add(self._set_play)
-            GObject.idle_add(self._cover_panel.set_play, pos, time)
-            self._play_action.set_state(GLib.Variant.new_boolean(True))
-        elif state == 'pause' or state == 'stop':
-            GObject.idle_add(self._set_pause)
-            GObject.idle_add(self._cover_panel.set_pause)
-            self._play_action.set_state(GLib.Variant.new_boolean(False))
-        # Volume
-        GObject.idle_add(self._set_volume, volume)
-        # Status
-        self._server_panel.set_status(file, audio, bitrate, error)
-        # Error
-        if error:
-            self._show_error(error)
-
-    def on_mcg_stats(self, artists, albums, songs, dbplaytime, playtime,
-                     uptime):
-        self._server_panel.set_stats(artists, albums, songs, dbplaytime,
-                                     playtime, uptime)
-
-    def on_mcg_load_output_devices(self, devices):
-        self._server_panel.set_output_devices(devices)
-
-    def on_mcg_load_playlist(self, playlist):
-        self._playlist_panel.set_playlist(self._connection_panel.get_host(),
-                                          playlist)
-
-    def on_mcg_init_albums(self):
-        GObject.idle_add(self._library_panel.init_albums)
-
-    def on_mcg_pulse_albums(self):
-        GObject.idle_add(self._library_panel.load_albums)
-
-    def on_mcg_load_albums(self, albums):
-        self._library_panel.set_albums(self._connection_panel.get_host(),
-                                       albums)
-
-    def on_mcg_load_albumart(self, album, data):
-        self._cover_panel.set_albumart(album, data)
-        self._playlist_panel.set_albumart(album, data)
-        self._library_panel.set_albumart(album, data)
-
-    def on_mcg_error(self, error):
-        GObject.idle_add(self._show_error, str(error))
-
-    # Settings callbacks
-
-    def on_settings_panel_changed(self, settings, key):
-        panel_index = settings.get_int(key)
-        self.panel_stack.set_visible_child(self._panels[panel_index])
-
-    def on_settings_item_size_changed(self, settings, key):
-        size = settings.get_int(key)
-        self._playlist_panel.set_item_size(size)
-        self._library_panel.set_item_size(size)
-
-    def on_settings_sort_order_changed(self, settings, key):
-        sort_order = settings.get_enum(key)
-        self._library_panel.set_sort_order(sort_order)
-
-    def on_settings_sort_type_changed(self, settings, key):
-        sort_type = settings.get_boolean(key)
-        self._library_panel.set_sort_type(sort_type)
-
-    # Private methods
-
-    def _connect(self):
-        self._connection_panel.set_sensitive(False)
-        self._set_headerbar_sensitive(False, True)
-        if self._mcg.is_connected():
-            self._mcg.disconnect()
-            self._settings.set_boolean(Window.SETTING_CONNECTED, False)
-        else:
-            host = self._connection_panel.get_host()
-            port = self._connection_panel.get_port()
-            password = self._connection_panel.get_password()
-            self._mcg.connect(host, port, password)
-            self._settings.set_boolean(Window.SETTING_CONNECTED, True)
-
-    def _connect_connected(self):
-        self._headerbar_connected()
-        self._set_headerbar_sensitive(True, False)
-        self.content_stack.set_visible_child(self.panel_stack)
-        self.panel_stack.set_visible_child(self._panels[self._settings.get_int(
-            Window.SETTING_PANEL)])
-
-    def _connect_disconnected(self):
-        self._playlist_panel.stop_threads()
-        self._library_panel.stop_threads()
-        self._headerbar_disconnected()
-        self._set_headerbar_sensitive(False, False)
-        self._save_visible_panel()
-        self.content_stack.set_visible_child(self._connection_panel)
-        self._connection_panel.set_sensitive(True)
-
-    def _fullscreen(self, fullscreened_new):
-        if fullscreened_new != self._state.get_property(
-            WindowState.PROP_FULLSCREENED
-        ):
-            self._state.set_property(WindowState.PROP_FULLSCREENED,
-                                     fullscreened_new)
-            if self._state.get_property(WindowState.PROP_FULLSCREENED):
-                self.headerbar.hide()
-                self._cover_panel.set_fullscreen(True)
-                self.set_cursor(Gdk.Cursor.new_from_name("none", None))
-            else:
-                self.headerbar.show()
-                self._cover_panel.set_fullscreen(False)
-                self.set_cursor(Gdk.Cursor.new_from_name("default", None))
-
-    def _save_visible_panel(self):
-        panel_index_selected = self._panels.index(
-            self.panel_stack.get_visible_child())
-        self._settings.set_int(Window.SETTING_PANEL, panel_index_selected)
-
-    def _set_menu_visible_panel(self):
-        panel_index_selected = self._panels.index(
-            self.panel_stack.get_visible_child())
-        self._panel_action.set_state(
-            GLib.Variant.new_string(str(panel_index_selected)))
-
-    def _set_visible_toolbar(self):
-        panel_index_selected = self._panels.index(
-            self.panel_stack.get_visible_child())
-        toolbar = self._panels[panel_index_selected].get_toolbar()
-        self.toolbar_stack.set_visible_child(toolbar)
-
-    def _set_play(self):
-        self._headerbar_playpause_button_active = False
-        self.headerbar_button_playpause.set_active(True)
-        self._headerbar_playpause_button_active = True
-
-    def _set_pause(self):
-        self._headerbar_playpause_button_active = False
-        self.headerbar_button_playpause.set_active(False)
-        self._headerbar_playpause_button_active = True
-
-    def _set_volume(self, volume):
-        if volume >= 0:
-            self.headerbar_button_volume.set_visible(True)
-            self._setting_volume = True
-            self.headerbar_button_volume.set_value(volume / 100)
-            self._setting_volume = False
-        else:
-            self.headerbar_button_volume.set_visible(False)
-
-    def _headerbar_connected(self):
-        self._headerbar_connection_button_active = False
-        self.headerbar_button_connect.set_active(True)
-        self.headerbar_button_connect.set_state(True)
-        self._headerbar_connection_button_active = True
-
-    def _headerbar_disconnected(self):
-        self._headerbar_connection_button_active = False
-        self.headerbar_button_connect.set_active(False)
-        self.headerbar_button_connect.set_state(False)
-        self._headerbar_connection_button_active = True
-
-    def _set_headerbar_sensitive(self, sensitive, connecting):
-        self.headerbar_button_playpause.set_sensitive(sensitive)
-        self.headerbar_button_volume.set_sensitive(sensitive)
-        self.headerbar_panel_switcher.set_sensitive(sensitive)
-        self.headerbar_button_connect.set_sensitive(not connecting)
-
-    def _show_error(self, message):
-        self.info_toast.add_toast(Adw.Toast.new(message))
diff --git a/src/zeroconf.py b/src/zeroconf.py
deleted file mode 100644
index 6dc1f00..0000000
--- a/src/zeroconf.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-
-import gi
-try:
-    gi.require_version('Avahi', '0.6')
-    from gi.repository import Avahi
-    use_avahi = True
-except ValueError | ImportError:
-    use_avahi = False
-import logging
-
-from mcg import client
-
-
-class ZeroconfProvider(client.Base):
-    KEYRING_SYSTEM = 'mcg'
-    KEYRING_USERNAME = 'mpd'
-    SIGNAL_SERVICE_NEW = 'service-new'
-    TYPE = '_mpd._tcp'
-
-    def __init__(self):
-        client.Base.__init__(self)
-        self._service_resolvers = []
-        self._services = {}
-        self._logger = logging.getLogger(__name__)
-        # Client
-        if use_avahi:
-            self._start_client()
-
-    def on_new_service(self, browser, interface, protocol, name, type, domain,
-                       flags):
-        service_resolver = Avahi.ServiceResolver(
-            interface=interface,
-            protocol=protocol,
-            name=name,
-            type=type,
-            domain=domain,
-            aprotocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC,
-            flags=0,
-        )
-        service_resolver.connect('found', self.on_found)
-        service_resolver.connect('failure', self.on_failure)
-        service_resolver.attach(self._client)
-        self._service_resolvers.append(service_resolver)
-
-    def on_found(self, resolver, interface, protocol, name, type, domain, host,
-                 date, port, *args):
-        if (host, port) not in self._services.keys():
-            service = (name, host, port)
-            self._services[(host, port)] = service
-            self._callback(ZeroconfProvider.SIGNAL_SERVICE_NEW, service)
-
-    def on_failure(self, resolver, date):
-        if resolver in self._service_resolvers:
-            self._service_resolvers.remove(resolver)
-
-    def _start_client(self):
-        self._logger.info("Starting Avahi client")
-        self._client = Avahi.Client(flags=0, )
-        try:
-            self._client.start()
-            # Browser
-            self._service_browser = Avahi.ServiceBrowser(
-                domain='local',
-                flags=0,
-                interface=-1,
-                protocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC,
-                type=ZeroconfProvider.TYPE)
-            self._service_browser.connect('new_service', self.on_new_service)
-            self._service_browser.attach(self._client)
-        except Exception as e:
-            self._logger.info(e)

From af4fc2fb64e186f9eb7ebeaa67b9ca0e3f795372 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Thu, 26 Feb 2026 10:38:28 +0100
Subject: [PATCH 29/33] Add common go types

---
 internal/common/album.go        | 189 ++++++++++++++++++++++++++++++++
 internal/common/outputdevice.go |  14 +++
 internal/common/song.go         | 122 +++++++++++++++++++++
 internal/common/sort.go         |  89 +++++++++++++++
 4 files changed, 414 insertions(+)
 create mode 100644 internal/common/album.go
 create mode 100644 internal/common/outputdevice.go
 create mode 100644 internal/common/song.go
 create mode 100644 internal/common/sort.go

diff --git a/internal/common/album.go b/internal/common/album.go
new file mode 100644
index 0000000..1ce2ea7
--- /dev/null
+++ b/internal/common/album.go
@@ -0,0 +1,189 @@
+package common
+
+import (
+	"crypto/md5"
+	"fmt"
+	"io"
+	"path/filepath"
+	"slices"
+	"strings"
+	"time"
+
+	"suruatoel.xyz/mcg/internal/i18n"
+)
+
+type Album struct {
+	title        string
+	songs        []*Song
+	artists      []string
+	pathes       []string
+	dates        []string
+	length       uint64
+	lastModified time.Time
+}
+
+func NewAlbum(title string) *Album {
+	album := Album{
+		title: title,
+	}
+
+	return &album
+}
+
+func (a *Album) Title() string {
+	return a.title
+}
+
+func (a *Album) AddSong(song *Song) {
+	a.songs = append(a.songs, song)
+	a.length += song.Length()
+
+	for _, artist := range song.AlbumArtists() {
+		if !slices.Contains(a.artists, artist) {
+			a.artists = append(a.artists, artist)
+		}
+	}
+
+	if !slices.Contains(a.dates, song.Date()) {
+		a.dates = append(a.dates, song.Date())
+	}
+
+	path := filepath.Base(song.File())
+	if !slices.Contains(a.pathes, path) {
+		a.pathes = append(a.pathes, path)
+	}
+
+	if !song.LastModified().After(a.lastModified) {
+		a.lastModified = song.LastModified()
+	}
+}
+
+func (a *Album) Songs() []*Song {
+	return a.songs
+}
+
+func (a *Album) Artists() []string {
+	return a.artists
+}
+
+func (a *Album) Dates() []string {
+	return a.dates
+}
+
+func (a *Album) Length() uint64 {
+	return a.length
+}
+
+func (a *Album) LastModified() time.Time {
+	return a.lastModified
+}
+
+func (a *Album) ID() string {
+	return generateAlbumId(a.title)
+}
+
+func (a *Album) Tooltip() string {
+	artists := strings.Join(a.Artists(), ", ")
+	dates := strings.Join(a.dates, ", ")
+	minutes := a.length / 60
+	seconds := a.length - minutes*60
+	length := fmt.Sprintf(i18n.T("%d:%d minutes"), minutes, seconds)
+
+	return strings.Join(
+		[]string{
+			a.title,
+			dates,
+			artists,
+			length,
+		},
+		"\n",
+	)
+}
+
+type PlaylistAlbum struct {
+	*Album
+	songs  []*PlaylistSong
+	length uint64
+}
+
+func NewPlaylistAlbum(album *Album) *PlaylistAlbum {
+	playlistAlbum := PlaylistAlbum{
+		Album: album,
+	}
+
+	return &playlistAlbum
+}
+
+func (a *PlaylistAlbum) AddSong(playlistSong *PlaylistSong) {
+	a.songs = append(a.songs, playlistSong)
+
+	song := playlistSong.Song
+	a.length += song.Length()
+
+	for _, artist := range song.AlbumArtists() {
+		if !slices.Contains(a.artists, artist) {
+			a.artists = append(a.artists, artist)
+		}
+	}
+
+	if !slices.Contains(a.dates, song.Date()) {
+		a.dates = append(a.dates, song.Date())
+	}
+
+	path := filepath.Base(song.File())
+	if !slices.Contains(a.pathes, path) {
+		a.pathes = append(a.pathes, path)
+	}
+}
+
+func (a *PlaylistAlbum) Songs() []*PlaylistSong {
+	return a.songs
+}
+
+func (a *PlaylistAlbum) Length() uint64 {
+	return a.length
+}
+
+func (a *Album) IsMatch(query string) bool {
+	if query == "" {
+		return true
+	}
+
+	for keyword := range strings.SplitSeq(query, " ") {
+		if !a.isKeywordMatch(keyword) {
+			return false
+		}
+	}
+
+	return true
+}
+
+func (a *Album) isKeywordMatch(keyword string) bool {
+	if strings.Contains(strings.ToLower(a.title), keyword) {
+		return true
+	}
+	for _, artist := range a.artists {
+		if strings.Contains(strings.ToLower(artist), keyword) {
+			return true
+		}
+	}
+	for _, song := range a.songs {
+		if strings.Contains(strings.ToLower(song.Title()), keyword) {
+			return true
+		}
+		if strings.Contains(strings.ToLower(song.File()), keyword) {
+			return true
+		}
+	}
+
+	return false
+}
+
+func generateAlbumId(values ...string) string {
+	h := md5.New()
+	for _, value := range values {
+		io.WriteString(h, value)
+	}
+
+	return fmt.Sprintf("%x", h.Sum(nil))
+}
diff --git a/internal/common/outputdevice.go b/internal/common/outputdevice.go
new file mode 100644
index 0000000..df6aa49
--- /dev/null
+++ b/internal/common/outputdevice.go
@@ -0,0 +1,14 @@
+package common
+
+type OutputDevice struct {
+	ID      string
+	Name    string
+	Enabled bool
+}
+
+func NewOutputDevice(id string, name string) *OutputDevice {
+	return &OutputDevice{
+		ID:   id,
+		Name: name,
+	}
+}
diff --git a/internal/common/song.go b/internal/common/song.go
new file mode 100644
index 0000000..1b81806
--- /dev/null
+++ b/internal/common/song.go
@@ -0,0 +1,122 @@
+package common
+
+import (
+	"slices"
+	"time"
+)
+
+type Song struct {
+	artists      []string
+	title        string
+	file         string
+	albumartists []string
+	track        string
+	length       uint64
+	date         string
+	lastModified time.Time
+}
+
+func NewSong(artist string, title string, file string) *Song {
+	song := Song{
+		artists: []string{artist},
+		title:   title,
+		file:    file,
+	}
+
+	return &song
+}
+
+func (s *Song) AddArtist(artist string) {
+	s.artists = append(s.artists, artist)
+}
+
+func (s *Song) AddAlbumartist(artist string) {
+	s.albumartists = append(s.albumartists, artist)
+}
+
+func (s *Song) SongArtists() []string {
+	if len(s.albumartists) > 0 {
+		songArtists := []string{}
+		for _, artist := range s.artists {
+			if !slices.Contains(s.albumartists, artist) {
+				songArtists = append(songArtists, artist)
+			}
+		}
+
+		return songArtists
+	}
+
+	return []string{}
+}
+
+func (s *Song) AlbumArtists() []string {
+	if len(s.albumartists) > 0 {
+		return s.albumartists
+	}
+
+	return s.artists
+}
+
+func (s *Song) Title() string {
+	return s.title
+}
+
+func (s *Song) File() string {
+	return s.file
+}
+
+func (s *Song) SetTrack(track string) {
+	s.track = track
+}
+
+func (s *Song) Track() string {
+	return s.track
+}
+
+func (s *Song) SetLength(length uint64) {
+	s.length = length
+}
+
+func (s *Song) Length() uint64 {
+	return s.length
+}
+
+func (s *Song) SetDate(date string) {
+	s.date = date
+}
+
+func (s *Song) Date() string {
+	return s.date
+}
+
+func (s *Song) SetLastModified(lastModified time.Time) {
+	s.lastModified = lastModified
+}
+
+func (s *Song) LastModified() time.Time {
+	return s.lastModified
+}
+
+type PlaylistSong struct {
+	*Song
+	id  string
+	pos uint64
+}
+
+func NewPlaylistSong(song *Song, id string, pos uint64) *PlaylistSong {
+	playlistSong := &PlaylistSong{
+		Song: song,
+		id:   id,
+		pos:  pos,
+	}
+
+	return playlistSong
+}
+
+func (t *PlaylistSong) ID() string {
+	return t.id
+}
+
+func (t *PlaylistSong) Pos() uint64 {
+	return t.pos
+}
diff --git a/internal/common/sort.go b/internal/common/sort.go
new file mode 100644
index 0000000..7c62117
--- /dev/null
+++ b/internal/common/sort.go
@@ -0,0 +1,89 @@
+package common
+
+import "sort"
+
+type albumLessFunc func(p1, p2 *Album) bool
+
+type albumSorter struct {
+	albums []*Album
+	less   []albumLessFunc
+}
+
+func (s *albumSorter) Len() int {
+	return len(s.albums)
+}
+
+func (s *albumSorter) Swap(i, j int) {
+	s.albums[i], s.albums[j] = s.albums[j], s.albums[i]
+}
+
+func (s *albumSorter) Less(i, j int) bool {
+	p, q := s.albums[i], s.albums[j]
+
+	var k int
+	for k = 0; k < len(s.less)-1; k++ {
+		less := s.less[k]
+		switch {
+		case less(p, q):
+			return true
+		case less(q, p):
+			return false
+		}
+	}
+
+	return s.less[k](p, q)
+}
+
+func (s *albumSorter) Sort(albums []*Album) {
+	s.albums = albums
+	sort.Sort(s)
+}
+
+func OrderAlbumBy(less ...albumLessFunc) *albumSorter {
+	return &albumSorter{
+		less: less,
+	}
+}
+
+func SortAlbums(album []*Album, field string) {
+	title := orderAlbumByTitle
+	artists := orderAlbumByArtists
+	years := orderAlbumByYears
+	modified := orderAlbumByModified
+
+	var sorter *albumSorter
+	switch field {
+	case "artist":
+		sorter = OrderAlbumBy(artists, title, years, modified)
+	case "year":
+		sorter = OrderAlbumBy(years, title, artists, modified)
+	case "modified":
+		sorter = OrderAlbumBy(modified, title, artists, years)
+	default:
+		sorter = OrderAlbumBy(title, artists, years, modified)
+	}
+
+	sorter.Sort(album)
+}
+
+func orderAlbumByTitle(c1, c2 *Album) bool {
+	return c1.Title() < c2.Title()
+}
+
+func orderAlbumByArtists(left, right *Album) bool {
+	if len(left.Artists()) > 0 && len(right.Artists()) > 0 {
+		return left.Artists()[0] < right.Artists()[0]
+	}
+	return false
+}
+
+func orderAlbumByYears(c1, c2 *Album) bool {
+	if len(c1.Dates()) > 0 && len(c2.Dates()) > 0 {
+		return c1.Dates()[0] < c2.Dates()[0]
+	}
+	return false
+}
+
+func orderAlbumByModified(c1, c2 *Album) bool {
+	return c1.LastModified().Before(c2.LastModified())
+}

From 4a11ea5ad0d8a62c071f66c9df2cb1eff7adfc9d Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Thu, 26 Feb 2026 10:38:04 +0100
Subject: [PATCH 30/33] Add MPD client implementation

---
 internal/client/client.go  | 947 +++++++++++++++++++++++++++++++++++++
 internal/client/command.go |  10 +
 internal/client/errors.go  |  19 +
 internal/client/reader.go  | 236 +++++++++
 4 files changed, 1212 insertions(+)
 create mode 100644 internal/client/client.go
 create mode 100644 internal/client/command.go
 create mode 100644 internal/client/errors.go
 create mode 100644 internal/client/reader.go

diff --git a/internal/client/client.go b/internal/client/client.go
new file mode 100644
index 0000000..26fb49b
--- /dev/null
+++ b/internal/client/client.go
@@ -0,0 +1,947 @@
+package client
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"net/textproto"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"suruatoel.xyz/mcg/internal/common"
+)
+
+type QueueItem struct {
+	Command func(*Client) error
+}
+
+type Client struct {
+	Host            string
+	con             *textproto.Conn
+	runGroup        sync.WaitGroup
+	queue           chan QueueItem
+	idling          bool
+	version         string
+	state           string
+	playlist        []*common.PlaylistAlbum
+	albums          map[string]*common.Album
+	errorCB         ErrorCB
+	connectionCB    ConnectionCB
+	playlistCB      PlaylistCB
+	albumsCB        AlbumsCB
+	statusCB        StatusCB
+	statisticsCB    StatisticsCB
+	outputDevicesCB OutputDevicesCB
+	albumartCB      AlbumartCB
+	albumartChan    chan []byte
+}
+
+type ErrorCB func(string)
+
+type ConnectionCB func(bool)
+
+type PlaylistCB func([]*common.PlaylistAlbum)
+
+type AlbumsCB func(map[string]*common.Album)
+
+type StatusCB func(string, *common.PlaylistAlbum, uint64, uint64, int64, string, string, string, string)
+
+type StatisticsCB func(string, string, string, string, string, string)
+
+type OutputDevicesCB func(devices []*common.OutputDevice)
+
+type AlbumartCB func(*common.Album, []byte)
+
+var (
+	clientInstance *Client
+	clientInit     sync.Once
+)
+
+func Instance() *Client {
+	clientInit.Do(func() {
+		clientInstance = &Client{}
+	})
+
+	return clientInstance
+}
+
+func (c *Client) IsConnected() bool {
+	return (c.con != nil)
+}
+
+func (c *Client) Connect(host string, port int, password string) {
+	c.Host = host
+	c.queue = make(chan QueueItem, 300)
+	c.albumartChan = make(chan []byte)
+	// Add connect action
+	c.addAction(
+		func(client *Client) error {
+			return client.connect(host, port, password)
+		},
+	)
+
+	go c.run()
+}
+
+func (c *Client) connect(host string, port int, password string) error {
+	// Notify listeners
+	defer func() {
+		if c.connectionCB != nil {
+			c.connectionCB(c.con != nil)
+		}
+	}()
+
+	// Create socket
+	con, err := textproto.Dial("tcp", fmt.Sprintf("%s:%d", host, port))
+	c.con = con
+	if err != nil {
+		return err
+	}
+
+	// Greeting
+	greeting, err := c.readLine()
+	if err != nil {
+		return err
+	}
+	if greeting[0:6] != "OK MPD" {
+		return textproto.ProtocolError(fmt.Sprintf("Unexpected greeting: %s", greeting))
+	}
+
+	// Parse and store server version
+	c.version = greeting[7:]
+
+	// Add post-connect actions
+	c.addPostConnectActions(password)
+
+	return nil
+}
+
+func (c *Client) addPostConnectActions(password string) {
+	c.addAction(
+		func(client *Client) error {
+			return client.password(password)
+		},
+		func(client *Client) error {
+			return client.loadAlbums()
+		},
+		func(client *Client) error {
+			return client.loadPlaylist()
+		},
+		func(client *Client) error {
+			return client.getStatus()
+		},
+		func(client *Client) error {
+			return client.getStatistics()
+		},
+		func(client *Client) error {
+			return client.getOutputDevices()
+		},
+	)
+}
+
+func (c *Client) password(password string) error {
+	if password != "" {
+		reader := &emptyReader{}
+		return c.cmd(reader, "password", password)
+	}
+
+	return nil
+}
+
+func (c *Client) Disconnect() {
+	c.addDisconnectActions()
+
+	close(c.queue)
+	close(c.albumartChan)
+	c.runGroup.Wait()
+}
+
+func (c *Client) addDisconnectActions() {
+	c.addAction(
+		func(client *Client) error {
+			return client.disconnect()
+		},
+	)
+}
+
+func (c *Client) disconnect() error {
+	// Stop current idle process
+	c.noIdle()
+
+	// Close connection
+	err := c.con.Close()
+	if err != nil {
+		return err
+	}
+	c.con = nil
+
+	// Notify callback
+	if c.connectionCB != nil {
+		c.connectionCB(false)
+	}
+
+	return nil
+}
+
+func (c *Client) run() {
+	c.runGroup.Add(1)
+	defer func() {
+		c.runGroup.Done()
+	}()
+
+	for action := range c.queue {
+		err := action.Command(c)
+		if err != nil && c.errorCB != nil {
+			c.errorCB(fmt.Sprintf("Error running action: %s\n", err))
+		}
+	}
+}
+
+func (c *Client) Version() string {
+	return c.version
+}
+
+func (c *Client) ReceiveError(callback ErrorCB) {
+	c.errorCB = callback
+}
+
+func (c *Client) RegisterConnection(callback ConnectionCB) {
+	c.connectionCB = callback
+}
+
+func (c *Client) ReceivePlaylist(callback PlaylistCB) {
+	c.playlistCB = callback
+}
+
+func (c *Client) ReceiveAlbums(callback AlbumsCB) {
+	c.albumsCB = callback
+}
+
+func (c *Client) ReceiveStatus(callback StatusCB) {
+	c.statusCB = callback
+}
+
+func (c *Client) ReceiveStatistics(callback StatisticsCB) {
+	c.statisticsCB = callback
+}
+
+func (c *Client) ReceiveOutputDevices(callback OutputDevicesCB) {
+	c.outputDevicesCB = callback
+}
+
+func (c *Client) ReceiveAlbumart(callback AlbumartCB) {
+	c.albumartCB = callback
+}
+
+func (c *Client) loadPlaylist() error {
+	c.playlist = []*common.PlaylistAlbum{}
+
+	playlistReader := &listMapReader{Delimiter: "file"}
+	playlistErr := c.cmd(playlistReader, "playlistinfo")
+	if playlistErr != nil {
+		return playlistErr
+	}
+
+	for _, songData := range playlistReader.DictList() {
+		song := c.extractPlaylistSong(songData)
+		album := c.extractPlaylistAlbum(songData)
+		if len(c.playlist) == 0 || c.playlist[len(c.playlist)-1].ID() != album.ID() {
+			c.playlist = append(c.playlist, album)
+		} else {
+			album = c.playlist[len(c.playlist)-1]
+		}
+		if song != nil {
+			album.AddSong(song)
+		}
+	}
+
+	if c.playlistCB != nil {
+		c.playlistCB(c.playlist)
+	}
+
+	return nil
+}
+
+func (c *Client) loadAlbums() error {
+	// self._callback(Client.SIGNAL_INIT_ALBUMS)
+	c.albums = make(map[string]*common.Album)
+
+	albumReader := &listMapReader{Delimiter: "Album"}
+	albumErr := c.cmd(albumReader, "list album")
+	if albumErr != nil {
+		return albumErr
+	}
+	for _, entry := range albumReader.DictList() {
+		// self._callback(Client.SIGNAL_PULSE_ALBUMS)
+
+		// Album
+		album := c.extractAlbum(entry)
+		if album != nil {
+			// Songs
+			songReader := &listMapReader{Delimiter: "file"}
+			songErr := c.cmd(songReader, "find album", album.Title())
+			if songErr != nil {
+				return songErr
+			}
+			for _, songData := range songReader.DictList() {
+				song := c.extractSong(songData)
+				if song != nil {
+					album.AddSong(song)
+				}
+			}
+
+			c.albums[album.ID()] = album
+		}
+	}
+
+	if c.albumsCB != nil {
+		c.albumsCB(c.albums)
+	}
+
+	return nil
+}
+
+func (c *Client) getStatus() error {
+	statusReader := &mapReader{}
+	statusErr := c.cmd(statusReader, "status")
+	if statusErr != nil {
+		return statusErr
+	}
+
+	status := statusReader.Dict()
+	// State
+	c.state = status["state"]
+	// Time
+	var parseErr error
+	time := uint64(0)
+	if timeStr, timeSet := status["time"]; timeSet {
+		time, parseErr = strconv.ParseUint(strings.Split(timeStr, ":")[0], 10, 64)
+		if parseErr != nil {
+			return newValueParseError("time", timeStr)
+		}
+	}
+	// Volume
+	volume := int64(-1)
+	if volumeStr, volumeSet := status["volume"]; volumeSet {
+		volume, parseErr = strconv.ParseInt(volumeStr, 10, 64)
+		if parseErr != nil {
+			return newValueParseError("volume", volumeStr)
+		}
+	}
+	// Error
+	errorMessage := status["error"]
+
+	// Album information
+	file := ""
+	var album *common.PlaylistAlbum
+	pos := uint64(0)
+	songReader := &mapReader{}
+	songErr := c.cmd(songReader, "currentsong")
+	if songErr != nil {
+		return songErr
+	}
+	songData := songReader.Dict()
+	if len(songData) > 0 {
+		// File
+		file = songData["file"]
+		// Song
+		song := c.extractPlaylistSong(songData)
+		if song != nil {
+			// Album
+			album = c.extractPlaylistAlbum(songData)
+			pos = song.Pos()
+			for _, palbum := range c.playlist {
+				if palbum.ID() == album.ID() && uint64(len(palbum.Songs())) >= pos {
+					album = palbum
+					break
+				}
+				pos -= uint64(len(palbum.Songs()))
+			}
+		}
+	}
+	// Audio
+	audio := status["audio"]
+	// Bitrate
+	bitrate := status["bitrate"]
+
+	if c.statusCB != nil {
+		c.statusCB(c.state, album, pos, time, volume, file, audio, bitrate, errorMessage)
+	}
+
+	return nil
+}
+
+func (c *Client) getStatistics() error {
+	statisticsReader := &mapReader{}
+	statisticsErr := c.cmd(statisticsReader, "stats")
+	if statisticsErr != nil {
+		return statisticsErr
+	}
+
+	stats := statisticsReader.Dict()
+	artists := stats["artists"]
+	albums := stats["albums"]
+	songs := stats["songs"]
+	dbPlaytime := stats["db_playtime"]
+	playtime := stats["playtime"]
+	uptime := stats["uptime"]
+
+	if c.statisticsCB != nil {
+		c.statisticsCB(artists, albums, songs, dbPlaytime, playtime, uptime)
+	}
+
+	return nil
+}
+
+func (c *Client) getOutputDevices() error {
+	devicesReader := &listMapReader{Delimiter: "outputid"}
+	devicesErr := c.cmd(devicesReader, "outputs")
+	if devicesErr != nil {
+		return devicesErr
+	}
+
+	devices := []*common.OutputDevice{}
+	for _, deviceMap := range devicesReader.DictList() {
+		device := common.NewOutputDevice(
+			deviceMap["outputid"],
+			deviceMap["outputname"],
+		)
+
+		enabledString := deviceMap["outputenabled"]
+		if enabledString != "" {
+			enabled, enabledErr := strconv.ParseBool(enabledString)
+			if enabledErr == nil {
+				device.Enabled = enabled
+			} else {
+				log.Println("failed to parse status of output device", device.ID, device.Name)
+			}
+		}
+
+		devices = append(devices, device)
+	}
+
+	if c.outputDevicesCB != nil {
+		c.outputDevicesCB(devices)
+	}
+
+	return nil
+}
+
+func (c *Client) SetOutputDeviceState(device *common.OutputDevice, enable bool) {
+	c.addAction(func(client *Client) error {
+		return client.setOutputDeviceState(device, enable)
+	})
+}
+
+func (c *Client) setOutputDeviceState(device *common.OutputDevice, enable bool) error {
+	reader := &emptyReader{}
+	if enable {
+		return c.cmd(reader, "enableoutput", device.ID)
+	}
+	return c.cmd(reader, "disableoutput", device.ID)
+}
+
+func (c *Client) PlayPause() {
+	c.addAction(func(client *Client) error {
+		return client.playPause()
+	})
+}
+
+func (c *Client) playPause() error {
+	reader := &emptyReader{}
+	switch c.state {
+	case "play":
+		return c.cmd(reader, "pause")
+	default:
+		return c.cmd(reader, "play")
+	}
+}
+
+func (c *Client) PlayAlbum(album *common.Album) {
+	c.addAction(func(client *Client) error {
+		return client.playAlbum(album)
+	})
+}
+
+func (c *Client) playAlbum(album *common.Album) error {
+	songIDs, err := c.queueAlbum(album)
+	if err != nil {
+		return err
+	}
+
+	if len(songIDs) > 0 {
+		reader := &emptyReader{}
+		return c.cmd(reader, "playid", songIDs[0])
+	}
+
+	return nil
+}
+
+func (c *Client) QueueAlbum(album *common.Album) {
+	c.addAction(func(client *Client) error {
+		_, err := client.queueAlbum(album)
+		return err
+	})
+}
+
+func (c *Client) queueAlbum(album *common.Album) ([]string, error) {
+	songIDs := []string{}
+	for _, song := range album.Songs() {
+		reader := &mapReader{}
+		addErr := c.cmd(reader, "addid", song.File())
+		if addErr != nil {
+			return songIDs, addErr
+		}
+
+		addData := reader.Dict()
+		songID, found := addData["Id"]
+		if found {
+			songIDs = append(songIDs, songID)
+		}
+	}
+
+	return songIDs, nil
+}
+
+func (c *Client) QueueAlbums(albums []*common.Album) {
+	c.addAction(func(client *Client) error {
+		return client.queueAlbums(albums)
+	})
+}
+
+func (c *Client) queueAlbums(albums []*common.Album) error {
+	for _, album := range albums {
+		_, queueErr := c.queueAlbum(album)
+		if queueErr != nil {
+			return queueErr
+		}
+	}
+
+	return nil
+}
+
+func (c *Client) PlayQueuedAlbum(album *common.PlaylistAlbum) {
+	c.addAction(func(client *Client) error {
+		return client.playQueuedAlbum(album)
+	})
+}
+
+func (c *Client) playQueuedAlbum(album *common.PlaylistAlbum) error {
+	if len(album.Songs()) <= 0 {
+		return nil
+	}
+
+	reader := &emptyReader{}
+	return c.cmd(reader, "playid", album.Songs()[0].ID())
+}
+
+func (c *Client) UnqueueAlbum(album *common.PlaylistAlbum) {
+	c.addAction(func(client *Client) error {
+		return client.unqueueAlbum(album)
+	})
+}
+
+func (c *Client) unqueueAlbum(album *common.PlaylistAlbum) error {
+	commands := []listCommand{}
+	for _, song := range album.Songs() {
+		command := newListCommand("deleteid", song.ID())
+		commands = append(commands, command)
+	}
+
+	return c.cmdList(commands)
+}
+
+func (c *Client) UnqueueAlbums(albums []*common.PlaylistAlbum) {
+	c.addAction(func(client *Client) error {
+		return client.unqueueAlbums(albums)
+	})
+}
+
+func (c *Client) unqueueAlbums(albums []*common.PlaylistAlbum) error {
+	commands := []listCommand{}
+	for _, album := range albums {
+		for _, song := range album.Songs() {
+			command := newListCommand("deleteid", song.ID())
+			commands = append(commands, command)
+		}
+	}
+
+	return c.cmdList(commands)
+}
+
+func (c *Client) Seek(pos int, time uint64) {
+	c.addAction(func(client *Client) error {
+		return client.seek(pos, time)
+	})
+}
+
+func (c *Client) seek(pos int, time uint64) error {
+	reader := &emptyReader{}
+	return c.cmd(reader, "seek", strconv.Itoa(pos), strconv.FormatUint(time, 10))
+}
+
+func (c *Client) SetVolume(volume int) {
+	c.addAction(func(client *Client) error {
+		return client.setVolume(volume)
+	})
+}
+
+func (c *Client) setVolume(volume int) error {
+	reader := &emptyReader{}
+	return c.cmd(reader, "setvol", strconv.Itoa(volume))
+}
+
+func (c *Client) LoadAlbumart(album *common.Album) {
+	c.addAction(func(client *Client) error {
+		return client.loadAlbumart(album)
+	})
+}
+
+func (c *Client) LoadAlbumartNow(album *common.Album) []byte {
+	c.addAction(func(client *Client) error {
+		return client.loadAlbumartNow(album)
+	})
+
+	return <-c.albumartChan
+}
+
+func (c *Client) loadAlbumart(album *common.Album) error {
+	reader := &binaryReader{}
+	reader.size = 1
+	reader.offset = 0
+
+	if c.albumartCB != nil {
+		// We need to wrap this in an anonymous function to make sure the call to reader.Binary() is deferred as well
+		defer func() {
+			c.albumartCB(album, reader.Binary())
+		}()
+	}
+
+	if len(album.Songs()) > 0 {
+		return c.cmd(reader, "albumart", album.Songs()[0].File(), "0")
+	}
+
+	return nil
+}
+
+func (c *Client) loadAlbumartNow(album *common.Album) error {
+	reader := &binaryReader{}
+	reader.size = 1
+	reader.offset = 0
+
+	defer func() {
+		c.albumartChan <- reader.Binary()
+	}()
+
+	if len(album.Songs()) > 0 {
+		return c.cmd(reader, "albumart", album.Songs()[0].File(), "0")
+	}
+
+	return nil
+}
+
+func (c *Client) ClearPlaylist() {
+	c.addAction(func(client *Client) error {
+		return client.clearPlaylist()
+	})
+}
+
+func (c *Client) clearPlaylist() error {
+	reader := &emptyReader{}
+	return c.cmd(reader, "clear")
+}
+
+func (c *Client) idle() error {
+	reader := &listReader{
+		key: "changed",
+	}
+
+	c.idling = true
+	err := c.cmd(reader, "idle")
+	c.idling = false
+	if err != nil {
+		return err
+	}
+
+	for _, subsystem := range reader.List() {
+		switch subsystem {
+		case "player":
+			c.addAction(
+				func(client *Client) error {
+					return client.loadPlaylist()
+				},
+				func(client *Client) error {
+					return client.getStatus()
+				},
+			)
+		case "mixer":
+			fallthrough
+		case "output":
+			c.addAction(func(client *Client) error {
+				return client.getStatus()
+			})
+		case "playlist":
+			c.addAction(func(client *Client) error {
+				return client.loadPlaylist()
+			})
+		case "database":
+			fallthrough
+		case "update":
+			c.addAction(
+				func(client *Client) error {
+					return client.loadAlbums()
+				},
+				func(client *Client) error {
+					return client.loadPlaylist()
+				},
+				func(client *Client) error {
+					return client.getStatus()
+				},
+			)
+		}
+	}
+
+	return nil
+}
+
+func (c *Client) noIdle() error {
+	id, err := c.write("noidle")
+	if err != nil {
+		return err
+	}
+
+	c.con.StartResponse(id)
+	defer c.con.EndResponse(id)
+
+	return nil
+}
+
+func (c *Client) addAction(commands ...func(*Client) error) {
+	for _, command := range commands {
+		c.queue <- QueueItem{
+			command,
+		}
+	}
+	c.queue <- QueueItem{
+		func(client *Client) error {
+			if client.con != nil && len(client.queue) == 0 {
+				return client.idle()
+			}
+			return nil
+		},
+	}
+	if c.idling {
+		c.noIdle()
+	}
+}
+
+func (c *Client) cmd(reader reader, action string, args ...string) error {
+	readingComplete := false
+	for !readingComplete {
+		command := c.constructCommand(action, args...)
+		id, err := c.write(command)
+		if err != nil {
+			return textproto.ProtocolError(fmt.Sprintf("failed to write command \"%s\": %s", action, err))
+		}
+
+		complete, newArgs, err := c.readData(id, reader, args)
+		if err != nil {
+			return textproto.ProtocolError(fmt.Sprintf("failed to read response for command \"%s\": %s", action, err))
+		}
+		readingComplete = complete
+		args = newArgs
+	}
+
+	return nil
+}
+
+func (c *Client) cmdList(commands []listCommand) error {
+	beginReader := &noopReader{}
+	beginErr := c.cmd(beginReader, "command_list_begin")
+	if beginErr != nil {
+		return beginErr
+	}
+
+	commandReader := &noopReader{}
+	for _, command := range commands {
+		commandErr := c.cmd(commandReader, command.Action, command.Args...)
+		if commandErr != nil {
+			return commandErr
+		}
+	}
+
+	endReader := &emptyReader{}
+	return c.cmd(endReader, "command_list_end")
+}
+
+func (c *Client) constructCommand(command string, args ...string) string {
+	if len(args) == 0 {
+		return command
+	}
+
+	cleanArgs := c.escapeCommandArguments(args...)
+	joinedArgs := strings.Join(cleanArgs, "\" \"")
+
+	return fmt.Sprintf("%s \"%s\"", command, joinedArgs)
+}
+
+func (c *Client) escapeCommandArguments(args ...string) []string {
+	for i, arg := range args {
+		args[i] = strings.ReplaceAll(arg, "\"", "\\\"")
+	}
+
+	return args
+}
+
+func (c *Client) write(command string) (uint, error) {
+	id := c.con.Next()
+	c.con.StartRequest(id)
+	defer c.con.EndRequest(id)
+
+	fmt.Fprintf(c.con.W, "%s", command)
+	c.con.W.WriteByte('\n')
+	err := c.con.W.Flush()
+	if err != nil {
+		return id, err
+	}
+
+	return id, nil
+}
+
+func (c *Client) readData(id uint, reader reader, args []string) (bool, []string, error) {
+	c.con.StartResponse(id)
+	defer c.con.EndResponse(id)
+
+	return reader.ReadData(c, args)
+}
+
+func (c *Client) read() ([]string, error) {
+	response := []string{}
+
+	for {
+		line, err := c.readLine()
+		if err != nil {
+			return nil, err
+		}
+		if line == "OK" {
+			break
+		}
+		response = append(response, line)
+	}
+
+	return response, nil
+}
+
+func (c *Client) readLine() (string, error) {
+	line, err := c.con.ReadLine()
+	if err != nil {
+		return "", err
+	}
+	if strings.HasPrefix(line, "ACK ") {
+		return "", textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line[4:]))
+	}
+
+	return line, nil
+}
+
+func (c *Client) readBytes(bytes []byte) error {
+	n, err := io.ReadFull(c.con.R, bytes)
+	if err != nil {
+		return err
+	}
+	if n != len(bytes) {
+		return textproto.ProtocolError(fmt.Sprintf("Wrong byte count: %d instead of %d", n, len(bytes)))
+	}
+
+	return nil
+}
+
+func (c *Client) extractAlbum(song map[string]string) *common.Album {
+	albumTitle := "Various"
+	if title, titleSet := song["Album"]; titleSet {
+		albumTitle = title
+	}
+	album := common.NewAlbum(albumTitle)
+
+	if albumLookup, albumExists := c.albums[album.ID()]; albumExists {
+		return albumLookup
+	}
+
+	return album
+}
+
+func (c *Client) extractPlaylistAlbum(song map[string]string) *common.PlaylistAlbum {
+	albumTitle := "Various"
+	if title, titleSet := song["Album"]; titleSet {
+		albumTitle = title
+	}
+	album := common.NewAlbum(albumTitle)
+
+	if albumLookup, albumExists := c.albums[album.ID()]; albumExists {
+		album = albumLookup
+	}
+
+	playlistAlbum := common.NewPlaylistAlbum(album)
+
+	return playlistAlbum
+}
+
+func (c *Client) extractSong(data map[string]string) *common.Song {
+	if artist, artistSet := data["Artist"]; artistSet {
+		if title, titleSet := data["Title"]; titleSet {
+			if file, fileSet := data["file"]; fileSet {
+				song := common.NewSong(artist, title, file)
+
+				if track, isSet := data["Track"]; isSet {
+					song.SetTrack(track)
+				}
+				if timeString, isSet := data["Time"]; isSet {
+					time, timeErr := strconv.ParseUint(timeString, 10, 64)
+					if timeErr == nil {
+						song.SetLength(time)
+					} else {
+						log.Println("failed to parse \"Time\" field of song file", file)
+					}
+				}
+				if date, isSet := data["Date"]; isSet {
+					song.SetDate(date)
+				}
+				if albumartist, isSet := data["Albumartist"]; isSet {
+					song.AddAlbumartist(albumartist)
+				}
+				if lastModifiedString, isSet := data["last-modified"]; isSet {
+					lastModified, dateErr := time.Parse("2006-01-02T15:04:05-0700", lastModifiedString)
+					if dateErr == nil {
+						song.SetLastModified(lastModified)
+					} else {
+						log.Println("failed to parse \"last-modified\" field of song file", file)
+					}
+				}
+
+				return song
+			}
+		}
+	}
+
+	return nil
+}
+
+func (c *Client) extractPlaylistSong(data map[string]string) *common.PlaylistSong {
+	song := c.extractSong(data)
+	if song != nil {
+		if id, idSet := data["Id"]; idSet {
+			if posString, posSet := data["Pos"]; posSet {
+				pos, posErr := strconv.ParseUint(posString, 10, 64)
+				if posErr != nil {
+					log.Println("failed to parse \"Pos\" field of playlist song")
+				}
+
+				return common.NewPlaylistSong(song, id, pos)
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/internal/client/command.go b/internal/client/command.go
new file mode 100644
index 0000000..a584e9f
--- /dev/null
+++ b/internal/client/command.go
@@ -0,0 +1,10 @@
+package client
+
+type listCommand struct {
+	Action string
+	Args   []string
+}
+
+func newListCommand(action string, args ...string) listCommand {
+	return listCommand{action, args}
+}
diff --git a/internal/client/errors.go b/internal/client/errors.go
new file mode 100644
index 0000000..345dc11
--- /dev/null
+++ b/internal/client/errors.go
@@ -0,0 +1,19 @@
+package client
+
+import "fmt"
+
+type ValueParseErr struct {
+	field string
+	value string
+}
+
+func newValueParseError(field string, value string) ValueParseErr {
+	return ValueParseErr{
+		field: field,
+		value: value,
+	}
+}
+
+func (e ValueParseErr) Error() string {
+	return fmt.Sprintf("failed to parse %s value: %s", e.field, e.value)
+}
diff --git a/internal/client/reader.go b/internal/client/reader.go
new file mode 100644
index 0000000..27fa821
--- /dev/null
+++ b/internal/client/reader.go
@@ -0,0 +1,236 @@
+package client
+
+import (
+	"fmt"
+	"net/textproto"
+	"strconv"
+	"strings"
+)
+
+type reader interface {
+	ReadData(client *Client, args []string) (bool, []string, error)
+}
+
+type noopReader struct{}
+
+func (r *noopReader) ReadData(client *Client, args []string) (bool, []string, error) {
+	return true, args, nil
+}
+
+type emptyReader struct{}
+
+func (r *emptyReader) ReadData(client *Client, args []string) (bool, []string, error) {
+	_, err := client.read()
+
+	return true, args, err
+}
+
+type listReader struct {
+	key  string
+	data []string
+}
+
+func (r *listReader) ReadData(client *Client, args []string) (bool, []string, error) {
+	data, err := client.read()
+	if err != nil {
+		return true, args, err
+	}
+
+	r.data = []string{}
+	for _, line := range data {
+		if !strings.HasPrefix(line, r.key+": ") {
+			return true, args, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line))
+		}
+
+		r.data = append(r.data, line[len(r.key)+2:])
+	}
+
+	return true, args, nil
+}
+
+func (r *listReader) List() []string {
+	return r.data
+}
+
+type mapReader struct {
+	data map[string]string
+}
+
+func (r *mapReader) ReadData(client *Client, args []string) (bool, []string, error) {
+	data, err := client.read()
+	if err != nil {
+		return true, args, err
+	}
+
+	r.data = make(map[string]string)
+	for _, line := range data {
+		parts := strings.Split(line, ": ")
+		if len(parts) < 2 {
+			return true, args, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line))
+		}
+		r.data[parts[0]] = strings.Join(parts[1:], ": ")
+	}
+
+	return true, args, nil
+}
+
+func (r *mapReader) Dict() map[string]string {
+	return r.data
+}
+
+type listMapReader struct {
+	Delimiter string
+	data      []map[string]string
+}
+
+func (r *listMapReader) ReadData(client *Client, args []string) (bool, []string, error) {
+	data, err := client.read()
+	if err != nil {
+		return true, args, err
+	}
+
+	r.data = nil
+	var entry map[string]string
+	for _, line := range data {
+		parts := strings.Split(line, ": ")
+		if len(parts) < 2 {
+			return true, args, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line))
+		}
+
+		if parts[0] == r.Delimiter {
+			if entry != nil {
+				r.data = append(r.data, entry)
+			}
+			entry = make(map[string]string)
+		}
+		entry[parts[0]] = strings.Join(parts[1:], ": ")
+	}
+	if entry != nil {
+		r.data = append(r.data, entry)
+	}
+
+	return true, args, nil
+}
+
+func (r *listMapReader) DictList() []map[string]string {
+	return r.data
+}
+
+type binaryReader struct {
+	data   []byte
+	size   int
+	offset int
+}
+
+func (r *binaryReader) ReadData(client *Client, args []string) (bool, []string, error) {
+	firstLine, dataComplete, firstLineErr := r.readFirstLine(client)
+	if firstLineErr != nil {
+		return true, args, firstLineErr
+	}
+	if dataComplete {
+		return true, args, nil
+	}
+
+	totalSize, sizeErr := r.readSize(firstLine)
+	if sizeErr != nil {
+		return true, args, sizeErr
+	}
+	r.size = totalSize
+
+	currentSize, bytesCountErr := r.readBytesCount(client)
+	if bytesCountErr != nil {
+		return true, args, bytesCountErr
+	}
+
+	r.initData(totalSize)
+	bytesErr := r.readBytes(client, currentSize)
+	if bytesErr != nil {
+		return true, args, bytesErr
+	}
+
+	_, lineBreakErr := client.readLine()
+	if lineBreakErr != nil {
+		return true, args, lineBreakErr
+	}
+	_, lineCompletionErr := client.readLine()
+	if lineCompletionErr != nil {
+		return true, args, lineCompletionErr
+	}
+
+	complete := (r.offset >= r.size)
+	newArgs := r.updateOffsetArgument(args)
+
+	return complete, newArgs, nil
+}
+
+func (r *binaryReader) readFirstLine(client *Client) (line string, complete bool, err error) {
+	line, lineErr := client.readLine()
+	if lineErr != nil {
+		return "", true, lineErr
+	}
+
+	// OK here means the binary data is complete
+	if line == "OK" {
+		return "", true, nil
+	}
+
+	return line, false, nil
+}
+
+func (r *binaryReader) readSize(line string) (int, error) {
+	if !strings.HasPrefix(line, "size: ") {
+		return 0, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line))
+	}
+
+	parsedSize, err := strconv.Atoi(line[6:])
+	if err != nil {
+		return 0, textproto.ProtocolError(fmt.Sprintf("Invalid size: %s", line[6:]))
+	}
+
+	return parsedSize, nil
+}
+
+func (r *binaryReader) readBytesCount(client *Client) (int, error) {
+	line, lineErr := client.readLine()
+	if lineErr != nil {
+		return 0, lineErr
+	}
+
+	if !strings.HasPrefix(line, "binary: ") {
+		return 0, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line))
+	}
+
+	count, countErr := strconv.Atoi(line[8:])
+	if countErr != nil {
+		return 0, textproto.ProtocolError(fmt.Sprintf("Invalid binary: %s", line[8:]))
+	}
+
+	return count, nil
+}
+
+func (r *binaryReader) initData(size int) {
+	if r.data == nil {
+		r.data = make([]byte, size)
+	}
+}
+
+func (r *binaryReader) readBytes(client *Client, size int) error {
+	bytesError := client.readBytes(r.data[r.offset : r.offset+size])
+	if bytesError != nil {
+		return bytesError
+	}
+
+	r.offset += size
+
+	return nil
+}
+
+func (r *binaryReader) updateOffsetArgument(args []string) []string {
+	args[len(args)-1] = strconv.Itoa(r.offset)
+
+	return args
+}
+
+func (r *binaryReader) Binary() []byte {
+	return r.data
+}

From d1bb505e0afb6e48d46783203ea8c5f1b69949e1 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Thu, 26 Feb 2026 10:39:52 +0100
Subject: [PATCH 31/33] Add c-based localization support

---
 internal/i18n/i18n.go        |  38 ++++
 locale/de/LC_MESSAGES/mcg.mo | Bin 0 -> 3463 bytes
 locale/de/LC_MESSAGES/mcg.po | 333 +++++++++++++++++++++++++++++++++++
 main.go                      |   5 +
 po/LINGUAS                   |   2 +-
 po/mcg.pot                   | 110 ++++++------
 6 files changed, 428 insertions(+), 60 deletions(-)
 create mode 100644 internal/i18n/i18n.go
 create mode 100644 locale/de/LC_MESSAGES/mcg.mo
 create mode 100644 locale/de/LC_MESSAGES/mcg.po

diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go
new file mode 100644
index 0000000..40183e1
--- /dev/null
+++ b/internal/i18n/i18n.go
@@ -0,0 +1,38 @@
+package i18n
+
+/*
+#include <locale.h>
+#include <stdlib.h>
+#include <libintl.h>
+
+static void init_i18n(const char* domain, const char* localedir) {
+	setlocale(LC_ALL, "");
+	bindtextdomain(domain, localedir);
+	bind_textdomain_codeset(domain, "UTF-8");
+	textdomain(domain);
+}
+*/
+import "C"
+
+import (
+	"log"
+	"unsafe"
+)
+
+func Init(domain, localeDir string) {
+	cDomain := C.CString(domain)
+	defer C.free(unsafe.Pointer(cDomain))
+
+	cDir := C.CString(localeDir)
+	defer C.free(unsafe.Pointer(cDir))
+
+	log.Println("initialize localization for domain", domain, "with directory", localeDir)
+	C.init_i18n(cDomain, cDir)
+}
+
+func T(msgid string) string {
+	c := C.CString(msgid)
+	defer C.free(unsafe.Pointer(c))
+
+	return C.GoString(C.gettext(c))
+}
diff --git a/locale/de/LC_MESSAGES/mcg.mo b/locale/de/LC_MESSAGES/mcg.mo
new file mode 100644
index 0000000000000000000000000000000000000000..79cb7795dd4fe89ae644322a346df451d0ad0046
GIT binary patch
literal 3463
zcmca7#4?qEfq}uCfq_AWfq~%)BLjmc0|P@3Gf0$yVFL>T11|#u!$uYc25trhhW$|b
zGz$X*8v_HwbruE&b_NE9dr)=HpyFRx7#KJh7#M!DFfa%)Ffg#NGBAiTFffR-GBB_*
zFfiz{Ld-K}WnhSBU|_Ikg_t)VD!+^sV(uDN1_l-e28JzA{!Uhidk(TPFo-ZPFq~(F
z*z*Lc|1FgN1*-2aR2>r=#2w;n5OcNI7#R2%7#NJ$7#R2&7#JMc7#PGD7#ITCAnwRu
zgP5Ps#=xM+z`)SL#=s!Wz`(GK4dVVoY!G*yU}Iq5Vqjo63)Odnje$Xyfq~&Z8v}zJ
z0|UcfHU<VsP}s6V^qa9m!a0Z?VoyFh#GEpAh`H5J@kVxt`#PZXbase)ma#+pznh(b
zfro*C;Uqf)gE#{N!!@Y7ckB!dos0|&f1&EyIT;u@85kI*azgaY=Y-g^7An4(6JpL@
zPKbL>aYDlLA}0fb6axdpElvgoH3kNTuTXt5ToCn2Tnr553=9nVT#)cw&IQrGo(p2%
zHZF+24sb!j=O`BggCGL~!v!u#I6vZo*z=PM5-&{Lka!T~hUin}hNKrQZiqV^xFPDJ
zxgqAHa5FFnFfcHbaWgPTFfcH*b3^Q309C)7n}I=@fq~%=Hv@wK0|Ub|Ziv6dc_8kQ
z<$<I>4IYR-6CMTzRR#tIYaU3vCGtSxtpUoP#RD;KClADbccJuiDE$#i|K@@CkChh^
ze=@v~c+=*E*z3Rx(eDiv59NiVhb&$O21W*mA3-@!7!<Z31_J|wAp-*gC_94U0hFe6
z7#J9s7#J8-7#J9|86fTlrD2eAP}&2fQ&3og@&`x^gh6=^L>n<c`~^z;TA+Lh%99L`
zI0fZPkQz|9=`k=cn1VP+SQp9$l?Un!5dUa0K;lP%0TP}dC7^r+$}?sl4g&*&JOcxR
zF_aA|D?sr9iZf7oqX88Ml|M=h3=AevJ}7QM@c}A3K<O7M%)p?UVx^j*keiuTT9R7K
zpjxbumYP_ir=VKQV3TQ=m!Fqvqn~NV;FyzCnp@1^SX7c(TvE*7SelZVui%nemYJLi
z<ykQ}WtJ2rmZVxSIOn7$7Acfuq$(8TBv$5R7MCzM=jY|6CYLDW7b&D<7AHe^49@vw
zsYMV{As{g?H3!0WFUm|&$ShV!R7lRrOwB7%NXv&9=UZBwnXC|ylUSKrq~Ma6nwy`e
zqmY)LTw0u&m#&bXr;rGCrb1?3aY<@oib8&x0!St&RiUIPF*&<fkHNL5D8I;x!7Vc<
z)r!GAH7~U&F^9n;zqo|KCo`!iv8WP8L*3(FkeUbfNoHPJzCuc7VorWKLqKA2ae01G
z3IoI?U<&NZfc&BohQQLy60nxUf`XjP<iwK9{5*!>)Wo9X46twx)S}?j<ovvpVg@J;
z4y)7@IJc-YFE2AMogp|i2NZC*r8y;;1v#luFERwD7J<SpIJKlCGcUbZAu%sSAu$<b
zS206yMt(Wis$@|3DrDv<q?P966eky@rsgT+=BK10RAi@CCgmp<r6?3<<QJ7BmzESW
z1n1|agUF&1hTxJ!P<&@57lWCl#SFpanI*{?3Q4IY<sidA@e8)PAhEPK6((Df54If|
z=b8C=3I*WEg=&UNm!%eAm4QYDRyk0RgTfjrnVguHoSMS`atA|UX=-UILs4pOepxC*
zF(klYfnA(mRHBensgMXxzzi^MZhlH;8Z3@rf+d+HIjL|Zm8pqE5DwHVg_P9d<kY+r
zP~?;rq$HN4DnMlz0*dmpQj<$`JyUeUQj3Z+^Yg3}z-b(uqBU}p(>1w*QVa5nN_2gT
z(=$_aol4V-bwl#46u1KXb%RpNGC_KDT|l`=!N|bKOxM6d*U&`4z|zXtMBBi~z<|pq
zvA9Gxq$n}3I47|rzsO1<IX@+}D7!RI!6rW^C)1(0w5T+(BtJDrucETbj>{)8FTFG|
zJyka(H8Iyp0nWElNJ))%apm&$^mRqJ)lkoX%Q-)<BsH%@H>9#4)k>ixwW377ASW?1
z&srflBeAGBwZt|w#7)-%p$_DhwA3P9*SzF>P@q^TSR`eZa0TR)7A5BBy5$$;7F#Lg
z6@a<Lwno+p5T>n0o`RySf}y50SA;GkCxZPGke`~8S)yR9XUP?z3*qQGB^IX^B$i}Y
zDd_3xgAqb5IKQ+gIn^2BHY){)<DjLQFSu081C?sInI*6?Ei*Zzq!?DJrRFhsAKsH!
zT#}Po1S!_iQ;QBSDM^KJkV-X|%v6Q&%+!?BqV&Y1R8SgBRme$AElSN}07-?V7A0lo
zrIhBSD`cb=6_=#u<fP^)fFehsq$o8nFEtNRxIsu=P;rM=-jyh%X6AvhGql({yr)PZ
zB{fe0Yq^(_TBJ~%nVg}JSemBbn3I&6r;rFL_rUg+<%3PCO3lej%~JqpX@#`>?9$@m
z%+#V1JqEYbjGWXWD+W+f%d}!}%*jbl%}veBgOr6%nMpaB`6U^t*$fC~F(?zK<}kRV
z<|%mQrR75kLxscJ($YYlgBFS<42Uo)D9TSSO3ckg5&{Ps1Gt<71)5`Cc`78#l2TLi
zQlLSJuu~zWv?w{FxHLH<6;y_1mx9#<r$QJC>8Zs9nW;G?3~-U0#L~3Xyc7oC)QqCk
zqEuM8loppCUXqamHUwO5x`L~SoSf3U^wd0s(!3M}$81pH335SVF(lI}WacV_<>%xi
zW#**h=BJc`3fZdE%yf{N%v6Pt#Nv|FyzKnkq|7{UArFoKhyn$Tl+4s(P$dPfF*K11
z)y&kQQc$rDEn2fdZYoJEDJ^D*D$gtic~rqM3G6MX!va7>t3r8daz=4#P98&4X|4hy
ztwAFNRT^C6KvNj13?gK)YD7dGIG*w#F^(`IF)67i734&QM3@s9QZw_4QZqsElbTnO
zmRbZ#3kYjaA}}v8IYR-F+rZqzEqN*65GhVcEGf-p01Jj>mZauDm|lq)MIhTszyY74
a04k(2;h7G}qQvZy(!`uhQ2I{IV*mg+UUtF&

literal 0
HcmV?d00001

diff --git a/locale/de/LC_MESSAGES/mcg.po b/locale/de/LC_MESSAGES/mcg.po
new file mode 100644
index 0000000..8819521
--- /dev/null
+++ b/locale/de/LC_MESSAGES/mcg.po
@@ -0,0 +1,333 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CoverGrid (mcg)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-08-09 19:13+0200\n"
+"PO-Revision-Date: 2026-08-14 09:34+0200\n"
+"Last-Translator: coderkun <olli@suruatoel.xyz>\n"
+"Language-Team: \n"
+"Language: de_DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.9\n"
+"X-Poedit-Basepath: ../../..\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: internal/common/album.go:93 internal/gui/coverpanel.go:290
+#, go-format
+msgid "%d:%d minutes"
+msgstr "%d:%d Minuten"
+
+#: internal/gui/application.go:108
+msgid ""
+"CoverGrid is a client for the Music Player Daemon, focusing on albums "
+"instead of single tracks."
+msgstr ""
+"CoverGrid ist ein ein Client für den Music Player Daemon, der sich auf Alben "
+"anstellen von einzelnen Songs fokussiert."
+
+#: internal/gui/coverpanel.go:277
+#, go-format
+msgid "%s feat. %s"
+msgstr "%s mit %s"
+
+#: internal/gui/window.go:117
+msgid "Server"
+msgstr "Server"
+
+#: internal/gui/window.go:118
+msgid "Cover"
+msgstr "Cover"
+
+#: internal/gui/window.go:119
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
+#: internal/gui/window.go:120
+msgid "Library"
+msgstr "Bibliothek"
+
+#: data/ui/connection-panel.ui:26
+msgid "Host"
+msgstr "Host"
+
+#: data/ui/connection-panel.ui:38
+msgid "Port"
+msgstr "Port"
+
+#: data/ui/connection-panel.ui:57
+msgid "Password"
+msgstr "Passwort"
+
+#: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88
+msgid "Show the cover in fullscreen mode"
+msgstr "Das Cover im Vollbildmodus anzeigen"
+
+#: data/ui/library-panel.ui:33
+msgid "update library"
+msgstr "Die Bibliothek aktualisieren"
+
+#: data/ui/library-panel.ui:46
+msgid "Sort"
+msgstr "Sortierung"
+
+#: data/ui/library-panel.ui:51
+msgid "sort by artist"
+msgstr "nach Künstler"
+
+#: data/ui/library-panel.ui:58
+msgid "sort by title"
+msgstr "nach Titel"
+
+#: data/ui/library-panel.ui:65
+msgid "sort by year"
+msgstr "nach Jahr"
+
+#: data/ui/library-panel.ui:71
+msgid "sort by modification"
+msgstr "nach Änderungsdatum"
+
+#: data/ui/library-panel.ui:78
+msgid "sort library descending"
+msgstr "absteigend sortieren"
+
+#: data/ui/library-panel.ui:98 data/ui/shortcuts-dialog.ui:99
+msgid "Search the library"
+msgstr "Die Bibliothek durchsuchen"
+
+#: data/ui/library-panel.ui:111 data/ui/playlist-panel.ui:14
+msgid "Select multiple albums"
+msgstr "Mehrere Alben auswählen"
+
+#: data/ui/library-panel.ui:124
+msgid "Settings and actions"
+msgstr "Einstellungen und Aktionen"
+
+#: data/ui/library-panel.ui:149
+msgid "search library"
+msgstr "Bibliothek durchsuchen"
+
+#: data/ui/library-panel.ui:216 data/ui/playlist-panel.ui:69
+msgid "cancel"
+msgstr "abbrechen"
+
+#: data/ui/library-panel.ui:222 data/ui/library-panel.ui:277
+msgid "queue"
+msgstr "einreihen"
+
+#: data/ui/library-panel.ui:271 data/ui/playlist-panel.ui:123
+msgid "play"
+msgstr "abspielen"
+
+#: data/ui/playlist-panel.ui:27 data/ui/shortcuts-dialog.ui:77
+msgid "Clear the playlist"
+msgstr "Die Wiedergabeliste leeren"
+
+#: data/ui/playlist-panel.ui:75 data/ui/playlist-panel.ui:129
+msgid "remove"
+msgstr "entfernen"
+
+#: data/ui/server-panel.ui:35
+msgid "Status"
+msgstr "Status"
+
+#: data/ui/server-panel.ui:49
+msgid "File:"
+msgstr "Datei:"
+
+#: data/ui/server-panel.ui:60
+msgid "Audio:"
+msgstr "Audio:"
+
+#: data/ui/server-panel.ui:71
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: data/ui/server-panel.ui:82
+msgid "Error:"
+msgstr "Fehler:"
+
+#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106
+#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134
+msgid "<i>none</i>"
+msgstr "<i>nichts</i>"
+
+#: data/ui/server-panel.ui:154
+msgid "Statistics"
+msgstr "Statistiken"
+
+#: data/ui/server-panel.ui:178
+msgid "Artists"
+msgstr "Künstler"
+
+#: data/ui/server-panel.ui:198
+msgid "Albums"
+msgstr "Alben"
+
+#: data/ui/server-panel.ui:218
+msgid "Songs"
+msgstr "Songs"
+
+#: data/ui/server-panel.ui:238
+msgid "Seconds"
+msgstr "Sekunden"
+
+#: data/ui/server-panel.ui:267
+msgid "Seconds played"
+msgstr "Sekunden gespielt"
+
+#: data/ui/server-panel.ui:287
+msgid "Seconds running"
+msgstr "Sekunden laufend"
+
+#: data/ui/server-panel.ui:303
+msgid "Audio Devices"
+msgstr "Audiogeräte"
+
+#: data/ui/shortcuts-dialog.ui:14
+msgid "General"
+msgstr "Allgemein"
+
+#: data/ui/shortcuts-dialog.ui:18
+msgid "Switch to the Connection panel"
+msgstr "Zum Verbindungspaneel wechseln"
+
+#: data/ui/shortcuts-dialog.ui:24
+msgid "Switch to the Cover panel"
+msgstr "Zum Cover-Paneel wechseln"
+
+#: data/ui/shortcuts-dialog.ui:30
+msgid "Switch to the Playlist panel"
+msgstr "Zum Wiedergabelistenpaneel wechseln"
+
+#: data/ui/shortcuts-dialog.ui:36
+msgid "Switch to the Library panel"
+msgstr "Zum Bibliothekspaneel wechseln"
+
+#: data/ui/shortcuts-dialog.ui:42
+msgid "Show the keyboard shortcuts"
+msgstr "Die Tastenkombinationen anzeigen (dieser Dialog)"
+
+#: data/ui/shortcuts-dialog.ui:48
+msgid "Open the info dialog"
+msgstr "Den Infodialog öffnen"
+
+#: data/ui/shortcuts-dialog.ui:54
+msgid "Quit the application"
+msgstr "Die Anwendung beenden"
+
+#: data/ui/shortcuts-dialog.ui:61
+msgid "Player"
+msgstr "Wiedergabeprogramm"
+
+#: data/ui/shortcuts-dialog.ui:65
+msgid "Connect or disconnect"
+msgstr "Die Verbindung herstellen oder trennen"
+
+#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:26
+msgid "Switch between play and pause"
+msgstr "Zwischen Abspielen und Pause wechseln"
+
+#: data/ui/shortcuts-dialog.ui:84
+msgid "Cover Panel"
+msgstr "Cover-Paneel"
+
+#: data/ui/shortcuts-dialog.ui:95
+msgid "Library Panel"
+msgstr "Bibliothekspaneel"
+
+#~ msgid "No service found"
+#~ msgstr "Keine Dienste gefunden"
+
+#~ msgid "use"
+#~ msgstr "verwenden"
+
+#~ msgid "Loading albums"
+#~ msgstr "Alben werden geladen"
+
+#~ msgid "Loading images"
+#~ msgstr "Bilder werden geladen"
+
+#, fuzzy
+#~ msgid "Connection state"
+#~ msgstr "Verbindung"
+
+#~ msgid "Title"
+#~ msgstr "Titel"
+
+#~ msgid "Artist"
+#~ msgstr "Künstler"
+
+#~ msgid "Enter hostname or IP address"
+#~ msgstr "Hostnamen oder IP-Adresse eingeben"
+
+#~ msgid "Enter password or leave blank"
+#~ msgstr "Passwort eingeben oder leer lassen"
+
+#~ msgid "Connect"
+#~ msgstr "Verbinden"
+
+#~ msgid "Play"
+#~ msgstr "Abspielen"
+
+#~ msgid "Clear Playlist"
+#~ msgstr "Playlist leeren"
+
+#~ msgid "Toggle Fullscreen"
+#~ msgstr "Vollbild wechseln"
+
+#~ msgid "Search Library"
+#~ msgstr "Bibliothek durchsuchen"
+
+#~ msgid "Connection"
+#~ msgstr "Verbindung"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Tastenkombinationen"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Quit"
+#~ msgstr "Beenden"
+
+#~ msgid "Connect to MPD"
+#~ msgstr "Zu MPD verbinden"
+
+#~ msgid "Adjust the volume"
+#~ msgstr "Die Lautstärke anpassen"
+
+#~ msgid "Enter URL or local path"
+#~ msgstr "URL oder lokalen Pfad eingeben"
+
+#~ msgid "Image Directory:"
+#~ msgstr "Bildordner:"
+
+#~ msgid "{} of {} images loaded"
+#~ msgstr "{} von {} Bildern geladen"
+
+#~ msgid "Tracklist"
+#~ msgstr "Titelliste"
+
+#~ msgid "large tracklist"
+#~ msgstr "große Titelliste"
+
+#~ msgid "small tracklist"
+#~ msgstr "kleine Titelliste"
+
+#~ msgid "hide tracklist"
+#~ msgstr "gar keine Titelliste"
+
+#~ msgid "_Play"
+#~ msgstr "_Abspielen"
+
+#~ msgid "_Keyboard Shortcuts"
+#~ msgstr "Tastenkombinationen"
+
+#~ msgid "_Quit"
+#~ msgstr "_Beenden"
+
+#~ msgid "Show the keyboard shortcuts (this dialog)"
+#~ msgstr "Die Tastenkombinationen anzeigen (dieser Dialog)"
diff --git a/main.go b/main.go
index da29a2c..b5aa37f 100644
--- a/main.go
+++ b/main.go
@@ -1,4 +1,9 @@
 package main
 
+import (
+	"suruatoel.xyz/mcg/internal/i18n"
+)
+
 func main() {
+	i18n.Init("mcg", "locale")
 }
diff --git a/po/LINGUAS b/po/LINGUAS
index 3ae2b72..7673daa 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-en de
+de
diff --git a/po/mcg.pot b/po/mcg.pot
index 451e0a8..f813837 100644
--- a/po/mcg.pot
+++ b/po/mcg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mcg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-22 14:39+0200\n"
+"POT-Creation-Date: 2026-08-09 19:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/ui/connection-panel.ui:29
-msgid "No service found"
+#: internal/common/album.go:93 internal/gui/coverpanel.go:290
+#, go-format
+msgid "%d:%d minutes"
 msgstr ""
 
-#: data/ui/connection-panel.ui:43
+#: internal/gui/application.go:108
+msgid ""
+"CoverGrid is a client for the Music Player Daemon, focusing on albums "
+"instead of single tracks."
+msgstr ""
+
+#: internal/gui/coverpanel.go:277
+#, go-format
+msgid "%s feat. %s"
+msgstr ""
+
+#: internal/gui/window.go:117
+msgid "Server"
+msgstr ""
+
+#: internal/gui/window.go:118
+msgid "Cover"
+msgstr ""
+
+#: internal/gui/window.go:119
+msgid "Playlist"
+msgstr ""
+
+#: internal/gui/window.go:120
+msgid "Library"
+msgstr ""
+
+#: data/ui/connection-panel.ui:26
 msgid "Host"
 msgstr ""
 
-#: data/ui/connection-panel.ui:56
+#: data/ui/connection-panel.ui:38
 msgid "Port"
 msgstr ""
 
-#: data/ui/connection-panel.ui:76
+#: data/ui/connection-panel.ui:57
 msgid "Password"
 msgstr ""
 
@@ -37,67 +65,67 @@ msgstr ""
 msgid "Show the cover in fullscreen mode"
 msgstr ""
 
-#: data/ui/library-panel.ui:34
+#: data/ui/library-panel.ui:33
 msgid "update library"
 msgstr ""
 
-#: data/ui/library-panel.ui:48
+#: data/ui/library-panel.ui:46
 msgid "Sort"
 msgstr ""
 
-#: data/ui/library-panel.ui:53
+#: data/ui/library-panel.ui:51
 msgid "sort by artist"
 msgstr ""
 
-#: data/ui/library-panel.ui:61
+#: data/ui/library-panel.ui:58
 msgid "sort by title"
 msgstr ""
 
-#: data/ui/library-panel.ui:69
+#: data/ui/library-panel.ui:65
 msgid "sort by year"
 msgstr ""
 
-#: data/ui/library-panel.ui:76
+#: data/ui/library-panel.ui:71
 msgid "sort by modification"
 msgstr ""
 
-#: data/ui/library-panel.ui:84
+#: data/ui/library-panel.ui:78
 msgid "sort library descending"
 msgstr ""
 
-#: data/ui/library-panel.ui:105 data/ui/shortcuts-dialog.ui:99
+#: data/ui/library-panel.ui:98 data/ui/shortcuts-dialog.ui:99
 msgid "Search the library"
 msgstr ""
 
-#: data/ui/library-panel.ui:121 data/ui/playlist-panel.ui:14
+#: data/ui/library-panel.ui:111 data/ui/playlist-panel.ui:14
 msgid "Select multiple albums"
 msgstr ""
 
-#: data/ui/library-panel.ui:135
+#: data/ui/library-panel.ui:124
 msgid "Settings and actions"
 msgstr ""
 
-#: data/ui/library-panel.ui:160
+#: data/ui/library-panel.ui:149
 msgid "search library"
 msgstr ""
 
-#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107
+#: data/ui/library-panel.ui:216 data/ui/playlist-panel.ui:69
 msgid "cancel"
 msgstr ""
 
-#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327
+#: data/ui/library-panel.ui:222 data/ui/library-panel.ui:277
 msgid "queue"
 msgstr ""
 
-#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163
+#: data/ui/library-panel.ui:271 data/ui/playlist-panel.ui:123
 msgid "play"
 msgstr ""
 
-#: data/ui/playlist-panel.ui:28 data/ui/shortcuts-dialog.ui:77
+#: data/ui/playlist-panel.ui:27 data/ui/shortcuts-dialog.ui:77
 msgid "Clear the playlist"
 msgstr ""
 
-#: data/ui/playlist-panel.ui:114 data/ui/playlist-panel.ui:170
+#: data/ui/playlist-panel.ui:75 data/ui/playlist-panel.ui:129
 msgid "remove"
 msgstr ""
 
@@ -198,7 +226,7 @@ msgstr ""
 msgid "Connect or disconnect"
 msgstr ""
 
-#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:25
+#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:26
 msgid "Switch between play and pause"
 msgstr ""
 
@@ -209,39 +237,3 @@ msgstr ""
 #: data/ui/shortcuts-dialog.ui:95
 msgid "Library Panel"
 msgstr ""
-
-#: src/connectionpanel.py:51
-msgid "use"
-msgstr ""
-
-#: src/librarypanel.py:291
-msgid "Loading albums"
-msgstr ""
-
-#: src/librarypanel.py:379
-msgid "Loading images"
-msgstr ""
-
-#: src/utils.py:50 src/utils.py:67
-msgid "{} feat. {}"
-msgstr ""
-
-#: src/utils.py:61
-msgid "{}:{} minutes"
-msgstr ""
-
-#: src/window.py:114
-msgid "Server"
-msgstr ""
-
-#: src/window.py:115
-msgid "Cover"
-msgstr ""
-
-#: src/window.py:116
-msgid "Playlist"
-msgstr ""
-
-#: src/window.py:117
-msgid "Library"
-msgstr ""

From b7c0307f6b6b27163098b10a60c797caec7a6803 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Thu, 26 Feb 2026 10:41:33 +0100
Subject: [PATCH 32/33] Add GTK application implementation

---
 data/data.go                                  |  32 +
 data/gtk.css                                  |   5 -
 data/icons/meson.build                        |   7 -
 data/ui/album-headerbar.ui                    |   7 +-
 data/ui/connection-panel.ui                   |  91 ++-
 data/ui/cover-panel.ui                        |   4 +-
 data/ui/library-panel.ui                      |  68 +--
 data/ui/playlist-panel.ui                     |  54 +-
 data/ui/server-panel.ui                       |   4 +-
 data/ui/shortcuts-dialog.ui                   |   4 +-
 data/ui/window.ui                             |  17 +-
 data/xyz.suruatoel.mcg.gresource.xml          |  15 -
 data/xyz.suruatoel.mcg.gschema.xml            |  63 --
 .../scalable/apps => }/xyz.suruatoel.mcg.svg  |   0
 go.mod                                        |   7 +
 go.sum                                        |   6 +
 internal/gui/albumheaderbar.go                |  42 ++
 internal/gui/application.go                   | 151 +++++
 internal/gui/config.go                        |  78 +++
 internal/gui/connectionpanel.go               |  58 ++
 internal/gui/coverloader.go                   | 188 ++++++
 internal/gui/coverpanel.go                    | 343 +++++++++++
 internal/gui/librarypanel.go                  | 563 ++++++++++++++++++
 internal/gui/pictureitemfactory.go            |  78 +++
 internal/gui/playlistpanel.go                 | 358 +++++++++++
 internal/gui/serverpanel.go                   | 115 ++++
 internal/gui/shortcutsdialog.go               |  23 +
 internal/gui/window.go                        | 454 ++++++++++++++
 main.go                                       |   9 +
 29 files changed, 2571 insertions(+), 273 deletions(-)
 create mode 100644 data/data.go
 delete mode 100644 data/icons/meson.build
 delete mode 100644 data/xyz.suruatoel.mcg.gresource.xml
 delete mode 100644 data/xyz.suruatoel.mcg.gschema.xml
 rename data/{icons/hicolor/scalable/apps => }/xyz.suruatoel.mcg.svg (100%)
 create mode 100644 internal/gui/albumheaderbar.go
 create mode 100644 internal/gui/application.go
 create mode 100644 internal/gui/config.go
 create mode 100644 internal/gui/connectionpanel.go
 create mode 100644 internal/gui/coverloader.go
 create mode 100644 internal/gui/coverpanel.go
 create mode 100644 internal/gui/librarypanel.go
 create mode 100644 internal/gui/pictureitemfactory.go
 create mode 100644 internal/gui/playlistpanel.go
 create mode 100644 internal/gui/serverpanel.go
 create mode 100644 internal/gui/shortcutsdialog.go
 create mode 100644 internal/gui/window.go

diff --git a/data/data.go b/data/data.go
new file mode 100644
index 0000000..5076620
--- /dev/null
+++ b/data/data.go
@@ -0,0 +1,32 @@
+package data
+
+import (
+	_ "embed"
+)
+
+//go:embed ui/window.ui
+var WindowXML string
+
+//go:embed ui/shortcuts-dialog.ui
+var ShortcutsDialogXML string
+
+//go:embed ui/connection-panel.ui
+var ConnectionPanelXML string
+
+//go:embed ui/server-panel.ui
+var ServerPanelXML string
+
+//go:embed ui/cover-panel.ui
+var CoverPanelXML string
+
+//go:embed ui/playlist-panel.ui
+var PlaylistPanelXML string
+
+//go:embed ui/album-headerbar.ui
+var AlbumHeaderbarXML string
+
+//go:embed ui/library-panel.ui
+var LibraryPanelXML string
+
+//go:embed gtk.css
+var MainCSS string
diff --git a/data/gtk.css b/data/gtk.css
index 1b361de..aa3357b 100644
--- a/data/gtk.css
+++ b/data/gtk.css
@@ -1,6 +1,5 @@
 #content_stack {
     box-shadow:inset 4px 4px 10px rgba(0,0,0,0.3);
-    background-image:url('noise-texture.png');
 }
 
 #port_spinner {
@@ -30,10 +29,6 @@
     font-weight:bold;
 }
 
-window.fullscreen #cover_box {
-    background: black;
-}
-
 #cover_info_revealer {
     background-color:alpha(@theme_bg_color, 0.8);
     box-shadow:0 0 10px @theme_bg_color;
diff --git a/data/icons/meson.build b/data/icons/meson.build
deleted file mode 100644
index 20bdb7c..0000000
--- a/data/icons/meson.build
+++ /dev/null
@@ -1,7 +0,0 @@
-application_id = 'xyz.suruatoel.mcg'
-
-scalable_dir = join_paths('hicolor', 'scalable', 'apps')
-install_data(
-    join_paths(scalable_dir, ('@0@.svg').format(application_id)),
-    install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir)
-)
diff --git a/data/ui/album-headerbar.ui b/data/ui/album-headerbar.ui
index bda26a8..8a1be95 100644
--- a/data/ui/album-headerbar.ui
+++ b/data/ui/album-headerbar.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="4.8"/>
   <requires lib="adw" version="1.2" />
-  <template class="McgAlbumHeaderbar" parent="AdwBin">
+  <object id="McgAlbumHeaderbar" class="AdwBin">
     <child>
       <object class="GtkHeaderBar">
         <child type="title">
@@ -25,9 +25,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkButton">
+          <object id="close_button" class="GtkButton">
             <property name="receives-default">True</property>
-            <signal name="clicked" handler="on_close_clicked" swapped="no"/>
             <child>
               <object class="GtkImage">
                 <property name="icon-name">go-previous-symbolic</property>
@@ -37,5 +36,5 @@
         </child>
       </object>
     </child>
-  </template>
+  </object>
 </interface>
diff --git a/data/ui/connection-panel.ui b/data/ui/connection-panel.ui
index d9e7364..42a280c 100644
--- a/data/ui/connection-panel.ui
+++ b/data/ui/connection-panel.ui
@@ -9,79 +9,58 @@
     <property name="step-increment">1</property>
     <property name="page-increment">100</property>
   </object>
-  <object class="GtkBox" id="toolbar">
-    <property name="orientation">horizontal</property>
-    <property name="spacing">6</property>
-  </object>
-  <template class="McgConnectionPanel" parent="AdwBin">
+  <object id="McgConnectionPanel" class="AdwBin">
     <child>
       <object class="AdwStatusPage">
         <property name="title">Connect to MPD</property>
         <child>
-          <object class="GtkBox">
+          <object class="GtkListBox">
             <property name="hexpand">false</property>
             <property name="halign">center</property>
+            <property name="selection-mode">none</property>
+            <style>
+              <class name="boxed-list"/>
+            </style>
             <child>
-              <object class="GtkListBox" id="zeroconf_list">
-                <property name="hexpand">true</property>
-                <child type="placeholder">
+              <object class="AdwEntryRow" id="host_row">
+                <property name="title" translatable="yes">Host</property>
+                <property name="show-apply-button">true</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <style>
+                  <class name="header"/>
+                </style>
+                <child>
                   <object class="GtkLabel">
-                    <property name="label" translatable="yes">No service found</property>
+                    <property name="label" translatable="yes">Port</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">false</property>
+                    <style>
+                      <class name="subtitle"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="port_spinner">
+                    <property name="name">port_spinner</property>
+                    <property name="value">6600</property>
+                    <property name="adjustment">server-port-adjustment</property>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkListBox">
-                <property name="hexpand">true</property>
-                <property name="selection-mode">none</property>
-                <style>
-                  <class name="boxed-list"/>
-                </style>
-                <child>
-                  <object class="AdwEntryRow" id="host_row">
-                    <property name="title" translatable="yes">Host</property>
-                    <property name="show-apply-button">true</property>
-                    <signal name="apply" handler="on_host_entry_apply"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <style>
-                      <class name="header"/>
-                    </style>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Port</property>
-                        <property name="halign">start</property>
-                        <property name="hexpand">false</property>
-                        <style>
-                          <class name="subtitle"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="port_spinner">
-                        <property name="name">port_spinner</property>
-                        <property name="value">6600</property>
-                        <property name="adjustment">server-port-adjustment</property>
-                        <signal name="value-changed" handler="on_port_spinner_value_changed"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwPasswordEntryRow" id="password_row">
-                    <property name="title" translatable="yes">Password</property>
-                    <property name="show-apply-button">true</property>
-                  </object>
-                </child>
+              <object class="AdwPasswordEntryRow" id="password_row">
+                <property name="title" translatable="yes">Password</property>
+                <property name="show-apply-button">true</property>
               </object>
             </child>
           </object>
         </child>
       </object>
     </child>
-  </template>
+  </object>
 </interface>
diff --git a/data/ui/cover-panel.ui b/data/ui/cover-panel.ui
index d869e76..f42cfe7 100644
--- a/data/ui/cover-panel.ui
+++ b/data/ui/cover-panel.ui
@@ -19,7 +19,7 @@
       </object>
     </child>
   </object>
-  <template class="McgCoverPanel" parent="GtkOverlay">
+  <object id="McgCoverPanel" class="GtkOverlay">
     <child>
       <object class="GtkStack" id="cover_stack">
         <property name="visible-child">cover_default</property>
@@ -157,5 +157,5 @@
         </child>
       </object>
     </child>
-  </template>
+  </object>
 </interface>
diff --git a/data/ui/library-panel.ui b/data/ui/library-panel.ui
index b835e3f..2ef262d 100644
--- a/data/ui/library-panel.ui
+++ b/data/ui/library-panel.ui
@@ -26,13 +26,11 @@
             <property name="round-digits">0</property>
             <property name="digits">0</property>
             <property name="has-origin">False</property>
-            <signal name="value-changed" handler="on_grid_scale_changed" swapped="no"/>
           </object>
         </child>
         <child>
           <object class="GtkButton" id="library-toolbar-update">
             <property name="label" translatable="yes">update library</property>
-            <signal name="clicked" handler="on_update_clicked" swapped="no"/>
           </object>
         </child>
         <child>
@@ -53,7 +51,6 @@
                 <property name="label" translatable="yes">sort by artist</property>
                 <property name="receives-default">False</property>
                 <property name="group">sort_year</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
               </object>
             </child>
             <child>
@@ -61,14 +58,12 @@
                 <property name="label" translatable="yes">sort by title</property>
                 <property name="receives-default">False</property>
                 <property name="group">sort_year</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkCheckButton" id="sort_year">
                 <property name="label" translatable="yes">sort by year</property>
                 <property name="receives-default">False</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
               </object>
             </child>
             <child>
@@ -76,7 +71,6 @@
                 <property name="label" translatable="yes">sort by modification</property>
                 <property name="receives-default">False</property>
                 <property name="group">sort_year</property>
-                <signal name="toggled" handler="on_sort_toggled" swapped="no"/>
               </object>
             </child>
             <child>
@@ -86,7 +80,6 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="active">True</property>
-                <signal name="toggled" handler="on_sort_order_toggled" swapped="no"/>
               </object>
             </child>
           </object>
@@ -108,9 +101,6 @@
             <property name="icon-name">system-search-symbolic</property>
           </object>
         </child>
-        <!--
-        <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-        -->
       </object>
     </child>
     <child>
@@ -119,7 +109,6 @@
         <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="icon-name">object-select-symbolic</property>
@@ -145,7 +134,7 @@
     </child>
   </object>
 
-  <template class="McgLibraryPanel" parent="AdwBin">
+  <object id="McgLibraryPanel" class="AdwBin">
     <child>
       <object class="GtkStack" id="library_stack">
         <property name="transition-type">slide-left-right</property>
@@ -158,7 +147,6 @@
                 <child>
                   <object class="GtkSearchEntry" id="filter_entry">
                     <property name="placeholder-text" translatable="yes">search library</property>
-                    <signal name="search-changed" handler="on_filter_entry_changed" swapped="no"/>
                   </object>
                 </child>
               </object>
@@ -206,49 +194,9 @@
                     <object class="GtkGridView" id="library_grid">
                       <property name="orientation">vertical</property>
                       <property name="single_click_activate">true</property>
-                      <signal name="activate" handler="on_library_grid_clicked"/>
                       <style>
                         <class name="no-bg"/>
                       </style>
-                      <property name="factory">
-                        <object class="GtkBuilderListItemFactory">
-                          <property name="bytes">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-  <interface>
-    <template class="GtkListItem">
-      <property name="activatable">true</property>
-      <property name="child">
-        <object class="GtkBox">
-          <property name="orientation">vertical</property>
-          <property name="vexpand">true</property>
-          <property name="hexpand">true</property>
-          <child>
-            <object class="GtkPicture">
-              <property name="content-fit">contain</property>
-              <property name="can-shrink">false</property>
-              <property name="vexpand">true</property>
-              <property name="hexpand">true</property>
-              <binding name="tooltip-markup">
-                <lookup name="tooltip" type="GridItem">
-                  <lookup name="item">GtkListItem</lookup>
-                </lookup>
-              </binding>
-              <binding name="paintable">
-                <lookup name="cover" type="GridItem">
-                  <lookup name="item">GtkListItem</lookup>
-                </lookup>
-              </binding>
-            </object>
-          </child>
-        </object>
-      </property>
-    </template>
-  </interface>
-]]>
-                          </property>
-                        </object>
-                      </property>
                     </object>
                   </child>
                   <style>
@@ -264,17 +212,15 @@
               <child>
                 <object class="GtkActionBar" id="actionbar">
                   <child type="end">
-                    <object class="GtkButton">
+                    <object class="GtkButton" id="selection_cancel_button">
                       <property name="label" translatable="yes">cancel</property>
                       <property name="receives-default">True</property>
-                      <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
                     </object>
                   </child>
                   <child type="end">
-                    <object class="GtkButton">
+                    <object class="GtkButton" id="selection_queue_button">
                       <property name="label" translatable="yes">queue</property>
                       <property name="receives-default">True</property>
-                      <signal name="clicked" handler="on_selection_add_clicked" swapped="no"/>
                     </object>
                   </child>
                 </object>
@@ -321,17 +267,15 @@
           <child>
             <object class="GtkActionBar" id="actionbar_standalone">
               <child type="end">
-                <object class="GtkButton">
+                <object class="GtkButton" id="standalone_play_button">
                   <property name="label" translatable="yes">play</property>
                   <property name="receives-default">True</property>
-                  <signal name="clicked" handler="on_standalone_play_clicked" swapped="no"/>
                 </object>
               </child>
               <child type="end">
-                <object class="GtkButton">
+                <object class="GtkButton" id="standalone_queue_button">
                   <property name="label" translatable="yes">queue</property>
                   <property name="receives-default">True</property>
-                  <signal name="clicked" handler="on_standalone_queue_clicked" swapped="no"/>
                 </object>
               </child>
             </object>
@@ -340,5 +284,5 @@
         </child>
       </object>
     </child>
-  </template>
+  </object>
 </interface>
diff --git a/data/ui/playlist-panel.ui b/data/ui/playlist-panel.ui
index d29c0c9..6994b72 100644
--- a/data/ui/playlist-panel.ui
+++ b/data/ui/playlist-panel.ui
@@ -12,7 +12,6 @@
         <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="icon-name">object-select-symbolic</property>
@@ -26,7 +25,6 @@
         <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>
@@ -37,7 +35,7 @@
       </object>
     </child>
   </object>
-  <template class="McgPlaylistPanel" parent="AdwBin">
+  <object id="McgPlaylistPanel" class="AdwBin">
     <child>
       <object class="GtkStack" id="playlist_stack">
         <property name="transition-type">slide-left-right</property>
@@ -51,45 +49,9 @@
                   <object class="GtkGridView" id="playlist_grid">
                     <property name="orientation">vertical</property>
                     <property name="single-click-activate">true</property>
-                    <signal name="activate" handler="on_playlist_grid_clicked"/>
                     <style>
                       <class name="no-bg"/>
                     </style>
-                    <property name="factory">
-                      <object class="GtkBuilderListItemFactory">
-                        <property name="bytes">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-  <interface>
-    <template class="GtkListItem">
-      <property name="activatable">true</property>
-      <property name="child">
-        <object class="GtkBox">
-          <property name="orientation">vertical</property>
-          <child>
-            <object class="GtkPicture">
-              <property name="content-fit">contain</property>
-              <property name="can-shrink">false</property>
-              <binding name="tooltip-markup">
-                <lookup name="tooltip" type="GridItem">
-                  <lookup name="item">GtkListItem</lookup>
-                </lookup>
-              </binding>
-              <binding name="paintable">
-                <lookup name="cover" type="GridItem">
-                  <lookup name="item">GtkListItem</lookup>
-                </lookup>
-              </binding>
-            </object>
-          </child>
-        </object>
-      </property>
-    </template>
-  </interface>
-]]>
-                        </property>
-                      </object>
-                    </property>
                   </object>
                 </child>
                 <style>
@@ -103,17 +65,15 @@
                 <child>
                   <object class="GtkActionBar" id="actionbar">
                     <child type="end">
-                      <object class="GtkButton">
+                      <object class="GtkButton" id="selection_cancel_button">
                         <property name="label" translatable="yes">cancel</property>
                         <property name="receives-default">True</property>
-                        <signal name="clicked" handler="on_selection_cancel_clicked" swapped="no"/>
                       </object>
                     </child>
                     <child type="end">
-                      <object class="GtkButton">
+                      <object class="GtkButton" id="selection_remove_button">
                         <property name="label" translatable="yes">remove</property>
                         <property name="receives-default">True</property>
-                        <signal name="clicked" handler="on_selection_remove_clicked" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -159,17 +119,15 @@
             <child>
               <object class="GtkActionBar" id="actionbar_standalone">
                 <child type="end">
-                  <object class="GtkButton">
+                  <object class="GtkButton" id="standalone_play_button">
                     <property name="label" translatable="yes">play</property>
                     <property name="receives-default">True</property>
-                    <signal name="clicked" handler="on_standalone_play_clicked" swapped="no"/>
                   </object>
                 </child>
                 <child type="end">
-                  <object class="GtkButton">
+                  <object class="GtkButton" id="standalone_remove_button">
                     <property name="label" translatable="yes">remove</property>
                     <property name="receives-default">True</property>
-                    <signal name="clicked" handler="on_standalone_remove_clicked" swapped="no"/>
                   </object>
                 </child>
               </object>
@@ -178,5 +136,5 @@
         </child>
       </object>
     </child>
-  </template>
+  </object>
 </interface>
diff --git a/data/ui/server-panel.ui b/data/ui/server-panel.ui
index 3907f50..ab84e11 100644
--- a/data/ui/server-panel.ui
+++ b/data/ui/server-panel.ui
@@ -13,7 +13,7 @@
       </object>
     </child>
   </object>
-  <template class="McgServerPanel" parent="AdwBin">
+  <object id="McgServerPanel" class="AdwBin">
     <child>
       <object class="AdwFlap" id="server_flap">
         <property name="flap-position">end</property>
@@ -322,5 +322,5 @@
         </property>
       </object>
     </child>
-  </template>
+  </object>
 </interface>
diff --git a/data/ui/shortcuts-dialog.ui b/data/ui/shortcuts-dialog.ui
index e3dc1d9..f4c9e66 100644
--- a/data/ui/shortcuts-dialog.ui
+++ b/data/ui/shortcuts-dialog.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="4.8"/>
   <requires lib="adw" version="1.2" />
-  <template class="McgShortcutsDialog" parent="GtkShortcutsWindow">
+  <object id="McgShortcutsDialog" class="GtkShortcutsWindow">
     <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
@@ -103,5 +103,5 @@
         </child>
       </object>
     </child>
-</template>
+  </object>
 </interface>
diff --git a/data/ui/window.ui b/data/ui/window.ui
index aa73ed1..f9717fb 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -2,7 +2,8 @@
 <interface>
   <requires lib="gtk+" version="4.8" />
   <requires lib="adw" version="1.2" />
-  <template class="McgAppWindow" parent="AdwApplicationWindow">
+  <object id="McgAppWindow" class="AdwApplicationWindow">
+    <property name="title">CoverGrid</property>
     <property name="content">
       <object class="AdwToolbarView" id="toolbar_view">
         <child type="top">
@@ -17,13 +18,12 @@
             </property>
             <child>
               <object class="GtkSwitch" id="headerbar_button_connect">
-                <signal name="state-set" handler="on_headerbar_connection_state_set" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkToggleButton" id="headerbar_button_playpause">
+                <property name="sensitive">false</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="can-focus">False</property>
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkVolumeButton" id="headerbar_button_volume">
-                <signal name="value-changed" handler="on_headerbar_volume_changed" swapped="no"/>
+                <property name="sensitive">false</property>
               </object>
             </child>
             <child type="end">
@@ -44,7 +44,7 @@
           </object>
         </child>
         <property name="content">
-          <object class="GtkBox" id="content_box">
+          <object class="GtkBox">
             <property name="orientation">vertical</property>
             <child>
               <object class="AdwToastOverlay" id="info_toast">
@@ -55,7 +55,6 @@
                     <child>
                       <object class="AdwViewStack" id="panel_stack">
                         <property name="vexpand">true</property>
-                        <signal name="notify::visible-child" handler="on_stack_switched" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -70,9 +69,13 @@
                 </binding>
               </object>
             </child>
+            <child>
+              <object class="GtkDrawingArea" id="resize_helper">
+              </object>
+            </child>
           </object>
         </property>
       </object>
     </property>
-  </template>
+  </object>
 </interface>
diff --git a/data/xyz.suruatoel.mcg.gresource.xml b/data/xyz.suruatoel.mcg.gresource.xml
deleted file mode 100644
index 02141b3..0000000
--- a/data/xyz.suruatoel.mcg.gresource.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-    <gresource prefix="/xyz/suruatoel/mcg">
-        <file>gtk.css</file>
-        <file>noise-texture.png</file>
-        <file>ui/window.ui</file>
-        <file>ui/shortcuts-dialog.ui</file>
-        <file>ui/connection-panel.ui</file>
-        <file>ui/album-headerbar.ui</file>
-        <file>ui/server-panel.ui</file>
-        <file>ui/cover-panel.ui</file>
-        <file>ui/playlist-panel.ui</file>
-        <file>ui/library-panel.ui</file>
-    </gresource>
-</gresources>
diff --git a/data/xyz.suruatoel.mcg.gschema.xml b/data/xyz.suruatoel.mcg.gschema.xml
deleted file mode 100644
index 9f50878..0000000
--- a/data/xyz.suruatoel.mcg.gschema.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-    <enum id="xyz.suruatoel.mcg.SortOrder">
-        <value nick="artist" value="0" />
-        <value nick="title" value="1" />
-        <value nick="year" value="2" />
-        <value nick="modified" value="3" />
-    </enum>
-	<schema path="/xyz/suruatoel/mcg/" id="xyz.suruatoel.mcg" gettext-domain="mcg">
-		<key type="s" name="host">
-			<default>'localhost'</default>
-			<summary>MPD host</summary>
-			<description>MPD host to connect to</description>
-		</key>
-		<key type="i" name="port">
-			<default>6600</default>
-			<summary>MPD port</summary>
-			<description>MPD port to connect to</description>
-		</key>
-		<key type="b" name="connected">
-			<default>false</default>
-			<summary>Connection state</summary>
-			<description>State of last connection</description>
-		</key>
-		<key type="i" name="width">
-			<default>800</default>
-			<summary>Window width</summary>
-			<description>The window width in pixels.</description>
-		</key>
-		<key type="i" name="height">
-			<default>600</default>
-			<summary>Window height</summary>
-			<description>The window height in pixels.</description>
-		</key>
-		<key type="b" name="is-maximized">
-			<default>false</default>
-			<summary>Window maximized</summary>
-			<description>Whether or not the window is in maximized state.</description>
-		</key>
-		<key type="i" name="panel">
-			<range min="0" max="3"/>
-			<default>1</default>
-			<summary>Last selected panel</summary>
-			<description>The index of the last selected panel.</description>
-		</key>
-		<key type="i" name="item-size">
-			<range min="100" max="1000" />
-			<default>150</default>
-			<summary>Size of library items</summary>
-			<description>The size of items displayed in the library.</description>
-		</key>
-		<key enum="xyz.suruatoel.mcg.SortOrder" name="sort-order">
-			<default>'year'</default>
-			<summary>Sort criterium for library items</summary>
-			<description>The sort criterium of items displayed in the library.</description>
-		</key>
-		<key type="b" name="sort-type">
-			<default>true</default>
-			<summary>Sort type for library items</summary>
-			<description>The sort type of items displayed in the library.</description>
-		</key>
-	</schema>
-</schemalist>
diff --git a/data/icons/hicolor/scalable/apps/xyz.suruatoel.mcg.svg b/data/xyz.suruatoel.mcg.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/xyz.suruatoel.mcg.svg
rename to data/xyz.suruatoel.mcg.svg
diff --git a/go.mod b/go.mod
index 7842f03..fe1746e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,3 +3,10 @@ module suruatoel.xyz/mcg
 go 1.25.0
 
 toolchain go1.26.0
+
+require (
+	github.com/diamondburned/gotk4-adwaita/pkg v0.0.0-20260808200908-d4aecaa0ff32
+	github.com/diamondburned/gotk4/pkg v0.4.1
+)
+
+require golang.org/x/sync v0.22.0 // indirect
diff --git a/go.sum b/go.sum
index e69de29..d02c405 100644
--- a/go.sum
+++ b/go.sum
@@ -0,0 +1,6 @@
+github.com/diamondburned/gotk4-adwaita/pkg v0.0.0-20260808200908-d4aecaa0ff32 h1:1EATAO7ZRrY7B7lt6djCzGnLPlKXPzuOuwPzDSF7jT0=
+github.com/diamondburned/gotk4-adwaita/pkg v0.0.0-20260808200908-d4aecaa0ff32/go.mod h1:ZzYiyPe0TqsukfPHi0sK/WwKzm0wIJdSRylLnuvAZNw=
+github.com/diamondburned/gotk4/pkg v0.4.1 h1:w4BwVUUBkKyNLz5HKHN2Oz3kZCTLHfpfKgB/su1p6uo=
+github.com/diamondburned/gotk4/pkg v0.4.1/go.mod h1:BAEEDXtj5srQ1S2++5HX2K1s9c6CtuWSa60dAywrkRM=
+golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
+golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
diff --git a/internal/gui/albumheaderbar.go b/internal/gui/albumheaderbar.go
new file mode 100644
index 0000000..6b96ec9
--- /dev/null
+++ b/internal/gui/albumheaderbar.go
@@ -0,0 +1,42 @@
+package gui
+
+import (
+	"strings"
+
+	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+	"suruatoel.xyz/mcg/internal/common"
+)
+
+type albumHeaderbar struct {
+	*adw.Bin
+	titleLabel  *gtk.Label
+	artistLabel *gtk.Label
+	closeButton *gtk.Button
+}
+
+func newAlbumHeaderbar() *albumHeaderbar {
+	bar := albumHeaderbar{}
+	bar.loadWidgets()
+
+	return &bar
+}
+
+func (b *albumHeaderbar) loadWidgets() {
+	builder := gtk.NewBuilderFromString(data.AlbumHeaderbarXML)
+
+	b.Bin = builder.GetObject("McgAlbumHeaderbar").Cast().(*adw.Bin)
+	b.titleLabel = builder.GetObject("standalone_title").Cast().(*gtk.Label)
+	b.artistLabel = builder.GetObject("standalone_artist").Cast().(*gtk.Label)
+	b.closeButton = builder.GetObject("close_button").Cast().(*gtk.Button)
+}
+
+func (b *albumHeaderbar) SetAlbum(album *common.Album) {
+	b.titleLabel.SetText(album.Title())
+	b.artistLabel.SetText(strings.Join(album.Artists(), ", "))
+}
+
+func (b *albumHeaderbar) ConnectClose(callback func()) {
+	b.closeButton.ConnectClicked(callback)
+}
diff --git a/internal/gui/application.go b/internal/gui/application.go
new file mode 100644
index 0000000..6a7598e
--- /dev/null
+++ b/internal/gui/application.go
@@ -0,0 +1,151 @@
+package gui
+
+import (
+	"log"
+	"os"
+
+	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
+	"github.com/diamondburned/gotk4/pkg/gdk/v4"
+	"github.com/diamondburned/gotk4/pkg/gio/v2"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+	"suruatoel.xyz/mcg/internal/client"
+	"suruatoel.xyz/mcg/internal/i18n"
+)
+
+type Application struct {
+	*gtk.Application
+	window      *mainWindow
+	aboutDialog *adw.AboutDialog
+	config      Configuration
+	configErr   error
+}
+
+func NewApplication() *Application {
+	app := Application{
+		Application: gtk.NewApplication("xyz.suruatoel.mcg", gio.ApplicationFlagsNone),
+	}
+	app.ConnectStartup(app.onStartup)
+	app.ConnectActivate(app.onActivate)
+	app.ConnectShutdown(app.onShutdown)
+
+	return &app
+}
+
+func (a *Application) onStartup() {
+	a.setDefaultSettings()
+	a.loadCSS()
+	a.registerShortcuts()
+	a.registerActions()
+	a.loadConfig()
+}
+
+func (a *Application) loadConfig() {
+	a.config = Configuration{
+		Host:      "localhost",
+		Port:      6600,
+		Panel:     "library",
+		SortField: "year",
+		SortDesc:  false,
+	}
+
+	a.configErr = readConfig(&a.config)
+}
+
+func (a *Application) setDefaultSettings() {
+	styleManager := adw.StyleManagerGetDefault()
+	styleManager.SetColorScheme(adw.ColorSchemePreferDark)
+}
+
+func (a *Application) loadCSS() {
+	styleProvider := gtk.NewCSSProvider()
+	styleProvider.LoadFromString(data.MainCSS)
+
+	gtk.StyleContextAddProviderForDisplay(
+		gdk.DisplayGetDefault(),
+		styleProvider,
+		gtk.STYLE_PROVIDER_PRIORITY_APPLICATION,
+	)
+}
+
+func (a *Application) registerShortcuts() {
+	a.SetAccelsForAction("window.close", []string{"<primary>q"})
+	a.SetAccelsForAction("win.show-help-overlay", []string{"<primary>k"})
+	a.SetAccelsForAction("app.info", []string{"<primary>i"})
+	a.SetAccelsForAction("win.connect", []string{"<primary>c"})
+	a.SetAccelsForAction("win.play", []string{"<primary>p"})
+	a.SetAccelsForAction("win.clear-playlist", []string{"<primary>r"})
+	a.SetAccelsForAction("win.toggle-fullscreen", []string{"F11"})
+	a.SetAccelsForAction("win.search-library", []string{"<primary>f"})
+	a.SetAccelsForAction("win.panel(\"server\")", []string{"<primary>KP_1"})
+	a.SetAccelsForAction("win.panel(\"cover\")", []string{"<primary>KP_2"})
+	a.SetAccelsForAction("win.panel(\"playlist\")", []string{"<primary>KP_3"})
+	a.SetAccelsForAction("win.panel(\"library\")", []string{"<primary>KP_4"})
+}
+
+func (a *Application) registerActions() {
+	infoAction := gio.NewSimpleAction("info", nil)
+	infoAction.ConnectActivate(func(_ *glib.Variant) {
+		a.showAboutDialog()
+	})
+	a.AddAction(infoAction)
+}
+
+func (a *Application) showAboutDialog() {
+	if a.aboutDialog == nil {
+		a.aboutDialog = a.newAboutDialog()
+	}
+
+	a.aboutDialog.Present(a.window)
+}
+
+func (a *Application) newAboutDialog() *adw.AboutDialog {
+	dialog := adw.NewAboutDialog()
+	dialog.SetApplicationName("CoverGrid")
+	dialog.SetApplicationIcon("xyz.suruatoel.mcg")
+	dialog.SetVersion(a.Version())
+	dialog.SetComments(i18n.T("CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks."))
+	dialog.SetWebsite("https://www.suruatoel.xyz/codes/mcg")
+	dialog.SetLicenseType(gtk.LicenseGPL30)
+	dialog.SetIssueURL("https://git.suruatoel.xyz/coderkun/mcg")
+
+	return dialog
+}
+
+func (a *Application) onActivate() {
+	if a.window == nil {
+		a.window = newMainWindow(a.Application, a.config)
+		if a.configErr != nil && !os.IsNotExist(a.configErr) {
+			a.window.SetConfigError(a.configErr)
+		}
+		a.window.ConnectCloseRequest(a.onCloseRequest)
+	}
+
+	a.window.Present()
+	if a.config.IsConnected {
+		client.Instance().Connect(a.config.Host, int(a.config.Port), a.config.Password)
+	}
+}
+
+func (a *Application) onCloseRequest() bool {
+	a.window.UpdateConfig(&a.config)
+	a.config.IsConnected = client.Instance().IsConnected()
+
+	a.saveConfig()
+
+	return false
+}
+
+func (a *Application) saveConfig() {
+	err := writeConfig(&a.config)
+	if err != nil {
+		log.Println("failed to save configuration file:", err)
+	}
+}
+
+func (a *Application) onShutdown() {
+	if client.Instance().IsConnected() {
+		client.Instance().Disconnect()
+	}
+}
diff --git a/internal/gui/config.go b/internal/gui/config.go
new file mode 100644
index 0000000..33f47e6
--- /dev/null
+++ b/internal/gui/config.go
@@ -0,0 +1,78 @@
+package gui
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+)
+
+type Configuration struct {
+	Host        string `json:"host"`
+	Port        uint64 `json:"port"`
+	Password    string `json:"password"`
+	IsConnected bool   `json:"connected"`
+	Panel       string `json:"panel"`
+	SortField   string `json:"sortField"`
+	SortDesc    bool   `json:"sortDesc"`
+	ItemSize    int    `json:"itemSize"`
+}
+
+func readConfig(config *Configuration) error {
+	filename, filenameErr := getConfigFile()
+	if filenameErr != nil {
+		return filenameErr
+	}
+
+	file, fileErr := os.Open(filename)
+	if fileErr != nil {
+		return fileErr
+	}
+	defer file.Close()
+
+	return json.NewDecoder(file).Decode(config)
+}
+
+func writeConfig(config *Configuration) error {
+	filename, filenameErr := getConfigFile()
+	if filenameErr != nil {
+		return filenameErr
+	}
+
+	file, fileErr := os.Create(filename)
+	if fileErr != nil {
+		return fileErr
+	}
+	defer file.Close()
+
+	encoder := json.NewEncoder(file)
+	encoder.SetIndent("", "\t")
+
+	return encoder.Encode(&config)
+}
+
+func getConfigFile() (string, error) {
+	configDir, configDirErr := getConfigDir()
+	if configDirErr != nil {
+		return "", configDirErr
+	}
+
+	createErr := ensureConfigDirExists(configDir)
+	if createErr != nil {
+		return "", createErr
+	}
+
+	return filepath.Join(configDir, "config.json"), nil
+}
+
+func ensureConfigDirExists(folder string) error {
+	return os.MkdirAll(folder, 0o750)
+}
+
+func getConfigDir() (string, error) {
+	configDir, configDirErr := os.UserConfigDir()
+	if configDirErr != nil {
+		return "", configDirErr
+	}
+
+	return filepath.Join(configDir, "mcg"), nil
+}
diff --git a/internal/gui/connectionpanel.go b/internal/gui/connectionpanel.go
new file mode 100644
index 0000000..679eb4d
--- /dev/null
+++ b/internal/gui/connectionpanel.go
@@ -0,0 +1,58 @@
+package gui
+
+import (
+	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+)
+
+type connectionPanel struct {
+	*adw.Bin
+
+	hostEntry     *adw.EntryRow
+	portSpinner   *gtk.SpinButton
+	passwordEntry *adw.PasswordEntryRow
+}
+
+func newConnectionPanel(config Configuration) *connectionPanel {
+	panel := connectionPanel{}
+	panel.loadWidgets()
+	panel.loadDefaultValues(config)
+	panel.connectSignals()
+
+	return &panel
+}
+
+func (p *connectionPanel) loadWidgets() {
+	builder := gtk.NewBuilderFromString(data.ConnectionPanelXML)
+
+	p.Bin = builder.GetObject("McgConnectionPanel").Cast().(*adw.Bin)
+	p.hostEntry = builder.GetObject("host_row").Cast().(*adw.EntryRow)
+	p.portSpinner = builder.GetObject("port_spinner").Cast().(*gtk.SpinButton)
+	p.passwordEntry = builder.GetObject("password_row").Cast().(*adw.PasswordEntryRow)
+}
+
+func (p *connectionPanel) connectSignals() {
+	p.hostEntry.ConnectApply(p.callback)
+	p.portSpinner.ConnectValueChanged(p.callback)
+	p.passwordEntry.ConnectApply(p.callback)
+}
+
+func (p *connectionPanel) loadDefaultValues(config Configuration) {
+	p.hostEntry.SetText(config.Host)
+	p.portSpinner.SetValue(float64(config.Port))
+	p.passwordEntry.SetText(config.Password)
+}
+
+func (p *connectionPanel) UpdateConfig(config *Configuration) {
+	config.Host = p.hostEntry.Text()
+	config.Port = uint64(p.portSpinner.Value())
+	config.Password = p.passwordEntry.Text()
+}
+
+func (p *connectionPanel) callback() {
+}
+
+func (p *connectionPanel) ConnectionDetails() (string, int, string) {
+	return p.hostEntry.Text(), p.portSpinner.ValueAsInt(), p.passwordEntry.Text()
+}
diff --git a/internal/gui/coverloader.go b/internal/gui/coverloader.go
new file mode 100644
index 0000000..02d1cd6
--- /dev/null
+++ b/internal/gui/coverloader.go
@@ -0,0 +1,188 @@
+package gui
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"strconv"
+	"sync"
+
+	"github.com/diamondburned/gotk4/pkg/core/gerror"
+	"github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
+	"suruatoel.xyz/mcg/internal/client"
+	"suruatoel.xyz/mcg/internal/common"
+)
+
+type CoverLoader struct {
+	hostDir string
+	size    int
+	mutex   sync.Mutex
+}
+
+func NewCoverLoader(host string) *CoverLoader {
+	loader := CoverLoader{}
+	loader.hostDir = loader.getHostDir(host)
+	loader.size = loader.readCacheSize()
+
+	return &loader
+}
+
+func (l *CoverLoader) SetSize(size int) {
+	if l.size != size {
+		log.Println("cache size has changed from", l.size, "to", size)
+		l.clearCache()
+		l.writeCacheSize(size)
+		l.size = size
+	}
+}
+
+func (l *CoverLoader) LoadThumbnail(album *common.Album) *gdkpixbuf.Pixbuf {
+	// Load cover from cache
+	pixbuf := l.getCached(album)
+	if pixbuf != nil {
+		return pixbuf
+	}
+
+	// Load cover from server
+	albumart := client.Instance().LoadAlbumartNow(album)
+	if albumart != nil {
+		pixbuf = l.loadImage(albumart)
+	}
+	if pixbuf != nil {
+		pixbuf = pixbuf.ScaleSimple(l.size, l.size, gdkpixbuf.InterpHyper)
+		if pixbuf != nil {
+			l.setCached(album, pixbuf)
+		}
+	}
+
+	return pixbuf
+}
+
+func (l *CoverLoader) getHostDir(host string) string {
+	cacheDir, cacheDirErr := os.UserCacheDir()
+	if cacheDirErr != nil {
+		log.Println("failed to detect user cache directory:", cacheDirErr)
+		return ""
+	}
+
+	hostDir := filepath.Join(cacheDir, "mcg", host)
+
+	return hostDir
+}
+
+func (l *CoverLoader) ensureHostDir() {
+	hostDirErr := os.MkdirAll(l.hostDir, 0o750)
+	if hostDirErr != nil {
+		log.Println("failed to create cache folder for host", l.hostDir, ":", hostDirErr)
+	}
+}
+
+func (l *CoverLoader) readCacheSize() int {
+	sizeFile := l.getCacheSizeFile()
+	if sizeFile == "" {
+		return 100
+	}
+
+	l.mutex.Lock()
+	defer l.mutex.Unlock()
+
+	content, readErr := os.ReadFile(sizeFile)
+	if readErr != nil {
+		log.Println("failed to read cache size file for host", l.hostDir, ":", readErr)
+		return 100
+	}
+
+	size, sizeErr := strconv.Atoi(string(content[:]))
+	if sizeErr != nil {
+		log.Println("invalid content of cache size file for host", l.hostDir, ":", readErr)
+	}
+
+	return size
+}
+
+func (l *CoverLoader) writeCacheSize(size int) {
+	l.ensureHostDir()
+	sizeFile := l.getCacheSizeFile()
+	if sizeFile == "" {
+		return
+	}
+
+	writeErr := os.WriteFile(sizeFile, []byte(fmt.Sprintf("%d", size)), 0o644)
+	if writeErr != nil {
+		log.Println("failed to write cache size file for host", l.hostDir, ":", writeErr)
+	}
+}
+
+func (l *CoverLoader) getCacheFile(album *common.Album) string {
+	if l.hostDir == "" {
+		return ""
+	}
+
+	return filepath.Join(l.hostDir, album.ID())
+}
+
+func (l *CoverLoader) getCacheSizeFile() string {
+	if l.hostDir == "" {
+		return ""
+	}
+
+	return filepath.Join(l.hostDir, "size")
+}
+
+func (l *CoverLoader) clearCache() {
+	if l.hostDir == "" {
+		return
+	}
+
+	removeErr := os.RemoveAll(l.hostDir)
+	if removeErr != nil {
+		log.Println("failed to clear cache folder for host", l.hostDir, ":", removeErr)
+	}
+}
+
+func (l *CoverLoader) getCached(album *common.Album) *gdkpixbuf.Pixbuf {
+	cacheFile := l.getCacheFile(album)
+	if cacheFile == "" {
+		return nil
+	}
+
+	pixbuf, pixbufErr := gdkpixbuf.NewPixbufFromFile(cacheFile)
+	if pixbufErr != nil {
+		if !isFileNotFoundError(pixbufErr) {
+			log.Println("failed to read cached thumbnail for host", l.hostDir, ":", pixbufErr)
+		}
+		return nil
+	}
+
+	return pixbuf
+}
+
+func isFileNotFoundError(err error) bool {
+	if gerr, isGerror := err.(*gerror.GError); isGerror {
+		return gerr.Quark() == uint32(glib.FileErrorQuark()) && gerr.ErrorCode() == int(glib.FileErrorNoent)
+	}
+
+	return false
+}
+
+func (l *CoverLoader) setCached(album *common.Album, pixbuf *gdkpixbuf.Pixbuf) {
+	cacheFile := l.getCacheFile(album)
+	if cacheFile == "" {
+		return
+	}
+
+	l.ensureHostDir()
+	pixbuf.Savev(cacheFile, "jpeg", []string{}, []string{})
+}
+
+func (l *CoverLoader) loadImage(file []byte) *gdkpixbuf.Pixbuf {
+	pixbufLoader, loaderErr := loadPixbuf(file)
+	if loaderErr != nil {
+		log.Println("failed to load image:", loaderErr)
+		return nil
+	}
+
+	return pixbufLoader.Pixbuf()
+}
diff --git a/internal/gui/coverpanel.go b/internal/gui/coverpanel.go
new file mode 100644
index 0000000..b2298af
--- /dev/null
+++ b/internal/gui/coverpanel.go
@@ -0,0 +1,343 @@
+package gui
+
+import (
+	"fmt"
+	"log"
+	"math"
+	"strings"
+
+	"github.com/diamondburned/gotk4/pkg/gdk/v4"
+	"github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+	"suruatoel.xyz/mcg/internal/client"
+	"suruatoel.xyz/mcg/internal/common"
+	"suruatoel.xyz/mcg/internal/i18n"
+)
+
+type coverPanel struct {
+	*gtk.Overlay
+	toolbar          *gtk.Box
+	fullscreenButton *gtk.Button
+	coverInfoScroll  *gtk.ScrolledWindow
+	coverStack       *gtk.Stack
+	coverSpinner     *gtk.Spinner
+	coverScroll      *gtk.ScrolledWindow
+	coverBox         *gtk.Viewport
+	coverDefault     *gtk.Image
+	coverImage       *gtk.Image
+	infoRevealer     *gtk.Revealer
+	albumTitleLabel  *gtk.Label
+	albumDateLabel   *gtk.Label
+	albumArtistLabel *gtk.Label
+	songsScale       *gtk.Scale
+	currentAlbum     *common.PlaylistAlbum
+
+	currentPixbuf *gdkpixbuf.Pixbuf
+	currentWidth  int
+	currentHeight int
+
+	timer              *glib.SourceHandle
+	coverBoxController *gtk.GestureClick
+	isFullscreenActive bool
+}
+
+func newCoverPanel() *coverPanel {
+	panel := coverPanel{}
+	panel.loadWidgets()
+	panel.connectSignals()
+
+	return &panel
+}
+
+func (p *coverPanel) loadWidgets() {
+	builder := gtk.NewBuilderFromString(data.CoverPanelXML)
+
+	p.toolbar = builder.GetObject("toolbar").Cast().(*gtk.Box)
+	p.fullscreenButton = builder.GetObject("fullscreen_button").Cast().(*gtk.Button)
+	p.Overlay = builder.GetObject("McgCoverPanel").Cast().(*gtk.Overlay)
+	p.coverInfoScroll = builder.GetObject("cover_info_scroll").Cast().(*gtk.ScrolledWindow)
+	p.infoRevealer = builder.GetObject("info_revealer").Cast().(*gtk.Revealer)
+	p.albumTitleLabel = builder.GetObject("album_title_label").Cast().(*gtk.Label)
+	p.albumDateLabel = builder.GetObject("album_date_label").Cast().(*gtk.Label)
+	p.albumArtistLabel = builder.GetObject("album_artist_label").Cast().(*gtk.Label)
+	p.songsScale = builder.GetObject("songs_scale").Cast().(*gtk.Scale)
+	p.coverStack = builder.GetObject("cover_stack").Cast().(*gtk.Stack)
+	p.coverSpinner = builder.GetObject("cover_spinner").Cast().(*gtk.Spinner)
+	p.coverScroll = builder.GetObject("cover_scroll").Cast().(*gtk.ScrolledWindow)
+	p.coverBox = builder.GetObject("cover_box").Cast().(*gtk.Viewport)
+	p.coverDefault = builder.GetObject("cover_default").Cast().(*gtk.Image)
+	p.coverImage = builder.GetObject("cover_image").Cast().(*gtk.Image)
+}
+
+func (p *coverPanel) connectSignals() {
+	p.coverBoxController = gtk.NewGestureClick()
+	p.coverBox.AddController(p.coverBoxController)
+
+	buttonController := gtk.NewGestureClick()
+	buttonController.ConnectPressed(p.OnSongsScalePressed)
+	buttonController.ConnectUnpairedRelease(p.OnSongsScaleUnpairedReleased)
+	p.songsScale.AddController(buttonController)
+}
+
+func (p *coverPanel) ConnectFullscreen(callback func()) {
+	p.fullscreenButton.ConnectClicked(callback)
+	p.coverBoxController.ConnectPressed(func(nPress int, x float64, y float64) {
+		if nPress == 2 && p.currentAlbum != nil {
+			callback()
+		}
+	})
+}
+
+func (p *coverPanel) OnSongsScalePressed(nPress int, x float64, y float64) {
+	p.clearTimer()
+}
+
+func (p *coverPanel) OnSongsScaleUnpairedReleased(x float64, y float64, button uint, sequence *gdk.EventSequence) {
+	value := uint64(p.songsScale.Value())
+	time := p.currentAlbum.Length()
+	songs := p.currentAlbum.Songs()
+
+	pos := 0
+	for index := len(songs) - 1; index >= 0; index-- {
+		time = time - songs[index].Length()
+		pos = int(songs[index].Pos())
+		if time < value {
+			break
+		}
+	}
+	time = max(value-time-1, 0)
+	client.Instance().Seek(pos, time)
+}
+
+func (p *coverPanel) Toolbar() gtk.Widgetter {
+	return p.toolbar
+}
+
+func (p *coverPanel) SetPlay(pos uint64, time uint64) {
+	p.clearTimer()
+	defer p.startTimer()
+
+	dsongs := p.currentAlbum.Songs()
+	for index := range pos {
+		time += uint64(dsongs[index].Length())
+	}
+	p.songsScale.SetValue(float64(time + 1))
+}
+
+func (p *coverPanel) SetPause() {
+	p.clearTimer()
+}
+
+func (p *coverPanel) clearTimer() {
+	if p.timer != nil {
+		glib.SourceRemove(*p.timer)
+		p.timer = nil
+	}
+}
+
+func (p *coverPanel) startTimer() {
+	newTimer := glib.TimeoutAdd(1000, p.playing)
+	p.timer = &newTimer
+}
+
+func (p *coverPanel) playing() bool {
+	p.songsScale.SetValue(p.songsScale.Value() + 1)
+
+	return true
+}
+
+func (p *coverPanel) SetAlbum(state string, album *common.PlaylistAlbum) {
+	if album != nil {
+		// Set labels
+		p.albumTitleLabel.SetLabel(album.Title())
+		p.albumDateLabel.SetLabel(strings.Join(album.Dates(), ", "))
+		p.albumArtistLabel.SetLabel(strings.Join(album.Artists(), ","))
+		p.infoRevealer.SetRevealChild(true)
+
+		p.setSongs(album)
+	} else {
+		p.infoRevealer.SetRevealChild(false)
+	}
+
+	// Load cover
+	if album != nil {
+		p.coverSpinner.Start()
+		p.coverStack.SetVisibleChild(p.coverSpinner)
+
+		client.Instance().LoadAlbumart(album.Album)
+	}
+
+	// Set current album
+	p.currentAlbum = album
+	p.fullscreenButton.SetSensitive(album != nil)
+	p.enableSonglist()
+}
+
+func (p *coverPanel) Fullscreen(active bool) {
+	p.isFullscreenActive = active
+	p.enableSonglist()
+	glib.IdleAdd(p.resizeImage)
+}
+
+func (p *coverPanel) enableSonglist() {
+	enable := p.currentAlbum != nil && !p.isFullscreenActive
+
+	p.infoRevealer.SetRevealChild(enable)
+}
+
+func (p *coverPanel) SetAlbumart(album *common.Album, albumart []byte) {
+	if p.currentAlbum == nil || album != p.currentAlbum.Album {
+		return
+	}
+
+	defer glib.IdleAdd(func() {
+		p.coverStack.SetVisibleChild(p.coverScroll)
+		p.coverSpinner.Stop()
+	})
+
+	p.currentPixbuf = nil
+	if albumart == nil || len(albumart) == 0 {
+		return
+	}
+
+	loader, loaderErr := loadPixbuf(albumart)
+	if loaderErr != nil {
+		log.Println("failed to load albumart for ", album.Title(), ":", loaderErr)
+		return
+	}
+
+	p.currentPixbuf = loader.Pixbuf()
+	glib.IdleAdd(p.showImage)
+}
+
+func (p *coverPanel) showImage() {
+	if p.currentPixbuf != nil {
+		p.resizeImage()
+		p.coverStack.SetVisibleChild(p.coverScroll)
+	} else {
+		p.coverStack.SetVisibleChild(p.coverDefault)
+	}
+}
+
+func loadPixbuf(data []byte) (*gdkpixbuf.PixbufLoader, error) {
+	loader := gdkpixbuf.NewPixbufLoader()
+	defer loader.Close()
+
+	return loader, loader.Write(data)
+}
+
+func (p *coverPanel) setSongs(album *common.PlaylistAlbum) {
+	p.songsScale.ClearMarks()
+	p.songsScale.SetRange(0, float64(album.Length()))
+
+	length := uint64(0)
+	for _, song := range album.Songs() {
+		curLength := length
+		if length > 0 && length < album.Length() {
+			curLength += 1
+		}
+		songTitle := createSongTitle(song)
+		p.songsScale.AddMark(
+			float64(curLength),
+			gtk.PosRight,
+			glib.MarkupEscapeText(songTitle),
+		)
+		length += song.Length()
+	}
+
+	p.songsScale.AddMark(float64(length), gtk.PosRight, createAlbumLengthTitle(length))
+	p.alignSongsScaleMarks()
+}
+
+func (p *coverPanel) alignSongsScaleMarks() {
+	p.alignScaleMarks(&p.songsScale.Widget)
+}
+
+func (p *coverPanel) alignScaleMarks(widgetter gtk.Widgetter) {
+	widget := widgetter.(*gtk.Widget)
+	child := widget.FirstChild()
+	for child != nil {
+		if label, isLabel := child.(*gtk.Label); isLabel {
+			label.SetHAlign(gtk.AlignStart)
+			child = label.NextSibling()
+		} else {
+			p.alignScaleMarks(child)
+			child = child.(*gtk.Widget).NextSibling()
+		}
+	}
+}
+
+func createSongTitle(song *common.PlaylistSong) string {
+	songArtists := song.SongArtists()
+	if len(songArtists) > 0 {
+		return fmt.Sprintf(
+			i18n.T("%s feat. %s"),
+			song.Title(),
+			strings.Join(songArtists, ", "),
+		)
+	}
+
+	return song.Title()
+}
+
+func createAlbumLengthTitle(length uint64) string {
+	minutes := length / 60
+	seconds := length % 60
+
+	return fmt.Sprintf(i18n.T("%d:%d minutes"), minutes, seconds)
+}
+
+func (p *coverPanel) SetWidth(width int) {
+	glib.IdleAdd(p.resizeImage)
+	glib.IdleAdd(func() {
+		p.coverInfoScroll.SetMaxContentWidth(width / 2)
+	})
+}
+
+func (p *coverPanel) resizeImage() {
+	newWidth, newHeight := p.getSize()
+	if p.hasSizeChanged(newWidth, newHeight) {
+		return
+	}
+	p.setSize(newWidth, newHeight)
+
+	if p.currentPixbuf == nil {
+		p.coverImage.SetPixelSize(min(newWidth, newHeight))
+		return
+	}
+
+	width, height := p.calculateCoverSize()
+	if width <= 0 || height <= 0 {
+		return
+	}
+
+	scaledPixbuf := p.currentPixbuf.ScaleSimple(width, height, gdkpixbuf.InterpHyper)
+	p.coverImage.SetFromPaintable(gdk.NewTextureForPixbuf(scaledPixbuf))
+	p.coverImage.SetPixelSize(min(width, height))
+}
+
+func (p *coverPanel) getSize() (int, int) {
+	return p.coverStack.Size(gtk.OrientationHorizontal), p.coverStack.Size(gtk.OrientationVertical)
+}
+
+func (p *coverPanel) hasSizeChanged(newWidth, newHeight int) bool {
+	return newWidth == p.currentWidth && newHeight == p.currentHeight
+}
+
+func (p *coverPanel) setSize(newWidth, newHeight int) {
+	p.currentWidth = newWidth
+	p.currentHeight = newHeight
+}
+
+func (p *coverPanel) calculateCoverSize() (width, height int) {
+	ratioWidth := float64(p.currentWidth) / float64(p.currentPixbuf.Width())
+	ratioHeight := float64(p.currentHeight) / float64(p.currentPixbuf.Height())
+	ratio := min(min(ratioWidth, ratioHeight), 1)
+
+	width = int(math.Floor(float64(p.currentPixbuf.Width()) * ratio))
+	height = int(math.Floor(float64(p.currentPixbuf.Height()) * ratio))
+
+	return
+}
diff --git a/internal/gui/librarypanel.go b/internal/gui/librarypanel.go
new file mode 100644
index 0000000..7f749c9
--- /dev/null
+++ b/internal/gui/librarypanel.go
@@ -0,0 +1,563 @@
+package gui
+
+import (
+	"log"
+	"math"
+	"slices"
+	"strings"
+	"sync"
+
+	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
+	"github.com/diamondburned/gotk4/pkg/gdk/v4"
+	"github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+	"suruatoel.xyz/mcg/internal/client"
+	"suruatoel.xyz/mcg/internal/common"
+)
+
+type libraryPanel struct {
+	*adw.Bin
+	toolbar           *gtk.Box
+	selectButton      *gtk.ToggleButton
+	actionbarRevealer *gtk.Revealer
+	toolbarPopover    *gtk.Popover
+	searchBar         *gtk.SearchBar
+	searchEntry       *gtk.SearchEntry
+	sortButtons       map[string]*gtk.CheckButton
+	sortDescButton    *gtk.CheckButton
+	gridScale         *gtk.Scale
+	stack             *gtk.Stack
+	progressBox       *gtk.Box
+	progressBar       *gtk.ProgressBar
+	scroll            *gtk.ScrolledWindow
+	libraryGrid       *gtk.GridView
+	gridFactory       *pictureItemFactory[string]
+	libraryModel      *gtk.StringList
+	selectionMulti    *gtk.MultiSelection
+	selectionSingle   *gtk.SingleSelection
+
+	headerbarStandalone   *albumHeaderbar
+	libraryStack          *gtk.Stack
+	panelNormal           *gtk.Box
+	panelStandalone       *gtk.Box
+	standaloneStack       *gtk.Stack
+	standaloneSpinner     *gtk.Spinner
+	standaloneScroll      *gtk.ScrolledWindow
+	standaloneImage       *gtk.Image
+	standalonePlayButton  *gtk.Button
+	standaloneQueueButton *gtk.Button
+	selectionQueueButton  *gtk.Button
+	selectionCancelButton *gtk.Button
+
+	coverLoader      *CoverLoader
+	albums           map[string]*common.Album
+	pixbufs          map[string]*gdkpixbuf.Pixbuf
+	sortField        string
+	sortDesc         bool
+	itemSize         int
+	itemSizeCallback ItemSizeCallback
+
+	libraryLock sync.Mutex
+	libraryWait sync.WaitGroup
+
+	standaloneAlbum    *common.Album
+	standalonePixbuf   *gdkpixbuf.Pixbuf
+	standaloneCallback func(bool)
+}
+
+type ItemSizeCallback func(itemSize int)
+
+func newLibraryPanel(config Configuration) *libraryPanel {
+	panel := libraryPanel{
+		albums:      make(map[string]*common.Album),
+		pixbufs:     make(map[string]*gdkpixbuf.Pixbuf),
+		sortField:   "year",
+		sortDesc:    false,
+		libraryLock: sync.Mutex{},
+		libraryWait: sync.WaitGroup{},
+	}
+	panel.loadWidgets(config)
+	panel.loadDefaultValues(config)
+	panel.connectSignals()
+
+	return &panel
+}
+
+func (p *libraryPanel) loadWidgets(config Configuration) {
+	builder := gtk.NewBuilderFromString(data.LibraryPanelXML)
+
+	p.toolbar = builder.GetObject("toolbar").Cast().(*gtk.Box)
+	p.selectButton = builder.GetObject("select_button").Cast().(*gtk.ToggleButton)
+	p.actionbarRevealer = builder.GetObject("actionbar_revealer").Cast().(*gtk.Revealer)
+	p.toolbarPopover = builder.GetObject("toolbar_popover").Cast().(*gtk.Popover)
+
+	p.searchBar = builder.GetObject("filter_bar").Cast().(*gtk.SearchBar)
+	p.searchEntry = builder.GetObject("filter_entry").Cast().(*gtk.SearchEntry)
+	p.sortButtons = make(map[string]*gtk.CheckButton)
+	p.sortButtons["artist"] = builder.GetObject("sort_artist").Cast().(*gtk.CheckButton)
+	p.sortButtons["title"] = builder.GetObject("sort_title").Cast().(*gtk.CheckButton)
+	p.sortButtons["year"] = builder.GetObject("sort_year").Cast().(*gtk.CheckButton)
+	p.sortButtons["modified"] = builder.GetObject("sort_modified").Cast().(*gtk.CheckButton)
+	p.sortDescButton = builder.GetObject("toolbar_sort_order_button").Cast().(*gtk.CheckButton)
+	p.gridScale = builder.GetObject("grid_scale").Cast().(*gtk.Scale)
+
+	p.Bin = builder.GetObject("McgLibraryPanel").Cast().(*adw.Bin)
+	p.stack = builder.GetObject("stack").Cast().(*gtk.Stack)
+	p.progressBox = builder.GetObject("progress_box").Cast().(*gtk.Box)
+	p.progressBar = builder.GetObject("progress_bar").Cast().(*gtk.ProgressBar)
+	p.scroll = builder.GetObject("scroll").Cast().(*gtk.ScrolledWindow)
+	p.libraryGrid = builder.GetObject("library_grid").Cast().(*gtk.GridView)
+	p.libraryModel = gtk.NewStringList(nil)
+	p.selectionMulti = gtk.NewMultiSelection(p.libraryModel)
+	p.selectionSingle = gtk.NewSingleSelection(p.libraryModel)
+	p.libraryGrid.SetModel(p.selectionSingle)
+
+	p.gridFactory = newPictureItemFactory[string](p.itemToModelID, p.modelIDToValue)
+	p.libraryGrid.SetFactory(p.gridFactory.ListItemFactory())
+
+	// Headerbar
+	p.headerbarStandalone = newAlbumHeaderbar()
+	p.libraryStack = builder.GetObject("library_stack").Cast().(*gtk.Stack)
+	p.panelNormal = builder.GetObject("panel_normal").Cast().(*gtk.Box)
+	p.panelStandalone = builder.GetObject("panel_standalone").Cast().(*gtk.Box)
+
+	p.standaloneStack = builder.GetObject("standalone_stack").Cast().(*gtk.Stack)
+	p.standaloneSpinner = builder.GetObject("standalone_spinner").Cast().(*gtk.Spinner)
+	p.standaloneScroll = builder.GetObject("standalone_scroll").Cast().(*gtk.ScrolledWindow)
+	p.standaloneImage = builder.GetObject("standalone_image").Cast().(*gtk.Image)
+	p.standalonePlayButton = builder.GetObject("standalone_play_button").Cast().(*gtk.Button)
+	p.standaloneQueueButton = builder.GetObject("standalone_queue_button").Cast().(*gtk.Button)
+
+	// Selection
+	p.selectionQueueButton = builder.GetObject("selection_queue_button").Cast().(*gtk.Button)
+	p.selectionCancelButton = builder.GetObject("selection_cancel_button").Cast().(*gtk.Button)
+}
+
+func (p *libraryPanel) itemToModelID(item *glib.Object) string {
+	return item.Cast().(*gtk.StringObject).String()
+}
+
+func (p *libraryPanel) modelIDToValue(itemID string) (tooltip string, pixbuf *gdkpixbuf.Pixbuf) {
+	if album, ok := p.albums[itemID]; ok {
+		tooltip = album.Tooltip()
+	}
+	pixbuf = p.pixbufs[itemID]
+
+	return
+}
+
+func (p *libraryPanel) loadDefaultValues(config Configuration) {
+	p.itemSize = config.ItemSize
+	p.gridScale.SetValue(float64(config.ItemSize))
+
+	_, found := p.sortButtons[config.SortField]
+	if found {
+		p.sortField = config.SortField
+	}
+	p.sortDesc = config.SortDesc
+
+	p.sortButtons[p.sortField].SetActive(true)
+	p.sortDescButton.SetActive(p.sortDesc)
+}
+
+func (p *libraryPanel) connectSignals() {
+	p.selectButton.ConnectToggled(p.onSelectToggled)
+	p.searchEntry.ConnectSearchChanged(p.onFilterEntryChanged)
+	for field, button := range p.sortButtons {
+		button.ConnectToggled(func() {
+			p.onSortToggled(field, button)
+		})
+	}
+	p.sortDescButton.ConnectToggled(p.onSortDescToggled)
+
+	p.libraryGrid.ConnectActivate(p.onGridClicked)
+
+	p.headerbarStandalone.ConnectClose(p.onHeaderbarStandaloneClose)
+	p.standalonePlayButton.ConnectClicked(p.onStandalonePlayClicked)
+	p.standaloneQueueButton.ConnectClicked(p.onStandaloneQueueClicked)
+
+	p.selectionQueueButton.ConnectClicked(p.onSelectionQueue)
+	p.selectionCancelButton.ConnectClicked(p.onSelectionCancel)
+
+	buttonController := gtk.NewGestureClick()
+	buttonController.ConnectUnpairedRelease(p.onGridScaleReleased)
+	p.gridScale.AddController(buttonController)
+	p.gridScale.ConnectValueChanged(p.onGridScaleChanged)
+}
+
+func (p *libraryPanel) ConnectItemSizeChanged(callback ItemSizeCallback) {
+	p.itemSizeCallback = callback
+}
+
+func (p *libraryPanel) ConnectStandalone(callback func(bool)) {
+	p.standaloneCallback = callback
+}
+
+func (p *libraryPanel) onSelectToggled() {
+	if p.selectButton.Active() {
+		p.actionbarRevealer.SetRevealChild(true)
+		p.libraryGrid.SetModel(p.selectionMulti)
+		p.libraryGrid.SetSingleClickActivate(false)
+		p.libraryGrid.StyleContext().AddClass("selection")
+	} else {
+		p.actionbarRevealer.SetRevealChild(false)
+		p.libraryGrid.SetModel(p.selectionSingle)
+		p.libraryGrid.SetSingleClickActivate(true)
+		p.libraryGrid.StyleContext().RemoveClass("selection")
+	}
+}
+
+func (p *libraryPanel) onFilterEntryChanged() {
+	p.updateGridModel()
+}
+
+func (p *libraryPanel) onSortToggled(field string, button *gtk.CheckButton) {
+	if !button.Active() {
+		return
+	}
+
+	p.sortField = field
+	p.updateGridModel()
+}
+
+func (p *libraryPanel) onSortDescToggled() {
+	p.sortDesc = p.sortDescButton.Active()
+	p.updateGridModel()
+}
+
+func (p *libraryPanel) onGridScaleChanged() {
+	size := math.Floor(p.gridScale.Value())
+	gridRange := p.gridScale.Adjustment()
+	if size < gridRange.Lower() || size > gridRange.Upper() {
+		return
+	}
+
+	go p.setGridSize(int(size))
+}
+
+func (p *libraryPanel) setGridSize(size int) {
+	if size == p.itemSize {
+		return
+	}
+
+	for i := range p.libraryGrid.Model().NItems() {
+		itemObj := p.libraryGrid.Model().Item(i)
+		if itemObj != nil {
+			itemStr := itemObj.Cast().(*gtk.StringObject)
+			albumID := itemStr.String()
+			picture, pictureFound := p.gridFactory.Picture(albumID)
+			if pictureFound {
+				pixbuf, pixbufFound := p.pixbufs[albumID]
+				if pixbufFound {
+					if pixbuf != nil {
+						pixbuf = pixbuf.ScaleSimple(size, size, gdkpixbuf.InterpNearest)
+					} else {
+					}
+					glib.IdleAdd(func() {
+						picture.SetPaintable(gdk.NewTextureForPixbuf(pixbuf))
+					})
+				}
+			}
+		}
+	}
+}
+
+func (p *libraryPanel) onGridScaleReleased(x float64, y float64, button uint, sequence *gdk.EventSequence) {
+	size := math.Floor(p.gridScale.Value())
+	gridRange := p.gridScale.Adjustment()
+	if size < gridRange.Lower() || size > gridRange.Upper() {
+		return
+	}
+
+	p.itemSize = int(size)
+	p.redraw()
+	glib.IdleAdd(p.toolbarPopover.Popdown)
+	if p.itemSizeCallback != nil {
+		p.itemSizeCallback(p.itemSize)
+	}
+}
+
+func (p *libraryPanel) redraw() {
+	if len(p.albums) > 0 {
+		p.SetAlbums(p.albums)
+	}
+}
+
+func (p *libraryPanel) onGridClicked(position uint) {
+	// Get selected album
+	itemObj := p.libraryModel.Item(position)
+	if itemObj == nil {
+		return
+	}
+	strObj := itemObj.Cast().(*gtk.StringObject)
+	id := strObj.String()
+	album, found := p.albums[id]
+	if !found {
+		return
+	}
+
+	// Show standalone album
+	if p.libraryGrid.Model().Native() == p.selectionSingle.Native() {
+		p.standaloneAlbum = album
+		p.headerbarStandalone.SetAlbum(album)
+		p.standaloneStack.SetVisibleChild(p.standaloneSpinner)
+		p.standaloneSpinner.Start()
+		p.openStandalone()
+		client.Instance().LoadAlbumart(album)
+	}
+}
+
+func (p *libraryPanel) onHeaderbarStandaloneClose() {
+	p.closeStandalone()
+}
+
+func (p *libraryPanel) openStandalone() {
+	p.libraryStack.SetVisibleChild(p.panelStandalone)
+	if p.standaloneCallback != nil {
+		p.standaloneCallback(true)
+	}
+}
+
+func (p *libraryPanel) closeStandalone() {
+	p.libraryStack.SetVisibleChild(p.panelNormal)
+	if p.standaloneCallback != nil {
+		p.standaloneCallback(false)
+	}
+}
+
+func (p *libraryPanel) setCoverLoader(loader *CoverLoader) {
+	p.coverLoader = loader
+}
+
+func (p *libraryPanel) SetAlbumart(album *common.Album, albumart []byte) {
+	if album != p.standaloneAlbum {
+		return
+	}
+
+	p.standalonePixbuf = nil
+	if albumart == nil || len(albumart) == 0 {
+		return
+	}
+
+	loader, loaderErr := loadPixbuf(albumart)
+	if loaderErr != nil {
+		log.Println("failed to load albumart for ", album.Title(), ":", loaderErr)
+		return
+	}
+
+	p.standalonePixbuf = loader.Pixbuf()
+	glib.IdleAdd(p.showStandaloneImage)
+}
+
+func (p *libraryPanel) showStandaloneImage() {
+	p.resizeStandaloneImage()
+	p.standaloneStack.SetVisibleChild(p.standaloneScroll)
+	p.standaloneSpinner.Stop()
+}
+
+func (p *libraryPanel) resizeStandaloneImage() {
+	newWidth, newHeight := p.getStandaloneSize()
+	if p.standalonePixbuf == nil {
+		p.standaloneImage.SetPixelSize(min(newWidth, newHeight))
+		return
+	}
+
+	width, height := p.calculateCoverSize(newWidth, newHeight)
+	if width <= 0 || height <= 0 {
+		return
+	}
+
+	scaledPixbuf := p.standalonePixbuf.ScaleSimple(width, height, gdkpixbuf.InterpHyper)
+	p.standaloneImage.SetFromPaintable(gdk.NewTextureForPixbuf(scaledPixbuf))
+	p.standaloneImage.SetPixelSize(min(width, height))
+}
+
+func (p *libraryPanel) getStandaloneSize() (int, int) {
+	return p.standaloneStack.Size(gtk.OrientationHorizontal), p.standaloneStack.Size(gtk.OrientationVertical)
+}
+
+func (p *libraryPanel) calculateCoverSize(currentWidth, currentHeight int) (width, height int) {
+	ratioWidth := float64(currentWidth) / float64(p.standalonePixbuf.Width())
+	ratioHeight := float64(currentHeight) / float64(p.standalonePixbuf.Height())
+	ratio := min(min(ratioWidth, ratioHeight), 1)
+
+	width = int(math.Floor(float64(p.standalonePixbuf.Width()) * ratio))
+	height = int(math.Floor(float64(p.standalonePixbuf.Height()) * ratio))
+
+	return
+}
+
+func (p *libraryPanel) onStandalonePlayClicked() {
+	client.Instance().PlayAlbum(p.standaloneAlbum)
+	p.closeStandalone()
+}
+
+func (p *libraryPanel) onStandaloneQueueClicked() {
+	client.Instance().QueueAlbum(p.standaloneAlbum)
+	p.closeStandalone()
+}
+
+func (p *libraryPanel) onSelectionQueue() {
+	albums := p.getSelectedAlbums()
+	if len(albums) > 0 {
+		client.Instance().QueueAlbums(albums)
+	}
+
+	p.selectButton.SetActive(false)
+}
+
+func (p *libraryPanel) onSelectionCancel() {
+	p.selectButton.SetActive(false)
+}
+
+func (p *libraryPanel) getSelectedAlbums() []*common.Album {
+	albums := []*common.Album{}
+	for i := range p.selectionMulti.NItems() {
+		if p.selectionMulti.IsSelected(i) {
+			itemObj := p.selectionMulti.Item(i)
+			if itemObj != nil {
+				itemStr := itemObj.Cast().(*gtk.StringObject)
+				albumID := itemStr.String()
+				album, found := p.albums[albumID]
+				if found {
+					albums = append(albums, album)
+				}
+			}
+		}
+	}
+
+	return albums
+}
+
+func (p *libraryPanel) UpdateConfig(config *Configuration) {
+	config.SortField = p.sortField
+	config.SortDesc = p.sortDesc
+	config.ItemSize = p.itemSize
+}
+
+func (p *libraryPanel) updateGridModel() {
+	albums := p.filterAlbums()
+	p.sortAlbums(albums)
+	p.updateGrid(albums)
+}
+
+func (p *libraryPanel) filterAlbums() []*common.Album {
+	var matchingAlbums []*common.Album
+	query := strings.TrimSpace(strings.ToLower(p.searchEntry.Text()))
+	for _, album := range p.albums {
+		if album.IsMatch(query) {
+			matchingAlbums = append(matchingAlbums, album)
+		}
+	}
+
+	return matchingAlbums
+}
+
+func (p *libraryPanel) sortAlbums(filtered []*common.Album) {
+	common.SortAlbums(filtered, p.sortField)
+
+	if p.sortDesc {
+		slices.Reverse(filtered)
+	}
+}
+
+func (p *libraryPanel) updateGrid(albums []*common.Album) {
+	glib.IdleAdd(func() {
+		n := p.libraryModel.NItems()
+		if n > 0 {
+			p.libraryModel.Splice(0, n, nil)
+		}
+
+		ids := make([]string, 0, len(albums))
+		for _, item := range albums {
+			ids = append(ids, item.ID())
+		}
+
+		if len(ids) > 0 {
+			p.libraryModel.Splice(0, 0, ids)
+		}
+	})
+}
+
+func (p *libraryPanel) Toolbar() gtk.Widgetter {
+	return p.toolbar
+}
+
+func (p *libraryPanel) Wait() {
+	p.libraryWait.Wait()
+}
+
+type LibraryFactory gtk.ListItemFactory
+
+func (p *libraryPanel) SetAlbums(albums map[string]*common.Album) {
+	p.libraryWait.Add(1)
+	go p.setAlbums(albums)
+}
+
+func (p *libraryPanel) setAlbums(albums map[string]*common.Album) {
+	p.libraryLock.Lock()
+	defer p.libraryLock.Unlock()
+	defer p.libraryWait.Done()
+
+	p.albums = albums
+	glib.IdleAdd(func() {
+		p.stack.SetVisibleChild(p.progressBox)
+		p.progressBar.SetFraction(0.0)
+	})
+
+	// Create loader loader
+	i := 0
+	n := len(albums)
+	p.pixbufs = make(map[string]*gdkpixbuf.Pixbuf)
+
+	for _, album := range albums {
+		if p.coverLoader != nil {
+			p.pixbufs[album.ID()] = p.coverLoader.LoadThumbnail(album)
+		}
+
+		i++
+		glib.IdleAdd(func() {
+			p.progressBar.SetFraction(float64(i) / float64(n))
+			// FIXME: i18n
+			p.progressBar.SetText("Loading images")
+		})
+	}
+
+	p.updateGridModel()
+	glib.IdleAdd(func() {
+		p.stack.SetVisibleChild(p.scroll)
+	})
+}
+
+func (p *libraryPanel) SetWidth(width int) {
+	p.resizeStandaloneImage()
+	p.setMarks(width)
+}
+
+func (p *libraryPanel) setMarks(width int) {
+	glib.IdleAdd(func() {
+		p.gridScale.ClearMarks()
+	})
+
+	lower := p.gridScale.Adjustment().Lower()
+	upper := p.gridScale.Adjustment().Upper()
+	countMin := int(math.Max(float64(width)/upper, 1))
+	countMax := int(math.Max(float64(width)/lower, 1))
+	for i := countMin; i <= countMax; i++ {
+		pixel := int(float64(width) / float64(i))
+		pixel = pixel - (2 * pixel / 100)
+		glib.IdleAdd(func() {
+			p.gridScale.AddMark(float64(pixel), gtk.PosBottom, "")
+		})
+	}
+}
+
+func (p *libraryPanel) ShowSearch() {
+	p.searchBar.SetSearchMode(true)
+}
+
+func (p *libraryPanel) HeaderbarStandalone() *albumHeaderbar {
+	return p.headerbarStandalone
+}
diff --git a/internal/gui/pictureitemfactory.go b/internal/gui/pictureitemfactory.go
new file mode 100644
index 0000000..a1097d1
--- /dev/null
+++ b/internal/gui/pictureitemfactory.go
@@ -0,0 +1,78 @@
+package gui
+
+import (
+	"github.com/diamondburned/gotk4/pkg/core/glib"
+	"github.com/diamondburned/gotk4/pkg/gdk/v4"
+	"github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+)
+
+type pictureItemFactory[T comparable] struct {
+	model           modelAccessor[T]
+	value           valueAccessor[T]
+	listItemFactory *gtk.SignalListItemFactory
+	pictures        map[T]*gtk.Picture
+}
+
+type (
+	modelAccessor[T any] func(item *glib.Object) T
+	valueAccessor[T any] func(T) (tooltip string, pixbuf *gdkpixbuf.Pixbuf)
+)
+
+func newPictureItemFactory[T comparable](model modelAccessor[T], value valueAccessor[T]) *pictureItemFactory[T] {
+	factory := pictureItemFactory[T]{
+		model:           model,
+		value:           value,
+		listItemFactory: gtk.NewSignalListItemFactory(),
+		pictures:        make(map[T]*gtk.Picture),
+	}
+	factory.listItemFactory.Connect("setup", factory.setup)
+	factory.listItemFactory.Connect("bind", factory.bind)
+	factory.listItemFactory.Connect("unbind", factory.unbind)
+
+	return &factory
+}
+
+func (f *pictureItemFactory[T]) setup(listitem *gtk.ListItem) {
+	picture := gtk.NewPicture()
+	picture.SetContentFit(gtk.ContentFitContain)
+	picture.SetCanShrink(false)
+	listitem.SetChild(picture)
+}
+
+func (f *pictureItemFactory[T]) bind(listitem *gtk.ListItem) {
+	item := listitem.Item()
+	if item == nil {
+		return
+	}
+	itemID := f.model(item)
+
+	tooltip, pixbuf := f.value(itemID)
+	picture := listitem.Child().(*gtk.Picture)
+	picture.SetTooltipText(tooltip)
+	if pixbuf != nil {
+		picture.SetPaintable(gdk.NewTextureForPixbuf(pixbuf))
+	}
+
+	f.pictures[itemID] = picture
+}
+
+func (f *pictureItemFactory[T]) unbind(listitem *gtk.ListItem) {
+	itemObj := listitem.Item()
+	if itemObj == nil {
+		return
+	}
+
+	itemID := f.model(itemObj)
+	delete(f.pictures, itemID)
+}
+
+func (f *pictureItemFactory[T]) ListItemFactory() *gtk.ListItemFactory {
+	return &f.listItemFactory.ListItemFactory
+}
+
+func (f *pictureItemFactory[T]) Picture(itemID T) (*gtk.Picture, bool) {
+	picture, found := f.pictures[itemID]
+
+	return picture, found
+}
diff --git a/internal/gui/playlistpanel.go b/internal/gui/playlistpanel.go
new file mode 100644
index 0000000..0bbd2cb
--- /dev/null
+++ b/internal/gui/playlistpanel.go
@@ -0,0 +1,358 @@
+package gui
+
+import (
+	"log"
+	"math"
+
+	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
+	"github.com/diamondburned/gotk4/pkg/gdk/v4"
+	"github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+	"suruatoel.xyz/mcg/internal/client"
+	"suruatoel.xyz/mcg/internal/common"
+)
+
+type playlistPanel struct {
+	*adw.Bin
+	toolbar           *gtk.Box
+	selectButton      *gtk.ToggleButton
+	actionbarRevealer *gtk.Revealer
+	clearButton       *gtk.Button
+	playlistGrid      *gtk.GridView
+	gridFactory       *pictureItemFactory[string]
+	playlistModel     *gtk.StringList
+	selectionMulti    *gtk.MultiSelection
+	selectionSingle   *gtk.SingleSelection
+
+	headerbarStandalone    *albumHeaderbar
+	playlistStack          *gtk.Stack
+	panelNormal            *gtk.Box
+	panelStandalone        *gtk.Box
+	standaloneStack        *gtk.Stack
+	standaloneSpinner      *gtk.Spinner
+	standaloneScroll       *gtk.ScrolledWindow
+	standaloneImage        *gtk.Image
+	standalonePlayButton   *gtk.Button
+	standaloneRemoveButton *gtk.Button
+
+	selectionRemoveButton *gtk.Button
+	selectionCancelButton *gtk.Button
+
+	coverLoader *CoverLoader
+	playlist    []*common.PlaylistAlbum
+	albums      map[string]*common.PlaylistAlbum
+	pixbufs     map[string]*gdkpixbuf.Pixbuf
+
+	standaloneAlbum    *common.PlaylistAlbum
+	standalonePixbuf   *gdkpixbuf.Pixbuf
+	standaloneCallback func(bool)
+}
+
+func newPlaylistPanel() *playlistPanel {
+	panel := playlistPanel{
+		albums:  make(map[string]*common.PlaylistAlbum),
+		pixbufs: make(map[string]*gdkpixbuf.Pixbuf),
+	}
+	panel.loadWidgets()
+	panel.connectSignals()
+
+	return &panel
+}
+
+func (p *playlistPanel) loadWidgets() {
+	builder := gtk.NewBuilderFromString(data.PlaylistPanelXML)
+
+	p.toolbar = builder.GetObject("toolbar").Cast().(*gtk.Box)
+	p.selectButton = builder.GetObject("select_button").Cast().(*gtk.ToggleButton)
+	p.actionbarRevealer = builder.GetObject("actionbar_revealer").Cast().(*gtk.Revealer)
+	p.clearButton = builder.GetObject("playlist_clear_button").Cast().(*gtk.Button)
+
+	p.Bin = builder.GetObject("McgPlaylistPanel").Cast().(*adw.Bin)
+	p.playlistGrid = builder.GetObject("playlist_grid").Cast().(*gtk.GridView)
+	p.playlistModel = gtk.NewStringList(nil)
+	p.selectionMulti = gtk.NewMultiSelection(p.playlistModel)
+	p.selectionSingle = gtk.NewSingleSelection(p.playlistModel)
+	p.playlistGrid.SetModel(p.selectionSingle)
+
+	p.gridFactory = newPictureItemFactory[string](p.itemToModelID, p.modelIDToValue)
+	p.playlistGrid.SetFactory(p.gridFactory.ListItemFactory())
+
+	// Headerbar
+	p.headerbarStandalone = newAlbumHeaderbar()
+	p.playlistStack = builder.GetObject("playlist_stack").Cast().(*gtk.Stack)
+	p.panelNormal = builder.GetObject("panel_normal").Cast().(*gtk.Box)
+	p.panelStandalone = builder.GetObject("panel_standalone").Cast().(*gtk.Box)
+
+	p.standaloneStack = builder.GetObject("standalone_stack").Cast().(*gtk.Stack)
+	p.standaloneSpinner = builder.GetObject("standalone_spinner").Cast().(*gtk.Spinner)
+	p.standaloneScroll = builder.GetObject("standalone_scroll").Cast().(*gtk.ScrolledWindow)
+	p.standaloneImage = builder.GetObject("standalone_image").Cast().(*gtk.Image)
+	p.standalonePlayButton = builder.GetObject("standalone_play_button").Cast().(*gtk.Button)
+	p.standaloneRemoveButton = builder.GetObject("standalone_remove_button").Cast().(*gtk.Button)
+
+	// Selection
+	p.selectionRemoveButton = builder.GetObject("selection_remove_button").Cast().(*gtk.Button)
+	p.selectionCancelButton = builder.GetObject("selection_cancel_button").Cast().(*gtk.Button)
+}
+
+func (p *playlistPanel) itemToModelID(item *glib.Object) string {
+	return item.Cast().(*gtk.StringObject).String()
+}
+
+func (p *playlistPanel) modelIDToValue(itemID string) (tooltip string, pixbuf *gdkpixbuf.Pixbuf) {
+	if album, ok := p.albums[itemID]; ok {
+		tooltip = album.Tooltip()
+	}
+	pixbuf = p.pixbufs[itemID]
+
+	return
+}
+
+func (p *playlistPanel) connectSignals() {
+	p.selectButton.ConnectToggled(p.onSelectToggled)
+	p.clearButton.ConnectClicked(p.onClearClicked)
+
+	p.playlistGrid.ConnectActivate(p.onGridClicked)
+
+	p.headerbarStandalone.ConnectClose(p.onHeaderbarStandaloneClose)
+	p.standalonePlayButton.ConnectClicked(p.onStandalonePlayClicked)
+	p.standaloneRemoveButton.ConnectClicked(p.onStandaloneRemoveClicked)
+
+	p.selectionRemoveButton.ConnectClicked(p.onSelectionRemove)
+	p.selectionCancelButton.ConnectClicked(p.onSelectionCancel)
+}
+
+func (p *playlistPanel) ConnectStandalone(callback func(bool)) {
+	p.standaloneCallback = callback
+}
+
+func (p *playlistPanel) onSelectToggled() {
+	if p.selectButton.Active() {
+		p.actionbarRevealer.SetRevealChild(true)
+		p.playlistGrid.SetModel(p.selectionMulti)
+		p.playlistGrid.SetSingleClickActivate(false)
+		p.playlistGrid.StyleContext().AddClass("selection")
+	} else {
+		p.actionbarRevealer.SetRevealChild(false)
+		p.playlistGrid.SetModel(p.selectionSingle)
+		p.playlistGrid.SetSingleClickActivate(true)
+		p.playlistGrid.StyleContext().AddClass("selection")
+	}
+}
+
+func (p *playlistPanel) onClearClicked() {
+	client.Instance().ClearPlaylist()
+}
+
+func (p *playlistPanel) onGridClicked(position uint) {
+	// Get selected album
+	itemObj := p.playlistModel.Item(position)
+	if itemObj == nil {
+		return
+	}
+	strObj := itemObj.Cast().(*gtk.StringObject)
+	id := strObj.String()
+	album, found := p.albums[id]
+	if !found {
+		return
+	}
+
+	// Show standalone album
+	if p.playlistGrid.Model().Native() == p.selectionSingle.Native() {
+		p.standaloneAlbum = album
+		p.headerbarStandalone.SetAlbum(album.Album)
+		p.standaloneStack.SetVisibleChild(p.standaloneSpinner)
+		p.standaloneSpinner.Start()
+		p.openStandalone()
+		client.Instance().LoadAlbumart(album.Album)
+	}
+}
+
+func (p *playlistPanel) onHeaderbarStandaloneClose() {
+	p.closeStandalone()
+}
+
+func (p *playlistPanel) openStandalone() {
+	p.playlistStack.SetVisibleChild(p.panelStandalone)
+	if p.standaloneCallback != nil {
+		p.standaloneCallback(true)
+	}
+}
+
+func (p *playlistPanel) closeStandalone() {
+	p.playlistStack.SetVisibleChild(p.panelNormal)
+	if p.standaloneCallback != nil {
+		p.standaloneCallback(false)
+	}
+}
+
+func (p *playlistPanel) setCoverLoader(loader *CoverLoader) {
+	p.coverLoader = loader
+}
+
+func (p *playlistPanel) SetAlbumart(album *common.Album, albumart []byte) {
+	if p.standaloneAlbum == nil || album != p.standaloneAlbum.Album {
+		return
+	}
+
+	p.standalonePixbuf = nil
+	if albumart == nil || len(albumart) == 0 {
+		return
+	}
+
+	loader, loaderErr := loadPixbuf(albumart)
+	if loaderErr != nil {
+		log.Println("failed to load albumart for ", album.Title(), ":", loaderErr)
+		return
+	}
+
+	p.standalonePixbuf = loader.Pixbuf()
+	glib.IdleAdd(p.showStandaloneImage)
+}
+
+func (p *playlistPanel) showStandaloneImage() {
+	p.resizeStandaloneImage()
+	p.standaloneStack.SetVisibleChild(p.standaloneScroll)
+	p.standaloneSpinner.Stop()
+}
+
+func (p *playlistPanel) resizeStandaloneImage() {
+	newWidth, newHeight := p.getStandaloneSize()
+	if p.standalonePixbuf == nil {
+		p.standaloneImage.SetPixelSize(min(newWidth, newHeight))
+		return
+	}
+
+	width, height := p.calculateCoverSize(newWidth, newHeight)
+	if width <= 0 || height <= 0 {
+		return
+	}
+
+	scaledPixbuf := p.standalonePixbuf.ScaleSimple(width, height, gdkpixbuf.InterpHyper)
+	p.standaloneImage.SetFromPaintable(gdk.NewTextureForPixbuf(scaledPixbuf))
+	p.standaloneImage.SetPixelSize(min(width, height))
+}
+
+func (p *playlistPanel) getStandaloneSize() (int, int) {
+	return p.standaloneStack.Size(gtk.OrientationHorizontal), p.standaloneStack.Size(gtk.OrientationVertical)
+}
+
+func (p *playlistPanel) calculateCoverSize(currentWidth, currentHeight int) (width, height int) {
+	ratioWidth := float64(currentWidth) / float64(p.standalonePixbuf.Width())
+	ratioHeight := float64(currentHeight) / float64(p.standalonePixbuf.Height())
+	ratio := min(min(ratioWidth, ratioHeight), 1)
+
+	width = int(math.Floor(float64(p.standalonePixbuf.Width()) * ratio))
+	height = int(math.Floor(float64(p.standalonePixbuf.Height()) * ratio))
+
+	return
+}
+
+func (p *playlistPanel) onStandalonePlayClicked() {
+	client.Instance().PlayQueuedAlbum(p.standaloneAlbum)
+	p.closeStandalone()
+}
+
+func (p *playlistPanel) onStandaloneRemoveClicked() {
+	client.Instance().UnqueueAlbum(p.standaloneAlbum)
+	p.closeStandalone()
+}
+
+func (p *playlistPanel) onSelectionRemove() {
+	albums := p.getSelectedAlbums()
+	if len(albums) > 0 {
+		client.Instance().UnqueueAlbums(albums)
+	}
+
+	p.selectButton.SetActive(false)
+}
+
+func (p *playlistPanel) getSelectedAlbums() []*common.PlaylistAlbum {
+	albums := []*common.PlaylistAlbum{}
+	for i := range p.selectionMulti.NItems() {
+		if p.selectionMulti.IsSelected(i) {
+			itemObj := p.selectionMulti.Item(i)
+			if itemObj != nil {
+				itemStr := itemObj.Cast().(*gtk.StringObject)
+				albumID := itemStr.String()
+				album, found := p.albums[albumID]
+				if found {
+					albums = append(albums, album)
+				}
+			}
+		}
+	}
+
+	return albums
+}
+
+func (p *playlistPanel) onSelectionCancel() {
+	p.selectButton.SetActive(false)
+}
+
+func (p *playlistPanel) Toolbar() gtk.Widgetter {
+	return p.toolbar
+}
+
+func (p *playlistPanel) ItemSizeChanged() {
+	p.redraw()
+}
+
+func (p *playlistPanel) redraw() {
+	if len(p.playlist) > 0 {
+		p.SetPlaylist(p.playlist)
+	}
+}
+
+func (p *playlistPanel) SetPlaylist(playlist []*common.PlaylistAlbum) {
+	go p.setPlaylist(playlist)
+}
+
+func (p *playlistPanel) setPlaylist(playlist []*common.PlaylistAlbum) {
+	p.playlist = playlist
+
+	for _, album := range playlist {
+		p.albums[album.ID()] = album
+		if p.coverLoader != nil {
+			p.pixbufs[album.ID()] = p.coverLoader.LoadThumbnail(album.Album)
+		}
+	}
+
+	p.updateGridModel()
+}
+
+func (p *playlistPanel) updateGridModel() {
+	p.updateGrid(p.playlist)
+}
+
+func (p *playlistPanel) updateGrid(albums []*common.PlaylistAlbum) {
+	glib.IdleAdd(func() {
+		n := p.playlistModel.NItems()
+		if n > 0 {
+			p.playlistModel.Splice(0, n, nil)
+		}
+
+		ids := make([]string, 0, len(albums))
+		for _, item := range albums {
+			ids = append(ids, item.ID())
+		}
+
+		if len(ids) > 0 {
+			p.playlistModel.Splice(0, 0, ids)
+		}
+	})
+}
+
+func (p *playlistPanel) SetWidth(width int) {
+	p.resizeStandaloneImage()
+}
+
+func (p *playlistPanel) ClearPlaylist() {
+	client.Instance().ClearPlaylist()
+}
+
+func (p *playlistPanel) HeaderbarStandalone() *albumHeaderbar {
+	return p.headerbarStandalone
+}
diff --git a/internal/gui/serverpanel.go b/internal/gui/serverpanel.go
new file mode 100644
index 0000000..f83fe55
--- /dev/null
+++ b/internal/gui/serverpanel.go
@@ -0,0 +1,115 @@
+package gui
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+	"suruatoel.xyz/mcg/internal/common"
+)
+
+type serverPanel struct {
+	*adw.Bin
+
+	toolbar         *gtk.Box
+	statusFile      *gtk.Label
+	statusAudio     *gtk.Label
+	statusBitrate   *gtk.Label
+	statusErrer     *gtk.Label
+	statsArtist     *gtk.Label
+	statsAlbums     *gtk.Label
+	statsSongs      *gtk.Label
+	statsDBPlaytime *gtk.Label
+	statsPlaytime   *gtk.Label
+	statsUptime     *gtk.Label
+	outputDevices   *gtk.ListBox
+
+	outputDeviceChangeCB OutputDeviceChangeCB
+}
+
+type OutputDeviceChangeCB func(device *common.OutputDevice, enable bool)
+
+func newServerPanel() *serverPanel {
+	panel := serverPanel{}
+	panel.loadWidgets()
+
+	return &panel
+}
+
+func (p *serverPanel) loadWidgets() {
+	builder := gtk.NewBuilderFromString(data.ServerPanelXML)
+
+	p.Bin = builder.GetObject("McgServerPanel").Cast().(*adw.Bin)
+	p.toolbar = builder.GetObject("toolbar").Cast().(*gtk.Box)
+	p.statusFile = builder.GetObject("status_file").Cast().(*gtk.Label)
+	p.statusAudio = builder.GetObject("status_audio").Cast().(*gtk.Label)
+	p.statusBitrate = builder.GetObject("status_bitrate").Cast().(*gtk.Label)
+	p.statusErrer = builder.GetObject("status_error").Cast().(*gtk.Label)
+	p.statsArtist = builder.GetObject("stats_artists").Cast().(*gtk.Label)
+	p.statsAlbums = builder.GetObject("stats_albums").Cast().(*gtk.Label)
+	p.statsSongs = builder.GetObject("stats_songs").Cast().(*gtk.Label)
+	p.statsDBPlaytime = builder.GetObject("stats_dbplaytime").Cast().(*gtk.Label)
+	p.statsPlaytime = builder.GetObject("stats_playtime").Cast().(*gtk.Label)
+	p.statsUptime = builder.GetObject("stats_uptime").Cast().(*gtk.Label)
+	p.outputDevices = builder.GetObject("output_devices").Cast().(*gtk.ListBox)
+}
+
+func (p *serverPanel) ReceiveOutputDeviceChange(callback OutputDeviceChangeCB) {
+	p.outputDeviceChangeCB = callback
+}
+
+func (p *serverPanel) Toolbar() gtk.Widgetter {
+	return p.toolbar
+}
+
+func (p *serverPanel) Status(file, audio, bitrate, errorMessage string) {
+	p.statusFile.SetText(file)
+	p.statusAudio.SetText(p.formatAudio(audio))
+	p.statusBitrate.SetText(p.formatBitrate(bitrate))
+	p.statusErrer.SetText(errorMessage)
+}
+
+func (p *serverPanel) formatAudio(audio string) string {
+	parts := strings.Split(audio, ":")
+	if len(parts) == 3 {
+		return fmt.Sprintf("%s Hz, %s bit, %s channels", parts[0], parts[1], parts[2])
+	}
+
+	return ""
+}
+
+func (p *serverPanel) formatBitrate(bitrate string) string {
+	if bitrate != "" {
+		return bitrate + " kb/s"
+	}
+
+	return ""
+}
+
+func (p *serverPanel) Statistics(artists, albums, songs, dbplaytime, playtime, uptime string) {
+	p.statsArtist.SetText(artists)
+	p.statsAlbums.SetText(albums)
+	p.statsSongs.SetText(songs)
+	p.statsDBPlaytime.SetText(dbplaytime)
+	p.statsPlaytime.SetText(playtime)
+	p.statsUptime.SetText(uptime)
+}
+
+func (p *serverPanel) OutputDevices(devices []*common.OutputDevice) {
+	p.outputDevices.RemoveAll()
+	for _, device := range devices {
+		deviceButton := gtk.NewCheckButtonWithLabel(device.Name)
+		if device.Enabled {
+			deviceButton.SetActive(true)
+		}
+		deviceButton.ConnectToggled(func() {
+			if p.outputDeviceChangeCB != nil {
+				p.outputDeviceChangeCB(device, deviceButton.Active())
+			}
+		})
+
+		p.outputDevices.Insert(deviceButton, -1)
+	}
+}
diff --git a/internal/gui/shortcutsdialog.go b/internal/gui/shortcutsdialog.go
new file mode 100644
index 0000000..b5b615b
--- /dev/null
+++ b/internal/gui/shortcutsdialog.go
@@ -0,0 +1,23 @@
+package gui
+
+import (
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+)
+
+type shortcutsDialog struct {
+	*gtk.ShortcutsWindow
+}
+
+func newShortcutsDialog() *shortcutsDialog {
+	dialog := shortcutsDialog{}
+	dialog.loadWidgets()
+
+	return &dialog
+}
+
+func (d *shortcutsDialog) loadWidgets() {
+	builder := gtk.NewBuilderFromString(data.ShortcutsDialogXML)
+
+	d.ShortcutsWindow = builder.GetObject("McgShortcutsDialog").Cast().(*gtk.ShortcutsWindow)
+}
diff --git a/internal/gui/window.go b/internal/gui/window.go
new file mode 100644
index 0000000..d1d295e
--- /dev/null
+++ b/internal/gui/window.go
@@ -0,0 +1,454 @@
+package gui
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/diamondburned/gotk4-adwaita/pkg/adw"
+	"github.com/diamondburned/gotk4/pkg/gdk/v4"
+	"github.com/diamondburned/gotk4/pkg/gio/v2"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
+	"suruatoel.xyz/mcg/data"
+	"suruatoel.xyz/mcg/internal/client"
+	"suruatoel.xyz/mcg/internal/common"
+	"suruatoel.xyz/mcg/internal/i18n"
+)
+
+type Panel interface {
+	Toolbar() gtk.Widgetter
+}
+
+type GridPanel interface {
+	HeaderbarStandalone() *albumHeaderbar
+}
+
+type mainWindow struct {
+	*adw.ApplicationWindow
+
+	toggleFullscreenAction *gio.SimpleAction
+	playAaction            *gio.SimpleAction
+	panelAction            *gio.SimpleAction
+	clearPlaylistAction    *gio.SimpleAction
+	searchLibraryAction    *gio.SimpleAction
+
+	toolbarView         *adw.ToolbarView
+	headerBar           *adw.HeaderBar
+	connectButton       *gtk.Switch
+	connectButtonActive bool
+	playButton          *gtk.ToggleButton
+	playButtonActive    bool
+	volumeButton        *gtk.VolumeButton
+	settingVolume       bool
+	toolbarStack        *gtk.Stack
+	infoToast           *adw.ToastOverlay
+	contentStack        *gtk.Stack
+	connectionPanel     *connectionPanel
+	panelStack          *adw.ViewStack
+	serverPanel         *serverPanel
+	coverPanel          *coverPanel
+	playlistPanel       *playlistPanel
+	libraryPanel        *libraryPanel
+	resizeHelper        *gtk.DrawingArea
+
+	panels       map[string]Panel
+	currentWidth int
+	coverLoader  *CoverLoader
+}
+
+func newMainWindow(app *gtk.Application, config Configuration) *mainWindow {
+	window := mainWindow{
+		panels: make(map[string]Panel),
+	}
+	window.loadWidgets(app, config)
+	window.connectSignals()
+	window.registerActions()
+	window.SetHelpOverlay(newShortcutsDialog().ShortcutsWindow)
+
+	return &window
+}
+
+func (w *mainWindow) loadWidgets(app *gtk.Application, config Configuration) {
+	builder := gtk.NewBuilderFromString(data.WindowXML)
+	w.ApplicationWindow = builder.GetObject("McgAppWindow").Cast().(*adw.ApplicationWindow)
+	w.ApplicationWindow.SetApplication(app)
+
+	w.toolbarView = builder.GetObject("toolbar_view").Cast().(*adw.ToolbarView)
+	w.headerBar = builder.GetObject("headerbar").Cast().(*adw.HeaderBar)
+
+	w.connectButton = builder.GetObject("headerbar_button_connect").Cast().(*gtk.Switch)
+	w.connectButtonActive = true
+
+	w.playButton = builder.GetObject("headerbar_button_playpause").Cast().(*gtk.ToggleButton)
+	w.playButtonActive = true
+
+	w.volumeButton = builder.GetObject("headerbar_button_volume").Cast().(*gtk.VolumeButton)
+	w.volumeButton.ConnectValueChanged(w.OnVolumeChanged)
+
+	w.toolbarStack = builder.GetObject("toolbar_stack").Cast().(*gtk.Stack)
+
+	w.infoToast = builder.GetObject("info_toast").Cast().(*adw.ToastOverlay)
+
+	w.contentStack = builder.GetObject("content_stack").Cast().(*gtk.Stack)
+
+	w.connectionPanel = newConnectionPanel(config)
+	w.contentStack.AddChild(w.connectionPanel)
+	w.contentStack.SetVisibleChild(w.connectionPanel)
+
+	// Server panel
+	w.serverPanel = newServerPanel()
+	w.panels["server"] = w.serverPanel
+	w.serverPanel.ReceiveOutputDeviceChange(w.OnServerPanelOutputDeviceChange)
+
+	// Cover panel
+	w.coverPanel = newCoverPanel()
+	w.panels["cover"] = w.coverPanel
+
+	// Playlist panel
+	w.playlistPanel = newPlaylistPanel()
+	w.panels["playlist"] = w.playlistPanel
+
+	// Library panel
+	w.libraryPanel = newLibraryPanel(config)
+	w.panels["library"] = w.serverPanel
+
+	// Panel stack
+	w.panelStack = builder.GetObject("panel_stack").Cast().(*adw.ViewStack)
+	w.panelStack.AddTitledWithIcon(w.serverPanel, "server", i18n.T("Server"), "network-wired-symbolic")
+	w.panelStack.AddTitledWithIcon(w.coverPanel, "cover", i18n.T("Cover"), "image-x-generic-symbolic")
+	w.panelStack.AddTitledWithIcon(w.playlistPanel, "playlist", i18n.T("Playlist"), "view-list-symbolic")
+	w.panelStack.AddTitledWithIcon(w.libraryPanel, "library", i18n.T("Library"), "emblem-music-symbolic")
+	if _, found := w.panels[config.Panel]; found {
+		w.panelStack.SetVisibleChildName(config.Panel)
+	} else {
+		log.Println("configured initial panel name is unknown:", config.Panel)
+	}
+
+	// Toolbar stack
+	w.toolbarStack.AddNamed(w.serverPanel.Toolbar(), "server")
+	w.toolbarStack.AddNamed(w.coverPanel.Toolbar(), "cover")
+	w.toolbarStack.AddNamed(w.playlistPanel.Toolbar(), "playlist")
+	w.toolbarStack.AddNamed(w.libraryPanel.Toolbar(), "library")
+	w.toolbarStack.SetVisibleChildName(config.Panel)
+
+	w.resizeHelper = builder.GetObject("resize_helper").Cast().(*gtk.DrawingArea)
+}
+
+func (w *mainWindow) connectSignals() {
+	w.connectButton.Connect("notify::active", func() {
+		w.connect()
+	})
+	w.connectButton.ConnectStateSet(w.OnConnectStateSet)
+
+	w.playButton.ConnectToggled(w.OnPlayPauseToggled)
+
+	w.panelStack.Connect("notify::visible-child", w.OnPanelStackSwitched)
+	w.resizeHelper.ConnectResize(w.OnWindowResize)
+
+	w.coverPanel.ConnectFullscreen(w.OnCoverPanelFullscreen)
+	w.Connect("notify::fullscreened", w.OnWindowFullscreen)
+
+	w.playlistPanel.ConnectStandalone(w.OnPlaylistPanelStandalone)
+
+	w.libraryPanel.ConnectItemSizeChanged(w.onLibraryPanelItemSizeChanged)
+	w.libraryPanel.ConnectStandalone(w.OnLibraryPanelStandalone)
+
+	clientInstance := client.Instance()
+	clientInstance.ReceiveError(w.OnClientError)
+	clientInstance.RegisterConnection(w.OnClientConnection)
+	clientInstance.ReceiveStatus(w.OnClientStatus)
+	clientInstance.ReceiveStatistics(w.OnClientStatistics)
+	clientInstance.ReceiveOutputDevices(w.OnClientOutputDevces)
+	clientInstance.ReceivePlaylist(w.OnClientPlaylist)
+	clientInstance.ReceiveAlbums(w.OnClientAlbums)
+	clientInstance.ReceiveAlbumart(w.OnClientAlbumart)
+}
+
+func (w *mainWindow) registerActions() {
+	connectAction := gio.NewSimpleAction("connect", nil)
+	connectAction.ConnectActivate(func(_ *glib.Variant) {
+		w.connect()
+	})
+	w.AddAction(connectAction)
+
+	w.playAaction = gio.NewSimpleAction("play", nil)
+	w.playAaction.SetEnabled(false)
+	w.playAaction.ConnectActivate(func(_ *glib.Variant) {
+		w.OnPlayPauseToggled()
+	})
+	w.AddAction(w.playAaction)
+
+	w.clearPlaylistAction = gio.NewSimpleAction("clear-playlist", nil)
+	w.clearPlaylistAction.SetEnabled(false)
+	w.clearPlaylistAction.ConnectActivate(func(_ *glib.Variant) {
+		w.playlistPanel.ClearPlaylist()
+	})
+	w.AddAction(w.clearPlaylistAction)
+
+	panelVariant := glib.NewVariantString("server")
+	w.panelAction = gio.NewSimpleActionStateful("panel", panelVariant.Type(), panelVariant)
+	w.panelAction.SetEnabled(false)
+	w.panelAction.ConnectActivate(func(value *glib.Variant) {
+		panelName := value.String()
+		w.panelStack.SetVisibleChildName(panelName)
+	})
+	w.AddAction(w.panelAction)
+
+	w.toggleFullscreenAction = gio.NewSimpleAction("toggle-fullscreen", nil)
+	w.toggleFullscreenAction.SetEnabled(false)
+	w.toggleFullscreenAction.ConnectActivate(func(_ *glib.Variant) {
+		w.Fullscreen()
+	})
+	w.AddAction(w.toggleFullscreenAction)
+
+	w.searchLibraryAction = gio.NewSimpleAction("search-library", nil)
+	w.searchLibraryAction.SetEnabled(false)
+	w.searchLibraryAction.ConnectActivate(func(_ *glib.Variant) {
+		w.panelStack.SetVisibleChild(w.libraryPanel)
+		w.libraryPanel.ShowSearch()
+	})
+	w.AddAction(w.searchLibraryAction)
+}
+
+func (w *mainWindow) OnPanelStackSwitched() {
+	w.setVisibleToolbar()
+}
+
+func (w *mainWindow) setVisibleToolbar() {
+	name := w.panelStack.VisibleChildName()
+	w.toolbarStack.SetVisibleChildName(name)
+}
+
+func (w *mainWindow) OnWindowFullscreen() {
+	w.reactToFullscreen()
+}
+
+func (w *mainWindow) reactToFullscreen() {
+	var cursor *gdk.Cursor
+	if w.IsFullscreen() {
+		w.panelStack.SetVisibleChild(w.coverPanel)
+		w.headerBar.SetVisible(false)
+		w.coverPanel.Fullscreen(true)
+		cursor = gdk.NewCursorFromName("none", nil)
+	} else {
+		w.headerBar.SetVisible(true)
+		w.coverPanel.Fullscreen(false)
+		cursor = gdk.NewCursorFromName("default", nil)
+	}
+
+	w.SetCursor(cursor)
+}
+
+func (w *mainWindow) OnCoverPanelFullscreen() {
+	if w.IsFullscreen() {
+		w.Unfullscreen()
+	} else {
+		w.Fullscreen()
+	}
+}
+
+func (w *mainWindow) OnPlaylistPanelStandalone(open bool) {
+	w.onPanelStandalone(w.playlistPanel, open)
+}
+
+func (w *mainWindow) onLibraryPanelItemSizeChanged(itemSize int) {
+	w.coverLoader.SetSize(itemSize)
+	w.playlistPanel.ItemSizeChanged()
+}
+
+func (w *mainWindow) OnLibraryPanelStandalone(open bool) {
+	w.onPanelStandalone(w.libraryPanel, open)
+}
+
+func (w *mainWindow) onPanelStandalone(panel GridPanel, open bool) {
+	if open {
+		w.toolbarView.AddTopBar(panel.HeaderbarStandalone())
+		w.toolbarView.Remove(w.headerBar)
+	} else {
+		w.toolbarView.AddTopBar(w.headerBar)
+		w.toolbarView.Remove(panel.HeaderbarStandalone())
+	}
+}
+
+func (w *mainWindow) connect() {
+	if !w.connectButtonActive {
+		return
+	}
+
+	if client.Instance().IsConnected() {
+		w.libraryPanel.Wait()
+		client.Instance().Disconnect()
+	} else {
+		client.Instance().Connect(w.connectionPanel.ConnectionDetails())
+	}
+}
+
+func (w *mainWindow) OnClientConnection(connected bool) {
+	glib.IdleAdd(func() {
+		w.connectButtonActive = false
+		w.connectButton.SetActive(connected)
+		w.connectButton.SetState(connected)
+		w.connectButtonActive = true
+
+		w.playButton.SetSensitive(connected)
+		w.volumeButton.SetSensitive(connected)
+		w.playAaction.SetEnabled(connected)
+		w.panelAction.SetEnabled(connected)
+		if connected {
+			w.contentStack.SetVisibleChild(w.panelStack)
+		} else {
+			w.contentStack.SetVisibleChild(w.connectionPanel)
+		}
+
+		w.clearPlaylistAction.SetEnabled(connected)
+		w.searchLibraryAction.SetEnabled(connected)
+	})
+
+	host, _, _ := w.connectionPanel.ConnectionDetails()
+	w.coverLoader = NewCoverLoader(host)
+	w.playlistPanel.setCoverLoader(w.coverLoader)
+	w.libraryPanel.setCoverLoader(w.coverLoader)
+}
+
+func (w *mainWindow) SetConfigError(err error) {
+	glib.IdleAdd(func() {
+		w.infoToast.AddToast(adw.NewToast(fmt.Sprintf("Loading the configuration has failed: %s", err.Error())))
+	})
+}
+
+func (w *mainWindow) UpdateConfig(config *Configuration) {
+	config.Panel = w.panelStack.VisibleChildName()
+
+	w.connectionPanel.UpdateConfig(config)
+	w.libraryPanel.UpdateConfig(config)
+}
+
+func (w *mainWindow) OnClientError(message string) {
+	glib.IdleAdd(func() {
+		w.infoToast.AddToast(adw.NewToast(message))
+	})
+}
+
+func (w *mainWindow) OnClientStatus(state string, album *common.PlaylistAlbum, pos uint64, time uint64, volume int64, file string, audio string, bitrate string, errorMessage string) {
+	// Album
+	glib.IdleAdd(func() {
+		w.coverPanel.SetAlbum(state, album)
+	})
+	w.toggleFullscreenAction.SetEnabled(album != nil)
+
+	// Fullscreen
+	if w.IsFullscreen() && album == nil {
+		w.Unfullscreen()
+	}
+
+	// State
+	if state == "play" {
+		glib.IdleAdd(func() {
+			w.setPlayPause(true)
+		})
+		glib.IdleAdd(func() {
+			w.coverPanel.SetPlay(pos, time)
+		})
+	} else if state == "pause" || state == "stop" {
+		glib.IdleAdd(func() {
+			w.setPlayPause(false)
+		})
+		w.coverPanel.SetPause()
+	}
+	// Volume
+	glib.IdleAdd(func() {
+		w.setVolume(volume)
+	})
+
+	glib.IdleAdd(func() {
+		w.serverPanel.Status(file, audio, bitrate, errorMessage)
+	})
+}
+
+func (w *mainWindow) OnClientStatistics(artists, albums, songs, dbplaytime, playtime, uptime string) {
+	glib.IdleAdd(func() {
+		w.serverPanel.Statistics(artists, albums, songs, dbplaytime, playtime, uptime)
+	})
+}
+
+func (w *mainWindow) OnClientOutputDevces(devices []*common.OutputDevice) {
+	glib.IdleAdd(func() {
+		w.serverPanel.OutputDevices(devices)
+	})
+}
+
+func (w *mainWindow) OnClientPlaylist(playlist []*common.PlaylistAlbum) {
+	w.playlistPanel.SetPlaylist(playlist)
+}
+
+func (w *mainWindow) OnClientAlbums(albums map[string]*common.Album) {
+	w.libraryPanel.SetAlbums(albums)
+}
+
+func (w *mainWindow) OnClientAlbumart(album *common.Album, albumart []byte) {
+	w.coverPanel.SetAlbumart(album, albumart)
+	w.playlistPanel.SetAlbumart(album, albumart)
+	w.libraryPanel.SetAlbumart(album, albumart)
+}
+
+func (w *mainWindow) OnConnectStateSet(state bool) bool {
+	return true
+}
+
+func (w *mainWindow) OnPlayPauseToggled() {
+	if w.playButtonActive {
+		client.Instance().PlayPause()
+	}
+}
+
+func (w *mainWindow) OnVolumeChanged(value float64) {
+	if !w.settingVolume {
+		client.Instance().SetVolume(int(value * 100))
+	}
+}
+
+func (w *mainWindow) setPlayPause(play bool) {
+	w.playButtonActive = false
+	w.playButton.SetActive(play)
+	w.playButtonActive = true
+}
+
+func (w *mainWindow) setVolume(volume int64) {
+	if volume >= 0 {
+		w.volumeButton.SetVisible(true)
+		w.settingVolume = true
+		w.volumeButton.SetValue(float64(volume) / 100.0)
+		w.settingVolume = false
+	} else {
+		w.volumeButton.SetVisible(false)
+	}
+}
+
+func (w *mainWindow) OnServerPanelOutputDeviceChange(device *common.OutputDevice, enable bool) {
+	client.Instance().SetOutputDeviceState(device, enable)
+}
+
+func (w *mainWindow) OnWindowResize(width int, _ int) {
+	if !w.hasWidthChanged(width) {
+		return
+	}
+	w.setWidth(width)
+
+	if width > 0 {
+		w.updateUIWidth()
+	}
+}
+
+func (w *mainWindow) hasWidthChanged(width int) bool {
+	return width != w.currentWidth
+}
+
+func (w *mainWindow) setWidth(width int) {
+	w.currentWidth = width
+}
+
+func (w *mainWindow) updateUIWidth() {
+	w.coverPanel.SetWidth(w.currentWidth)
+	w.playlistPanel.SetWidth(w.currentWidth)
+	w.libraryPanel.SetWidth(w.currentWidth)
+}
diff --git a/main.go b/main.go
index b5aa37f..4268eea 100644
--- a/main.go
+++ b/main.go
@@ -1,9 +1,18 @@
 package main
 
 import (
+	"os"
+
+	"suruatoel.xyz/mcg/internal/gui"
 	"suruatoel.xyz/mcg/internal/i18n"
 )
 
 func main() {
 	i18n.Init("mcg", "locale")
+
+	app := gui.NewApplication()
+	exitCode := app.Run(os.Args)
+	if exitCode > 0 {
+		os.Exit(exitCode)
+	}
 }

From 690f0f8e9a8e68bcb76c4ae7d7f61f900504e99e Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Fri, 14 Aug 2026 11:39:10 +0200
Subject: [PATCH 33/33] Add back noise texture

Add back the noise texture background by embedding the image file and setting it
as base64-encoded data as CSS background image.
---
 data/data.go                | 11 +++++++++++
 data/gtk.css                |  1 +
 internal/gui/application.go |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/data/data.go b/data/data.go
index 5076620..3383a7d 100644
--- a/data/data.go
+++ b/data/data.go
@@ -2,6 +2,8 @@ package data
 
 import (
 	_ "embed"
+	"encoding/base64"
+	"strings"
 )
 
 //go:embed ui/window.ui
@@ -30,3 +32,12 @@ var LibraryPanelXML string
 
 //go:embed gtk.css
 var MainCSS string
+
+//go:embed noise-texture.png
+var NoiseTexture []byte
+
+func BuildMainCSS() string {
+	noiseTextureEncoded := "data:image/png;base64," + base64.StdEncoding.EncodeToString(NoiseTexture)
+
+	return strings.ReplaceAll(MainCSS, "@NOISETEXTURE@", noiseTextureEncoded)
+}
diff --git a/data/gtk.css b/data/gtk.css
index aa3357b..9e74f64 100644
--- a/data/gtk.css
+++ b/data/gtk.css
@@ -1,5 +1,6 @@
 #content_stack {
     box-shadow:inset 4px 4px 10px rgba(0,0,0,0.3);
+    background-image:url("@NOISETEXTURE@");
 }
 
 #port_spinner {
diff --git a/internal/gui/application.go b/internal/gui/application.go
index 6a7598e..fe64d79 100644
--- a/internal/gui/application.go
+++ b/internal/gui/application.go
@@ -60,7 +60,7 @@ func (a *Application) setDefaultSettings() {
 
 func (a *Application) loadCSS() {
 	styleProvider := gtk.NewCSSProvider()
-	styleProvider.LoadFromString(data.MainCSS)
+	styleProvider.LoadFromString(data.BuildMainCSS())
 
 	gtk.StyleContextAddProviderForDisplay(
 		gdk.DisplayGetDefault(),