diff --git a/configurations/hosts/iolite/RESERVED.md b/configurations/hosts/iolite/RESERVED.md
index c630af5..89ad70b 100644
--- a/configurations/hosts/iolite/RESERVED.md
+++ b/configurations/hosts/iolite/RESERVED.md
@@ -1 +1 @@
-The hostname `iolite` is reserved for future use with my steam deck
+The hostname `iolite` is reserved for current use with my steam deck
diff --git a/configurations/hosts/iolite/configuration.nix b/configurations/hosts/iolite/configuration.nix
index bb03fad..b609a6e 100644
--- a/configurations/hosts/iolite/configuration.nix
+++ b/configurations/hosts/iolite/configuration.nix
@@ -19,88 +19,25 @@
   # Configure network connections interactively with nmcli or nmtui.
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
-  time.timeZone = "America/Chicago";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
   nixpkgs.config.allowUnfree = true;
 
-
-  
-
-  # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # services.pulseaudio.enable = true;
-  # OR
-  # services.pipewire = {
-  #   enable = true;
-  #   pulse.enable = true;
-  # };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.magames = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [
-    ];
+  # Enable sound with pipewire.
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
   };
 
-  # programs.firefox.enable = true;
-
-  # List packages installed in system profile.
-  # You can use https://search.nixos.org/ to find more packages (and options).
-  environment.systemPackages = with pkgs; [
-    neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    wget
-    git
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
+  jovian.devices.steamdeck.enable = true;
 
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
diff --git a/flake.nix b/flake.nix
index 1ab5ed3..afc110d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -100,12 +100,10 @@
         modules = [
           catppuccin.nixosModules.catppuccin
           home-manager.nixosModules.home-manager
-          niri.nixosModules.niri
 
           ./configurations/hosts/iolite/configuration.nix
-          ./modules/.
 
-          ./modules/display/cinnamon.nix
+          ./modules/iolite.nix
           ./modules/users/magames.nix
         ];
       };
diff --git a/modules/esp.nix b/modules/esp.nix
index 1d50541..096304d 100644
--- a/modules/esp.nix
+++ b/modules/esp.nix
@@ -5,10 +5,10 @@
     usbutils
     udisks
     git
-    inputs.agenix.packages.x86_64-linux.default
-    inputs.beeper.packages.x86_64-linux.default
+    # inputs.agenix.packages.x86_64-linux.default
+    # inputs.beeper.packages.x86_64-linux.default
     lynx
-    code-server
+    # code-server
     tmatrix
     pipes-rs
     fireplace
diff --git a/modules/iolite.nix b/modules/iolite.nix
new file mode 100644
index 0000000..16745dd
--- /dev/null
+++ b/modules/iolite.nix
@@ -0,0 +1,21 @@
+{ ... }:
+
+{
+  imports = [
+    ./boot/.
+    ./network/.
+    ./programs/.
+
+    ./display/sddm.nix
+    ./display/cinnamon.nix
+
+    ./users/magames.nix
+
+    ./jovian.nix
+    ./catppuccin.nix
+    ./fonts.nix
+    ./fsj.nix
+    ./i18n.nix
+    ./self.nix
+  ];
+}
diff --git a/modules/jovian.nix b/modules/jovian.nix
index 8532eb2..4c8cb72 100644
--- a/modules/jovian.nix
+++ b/modules/jovian.nix
@@ -9,6 +9,7 @@
       enable = true;
     };
     steam = {
+      user = "magames";
       enable = true;
       autoStart= true;
     };