diff --git a/azos-core b/azos-core
index 383a85b..897007c 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit 383a85b9a5a9640c89ce31649c8dd2ad78d2b092
+Subproject commit 897007c89f2538ae816628055b1f5d1c72cc91c4
diff --git a/features/hyprland/default.nix b/features/hyprland/default.nix
index 4237aac..38a3d46 100644
--- a/features/hyprland/default.nix
+++ b/features/hyprland/default.nix
@@ -10,6 +10,8 @@
       type = lib.types.bool;
     };
     config = lib.mkIf config.azos.suites.hyprland.enable {
+      azos.suites.base.enable = lib.mkDefault true;
+
       home.packages = with pkgs; [
         hyprland
         waybar
diff --git a/features/lauretta/default.nix b/features/lauretta/default.nix
index eecee76..e8efe7c 100644
--- a/features/lauretta/default.nix
+++ b/features/lauretta/default.nix
@@ -9,7 +9,11 @@
       default = false;
       type = lib.types.bool;
     };
-    config = lib.mkIf (config.azos.emacs.enable && config.azos.suites.lauretta.enable) {
+    config = lib.mkIf (config.azos.suites.lauretta.enable) {
+      azos.suites.exwm.enable = lib.mkDefault true;
+      azos.suites.editor.enable = lib.mkDefault true;
+      azos.suites.dev.enable = lib.mkDefault true;
+
       azos.emacs.enabledSuites = ["azos-emacs-lauretta"];
       azos.emacs.pkgs = [pkgs.azos-emacs-lauretta];
       home.packages = with pkgs; [nix-search-cli];
diff --git a/home-manager/home.nix b/home-manager/home.nix
index fa5b2f0..f397ac9 100755
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -34,11 +34,6 @@
 
   programs.home-manager.enable = true;
 
-  azos.suites.base.enable = true;
-  azos.suites.editor.enable = true;
-  azos.suites.dev.enable = true;
-  azos.suites.station.enable = true;
-  azos.suites.exwm.enable = true;
   azos.suites.lauretta.enable = true;
   azos.name = "Aner Zakobar";