diff --git a/configs/configs.clj b/configs/configs.clj
index c101d59..ede02c4 100755
--- a/configs/configs.clj
+++ b/configs/configs.clj
@@ -19,7 +19,7 @@
   ;; installing spacemacs
   (println "setting up spacemacs..")
   (-> (fs/file (str home "/.emacs.d")) (fs/delete-tree))
-  (safe-sh "git" "clone" "https://github.com/syl20bnr/spacemacs" (str home "/.emacs.d"))
+  (safe-sh-as-user "git" "clone" "https://github.com/syl20bnr/spacemacs" (str home "/.emacs.d"))
   (safe-sh "chown" (str user ":" user) "-R" (str home "/.emacs.d"))
   (println "spacemacs set up"))
 
@@ -31,13 +31,17 @@
 
 (defn- setup-i3 []
   (println "setting up i3..")
-  (println "clearing xfce keyboard bindings..")
-  (as-> (safe-sh "xfconf-query" "--channel" "xfce4-keyboard-shortcuts" "--list") $
-    (:out $)
-    (str/split-lines $)
-    (doseq [property $]
-      ;;we actually need to ignore errors here, as we will hit a few undefined properties
-      (shell/sh "xfconf-query" "--channel" "xfce4-keyboard-shortcuts" "--property" property "--set" ""))))
+  (println "setting i3 as default wm..")
+  (safe-sh-as-user "gsettings" "set" "org.mate.session.required-components" "windowmanager" "i3")
+  (safe-sh-as-user "gsettings" "set" "org.mate.session" "required-components-list" "['windowmanager', 'panel', 'dock']"))
+
+(defn- setup-theme []
+  (println "setting up fonts..")
+  (safe-sh-as-user "gsettings" "set" "org.mate.interface" "font-name" "Fira Code Regular 10.0")
+  (safe-sh-as-user "gsettings" "set" "org.mate.interface" "document-font-name" "Fira Code Regular 10.0")
+  (safe-sh-as-user "gsettings" "set" "org.mate.interface" "monospace-font-name" "Fira Code Regular 10.0")
+  (safe-sh-as-user "gsettings" "set" "org.mate.Marco.general" "titlebar-font" "Fira Code Bold 10.0")
+  (safe-sh-as-user "gsettings" "set" "org.mate.caja.desktop" "font" "Fira Code Regular 10.0"))
 
 ;;todo: fetch spacemacs
 ;;todo: disable locking when closing lid on ac
@@ -55,6 +59,7 @@
 
 (setup-i3)
 (println "set up i3")
+(setup-theme)
 
 ;;creating projects dir
 (let [projects-dir (str home "/Projects")]
diff --git a/packages/packages.clj b/packages/packages.clj
index ae53927..8cde5cc 100755
--- a/packages/packages.clj
+++ b/packages/packages.clj
@@ -12,7 +12,7 @@
 (def home (str "/home/" user))
 
 (def packages {
-  :base ["bluez" "chromium" "curl" "emacs-gtk3" "fish-shell" "firefox" "flameshot" "flatpak" "git" "htop" "i3" "pass" "ranger" "Signal-Desktop" "thunar-archive-plugin" "unzip" "wget" "xarchiver" "xclip" "xfce4-i3-workspaces-plugin"]
+               :base ["bluez" "chromium" "curl" "emacs-gtk3" "engrampa" "feh" "fish-shell" "firefox" "flameshot" "flatpak" "font-firacode" "gimp" "git" "htop" "i3" "i3status" "mate" "mate-power-manager" "mate-terminal" "mate-utils" "pass" "ranger" "Signal-Desktop" "thunar-archive-plugin" "unzip" "wget" "xbindkeys" "xclip" "xz"]
   :work ["kotlin-bin" "scrcpy"]
 })
 
@@ -53,21 +53,26 @@
     (safe-sh "chown" (str user ":" user) "-R" target-directory)))
 
 ;;installing jetbrains toolbox
-(println "installing jetbrains toolbox..")
+(defn- install-jetbrains-toolbox []
+ (println "installing jetbrains toolbox..")
 (let [target-directory (str home "/Applications/JetbrainsToolbox")]
   (install-application
    toolbox-link
    "toolbox.tar.gz"
    target-directory
    #(safe-sh "tar" "-xzf" %1 "-C" %2)))
-(println "jetbrains toolbox installed")
+(println "jetbrains toolbox installed"))
 
 ;;installing http toolkit
-(println "installing http toolkit..")
-(let [target-directory (str home "/Applications/HttpToolkit")]
+(defn- install-http-toolkit []
+  (println "installing http toolkit..")
+  (let [target-directory (str home "/Applications/HttpToolkit")]
   (install-application
    http-toolkit-link
    "httptoolkit.zip"
    target-directory
    #(safe-sh "unzip" %1 "-d" %2)))
-(println "http toolkit installed")
+(println "http toolkit installed"))
+
+;;(install-jetbrains-toolbox)
+;;(install-http-toolkit)