diff --git a/desktop/environment.nix b/desktop/environment.nix
index fe59620..8a83a41 100644
--- a/desktop/environment.nix
+++ b/desktop/environment.nix
@@ -27,7 +27,7 @@
     packages = with pkgs; [
       noto-fonts
       noto-fonts-cjk
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       # Noto + NerdFont => Noto-Nerdfonts
       (nerdfonts.override { fonts = [ "Noto" ]; })
       # Microsoft TrueType core fonts
diff --git a/development/nix-cage.nix b/development/NixOS-wrappers/cage-shell.nix
similarity index 100%
rename from development/nix-cage.nix
rename to development/NixOS-wrappers/cage-shell.nix
diff --git a/development/NixOS-wrappers/default.nix b/development/NixOS-wrappers/default.nix
new file mode 100644
index 0000000..8985673
--- /dev/null
+++ b/development/NixOS-wrappers/default.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./cage-shell.nix
+  ];
+}
diff --git a/development/base-devel.nix b/development/base-devel.nix
index cb56ac7..b7ea754 100644
--- a/development/base-devel.nix
+++ b/development/base-devel.nix
@@ -15,7 +15,6 @@
     nix-index
     nmap
     psmisc
-    pstree
     pv
     ripgrep
     screen
diff --git a/development/default.nix b/development/default.nix
index f4d3c44..bc7cd1c 100644
--- a/development/default.nix
+++ b/development/default.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   imports = [
     ./base-devel.nix
     ./desktop.nix
     ./neovim.nix
-    ./nix-cage.nix
+    ./NixOS-wrappers
   ];
 }
diff --git a/files/packages/files-cleanup/bin/cleanup.sh b/files/packages/files-cleanup/bin/cleanup.sh
index 26dc440..15c890b 100755
--- a/files/packages/files-cleanup/bin/cleanup.sh
+++ b/files/packages/files-cleanup/bin/cleanup.sh
@@ -23,7 +23,7 @@ rm -r /home/*/.var/app/org.mozilla.firefox/cache
 
 ### delete temporary flatpak overrides
 ### they are now managed by nix
-### /var/lib/flatpak/overrides -> /etc/flatpak/overrides -> pkgs.flatpak-overrides
+### /var/lib/flatpak/overrides -> pkgs.flatpak-overrides
 rm -fr /home/*/.local/share/flatpak/overrides
 
 ### delete old Tab Group backups
diff --git a/flake.nix b/flake.nix
index 2fd342f..5199117 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,11 +3,15 @@
     nixpkgs-stable.url = "nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
-    home-manager = {
-      #url = "github:nix-community/home-manager/release-23.05";
+    home-manager-stable = {
+      url = "github:nix-community/home-manager/release-23.05";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+    home-manager-unstable = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+
     tuxedo-nixos = {
       url = "github:blitz/tuxedo-nixos";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -22,9 +26,10 @@
     self,
     nixpkgs-stable,
     nixpkgs-unstable,
-    home-manager,
+    home-manager-stable,
+    home-manager-unstable,
     lanzaboote,
-    tuxedo-nixos
+    tuxedo-nixos,
   }@inputs: {
     nixosConfigurations = {
 
@@ -40,7 +45,7 @@
         };
         modules = [
           ./machines/cookieclicker.nix
-          home-manager.nixosModules.home-manager
+          home-manager-unstable.nixosModules.home-manager
           lanzaboote.nixosModules.lanzaboote
         ];
       };
@@ -56,7 +61,7 @@
         };
         modules = [
           ./machines/cookiethinker.nix
-          home-manager.nixosModules.home-manager
+          home-manager-unstable.nixosModules.home-manager
           tuxedo-nixos.nixosModules.default
           lanzaboote.nixosModules.lanzaboote
         ];
diff --git a/services/system/files-cleanup.nix b/services/system/files-cleanup.nix
index 9f4bbc5..256f0f0 100644
--- a/services/system/files-cleanup.nix
+++ b/services/system/files-cleanup.nix
@@ -43,6 +43,7 @@
             "-/root/.dbus"
             "-/root/.local"
             "-/home/keks/.cache"
+            "-/home/keks/.local/share/flatpak/overrides"
             "-/home/keks/.var/app/io.gitlab.librewolf-community/cache"
             "-/home/keks/.var/app/org.kde.kdenlive/cache"
             "-/home/keks/.var/app/org.mozilla.firefox/cache"