diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..21575d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,41 @@
+# Paid wallpapers
+/home/wallpaper/wallpaper/16.png
+/home/wallpaper/wallpaper/17.png
+/home/wallpaper/wallpaper/2020.png
+/home/wallpaper/wallpaper/35.png
+/home/wallpaper/wallpaper/abyss.png
+/home/wallpaper/wallpaper/afterglow.png
+/home/wallpaper/wallpaper/air.png
+/home/wallpaper/wallpaper/birds.png
+/home/wallpaper/wallpaper/cell.png
+/home/wallpaper/wallpaper/circles.png
+/home/wallpaper/wallpaper/dawn.png
+/home/wallpaper/wallpaper/destination.png
+/home/wallpaper/wallpaper/dim.png
+/home/wallpaper/wallpaper/distance.png
+/home/wallpaper/wallpaper/edge.png
+/home/wallpaper/wallpaper/empty.png
+/home/wallpaper/wallpaper/evening.png
+/home/wallpaper/wallpaper/faraway_point.png
+/home/wallpaper/wallpaper/framents.png
+/home/wallpaper/wallpaper/harbour.png
+/home/wallpaper/wallpaper/horizon.png
+/home/wallpaper/wallpaper/lull.png
+/home/wallpaper/wallpaper/nice.png
+/home/wallpaper/wallpaper/night.png
+/home/wallpaper/wallpaper/on_the_hill.png
+/home/wallpaper/wallpaper/pap6.png
+/home/wallpaper/wallpaper/pearls.png
+/home/wallpaper/wallpaper/pieces.png
+/home/wallpaper/wallpaper/rose.png
+/home/wallpaper/wallpaper/same_way.png
+/home/wallpaper/wallpaper/specimen.png
+/home/wallpaper/wallpaper/stardust.png
+/home/wallpaper/wallpaper/stay_here.png
+/home/wallpaper/wallpaper/summer.png
+/home/wallpaper/wallpaper/undertone.png
+/home/wallpaper/wallpaper/weak_blue.png
+/home/wallpaper/wallpaper/weak_red.png
+/home/wallpaper/wallpaper/works.png
+/home/wallpaper/wallpaper/xp.png
+/home/wallpaper/wallpaper/zephyr.png
diff --git a/README.md b/README.md
index 5a5bae2..154f682 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,9 @@ This is my dotfiles repo. It's a work in progress, and I'm still learning how to
 
 # TODOLIST
 
-- [x] import theme globally
 - [ ] Variable user & homeDir
 - [ ] Settings fzf
 - [ ] Nixvim Alpha config
-  - [ ] Add shortcuts for nixos config
 - [ ] Scripts:
   - [ ] Edit
   - [ ] Rebuild
@@ -16,9 +14,7 @@ This is my dotfiles repo. It's a work in progress, and I'm still learning how to
   - [ ] Garbage collector
 - [ ] Ricing things
   - [ ] Peaclock
