diff --git a/flake.lock b/flake.lock
index e75a0a4e..73850c29 100644
--- a/flake.lock
+++ b/flake.lock
@@ -115,18 +115,12 @@
       }
     },
     "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1721842668,
-        "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
+        "lastModified": 1728776144,
+        "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
+        "rev": "f876e3d905b922502f031aeec1a84490122254b7",
         "type": "github"
       },
       "original": {
@@ -185,11 +179,19 @@
         ]
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728763831,
         "narHash": "sha256-KOp33tls7jRAhcmu77aVxKpSMou8QgK0BC+Y3sYLuGo=",
         "owner": "nix-community",
         "repo": "disko",
         "rev": "b6215392ec3bd05e9ebfbb2f7945c414096fce8f",
+=======
+        "lastModified": 1729010169,
+        "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -299,11 +301,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -568,11 +570,19 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728679815,
         "narHash": "sha256-3IXvY30zzFq7lHFujMupPz3TiPXo8o8qiIjkXUvznCI=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
         "rev": "e4f4d7832cc559389b93798c1f0d615e3816f4ef",
+=======
+        "lastModified": 1728974938,
+        "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=",
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "rev": "23170582b0658e6afd913149a58863af3a57b376",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -593,11 +603,19 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728632221,
         "narHash": "sha256-LnBVdKPsreziZkYbeFqiSYP7tPFlprt9ej2QGd2aNlw=",
         "owner": "nix-community",
         "repo": "lanzaboote",
         "rev": "3326a0b3974fc04d991990f6497fe1a7d9892439",
+=======
+        "lastModified": 1729028850,
+        "narHash": "sha256-eOhjiU+3TCaSYZESYhU2ZTUQKrBcer9cQ/XpVkergAg=",
+        "owner": "nix-community",
+        "repo": "lanzaboote",
+        "rev": "bd01eac8c7cfa9b7e25304f0e7f0fed80de63f9d",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -612,11 +630,19 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728216729,
         "narHash": "sha256-HsisE2yMld0LckvQ3v/00bXFg11E5Q2XI8taPUewDPA=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
         "rev": "6c4cf448d33ce86bcc06c6d50bcecc33666105ee",
+=======
+        "lastModified": 1728821524,
+        "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=",
+        "owner": "nix-community",
+        "repo": "lib-aggregate",
+        "rev": "8921856c37862428741a29cfd4c98c4893ca407d",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -713,11 +739,19 @@
     },
     "nixlib": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728176478,
         "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
         "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
+=======
+        "lastModified": 1728781282,
+        "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -734,11 +768,19 @@
         ]
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728522165,
         "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
         "owner": "nix-community",
         "repo": "nixos-generators",
         "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
+=======
+        "lastModified": 1728867876,
+        "narHash": "sha256-NCyOA8WZNoojmXH+kBDrQj3LwvakYNzSc0h+LTXkmPE=",
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "rev": "fdf142111597f6c6283cf5ffe092b6293a3911d0",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -781,11 +823,19 @@
     },
     "nixpkgs-lib": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728176478,
         "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
         "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
+=======
+        "lastModified": 1728781282,
+        "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -828,11 +878,19 @@
     },
     "nixpkgs-unstable": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728492678,
         "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+=======
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -849,11 +907,19 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728757472,
         "narHash": "sha256-AM37viNRyjiPo8l+MgjtuBbLQbZ14UdqUsQZQYC7v8Q=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
         "rev": "f31d5880ded44894e6c14e04d3a2dc624c542756",
+=======
+        "lastModified": 1729027943,
+        "narHash": "sha256-o3+ewMrevE4J2YJg8QAbqTS7HVrzQqhaV3WFCHTbwZ4=",
+        "owner": "nix-community",
+        "repo": "nixpkgs-wayland",
+        "rev": "9b5a5691436324f6b4eed2211af688551a6071e9",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -864,11 +930,19 @@
     },
     "nixpkgs_2": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728627514,
         "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
+=======
+        "lastModified": 1728909085,
+        "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -895,11 +969,19 @@
     },
     "nixpkgs_4": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728492678,
         "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+=======
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -985,11 +1067,19 @@
     },
     "nur": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728778053,
         "narHash": "sha256-cMrvP6KtU70EZXJaG60ASzjia1CoEKN1UuX5BpS93Uw=",
         "owner": "nix-community",
         "repo": "NUR",
         "rev": "c6b7ef33feea3c22ef420ebdf97f547a34d16adf",
+=======
+        "lastModified": 1729035911,
+        "narHash": "sha256-MD81qtqfNYzbKssBk6hmozn3sB/qR+LL1Tx8qQE6+9U=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "64079c912fb1734bf1f06ba4754ae8a1b6fa6e25",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -1006,11 +1096,19 @@
         ]
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1728750492,
         "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=",
         "owner": "pjones",
         "repo": "plasma-manager",
         "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108",
+=======
+        "lastModified": 1729011811,
+        "narHash": "sha256-lNzTx9nUEaezJJ77Zm1IkOzTdak9i1n+EP08Z4Ef7xY=",
+        "owner": "pjones",
+        "repo": "plasma-manager",
+        "rev": "a9960fef15f27eb24ab172290c3febc2f1e66fd9",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -1033,11 +1131,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1721042469,
-        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "lastModified": 1728778939,
+        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
         "type": "github"
       },
       "original": {
@@ -1073,11 +1171,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722219664,
-        "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=",
+        "lastModified": 1728959392,
+        "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4",
+        "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9d07350d..649aa993 100644
--- a/flake.nix
+++ b/flake.nix
@@ -107,8 +107,12 @@
       warsaw-ovh-01       = libx.deploy { hostname = "warsaw-ovh-01"; };
     # nuc-server          = libx.deploy { hostname = "nuc-server"; };
 
+<<<<<<< Updated upstream
       # Raspberry Pi's 
     # Temporarily removed due to moving
+=======
+      # Raspberry Pi's  
+>>>>>>> Stashed changes
     # backups-rpi4        = libx.deploy { hostname = "backups-rpi4";      system = "aarch64-linux"; };
     # piaware-rpi4        = libx.deploy { hostname = "piaware-rpi4";      system = "aarch64-linux"; };
       bakersfield-rpi4    = libx.deploy { hostname = "bakersfield-rpi4";  system = "aarch64-linux"; };
diff --git a/wallpapers b/wallpapers
index 8ed82c9a..26552d8b 160000
--- a/wallpapers
+++ b/wallpapers
@@ -1 +1 @@
-Subproject commit 8ed82c9afaac6359cf4603196f7a5bd4b399a4b5
+Subproject commit 26552d8bade6fa39188ebf68e9ffa1a8dcd75108