diff --git a/flake.nix b/flake.nix
index aa28c5b..0a7f95b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";
     mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
-    blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
+    blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz";
     minecraft.url = "github:Infinidoge/nix-minecraft";
     hardware.url = "github:nixos/nixos-hardware/master";
 
@@ -16,7 +16,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Home manager
     home-manager = {
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -34,7 +33,8 @@
     lanzaboote,
     home-manager,
     ...
-  }@inputs: let
+  }@inputs:
+  let
     mkNixos = modules: nixpkgs.lib.nixosSystem {
       inherit modules;
       specialArgs = { inherit (self) inputs outputs; };
@@ -59,11 +59,11 @@
         lanzaboote.nixosModules.lanzaboote
       ];
       cyberspark = mkNixos [
-        ./system/hosts/JimServer/configuration.nix
+        ./hosts/cyberspark/system
         mailserver.nixosModule
       ];
       shuttleworth = mkNixos [
-        ./system/hosts/JimPine/configuration.nix
+        ./hosts/shuttleworth/system
         hardware.nixosModules.pine64-pinebook-pro
       ];
     };
@@ -76,17 +76,17 @@
       ] nixpkgs.legacyPackages.x86_64-linux;
 
       "jimbo@cyberspark" = mkHome [
-        ./home/hosts/JimServer/home.nix
+        ./hosts/cyberspark/home
       ] nixpkgs.legacyPackages.x86_64-linux;
 
       "jimbo@shuttleworth" = mkHome [
-        ./home/hosts/JimPine/home.nix
+        ./hosts/shuttleworth/home
         nur.nixosModules.nur
       ] nixpkgs.legacyPackages.aarch64-linux;
 
       # Profile for ssh envrionments on different non-root systems
       "jimbo@terminal" = mkHome [
-        ./home/hosts/JimTerminal/home.nix
+        ./hosts/terminal/home
       ] nixpkgs.legacyPackages.x86_64-linux;
     };
   };
diff --git a/overlays/default.nix b/overlays/default.nix
index fe596a5..771126b 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -3,7 +3,7 @@
   nixpkgs.overlays = [
     inputs.blender-bin.overlays.default
     (final: _prev: import ./packages { pkgs = final; })
-    #(import ./mpv)
-    #(import ./unstable { inherit inputs; })
+    (import ./mpv)
+    (import ./unstable { inherit inputs; })
   ];
 }