diff --git a/hosts/sakopc/configuration.nix b/hosts/sakopc/configuration.nix
index 48429cc9..f909c5fc 100644
--- a/hosts/sakopc/configuration.nix
+++ b/hosts/sakopc/configuration.nix
@@ -17,14 +17,19 @@
 
   modules = {
     desktop = {
-      xmonad.enable = true;
+      bspwm = {
+        enable = true;
+        polybar.enable = true;
+      };
       kitty.enable = true;
       picom.enable = true;
       apps = {
         keepassxc.enable = true;
-        obs.enable = true;
         nextcloud.enable = true;
         rssguard.enable = true;
+        nextcloud.enable = true;
+        bitwarden.enable = true;
+        obs.enable = true;
       };
       browsers = {
         firefox.enable = true;
@@ -35,22 +40,30 @@
         whatsapp.enable = true;
         zoom.enable = true;
         discord.enable = true;
+        teams.enable = true;
+        telegram.enable = true;
       };
       game = {
         lutris.enable = true;
         steam.enable = true;
         wine.enable = true;
         grapejuice.enable = true;
+        tetrio.enable = true;
       };
       media = {
         mpv.enable = true;
         kdenlive.enable = true;
+        blender.enable = true;
+        mpv.enable = true;
       };
     };
     dev = {
       editors = {
         nvim.enable = true;
-        emacs.enable = true;
+        emacs = {
+          enable = true;
+          daemon = true;
+        };
       };
       cc.enable = true;
       javascript.enable = true;
diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix
index a45f79f3..a37c56a7 100644
--- a/hosts/sakotop/configuration.nix
+++ b/hosts/sakotop/configuration.nix
@@ -22,10 +22,10 @@
       kitty.enable = true;
       xmonad.enable = false;
       bspwm = {
-        enable = false;
+        enable = true;
         polybar.enable = true;
       };
-      exwm.enable = true;
+      exwm.enable = false;
       picom.enable = true;
       dunst.enable = true;
       browsers = {