diff --git a/flake.lock b/flake.lock
index 77b5847..48fadca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
         "pre-commit-hooks-nix": "pre-commit-hooks-nix"
       },
       "locked": {
-        "lastModified": 1619598097,
-        "narHash": "sha256-g8Qha/DlieKpc92yW/2HsucHQ6m+mjJPsc7p6bsBG8s=",
+        "lastModified": 1620750556,
+        "narHash": "sha256-J+z8oduu9u1FZ8spSowrgyAmtnBUIUDImqfQCZ58heo=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-agent",
-        "rev": "43d12815b3d53fb062fa23a2053618c1bccf304c",
+        "rev": "f62ce85aed4c4a7fca9e5da2b00340bbcdc92f88",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1616406726,
-        "narHash": "sha256-n9zmgxR03QNrvs9/fHewqE0j3SjL7Y+cglBCFu3U3rg=",
+        "lastModified": 1620708296,
+        "narHash": "sha256-8o6qy8kYYNX+gMgKWnNqGvmX0GCEmJ4ubDS3gdWH7sI=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "9e405fbc5ab5bacbd271fd78c6b6b6877c4d9f8d",
+        "rev": "896f9d3b5d7c0dc2566c7d2c6fe854ecef17daec",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
     },
     "devshell": {
       "locked": {
-        "lastModified": 1618523768,
-        "narHash": "sha256-Gev9da35pHUey3kGz/zrJFc/9ICs++vPCho7qB1mqd8=",
+        "lastModified": 1620641550,
+        "narHash": "sha256-o359KdI/LNiPL6EbirONff2MOvZHtZr9MgYx3R9oVFk=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "709fe4d04a9101c9d224ad83f73416dce71baf21",
+        "rev": "a47493423092f6c4c0a7eb605a7cd515a77db4a8",
         "type": "github"
       },
       "original": {
@@ -118,11 +118,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1620252045,
-        "narHash": "sha256-yDVOFHU1dZ/J0a4op9pImqDDKZxmeXuIwOQguJrTW9I=",
+        "lastModified": 1621407112,
+        "narHash": "sha256-zPYM4SNvVktHmdYRkfjj/T6aG3hs3Ov3r96P4xmxebA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90dd375eba16e11949d4a4a7538554dc8e9ceb8f",
+        "rev": "b449cb77b19be059f2a3cf9e7e26d3f68cea56a8",
         "type": "github"
       },
       "original": {
@@ -138,11 +138,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1618844365,
-        "narHash": "sha256-Z9t0rr+5OG/ru3jdg3jivfYVU4ydV/nqt8UwIut7uHs=",
+        "lastModified": 1620316130,
+        "narHash": "sha256-sU0VS5oJS1FsHsZsLELAXc7G2eIelVuucRw+q5B1x9k=",
         "owner": "nmattia",
         "repo": "naersk",
-        "rev": "32e3ba39d9d83098b13720a4384bdda191dd0445",
+        "rev": "a3f40fe42cc6d267ff7518fa3199e99ff1444ac4",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1620252427,
-        "narHash": "sha256-U1Q5QceuT4chJTJ1UOt7bZOn9Y2o5/7w27RISjqXoQw=",
+        "lastModified": 1621073999,
+        "narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d3ba49889a76539ea0f7d7285b203e7f81326ded",
+        "rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1619336929,
-        "narHash": "sha256-joIC2D26jtSbHodR/o8r+5T9XL2hXs6NIp5mVyA4JOc=",
+        "lastModified": 1620983891,
+        "narHash": "sha256-E2OKVgGo/cUqDsrIeYGVx64b4cxgzd7+bX33NHL0rbA=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f7540d6c27704ec0fe56ecc8b2a9b663181850b0",
+        "rev": "c4399b921fa7ff5f93ee10b3521b56b722ed74d8",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1620301725,
-        "narHash": "sha256-c7+L7g61fVBUE/z1XolqAUneBdqt3fhHyLVR7fKh4yU=",
+        "lastModified": 1621408301,
+        "narHash": "sha256-1j1I1oO7I2ihAYSM7R/GA79qhVfiES978buHouJ5wmM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "09a6296a7910d97e5d8f69fee747f17ef8e4d905",
+        "rev": "3a4856d8334f5d8fc47bf9e6dceedc293866df26",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
     },
     "override": {
       "locked": {
-        "lastModified": 1620302237,
-        "narHash": "sha256-AgJcLGc+6pPf8Ji3LQFdmsPbAz6c5Kd+NYweJsbr8y0=",
+        "lastModified": 1621410834,
+        "narHash": "sha256-dTnT197eNAeC6Yvoa5BNcU6281oNs368tkj6/NRu0TA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b418e17a4ccf42b1a99aa6eca2b86a5b552d081a",
+        "rev": "ea87fc7c63bd906871c7182a9c385e879fbb8311",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1619345332,
-        "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
+        "lastModified": 1620759905,
+        "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
+        "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8",
         "type": "github"
       },
       "original": {
diff --git a/users/mae/home-manager-base.nix b/users/mae/home-manager-base.nix
index 9120211..f9b4dd3 100644
--- a/users/mae/home-manager-base.nix
+++ b/users/mae/home-manager-base.nix
@@ -1,13 +1,11 @@
 { pkgs, ... }:
 {
   imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ];
-  home.packages = with pkgs; [
-    arc-theme
-  ];
 
   home.sessionVariables = {
     XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
     NIX_BUILD_SHELL = "zsh";
   };
   gtk.theme.name = "arc-dark";
+  gtk.theme.package = pkgs.arc-theme;
 }
diff --git a/users/profiles/sway/desktop.nix b/users/profiles/sway/desktop.nix
index ecfb2ca..6882e37 100644
--- a/users/profiles/sway/desktop.nix
+++ b/users/profiles/sway/desktop.nix
@@ -39,9 +39,8 @@
         {
           block = "disk_space";
           path = "/";
-          alias = "/";
           info_type = "available";
-          unit = "GiB";
+          unit = "GB";
           interval = 60;
           warning = 20.0;
           alert = 10.0;
@@ -49,8 +48,8 @@
         {
           block = "memory";
           display_type = "memory";
-          format_mem = "{Mup}%";
-          format_swap = "{SUp}%";
+          format_mem = "{mem_used}/{mem_total}({mem_used_percents})";
+          format_swap = "{swap_used}/{swap_total}({swap_used_percents})";
         }
         {
           block = "cpu";