-  - [ ] Spicetify
 - [ ] Find a tui app for white noises (does that exist ? If not, I'll build my own)
 - [ ] Collections of wallpapers
   - [ ] Symbolic links for own dotfiles in Nextcloud folder if exist (wallpapers)
 - [ ] Custom GTK & Qt Theme based on the colorscheme
-- [ ] Ascii art neofetch
diff --git a/home/home.nix b/home/home.nix
index 4465ca8..dc6aa05 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -52,5 +52,6 @@
     ./neofetch
     ./spicetify
     ./variables/theme
+    ./wallpaper
   ];
 }
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index af41c42..2d3688c 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,11 +1,10 @@
 { pkgs, config, ... }: {
 
-  imports = [ ./hyprlock.nix ./hypridle.nix ];
+  imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ];
 
   home.packages = with pkgs; [
     xdg-desktop-portal-hyprland
     wlr-randr
-    swww
     wl-clipboard
     brightnessctl
     gnome.gnome-themes-extra
@@ -31,11 +30,7 @@
       "$menu" = "menu";
       "$powermenu" = "${pkgs.wlogout}/bin/wlogout";
 
-      exec-once = [
-        "swww init"
-        "swww img /home/hadi/.config/wallpaper/default.png"
-        "hypridle"
-      ];
+      exec-once = [ "hypridle" "hyprpaper"];
 
       monitor = [
         "eDP-2,highres,0x0,1"
diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix
new file mode 100644
index 0000000..237abb8
--- /dev/null
+++ b/home/hyprland/hyprpaper.nix
@@ -0,0 +1,8 @@
+{ pkgs, config, ... }: {
+  home.packages = with pkgs; [ hyprpaper ];
+
+  xdg.configFile."hypr/hyprpaper.conf".text = ''
+      preload = ~/.config/wallpaper/${config.theme.wallpaper}
+    wallpaper = ,~/.config/wallpaper/${config.theme.wallpaper}
+  '';
+}
diff --git a/home/shell/zsh.nix b/home/shell/zsh.nix
index 0a1fa54..f4c361e 100644
--- a/home/shell/zsh.nix
+++ b/home/shell/zsh.nix
@@ -24,6 +24,7 @@
     '';
 
     shellAliases = {
+      sl = "ls";
       vim = "nvim";
       v = "nvim";
       c = "clear";
diff --git a/home/variables/theme/blackish.nix b/home/variables/theme/blackish.nix
deleted file mode 100644
index 9c1e418..0000000
--- a/home/variables/theme/blackish.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  imports = [ ./config/template.nix ];
-
-  theme = {
-    waybar-transparent = true;
-    font-mono = "FiraCode Nerd Font Mono";
-    font = "SFProDisplay Nerd Font";
-    rounding = 12;
-    gaps-in = 10;
-    gaps-out = 20;
-    border-size = 3;
-
-    colors = {
-      bg = "040409";
-      fg = "FCFCFC";
-      alt-bg = "101012";
-      alt-fg = "ECECEC";
-      primary-bg = "a158ff";
-      primary-fg = "000000";
-      secondary-bg = "4928B8";
-      secondary-fg = "000000";
-      color0 = "000000";
-      color1 = "f7768e";
-      color2 = "73daca";
-      color3 = "e0af68";
-      color4 = "7aa2f7";
-      color5 = "9978F8";
-      color6 = "7dcfff";
-      color7 = "E4E5E7";
-      color8 = "515878";
-      color9 = "f7869e";
-      color10 = "83eada";
-      color11 = "f0bf78";
-      color12 = "8ab2f7";
-      color13 = "A988F8";
-      color14 = "8ddfff";
-      color15 = "f4f5f7";
-    };
-  };
-
-}
diff --git a/home/variables/theme/config/template.nix b/home/variables/theme/config/template.nix
index cd0cdfe..dfbcc32 100644
--- a/home/variables/theme/config/template.nix
+++ b/home/variables/theme/config/template.nix
@@ -9,6 +9,12 @@ with lib;
       type = types.bool;
       description = "Does waybar have a transparent background?";
     };
+
+    wallpaper = mkOption {
+      type = types.str;
+      description = "Name of the wallpaper (in the wallpaper directory)";
+    };
+
     font = mkOption {
       type = types.str;
       description = "Default font";
diff --git a/home/variables/theme/default.nix b/home/variables/theme/default.nix
index 40e063c..f8a4516 100644
--- a/home/variables/theme/default.nix
+++ b/home/variables/theme/default.nix
@@ -1 +1 @@
-{ imports = [ ./blackish.nix ]; }
+{ imports = [ ./nixy.nix ]; }
diff --git a/home/variables/theme/nixy.nix b/home/variables/theme/nixy.nix
index 4ad4fd6..1752471 100644
--- a/home/variables/theme/nixy.nix
+++ b/home/variables/theme/nixy.nix
@@ -2,19 +2,21 @@
   imports = [ ./config/template.nix ];
 
   theme = {
+    wallpaper = "default.png";
+    waybar-transparent = true;
     font-mono = "FiraCode Nerd Font Mono";
     font = "SFProDisplay Nerd Font";
-    rounding = 15;
+    rounding = 12;
     gaps-in = 10;
-    gaps-out = 15;
-    border-size = 2;
+    gaps-out = 20;
+    border-size = 3;
 
     colors = {
-      bg = "090914";
+      bg = "040409";
       fg = "FCFCFC";
-      alt-bg = "191924";
+      alt-bg = "101012";
       alt-fg = "ECECEC";
-      primary-bg = "9978F8";
+      primary-bg = "a158ff";
       primary-fg = "000000";
       secondary-bg = "4928B8";
       secondary-fg = "000000";
diff --git a/home/wallpaper/wallpaper.nix b/home/wallpaper/wallpaper.nix
new file mode 100644
index 0000000..81db544
--- /dev/null
+++ b/home/wallpaper/wallpaper.nix
@@ -0,0 +1,6 @@
+{ config, ... }: {
+  xdg.configFile."wallpaper" = {
+    recursive = true;
+    source = ./wallpaper;
+  };
+}
diff --git a/home/wallpaper/wallpaper/default.png b/home/wallpaper/wallpaper/default.png
new file mode 100644
index 0000000..fdc050b
Binary files /dev/null and b/home/wallpaper/wallpaper/default.png differ