diff --git a/docs/SCRIPTS.md b/docs/SCRIPTS.md
index 2e6b1e7..90fa106 100644
--- a/docs/SCRIPTS.md
+++ b/docs/SCRIPTS.md
@@ -2,6 +2,8 @@
 
 ## Nix/NixOs shortcuts
 
+The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
+
 - `nixy-rebuild`
 - `nixy-update`
 - `nixy-gc` # garbage collection
diff --git a/docs/TODO.md b/docs/TODO.md
index e9aa356..0c6e3c3 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -2,28 +2,37 @@
 
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
-- [ ] Nixy script v2 (with nixosConfiguration's name variable)
-- [ ] Installation script
-- [ ] Themes
-  - [ ] Upload new wallpapers
-  - [ ] MacOS theme
-- [ ] Make hyprcursor work
+- [ ] Nixy
+  - [ ] Nixy script v2 (with nixosConfiguration's name variable)
+    - [ ] Installation script
+    - [ ] Themes
+      - [ ] Upload new wallpapers
+      - [ ] MacOS theme
+
+- [ ] Hyprland
+  - [ ] Make hyprcursor work
+  - [ ] Animations based on app name
+
 - [ ] Homepage (web) v2
-  - [ ] Different link on web/mobile (so it can open ios/android apps)
   - [ ] Manifest & favicon
+
 - [ ] Nixvim
   - [ ] Nerdfont pluggins to search and paste in the code
   - [ ] Telescope shortcut for file content
   - [ ] Markdown snippets
   - [ ] Make whichkey better
+
 - [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
   - [ ] Exclude file pattern (nodes modules, ...)
+
 - [ ] Nextcloud exclude file pattern (nodes modules, ...)
+
 - [ ] Automount USB Key (And notify-send when it's done)
   - [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
-- [ ] Bitcoin-git
-- [ ] server fetch
-- [ ] Remote push
-- [ ] Ntfy auth file
-- [ ] Fix adguard
-- [ ] Variable hostConfiguration name
+
+- [ ] Server
+  - [ ] Bitcoin-git
+  - [ ] server fetch
+  - [ ] Remote push
+  - [ ] Ntfy auth file
+  - [ ] Fix adguard
diff --git a/home/scripts/default.nix b/home/scripts/default.nix
index 9a13c83..726d113 100644
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -12,5 +12,6 @@
     ./compress
     ./misc
     ./tofi
+    ./remote-rebuild
   ];
 }
diff --git a/home/scripts/nixy/default.nix b/home/scripts/nixy/default.nix
index 11d5015..50a458e 100644
--- a/home/scripts/nixy/default.nix
+++ b/home/scripts/nixy/default.nix
@@ -51,11 +51,11 @@ let
   '';
 
   nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" ''
-    sudo nixos-rebuild switch --flake ${config.var.configDirectory}#nixy
+    sudo nixos-rebuild switch --flake ${config.var.configDirectory}#${config.var.hostname}
   '';
 
   nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" ''
-    sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#nixy
+    sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#${config.var.hostname}
   '';
 
   nixy-update = pkgs.writeShellScriptBin "nixy-update" ''
diff --git a/home/scripts/remote-rebuild/default.nix b/home/scripts/remote-rebuild/default.nix
new file mode 100644
index 0000000..e32c819
--- /dev/null
+++ b/home/scripts/remote-rebuild/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, config, ... }:
+
+let
+
+  remote-rebuild = pkgs.writeShellScriptBin "remote-rebuild" ''
+    ssh jack -C "cd /home/hadi/.config/nixos && git pull && nixy-rebuild"
+  '';
+
+in { home.packages = with pkgs; [ remote-rebuild ]; }
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index e55fad5..3771454 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -28,6 +28,6 @@
     obsidian = true;
     tailscale = true;
 
-    theme = import ../themes/nixy.nix; # select your theme here
+    theme = import ../themes/catppuccin.nix; # select your theme here
   };
 }