diff --git a/ks_includes/KlippyGtk.py b/ks_includes/KlippyGtk.py
index d987da9d..a756df71 100644
--- a/ks_includes/KlippyGtk.py
+++ b/ks_includes/KlippyGtk.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 import contextlib
-import gi
 import logging
 import os
 import pathlib
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gdk, GdkPixbuf, Gio, Gtk, Pango
 
diff --git a/ks_includes/KlippyRest.py b/ks_includes/KlippyRest.py
index d3206b36..772a24a9 100644
--- a/ks_includes/KlippyRest.py
+++ b/ks_includes/KlippyRest.py
@@ -1,7 +1,8 @@
 import json
-import requests
 import logging
 
+import requests
+
 
 class KlippyRest:
     def __init__(self, ip, port=7125, api_key=False):
diff --git a/ks_includes/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py
index bbd15361..be5cb8f7 100644
--- a/ks_includes/KlippyWebsocket.py
+++ b/ks_includes/KlippyWebsocket.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
-import gi
 import threading
-
 import json
-import websocket
 import logging
 
+import gi
+import websocket
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import GLib
 from ks_includes.KlippyGcodes import KlippyGcodes
diff --git a/ks_includes/printer.py b/ks_includes/printer.py
index 488a2615..befb81a9 100644
--- a/ks_includes/printer.py
+++ b/ks_includes/printer.py
@@ -1,8 +1,9 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, GLib
+from gi.repository import GLib
 
 
 class Printer:
diff --git a/ks_includes/screen_panel.py b/ks_includes/screen_panel.py
index 300a23e9..c69bedd9 100644
--- a/ks_includes/screen_panel.py
+++ b/ks_includes/screen_panel.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
diff --git a/ks_includes/widgets/graph.py b/ks_includes/widgets/graph.py
index c34d72d7..501e95c4 100644
--- a/ks_includes/widgets/graph.py
+++ b/ks_includes/widgets/graph.py
@@ -1,8 +1,9 @@
 import datetime
-import gi
 import logging
 import math
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gdk, Gtk
 
diff --git a/ks_includes/widgets/keyboard.py b/ks_includes/widgets/keyboard.py
index 1e5365f7..481f8b8a 100644
--- a/ks_includes/widgets/keyboard.py
+++ b/ks_includes/widgets/keyboard.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")
diff --git a/ks_includes/wifi.py b/ks_includes/wifi.py
index 623166a6..b19e49cc 100644
--- a/ks_includes/wifi.py
+++ b/ks_includes/wifi.py
@@ -3,9 +3,7 @@ import logging
 import re
 import socket
 import threading
-
 from threading import Thread
-
 from queue import Queue
 
 import gi
diff --git a/panels/base_panel.py b/panels/base_panel.py
index 5a7a8ccc..ba7fbf96 100644
--- a/panels/base_panel.py
+++ b/panels/base_panel.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import contextlib
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import GLib, Gtk, Pango
 from jinja2 import Environment
diff --git a/panels/bed_level.py b/panels/bed_level.py
index c73cfd49..3d485cf6 100644
--- a/panels/bed_level.py
+++ b/panels/bed_level.py
@@ -1,7 +1,8 @@
-import gi
 import logging
 import re
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/bed_mesh.py b/panels/bed_mesh.py
index 5f527067..a592ef0b 100644
--- a/panels/bed_mesh.py
+++ b/panels/bed_mesh.py
@@ -1,7 +1,8 @@
-import gi
 import logging
 import contextlib
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/console.py b/panels/console.py
index 5fbc861a..cc30ac53 100644
--- a/panels/console.py
+++ b/panels/console.py
@@ -1,7 +1,8 @@
-import gi
 import time
 import re
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
diff --git a/panels/extrude.py b/panels/extrude.py
index d3f2d134..e9504672 100644
--- a/panels/extrude.py
+++ b/panels/extrude.py
@@ -1,7 +1,8 @@
-import gi
 import logging
 import re
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/fan.py b/panels/fan.py
index 9ac59b9f..46ee610e 100644
--- a/panels/fan.py
+++ b/panels/fan.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib, Pango
 
