diff --git a/widgets/circle_image.py b/widgets/circle_image.py
index aefd7e0..fb68587 100644
--- a/widgets/circle_image.py
+++ b/widgets/circle_image.py
@@ -2,12 +2,10 @@ import math
 from typing import Literal
 
 import cairo
-import gi
+
 from fabric.core.service import Property
 from fabric.widgets.widget import Widget
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, GdkPixbuf, Gtk  # noqa: E402
+from fabric.utils import Gdk, GdkPixbuf, Gtk  # noqa: E402
 
 
 class CircleImage(Gtk.DrawingArea, Widget):
diff --git a/widgets/custom_image.py b/widgets/custom_image.py
index 1aae7f6..a62612e 100644
--- a/widgets/custom_image.py
+++ b/widgets/custom_image.py
@@ -2,7 +2,7 @@ import math
 from typing import cast
 
 import cairo
-from gi.repository import Gtk
+from fabric.utils import Gtk
 
 from fabric.widgets.image import Image
 
diff --git a/widgets/customrevealer.py b/widgets/customrevealer.py
index d6de04b..874de83 100644
--- a/widgets/customrevealer.py
+++ b/widgets/customrevealer.py
@@ -1,9 +1,6 @@
-from gi.repository import GLib, Gtk
-import gi
+from fabric.utils import GLib, Gtk
 import math
 
-gi.require_version("Gtk", "3.0")
-
 # TODO: UsE BETTER APPROACH IF POSSIBLE
 
 
diff --git a/widgets/wifi_password_dialog.py b/widgets/wifi_password_dialog.py
index 3b33577..2397f9a 100644
--- a/widgets/wifi_password_dialog.py
+++ b/widgets/wifi_password_dialog.py
@@ -1,5 +1,4 @@
-import gi
-from gi.repository import Gdk, GLib
+from fabric.utils import Gdk, GLib
 
 from fabric.widgets.box import Box
 from fabric.widgets.button import Button
@@ -7,12 +6,10 @@ from fabric.widgets.entry import Entry
 from fabric.widgets.image import Image
 from fabric.widgets.label import Label
 
-# from widgets.wayland import WaylandWindow as Window
+# from fabric.widgets.wayland import WaylandWindow as Window
 
 from fabric.widgets.window import Window
 
-gi.require_version("Gtk", "3.0")
-
 
 class WiFiPasswordDialog(Window):
     def __init__(