diff --git a/src/csdwindow.nim b/src/csdwindow.nim
index 8a652a04..20273660 100644
--- a/src/csdwindow.nim
+++ b/src/csdwindow.nim
@@ -12,6 +12,7 @@ import common
 import utils/misc
 import utils/rect
 
+
 # {{{ Constants
 const
   TitleBarFontSize    = 14.0
diff --git a/src/main.nim b/src/main.nim
index 688a7253..7f221706 100644
--- a/src/main.nim
+++ b/src/main.nim
@@ -23,15 +23,15 @@ import std/unicode
 
 # Libraries
 import glad/gl
-
 import glfw
-from glfw/wrapper import IconImageObj
 
 import koi
-from koi/utils as koiUtils import lerp, invLerp, remap
+from koi/utils import lerp, invLerp, remap
 
 import nanovg
-when not defined(DEBUG): import osdialog
+
+when not defined(DEBUG):
+  import osdialog
 
 when defined(windows):
   import platform/windows/console
@@ -9898,10 +9898,10 @@ proc closeSplash(a) =
 proc loadAndSetIcon(a) =
   alias(p, a.paths)
 
-  var icons: array[5, wrapper.IconImageObj]
+  var icons: array[5, IconImageObj]
 
   proc add(idx: Natural, img: ImageData) =
-    icons[idx].width = img.width.int32
+    icons[idx].width  = img.width.int32
     icons[idx].height = img.height.int32
     icons[idx].pixels = cast[ptr uint8](img.data)