diff --git a/panels/fine_tune.py b/panels/fine_tune.py
index 7bb5f317..f081d3f9 100644
--- a/panels/fine_tune.py
+++ b/panels/fine_tune.py
@@ -1,8 +1,9 @@
-import gi
 import logging
 import re
 import contextlib
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
diff --git a/panels/gcode_macros.py b/panels/gcode_macros.py
index 4d88ceba..52be8584 100644
--- a/panels/gcode_macros.py
+++ b/panels/gcode_macros.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib, Pango
 
diff --git a/panels/input_shaper.py b/panels/input_shaper.py
index 098a68d5..b25da872 100644
--- a/panels/input_shaper.py
+++ b/panels/input_shaper.py
@@ -1,6 +1,7 @@
-import gi
 import re
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/job_status.py b/panels/job_status.py
index a868ff5a..e05ac3b3 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-import gi
 import logging
 import os
 import time
 import contextlib
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import GLib, Gtk, Pango
 from ks_includes.screen_panel import ScreenPanel
diff --git a/panels/limits.py b/panels/limits.py
index a5924555..d52aab6f 100644
--- a/panels/limits.py
+++ b/panels/limits.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/main_menu.py b/panels/main_menu.py
index 5507c613..d30f9b5f 100644
--- a/panels/main_menu.py
+++ b/panels/main_menu.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib
 from panels.menu import MenuPanel
diff --git a/panels/menu.py b/panels/menu.py
index dbf459e2..0985c1d9 100644
--- a/panels/menu.py
+++ b/panels/menu.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 from jinja2 import Environment, Template
diff --git a/panels/move.py b/panels/move.py
index 3d2cf5e9..cfdf2f1d 100644
--- a/panels/move.py
+++ b/panels/move.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/network.py b/panels/network.py
index aa7f54ba..0a44a363 100644
--- a/panels/network.py
+++ b/panels/network.py
@@ -1,7 +1,9 @@
-import gi
 import logging
-import netifaces
 import os
+
+import gi
+import netifaces
+
 from ks_includes.wifi import WifiManager
 
 gi.require_version("Gtk", "3.0")
diff --git a/panels/pins.py b/panels/pins.py
index fc5f4c15..a2d45d39 100644
--- a/panels/pins.py
+++ b/panels/pins.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib, Pango
 
diff --git a/panels/power.py b/panels/power.py
index 566edcf4..e2da7b36 100644
--- a/panels/power.py
+++ b/panels/power.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/print.py b/panels/print.py
index e91e531b..06415377 100644
--- a/panels/print.py
+++ b/panels/print.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-import gi
 import logging
 import os
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib, Pango
 from datetime import datetime
diff --git a/panels/retraction.py b/panels/retraction.py
index cf29daca..1d09c3af 100644
--- a/panels/retraction.py
+++ b/panels/retraction.py
@@ -1,7 +1,8 @@
-import gi
 import logging
 import re
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/settings.py b/panels/settings.py
index 1920bc37..d46d5066 100644
--- a/panels/settings.py
+++ b/panels/settings.py
@@ -1,6 +1,7 @@
-import gi
 import logging
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/splash_screen.py b/panels/splash_screen.py
index 5e2220ef..a90c667d 100644
--- a/panels/splash_screen.py
+++ b/panels/splash_screen.py
@@ -1,7 +1,8 @@
-import gi
 import logging
 import os
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango
 
diff --git a/panels/system.py b/panels/system.py
index 3fcd4b78..409df913 100644
--- a/panels/system.py
+++ b/panels/system.py
@@ -1,7 +1,8 @@
-import gi
 import logging
 import os
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango, GLib
 
diff --git a/panels/temperature.py b/panels/temperature.py
index 53868f55..125437b4 100644
--- a/panels/temperature.py
+++ b/panels/temperature.py
@@ -1,7 +1,8 @@
-import gi
 import logging
 import contextlib
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib
 
diff --git a/screen.py b/screen.py
index 743cdac7..e19b2014 100644
--- a/screen.py
+++ b/screen.py
@@ -1,9 +1,6 @@
 #!/usr/bin/python
 
 import argparse
-
-import gi
-
 import json
 import importlib
 import logging
@@ -13,6 +10,8 @@ import subprocess
 import pathlib
 import traceback  # noqa
 
+import gi
+
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib, Pango
 from jinja2 import Environment