diff --git a/common/base.nix b/common/base.nix
index 3982942..bad46dc 100644
--- a/common/base.nix
+++ b/common/base.nix
@@ -24,14 +24,17 @@
     git
     curl
     usbutils
-    usbmuxd
     pciutils
     coreutils-full
+    killall
   ];
 
   networking.networkmanager.enable = true;
   networking.nameservers = [ "1.1.1.1" "1.0.0.1" "8.8.8.8" ];
 
+  services.timesyncd.enable = true;
+  networking.timeServers = [ "ntp1.vniiftri.ru" "0.ru.pool.ntp.org" "0.pool.ntp.org" ];
+
   i18n.defaultLocale = "ru_RU.UTF-8";
   console = {
     font = "${pkgs.terminus_font}/share/consolefonts/ter-u16b.psf.gz";
diff --git a/flake.nix b/flake.nix
index 033bffb..998f7bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,15 +12,15 @@
 
 
   outputs = { self, nixpkgs, ... }@inputs: {
-
+    # Stella = Unchartevice 6540 (Ryzen 3 3250U, 16GB RAM)
     nixosConfigurations."stella" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
         ./common/base.nix
-        ./common/laptop.nix
         ./common/user.nix
-        ./common/graphical.nix
-        ./common/gaming.nix
+        ./roles/laptop.nix
+        ./roles/graphical.nix
+        ./roles/gaming.nix
         ./machines/stella/configuration.nix
         ./machines/stella/hardware.nix
       ];
@@ -28,20 +28,39 @@
 
     /* These machines will be configured later. */
     /*
+    # Celerrime = MacBook Air M2
     nixosConfigurations."celerrime" = nixpkgs.lib.nixosSystem {
       system = "aarch64-linux";
       modules = [
+        ./common/base.nix
+        ./common/user.nix
+        ./roles/laptop.nix
+        ./roles/graphical.nix
         ./machines/celerrime/configuration.nix
-        ./user.nix
-        ./graphical.nix
+        ./machines/celerrime/hardware.nix
       ];
     };
-
+    # Effundam = MacBook Air M1 (server usage). Will not be added to flake.nix until thunderbolt and apfs proper support
+    nixosConfigurations."effundam" = nixpkgs.lib.nixosSystem {
+      system = "aarch64-linux";
+      modules = [
+        ./common/base.nix
+        ./common/user.nix
+        ./roles/laptop.nix
+        ./machines/effundam/configuration.nix
+        ./machines/effundam/hardware.nix
+      ];
+    };
+    # Vetus = iMac 27" 2017, i5, 64 GB RAM
     nixosConfigurations."vetus" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
+        ./common/base.nix
+        ./common/user.nix
+        ./roles/graphical.nix
+        ./roles/gaming.nix
         ./machines/vetus/configuration.nix
-        ./
+        ./machines/vetus/hardware.nix
       ];
     };
     */
diff --git a/machines/stella/about.md b/machines/stella/about.md
deleted file mode 100644
index 0e6d316..0000000
--- a/machines/stella/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Random Ryzen 3 3250U laptop
\ No newline at end of file
diff --git a/common/gaming.nix b/roles/gaming.nix
similarity index 68%
rename from common/gaming.nix
rename to roles/gaming.nix
index f5ed596..e2e9dcc 100644
--- a/common/gaming.nix
+++ b/roles/gaming.nix
@@ -2,9 +2,11 @@
 
 {
   nixpkgs.config.allowUnfree = true;
+  hardware.opengl.driSupport32Bit = true;
+  services.pipewire.alsa.support32Bit = true;
   environment.systemPackages = with pkgs; [
     steam
-	  wineWowPackages.stable
+    wineWowPackages.stable
     wine
     (wine.override { wineBuild = "wine64"; })
     wineWowPackages.staging
diff --git a/common/graphical.nix b/roles/graphical.nix
similarity index 97%
rename from common/graphical.nix
rename to roles/graphical.nix
index 909ca80..f515914 100644
--- a/common/graphical.nix
+++ b/roles/graphical.nix
@@ -5,10 +5,12 @@
     firefox
     alacritty
     pavucontrol
+    bottom
     mpv
     glib
     ffmpeg
     cinnamon.mint-y-icons
+    usbmuxd
   ];
   services.fwupd.enable = true;
   services.greetd = {
diff --git a/common/laptop.nix b/roles/laptop.nix
similarity index 100%
rename from common/laptop.nix
rename to roles/laptop.nix