diff --git a/flake.lock b/flake.lock
index 835ebec..9e47a3a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719037157,
-        "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
+        "lastModified": 1720045378,
+        "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
+        "rev": "0a30138c694ab3b048ac300794c2eb599dc40266",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1719009683,
-        "narHash": "sha256-kvGqeJdHpqmDu5qJYCbylipbcPaSr1pFlO1m1xPtPeQ=",
+        "lastModified": 1720092067,
+        "narHash": "sha256-ebMlTz4wm+Md5BkCk6uGcRUvOvyjtc4bENvVSO5jrBI=",
         "ref": "refs/heads/main",
-        "rev": "4778afe2e6b4a6f8c7d218ccd8fe7e0bd4d2ee9c",
-        "revCount": 4874,
+        "rev": "0a6e83005f1910b5c1ec78476fcffc05af47833a",
+        "revCount": 4906,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718804078,
-        "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=",
+        "lastModified": 1719316102,
+        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0",
+        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718119275,
-        "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=",
+        "lastModified": 1719067853,
+        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "1419520d5f7f38d35e05504da5c1b38212a38525",
+        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718530797,
-        "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
+        "lastModified": 1719075281,
+        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
+        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
         "type": "github"
       },
       "original": {
@@ -230,11 +230,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1718895438,
-        "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
+        "lastModified": 1720031269,
+        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
+        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
         "type": "github"
       },
       "original": {
@@ -262,11 +262,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719063509,
-        "narHash": "sha256-hKczPZmBb97TWoWOwHkF7trGO1e5SDA3RnuiShUlzXg=",
+        "lastModified": 1720111126,
+        "narHash": "sha256-Tl8ut36bbRz4suJ96PCTegfq9iNy9ILQnM+tgyGato8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "880c22ac49ac208c1ee3e75d67238da4abdaff6f",
+        "rev": "51e238d1713b58ce589b3f0696750222c1aa58ed",
         "type": "github"
       },
       "original": {
diff --git a/home/email/default.nix b/home/email/default.nix
index 53661a1..3b4dbb8 100644
--- a/home/email/default.nix
+++ b/home/email/default.nix
@@ -177,7 +177,7 @@
       };
       filters = {
         "text/plain" = "cat";
-        "text/calendar" = "${pkgs.gnome.gnome-calendar}/bin/gnome-calendar";
+        "text/calendar" = "${pkgs.gnome-calendar}/bin/gnome-calendar";
         "message/delivery-status" = "cat";
         "message/rfc822" = "cat";
         "text/html" =
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 2ff2a69..9b1d3ac 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -2,8 +2,8 @@
 let
   playerctl = "${pkgs.playerctl}/bin/playerctl";
   wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
-  nautilus = "${pkgs.gnome.nautilus}/bin/nautilus";
-  gnome-calendar = "${pkgs.gnome.gnome-calendar}/bin/gnome-calendar";
+  nautilus = "${pkgs.nautilus}/bin/nautilus";
+  gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
   waybar = "${inputs.waybar.packages.${pkgs.system}.waybar}/bin/waybar";
   wpctl = "${pkgs.wireplumber}/bin/wpctl";
   alacritty = "${pkgs.alacritty}/bin/alacritty";
diff --git a/home/nvim/files/lua/settings.lua b/home/nvim/files/lua/settings.lua
index 6f8aeae..5a42a82 100644
--- a/home/nvim/files/lua/settings.lua
+++ b/home/nvim/files/lua/settings.lua
@@ -44,7 +44,7 @@ vim.opt.conceallevel = 2
 vim.opt.foldmethod = "expr"
 vim.opt.foldlevel = 0
 vim.opt.foldexpr = "getline(v:lnum)=~'^X-ExtEditorR'?1:0"
-vim.opt.wrap = false
+vim.opt.wrap = true
 vim.opt.textwidth = 10000
 
 -- Vimtex
diff --git a/home/utils/desktop.nix b/home/utils/desktop.nix
index 8148655..a274744 100644
--- a/home/utils/desktop.nix
+++ b/home/utils/desktop.nix
@@ -20,7 +20,7 @@
     element-desktop
     evince
     loupe
-    gnome.file-roller
+    file-roller
     gimp
     obs-studio
     inkscape
@@ -32,10 +32,15 @@
     indicator = true;
   };
 
+  programs.thunderbird = {
+    enable = true;
+    profiles.default.isDefault = true;
+  };
+
   gtk = {
       enable = true;
       theme = {
-          package = pkgs.gnome.gnome-themes-extra;
+          package = pkgs.gnome-themes-extra;
           name = "Adwaita-dark";
       };
       iconTheme = {
@@ -48,7 +53,7 @@
       gtk.enable = true;
       name = "Adwaita";
       size = 28;
-      package = pkgs.gnome.adwaita-icon-theme;
+      package = pkgs.adwaita-icon-theme;
   };
 
   services.cliphist = { enable = true; };
diff --git a/hosts/Common/desktop.nix b/hosts/Common/desktop.nix
index 9a0d9f4..5c2e8c4 100644
--- a/hosts/Common/desktop.nix
+++ b/hosts/Common/desktop.nix
@@ -29,7 +29,7 @@
 
   # Calendar
   # Add the server using gnome-online-accounts:
-  # nix-shell -p gnome.gnome-control-center --run "gnome-control-center"
+  # nix-shell -p gnome-control-center --run "gnome-control-center"
   # Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.
   programs.dconf.enable = true;
   services.gnome.evolution-data-server.enable = true;
@@ -58,5 +58,7 @@
       Experimental = true;
     };
   };
-
+  i18n.extraLocaleSettings = {
+      LC_TIME = "en_GB.UTF-8";
+  };
 }
diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix
index ca845fa..f7b670f 100644
--- a/hosts/Kell/default.nix
+++ b/hosts/Kell/default.nix
@@ -27,6 +27,7 @@
   ];
   environment.variables = {
       ROC_ENABLE_PRE_VEGA = "1";
+      LC_TIME = "en_GB.UTF-8";
   };