diff --git a/src/__init__.py b/src/__init__.py
index 87f16c5..aae3b90 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,10 +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')
diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py
index 00397db..801e884 100644
--- a/src/albumheaderbar.py
+++ b/src/albumheaderbar.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 
diff --git a/src/application.py b/src/application.py
index 97ea726..82f7bd9 100644
--- a/src/application.py
+++ b/src/application.py
@@ -1,14 +1,11 @@
 #!/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
 
 
diff --git a/src/client.py b/src/client.py
index 3514aa7..d8fe179 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
@@ -16,6 +15,7 @@ from mcg.utils import Utils
 
 
 class MPDException(Exception):
+
     def __init__(self, error):
         super(MPDException, self).__init__(self._parse_error(error))
         self._error = error
@@ -56,6 +56,7 @@ class CommandException(MPDException):
 
 
 class Future(concurrent.futures.Future):
+
     def __init__(self, signal):
         concurrent.futures.Future.__init__(self)
         self._signal = signal
@@ -65,6 +66,7 @@ class Future(concurrent.futures.Future):
 
 
 class Base():
+
     def __init__(self):
         self._callbacks = {}
 
@@ -1109,6 +1111,7 @@ class MCGAlbum:
 
 
 class MCGTrack:
+
     def __init__(self, artists, title, file):
         if type(artists) is not list:
             artists = [artists]
diff --git a/src/connectionpanel.py b/src/connectionpanel.py
index c89f431..51e2b8b 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
diff --git a/src/coverpanel.py b/src/coverpanel.py
index b71aaa3..164ac65 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -1,13 +1,12 @@
 #!/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
 
 
diff --git a/src/librarypanel.py b/src/librarypanel.py
index e20552e..f58ebd2 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
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index 5dd252c..341f9c8 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,7 +9,6 @@ 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
diff --git a/src/serverpanel.py b/src/serverpanel.py
index c4ab7a6..0f39e86 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 
diff --git a/src/shortcutsdialog.py b/src/shortcutsdialog.py
index 6b1d210..2db83e3 100644
--- a/src/shortcutsdialog.py
+++ b/src/shortcutsdialog.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-
 import gi
+
 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 6819ad0..4146ef2 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
diff --git a/src/window.py b/src/window.py
index df752de..120aa1d 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:
diff --git a/src/zeroconf.py b/src/zeroconf.py
index 939e54b..82fb438 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')