diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix
index 2bcb52f..9373483 100644
--- a/nixos/hosts/Tibo-NixDesk/default.nix
+++ b/nixos/hosts/Tibo-NixDesk/default.nix
@@ -21,7 +21,6 @@
       networkmanager.enable = true;
       openconnect-sso.enable = true;
       openvpn.enable = true;
-      tailscale.enable = true;
     };
 
     nix = {
@@ -37,6 +36,7 @@
     };
 
     services = {
+      tailscale.enable = true;
       pipewire.enable = true;
       printing.enable = true;
       openrgb.enable = true;
diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index 80d9d98..2e790c3 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -23,7 +23,6 @@
     networking = {
       networkmanager.enable = true;
       openconnect-sso.enable = true;
-      tailscale.enable = true;
     };
 
     nix = {
@@ -38,7 +37,10 @@
       ssh.enable = true;
     };
 
-    services.pipewire.enable = true;
+    services = {
+      pipewire.enable = true;
+      tailscale.enable = true;
+    };
 
     users.tdpeuter.enable = true;
 
diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix
index 8cbbec7..7d977af 100644
--- a/nixos/hosts/Tibo-NixTop/default.nix
+++ b/nixos/hosts/Tibo-NixTop/default.nix
@@ -26,8 +26,6 @@
     networking = {
       networkmanager.enable = true;
       openconnect-sso.enable = true;
-      openvpn.enable = true;
-      tailscale.enable = true;
     };
 
     nix = {
@@ -43,7 +41,10 @@
       wireshark.enable = true;
     };
 
-    services.pipewire.enable = true;
+    services = {
+      pipewire.enable = true;
+      tailscale.enable = true;
+    };
 
     users.tdpeuter.enable = true;
 
diff --git a/nixos/modules/desktop/waybar/default.nix b/nixos/modules/desktop/waybar/default.nix
index 3eab3df..d893470 100644
--- a/nixos/modules/desktop/waybar/default.nix
+++ b/nixos/modules/desktop/waybar/default.nix
@@ -13,10 +13,6 @@ in {
       j4-dmenu-desktop
     ];
 
-    fonts.packages = with pkgs; [
-      font-awesome_6
-    ];
-
     programs.waybar.enable = true;
 
     services.atd.enable = true; # Command scheduler
diff --git a/nixos/modules/networking/default.nix b/nixos/modules/networking/default.nix
index 897a716..94bb711 100644
--- a/nixos/modules/networking/default.nix
+++ b/nixos/modules/networking/default.nix
@@ -3,6 +3,5 @@
     ./networkmanager
     ./openconnect-sso
     ./openvpn
-    ./tailscale
   ];
 }
diff --git a/nixos/modules/networking/tailscale/default.nix b/nixos/modules/networking/tailscale/default.nix
deleted file mode 100644
index ac2a936..0000000
--- a/nixos/modules/networking/tailscale/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
-
-let
-  cfg = config.sisyphus.networking.tailscale;
-in {
-  options.sisyphus.networking.tailscale.enable = lib.mkEnableOption "Tailscale";
-
-  config = lib.mkIf cfg.enable {
-    services = {
-      tailscale = {
-        enable = true;
-        package = pkgs-unstable.tailscale;
-        useRoutingFeatures = "client";
-        extraDaemonFlags = [
-          "--no-logs-no-support"
-        ];
-      };
-
-      resolved.enable = true;
-    };
-  };
-} 
diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
index 324ef55..663fc70 100644
--- a/nixos/modules/services/default.nix
+++ b/nixos/modules/services/default.nix
@@ -6,5 +6,6 @@
     ./pipewire
     ./printing
     ./remEYEnder
+    ./tailscale
   ];
 }
diff --git a/nixos/modules/services/tailscale/default.nix b/nixos/modules/services/tailscale/default.nix
new file mode 100644
index 0000000..48eceb7
--- /dev/null
+++ b/nixos/modules/services/tailscale/default.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, pkgs-unstable, ... }:
+
+let
+  cfg = config.sisyphus.services.tailscale;
+in {
+  options.sisyphus.services.tailscale.enable = lib.mkEnableOption "Tailscale";
+
+  config = lib.mkIf cfg.enable {
+    services.tailscale = {
+      enable = true;
+      package = pkgs-unstable.tailscale;
+      useRoutingFeatures = "client";
+    };
+  };
+} 
diff --git a/scripts/remEYEnder.sh b/scripts/remEYEnder.sh
index b06e5fa..c6dd482 100644
--- a/scripts/remEYEnder.sh
+++ b/scripts/remEYEnder.sh
@@ -7,10 +7,11 @@ interval_ms="$(( "${DURATION}" * ( 10 ** "${EXP}" ) / "${STEPS}" ))"
 padded_interval_ms="$(printf "%0${EXP}d" "${interval_ms}")"
 interval_s="${padded_interval_ms:0:-${EXP}}.${padded_interval_ms:-${EXP}}"
 
-end_time="$(( "$( date '+%s' )" + "${DURATION}" ))"
+end_time="$(( "$( date '+%s' )" + "${DURATION}" + 1 ))"
 
 # notify-send args
 replace_id="${end_time}"
+expire_time="$(( "${interval_ms}" + 1 ))" # To avoid flickering
 
 counter=0
 while [[ "${end_time}" -gt "$( date '+%s' )" ]]; do
@@ -21,16 +22,9 @@ while [[ "${end_time}" -gt "$( date '+%s' )" ]]; do
         'Look away from your screen :)' 'RemEYEnder' \
         --hint="int:value:${remaining_part}" \
         --category='sysinfo' \
-        --replace-id="${replace_id}"
+        --replace-id="${replace_id}" \
+        --expire-time="${expire_time}"
 
     counter="$(( "${counter}" + 1 ))"
     sleep "${interval_s}"
 done
-
-notify-send \
-    'Look away from your screen :)' 'RemEYEnder' \
-    --hint="int:value:${remaining_part}" \
-    --category='sysinfo' \
-    --replace-id="${replace_id}" \
-    --expire-time="${interval_ms}"
-
diff --git a/stow/waybar/.config/waybar/config.jsonc b/stow/waybar/.config/waybar/config.jsonc
index addef9e..a83d47c 100644
--- a/stow/waybar/.config/waybar/config.jsonc
+++ b/stow/waybar/.config/waybar/config.jsonc
@@ -23,17 +23,18 @@
         ],
         "include": [
             "~/.config/waybar/modules.json"
-        ],
-        "start_hidden": true
+        ]
     },
 
     /* Toggle this bar, contains all information */
     {
         "name": "toggle",
+        "mode": "hide",
+        "ipc": true,
         "position": "top",
         "height": 26,
         /* Show this bar on top of the other one, seemingly replacing it. */
-        /*"margin": "-26px 0 0 0",*/
+        "margin": "-26px 0 0 0",
         "modules-left": [
             "custom/meta",
             "sway/window",
@@ -58,7 +59,6 @@
         ],
         "include": [
             "~/.config/waybar/modules.json"
-        ],
-        "reload_style_on_change": true
+        ]
     }
 ]