3 files changed, 21 insertions, 13 deletions
diff --git a/.stumpwm.d/init.lisp b/.stumpwm.d/init.lisp
index 1e9657a..c5398be 100644
--- a/.stumpwm.d/init.lisp
+++ b/.stumpwm.d/init.lisp
@@ -1,3 +1,6 @@
+(in-package :stumpwm)
+(setf *default-package* :stumpwm)
+
 ;; Utils
 (load "~/.stumpwm.d/utils.lisp")
 ;; Theme
diff --git a/.stumpwm.d/theme.lisp b/.stumpwm.d/theme.lisp
index e314441..a3cb002 100644
--- a/.stumpwm.d/theme.lisp
+++ b/.stumpwm.d/theme.lisp
@@ -1,9 +1,9 @@
 ;; Startup message
 
 (setf *startup-message* "Welcome back, Thanos")
-(load-module "swm-gaps")
+(stumpwm:load-module "swm-gaps")
 ;; Colors
-(load-module "ttf-fonts")
+(stumpwm:load-module "ttf-fonts")
 (load "~/.stumpwm.d/colors.lisp")
 
 (setf *message-window-gravity* :center
@@ -20,7 +20,6 @@
   (update-color-map (current-screen)))
 
 
-
 (set-border-color        thanos-hope)
 (set-focus-color         thanos-hope)
 (set-unfocus-color       thanos-hope-alt)
@@ -34,10 +33,14 @@
       swm-gaps:*inner-gaps-size* 5
       swm-gaps:*outer-gaps-size* 5)
 
-(when *initializing*
+(when stumpwm:*initializing*
   (swm-gaps:toggle-gaps-on))
 
 (ql:quickload :clx-truetype)
 
 (set-font
- `(,(make-instance 'xft:font :family "JetBrains Mono" :subfamily "Regular" :size 12 :antialias t)))
+ `(,(make-instance 'xft:font
+		   :family "JetBrains Mono"
+		   :subfamily "Regular"
+		   :size 12
+		   :antialias t)))
diff --git a/.stumpwm.d/utils.lisp b/.stumpwm.d/utils.lisp
index 3ae6081..236f6f2 100644
--- a/.stumpwm.d/utils.lisp
+++ b/.stumpwm.d/utils.lisp
@@ -8,14 +8,16 @@
 (setf *default-package* :stumpwm)
 (set-module-dir "~/.stumpwm.d/modules")
 
-(load-module "kbd-layouts")
-(load-module "mpd")
-(load-module "pinentry")
-(load-module "pass")
-(load-module "swm-emacs")
-(load-module "end-session")
-(load-module "globalwindows")
-(load-module "urgentwindows")
+(stumpwm:load-module "notifications")
+(stumpwm:load-module "productivity")
+(stumpwm:load-module "kbd-layouts")
+(stumpwm:load-module "mpd")
+(stumpwm:load-module "pinentry")
+(stumpwm:load-module "pass")
+(stumpwm:load-module "swm-emacs")
+(stumpwm:load-module "end-session")
+(stumpwm:load-module "globalwindows")
+(stumpwm:load-module "urgentwindows")
 
 (ql:quickload :slynk)