diff --git a/src/dorkbox/notify/Notify.java b/src/dorkbox/notify/Notify.java
index be471e4..6082e02 100644
--- a/src/dorkbox/notify/Notify.java
+++ b/src/dorkbox/notify/Notify.java
@@ -28,7 +28,7 @@ import javax.swing.ImageIcon;
 
 import dorkbox.util.ActionHandler;
 import dorkbox.util.LocationResolver;
-import dorkbox.util.Swing;
+import dorkbox.util.SwingUtil;
 
 /**
  * Popup notification messages, similar to the popular "Growl" notification system on macosx, that display in the corner of the monitor.
@@ -266,7 +266,7 @@ class Notify {
     void show() {
         // must be done in the swing EDT
         //noinspection Convert2Lambda
-        Swing.invokeAndWaitQuietly(new Runnable() {
+        SwingUtil.invokeAndWaitQuietly(new Runnable() {
             @Override
             public
             void run() {
@@ -320,7 +320,7 @@ class Notify {
         if (notifyPopup != null) {
             // must be done in the swing EDT
             //noinspection Convert2Lambda
-            Swing.invokeLater(new Runnable() {
+            SwingUtil.invokeLater(new Runnable() {
                 @Override
                 public
                 void run() {
@@ -343,7 +343,7 @@ class Notify {
 
         // must be done in the swing EDT
         //noinspection Convert2Lambda
-        Swing.invokeLater(new Runnable() {
+        SwingUtil.invokeLater(new Runnable() {
             @Override
             public
             void run() {
diff --git a/src/dorkbox/notify/NotifyPopup.java b/src/dorkbox/notify/NotifyPopup.java
index ece6242..3315a32 100644
--- a/src/dorkbox/notify/NotifyPopup.java
+++ b/src/dorkbox/notify/NotifyPopup.java
@@ -47,10 +47,10 @@ import dorkbox.tweenengine.TweenCallback;
 import dorkbox.tweenengine.TweenEquations;
 import dorkbox.tweenengine.TweenManager;
 import dorkbox.util.ActionHandlerLong;
-import dorkbox.util.Font;
+import dorkbox.util.FontUtil;
 import dorkbox.util.Property;
 import dorkbox.util.ScreenUtil;
-import dorkbox.util.Swing;
+import dorkbox.util.SwingUtil;
 import dorkbox.util.swing.SwingActiveRender;
 
 // we can't use regular popup, because if we have no owner, it won't work!
@@ -162,7 +162,7 @@ class NotifyPopup extends JFrame {
         if (image != null) {
             setIconImage(image);
         } else {
-            setIconImage(Swing.BLANK_ICON);
+            setIconImage(SwingUtil.BLANK_ICON);
         }
 
 
@@ -283,7 +283,7 @@ class NotifyPopup extends JFrame {
             g2.fillRect(0, 0, WIDTH, HEIGHT);
 
             // Draw the title text
-            java.awt.Font titleTextFont = Font.parseFont(TITLE_TEXT_FONT);
+            java.awt.Font titleTextFont = FontUtil.parseFont(TITLE_TEXT_FONT);
             g2.setColor(titleText_FG);
             g2.setFont(titleTextFont);
             g2.drawString(notification.title, 5, 20);
@@ -301,7 +301,7 @@ class NotifyPopup extends JFrame {
             }
 
             // Draw the main text
-            java.awt.Font mainTextFont = Font.parseFont(MAIN_TEXT_FONT);
+            java.awt.Font mainTextFont = FontUtil.parseFont(MAIN_TEXT_FONT);
             String notText = notification.text;
             int length = notText.length();
             StringBuilder text = new StringBuilder(length);