diff --git a/README.md b/README.md
index 97afd936..ea40e13e 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@
 - Rebuild and switch to change the system configuration (in the configuration directory):
 
 ```
-rebuild
+nh os switch
 ```
 
 OR
diff --git a/flake.lock b/flake.lock
index f537d71d..9128f055 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "nixvim": "nixvim"
       },
       "locked": {
-        "lastModified": 1713383187,
-        "narHash": "sha256-71fkl18ba3CQxbCjKMY7rBVFZf7nRO9OON4QxGFRhRc=",
+        "lastModified": 1715722315,
+        "narHash": "sha256-A9DqQw1dd04QeO8wV+Lx5TJQ0ur5BfQkbpOcL2LBzqc=",
         "owner": "redyf",
         "repo": "Neve",
-        "rev": "440ba4a08950db1f8f71f74398aeb7ed4ba6108b",
+        "rev": "e106a6783c8e0dd94914c06fcef576521e2618ef",
         "type": "github"
       },
       "original": {
@@ -20,6 +20,120 @@
         "type": "github"
       }
     },
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1708890466,
+        "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "665b3c6748534eb766c777298721cece9453fdae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16-fish": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1622559957,
+        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "type": "github"
+      }
+    },
+    "base16-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725948,
+        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+        "owner": "tinted-theming",
+        "repo": "base16-foot",
+        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-foot",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696727917,
+        "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
+    "base16-kitty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1665001328,
+        "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
+        "owner": "kdrag0n",
+        "repo": "base16-kitty",
+        "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kdrag0n",
+        "repo": "base16-kitty",
+        "type": "github"
+      }
+    },
+    "base16-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725902,
+        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+        "owner": "tinted-theming",
+        "repo": "base16-tmux",
+        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-tmux",
+        "type": "github"
+      }
+    },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1663659192,
+        "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
+        "owner": "chriskempson",
+        "repo": "base16-vim",
+        "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "chriskempson",
+        "repo": "base16-vim",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -48,11 +162,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1715445235,
-        "narHash": "sha256-SUu+oIWn+xqQIOlwfwNfS9Sek4i1HKsrLJchsDReXwA=",
+        "lastModified": 1716126753,
+        "narHash": "sha256-fdodsQ2AWreGj4arHk6cKcnqlWrNiLb64eRrHtMZ5cw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "159d87ea5b95bbdea46f0288a33c5e1570272725",
+        "rev": "601be8412d2ab72f752448766fe0fb2f00d5c40c",
         "type": "github"
       },
       "original": {
@@ -91,6 +205,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -167,6 +297,22 @@
         "type": "github"
       }
     },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1689549921,
+        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -190,6 +336,23 @@
         "type": "github"
       }
     },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713702291,
+        "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "ref": "46.1",
+        "repo": "gnome-shell",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -219,11 +382,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715380449,
-        "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=",
+        "lastModified": 1715930644,
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d7682620185f213df384c363288093b486b2883f",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
         "type": "github"
       },
       "original": {
@@ -233,6 +396,27 @@
         "type": "github"
       }
     },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714981474,
+        "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -249,11 +433,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713612213,
-        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
+        "lastModified": 1715791817,
+        "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
+        "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e",
         "type": "github"
       },
       "original": {
@@ -278,11 +462,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713612213,
-        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
+        "lastModified": 1715791817,
+        "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
+        "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e",
         "type": "github"
       },
       "original": {
@@ -301,11 +485,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1715468612,
-        "narHash": "sha256-pA0lpLJ3a+EhOCpEdksx5UlzXTcOaZzISppKKLYwAeg=",
+        "lastModified": 1716063601,
+        "narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=",
         "ref": "refs/heads/main",
-        "rev": "33a7b7bb6b307d6e4a093f75ffdda0419cd7ffaf",
-        "revCount": 4671,
+        "rev": "f8857e6072bd85b95393499688872aaf7f088b5b",
+        "revCount": 4719,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -382,11 +566,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713121246,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "lastModified": 1715791527,
+        "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee",
         "type": "github"
       },
       "original": {
@@ -407,11 +591,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713121246,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "lastModified": 1715791527,
+        "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee",
         "type": "github"
       },
       "original": {
@@ -432,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715287423,
-        "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
+        "lastModified": 1715879663,
+        "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
+        "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3",
         "type": "github"
       },
       "original": {
@@ -457,11 +641,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715287423,
-        "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
+        "lastModified": 1715879663,
+        "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
+        "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3",
         "type": "github"
       },
       "original": {
@@ -540,11 +724,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1715037484,
-        "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
+        "lastModified": 1715774670,
+        "narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
+        "rev": "b3fcfcfabd01b947a1e4f36622bbffa3985bdac6",
         "type": "github"
       },
       "original": {
@@ -556,11 +740,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1715087517,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
+        "lastModified": 1715787315,
+        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
         "type": "github"
       },
       "original": {
@@ -572,11 +756,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1715266358,
-        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
+        "lastModified": 1715961556,
+        "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
+        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
         "type": "github"
       },
       "original": {
@@ -588,11 +772,27 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1715087517,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
+        "lastModified": 1714912032,
+        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1715787315,
+        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
         "type": "github"
       },
       "original": {
@@ -628,11 +828,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1715463961,
-        "narHash": "sha256-FWGL+0DVOPdHnM+yWzHZW46bC+z0fpZrwvHiPV4RPe8=",
+        "lastModified": 1716155250,
+        "narHash": "sha256-hyjUJFrCxYJOIK2xM4IZCnW97HJpnUtv2NyykjoF5tE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "88bbe752f191c5b2ae376746c6e85ef951eed594",
+        "rev": "434a49f8736ccc9d108a6d3c34f2650bf15a3fe0",
         "type": "github"
       },
       "original": {
@@ -681,6 +881,7 @@
         "nixpkgs": "nixpkgs_5",
         "nur": "nur",
         "sf-mono-liga-src": "sf-mono-liga-src",
+        "stylix": "stylix",
         "waybar-hyprland": "waybar-hyprland"
       }
     },
@@ -700,6 +901,34 @@
         "type": "github"
       }
     },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-foot": "base16-foot",
+        "base16-helix": "base16-helix",
+        "base16-kitty": "base16-kitty",
+        "base16-tmux": "base16-tmux",
+        "base16-vim": "base16-vim",
+        "flake-compat": "flake-compat_3",
+        "gnome-shell": "gnome-shell",
+        "home-manager": "home-manager_3",
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1716037261,
+        "narHash": "sha256-eF0A36GdegKkEiwFArjCysGU/XEYvzj7x5jfkFMtmqM=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "76e7daf5a16d442ac98e844582f7dc1354610886",
+        "type": "github"
+      },
+      "original": {
+        "owner": "danth",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -780,16 +1009,16 @@
         "hyprcursor": "hyprcursor_2",
         "hyprlang": "hyprlang_2",
         "hyprwayland-scanner": "hyprwayland-scanner_2",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "systems": "systems_5",
         "xdph": "xdph_2"
       },
       "locked": {
-        "lastModified": 1715468612,
-        "narHash": "sha256-AF5bXnJqS7sj9ioJ/X6g1vg91nM9rtpf4iMIdPLjrRc=",
+        "lastModified": 1716063601,
+        "narHash": "sha256-lH2CLdRQFtbQVauhLFDbPWTGmj7LgblMg2dq9thd0Zc=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "33a7b7bb6b307d6e4a093f75ffdda0419cd7ffaf",
+        "rev": "f8857e6072bd85b95393499688872aaf7f088b5b",
         "type": "github"
       },
       "original": {
@@ -815,11 +1044,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714662532,
-        "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
+        "lastModified": 1715788457,
+        "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "1f228ba2f1f254195c0b571302b37482861abee3",
+        "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943",
         "type": "github"
       },
       "original": {
@@ -845,11 +1074,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714662532,
-        "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
+        "lastModified": 1715788457,
+        "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "1f228ba2f1f254195c0b571302b37482861abee3",
+        "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6bd0965e..705d0f3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,7 @@
     nur.url = "github:nix-community/NUR";
     Neve.url = "github:redyf/Neve";
     disko.url = "github:nix-community/disko";
+    stylix.url = "github:danth/stylix";
 
     # SFMono w/ patches
     sf-mono-liga-src = {
@@ -33,6 +34,7 @@
     hyprland,
     home-manager,
     disko,
+    stylix,
     ...
   } @ inputs: let
     supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
@@ -64,8 +66,10 @@
                 useGlobalPkgs = false;
                 extraSpecialArgs = {inherit inputs disko;};
                 users.redyf = ./home/redyf/home.nix;
+                backupFileExtension = "backup";
               };
             }
+            stylix.nixosModules.stylix
             hyprland.nixosModules.default
             disko.nixosModules.disko
           ];
diff --git a/home/redyf/apps/misc/default.nix b/home/redyf/apps/misc/default.nix
index 6ecf0fa4..90d1da25 100644
--- a/home/redyf/apps/misc/default.nix
+++ b/home/redyf/apps/misc/default.nix
@@ -20,31 +20,29 @@
     # Other stuff
     gh
     ollama
+    playerctl
 
     # Rice
-    # mako
-    # dunst # Notifications for your system
+    mako
+    bemenu
     # cmatrix
-    yazi # Best TUI file manager
     nitrogen # Wallpaper utility for X11
     nwg-look # Change GTK theme
 
     # Screenshot + extra utils
     grim # Screenshot tool for hyprland
     slurp # Works with grim to screenshot on wayland
-    ffmpeg_6 # A complete, cross-platform solution to record, convert and stream audio and video
     wl-clipboard # Enables copy/paste on wayland
     vlc
 
     # System Utils
     mpv
     glib
-    xclip
     unzip # Unzip files using the terminal
+    ffmpeg_6 # A complete, cross-platform solution to record, convert and stream audio and video
     tree-sitter # A parser generator tool and an incremental parsing library
     appimage-run # Run appimage files in the terminal
     polkit_gnome
-    dmenu
-    spotify
+    cinnamon.nemo
   ];
 }
diff --git a/home/redyf/cli-apps/bat/default.nix b/home/redyf/cli-apps/bat/default.nix
index f5d26922..8e768be2 100644
--- a/home/redyf/cli-apps/bat/default.nix
+++ b/home/redyf/cli-apps/bat/default.nix
@@ -3,7 +3,6 @@
     enable = true;
     config = {
       pager = "less -FR";
-      theme = "Catppuccin-mocha";
     };
     themes = let
       src = pkgs.fetchFromGitHub {
diff --git a/home/redyf/cli-apps/default.nix b/home/redyf/cli-apps/default.nix
index d5788f69..0cb7b76d 100644
--- a/home/redyf/cli-apps/default.nix
+++ b/home/redyf/cli-apps/default.nix
@@ -4,7 +4,6 @@ _: {
     ./eza
     ./fd
     ./fzf
-    # ./helix
     ./jq
     ./neovim
     # ./neve
diff --git a/home/redyf/cli-apps/fzf/default.nix b/home/redyf/cli-apps/fzf/default.nix
index 35a82f4f..ab26d1ab 100644
--- a/home/redyf/cli-apps/fzf/default.nix
+++ b/home/redyf/cli-apps/fzf/default.nix
@@ -34,7 +34,6 @@ in {
     tmux = {
       enableShellIntegration = true;
     };
-    colors = catppuccin;
     defaultOptions = [
       "--preview='bat --color=always {}'"
       "--multi"
diff --git a/home/redyf/cli-apps/tmux/default.nix b/home/redyf/cli-apps/tmux/default.nix
index d1457002..f797c557 100644
--- a/home/redyf/cli-apps/tmux/default.nix
+++ b/home/redyf/cli-apps/tmux/default.nix
@@ -48,10 +48,10 @@ in {
       tmux-fzf
       vim-tmux-navigator
       net-speed
-      {
-        plugin = tokyo-night;
-        extraConfig = builtins.readFile ./tokyo-night-tmux.conf;
-      }
+      # {
+      #   plugin = tokyo-night;
+      #   extraConfig = builtins.readFile ./tokyo-night-tmux.conf;
+      # }
       # {
       #   plugin = power-theme;
       #   extraConfig = builtins.readFile ./power-theme.conf;
@@ -64,10 +64,10 @@ in {
       #   plugin = catppuccin-tmux;
       #   extraConfig = builtins.readFile ./catppuccin-custom.conf;
       # }
-      # {
-      #   plugin = rose-pine;
-      #   extraConfig = builtins.readFile ./rose-pine.conf;
-      # }
+      {
+        plugin = rose-pine;
+        extraConfig = builtins.readFile ./rose-pine.conf;
+      }
     ];
     extraConfig = ''
       #--------------------------------------------------------------------------
diff --git a/home/redyf/cli-apps/tmux/power-theme.conf b/home/redyf/cli-apps/tmux/power-theme.conf
index 7b0e5558..ea004d95 100644
--- a/home/redyf/cli-apps/tmux/power-theme.conf
+++ b/home/redyf/cli-apps/tmux/power-theme.conf
@@ -23,9 +23,9 @@ set -g @tmux_power_date_icon " "
 set -g @tmux_power_time_icon " "
 set -g @tmux_power_user_icon " "
 set -g @tmux_power_session_icon " "
-set -g @tmux_power_show_upload_speed    true
-set -g @tmux_power_show_download_speed  true
-set -g @tmux_power_show_web_reachable   true
+set -g @tmux_power_show_upload_speed    false
+set -g @tmux_power_show_download_speed  false
+set -g @tmux_power_show_web_reachable   false
 set -g @tmux_power_right_arrow_icon     ""
 set -g @tmux_power_left_arrow_icon      ""
 set -g @tmux_power_upload_speed_icon    "󰕒"
diff --git a/home/redyf/cli-apps/tmux/rose-pine.conf b/home/redyf/cli-apps/tmux/rose-pine.conf
index 10c8d281..2d8b5cde 100644
--- a/home/redyf/cli-apps/tmux/rose-pine.conf
+++ b/home/redyf/cli-apps/tmux/rose-pine.conf
@@ -1,38 +1,38 @@
-set -g @rose_pine_variant 'moon' # Options are 'main', 'moon' or 'dawn'
+set -g @rose_pine_variant "moon" # Options are 'main', 'moon' or 'dawn'
 
-set -g @rose_pine_host 'on' # Enables hostname in the status bar
-set -g @rose_pine_date_time '' # It accepts the date UNIX command format (man date for info)
-set -g @rose_pine_user 'on' # Turn on the username component in the statusbar
-set -g @rose_pine_directory 'on' # Turn on the current folder component in the status bar
-set -g @rose_pine_bar_bg_disable 'on' # Disables background color, for transparent terminal emulators
-# If @rose_pine_bar_bg_disable is set to 'on', uses the provided value to set the background color
+set -g @rose_pine_host "on" # Enables hostname in the status bar
+set -g @rose_pine_date_time "" # It accepts the date UNIX command format (man date for info)
+set -g @rose_pine_user "on" # Turn on the username component in the statusbar
+set -g @rose_pine_directory "on" # Turn on the current folder component in the status bar
+set -g @rose_pine_bar_bg_disable "on" # Disables background color, for transparent terminal emulators
+# If @rose_pine_bar_bg_disable is set to "on", uses the provided value to set the background color
 # It can be any of the on tmux (named colors, 256-color set, `default` or hex colors)
 # See more on http://man.openbsd.org/OpenBSD-current/man1/tmux.1#STYLES
-set -g @rose_pine_bar_bg_disabled_color_option 'default'
+set -g @rose_pine_bar_bg_disabled_color_option "#232136"
 
-set -g @rose_pine_only_windows 'on' # Leaves only the window module, for max focus and space
-set -g @rose_pine_disable_active_window_menu 'on' # Disables the menu that shows the active window on the left
+set -g @rose_pine_only_windows "on" # Leaves only the window module, for max focus and space
+set -g @rose_pine_disable_active_window_menu "on" # Disables the menu that shows the active window on the left
 
-set -g @rose_pine_default_window_behavior 'on' # Forces tmux default window list behaviour
-set -g @rose_pine_show_current_program 'on' # Forces tmux to show the current running program as window name
-set -g @rose_pine_show_pane_directory 'on' # Forces tmux to show the current directory as window name
+set -g @rose_pine_default_window_behavior "on" # Forces tmux default window list behaviour
+set -g @rose_pine_show_current_program "on" # Forces tmux to show the current running program as window name
+set -g @rose_pine_show_pane_directory "on" # Forces tmux to show the current directory as window name
 # Previously set -g @rose_pine_window_tabs_enabled
 
 # Example values for these can be:
-set -g @rose_pine_left_separator ' > ' # The strings to use as separators are 1-space padded
-set -g @rose_pine_right_separator ' < ' # Accepts both normal chars & nerdfont icons
-set -g @rose_pine_field_separator ' | ' # Again, 1-space padding, it updates with prefix + I
+set -g @rose_pine_left_separator " > " # The strings to use as separators are 1-space padded
+set -g @rose_pine_right_separator " < " # Accepts both normal chars & nerdfont icons
+set -g @rose_pine_field_separator " | " # Again, 1-space padding, it updates with prefix + I
 
 # These are not padded
-set -g @rose_pine_session_icon '' # Changes the default icon to the left of the session name
-set -g @rose_pine_current_window_icon '' # Changes the default icon to the left of the active window name
-set -g @rose_pine_folder_icon '' # Changes the default icon to the left of the current directory folder
-set -g @rose_pine_username_icon '' # Changes the default icon to the right of the hostname
-set -g @rose_pine_hostname_icon '󰒋' # Changes the default icon to the right of the hostname
-set -g @rose_pine_date_time_icon '󰃰' # Changes the default icon to the right of the date module
+set -g @rose_pine_session_icon "" # Changes the default icon to the left of the session name
+set -g @rose_pine_current_window_icon "" # Changes the default icon to the left of the active window name
+set -g @rose_pine_folder_icon "" # Changes the default icon to the left of the current directory folder
+set -g @rose_pine_username_icon "" # Changes the default icon to the right of the hostname
+set -g @rose_pine_hostname_icon "󰒋" # Changes the default icon to the right of the hostname
+set -g @rose_pine_date_time_icon "󰃰" # Changes the default icon to the right of the date module
 set -g @rose_pine_window_status_separator "  " # Changes the default icon that appears between window names
 
 # Very beta and specific opt-in settings, tested on v3.2a, look at issue #10
-set -g @rose_pine_prioritize_windows 'on' # Disables the right side functionality in a certain window count / terminal width
-set -g @rose_pine_width_to_hide '80' # Specify a terminal width to toggle off most of the right side functionality
-set -g @rose_pine_window_count '5' # Specify a number of windows, if there are more than the number, do the same as width_to_hide
+set -g @rose_pine_prioritize_windows "on" # Disables the right side functionality in a certain window count / terminal width
+set -g @rose_pine_width_to_hide "80" # Specify a terminal width to toggle off most of the right side functionality
+set -g @rose_pine_window_count "5" # Specify a number of windows, if there are more than the number, do the same as width_to_hide
diff --git a/home/redyf/desktop/addons/default.nix b/home/redyf/desktop/addons/default.nix
index 4e4bf545..be869086 100644
--- a/home/redyf/desktop/addons/default.nix
+++ b/home/redyf/desktop/addons/default.nix
@@ -1,12 +1,11 @@
 _: {
   imports = [
     # ./alacritty
-    # ./bemenu
     # ./foot
     ./kitty
-    ./rofi
+    # ./rofi
     ./swww
-    ./waybar
-    ./wofi
+    # ./waybar
+    # ./wofi
   ];
 }
diff --git a/home/redyf/desktop/addons/kitty/challenger-deep.nix b/home/redyf/desktop/addons/kitty/challenger-deep.nix
deleted file mode 100644
index eda70086..00000000
--- a/home/redyf/desktop/addons/kitty/challenger-deep.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-''
-  # Challenger Deep Theme
-  # https://challenger-deep-theme.github.io/
-
-  foreground   #cbe3e7
-  background   #1b182c
-  selection_background  #fbfcfc
-
-  # black
-  color0       #565575
-  color8       #a6b3cc
-
-  # red
-  color1       #ff8080
-  color9       #ff5458
-
-  # green
-  color2       #95ffa4
-  color10      #62d196
-
-  # yellow
-  color3       #ffe9aa
-  color11      #ffb378
-
-  # blue
-  color4       #91ddff
-  color12      #65b2ff
-
-  # magenta
-  color5       #c991e1
-  color13      #906cff
-
-  # cyan
-  color6       #aaffe4
-  color14      #63f2f1
-
-  # white
-  color7       #cbe3e7
-  color15      #a6b3cc
-
-  # tabs
-  active_tab_foreground #1e1c31
-  active_tab_background #cbe3e7
-  inactive_tab_foreground #1e1e1e
-  inactive_tab_background #9d9d9d
-''
diff --git a/home/redyf/desktop/addons/kitty/custom-mocha.nix b/home/redyf/desktop/addons/kitty/custom-mocha.nix
deleted file mode 100644
index 3f7e891d..00000000
--- a/home/redyf/desktop/addons/kitty/custom-mocha.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-''
-  background #11111B
-
-  # Cursor
-  cursor #cba6f7
-
-  # Border
-  active_border_color #78a9ff
-  inactive_border_color #535353
-  bell_border_color #3ddbd9
-
-  # Tabs
-  active_tab_background #78a9ff
-  active_tab_foreground #0c0c0c
-  inactive_tab_background #2a2a2a
-  inactive_tab_foreground #6e6f70
-
-  # normal
-  color0 #11111B
-  color1 #ff5555
-  color2 #afffd7
-  color3 #f1fa8c
-  color4 #87afff
-  color5 #bd93f9
-  color6 #8be9fd
-  color7 #f8f8f2
-
-  # bright
-  color8 #2d5b69
-  color9 #ff665c
-  color10 #84c747
-  color11 #ebc13d
-  color12 #58a3ff
-  color13 #ff84cd
-  color14 #53d6c7
-  color15 #cad8d9
-''
diff --git a/home/redyf/desktop/addons/kitty/dark-decay.nix b/home/redyf/desktop/addons/kitty/dark-decay.nix
deleted file mode 100644
index 7df3575c..00000000
--- a/home/redyf/desktop/addons/kitty/dark-decay.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-''
-  # Eye Friendly Colors
-  # Created by https://github.com/decaycs
-
-  cursor_shape          Underline
-  cursor_underline_thickness 1
-  window_padding_width  20
-
-  # Special
-  foreground #b6beca
-  background #101419
-
-  # Black
-  color0 #1c252c
-  color8 #384148
-
-  # Red
-  color1 #e05f65
-  color9 #fc7b81
-
-  # Green
-  color2  #78dba9
-  color10 #94f7c5
-
-  # Yellow
-  color3  #f1cf8a
-  color11 #ffeba6
-
-  # Blue
-  color4  #70a5eb
-  color12 #8cc1ff
-
-  # Magenta
-  color5  #c68aee
-  color13 #e2a6ff
-
-  # Cyan
-  color6  #74bee9
-  color14 #90daff
-
-  # White
-  color7  #dee1e6
-  color15 #fafdff
-
-  # Cursor
-  cursor #f5f5f5
-  cursor_text_color #a9b1d6
-
-  # Selection highlight
-  selection_foreground #a9b1d6
-  selection_background #22262e
-''
diff --git a/home/redyf/desktop/addons/kitty/decayce.nix b/home/redyf/desktop/addons/kitty/decayce.nix
deleted file mode 100644
index f70a774a..00000000
--- a/home/redyf/desktop/addons/kitty/decayce.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-''
-  # Eye Friendly Colors
-  # Created by https://github.com/decaycs
-
-  # Special
-  background #0d0f18
-  foreground #a5b6cf
-
-  # Black
-  color0 #151720
-  color8 #1c1e27
-
-  # Red
-  color1 #dd6777
-  color9 #e26c7c
-
-  # Green
-  color2  #90ceaa
-  color10 #95d3af
-
-  # Yellow
-  color3  #ecd3a0
-  color11 #f1d8a5
-
-  # Blue
-  color4  #86aaec
-  color12 #8baff1
-
-  # Magenta
-  color5  #c296eb
-  color13 #c79bf0
-
-  # Cyan
-  color6  #93cee9
-  color14 #98d3ee
-
-  # White
-  color7  #cbced3
-  color15 #d0d3d8
-
-  # Cursor
-  cursor #cbced3
-  cursor_text_color #a5b6cf
-
-  # Selection highlight
-  selection_foreground #a5b6cf
-  selection_background #1c1e27
-''
diff --git a/home/redyf/desktop/addons/kitty/default.nix b/home/redyf/desktop/addons/kitty/default.nix
index ec4f9d34..d8477006 100644
--- a/home/redyf/desktop/addons/kitty/default.nix
+++ b/home/redyf/desktop/addons/kitty/default.nix
@@ -5,14 +5,14 @@
       enableZshIntegration = true;
       mode = "no-cursor";
     };
-    theme = "Catppuccin-Mocha";
-    font = {
-      name = "FiraCode Nerd Font";
-      # name = "JetBrainsMono Nerd Font";
-      # name = "MonoLisa";
-      # package = pkgs.monolisa-script;
-      size = 16;
-    };
+    # theme = "Tokyo Night";
+    # theme = "Catppuccin-Mocha";
+    # font = {
+    #   # name = "JetBrainsMono Nerd Font";
+    #   name = "MonoLisa";
+    #   package = pkgs.monolisa-script;
+    #   size = 11;
+    # };
     # https://www.monolisa.dev/faq#how-to-enable-stylistic-sets-for-the-kitty-terminal
     extraConfig = ''
       font_features MonoLisa -calt +liga +zero +ss01 +ss02 +ss07 +ss08 +ss10 +ss11 +ss18
@@ -30,7 +30,7 @@
       sync_to_monitor = "yes";
 
       # Background
-      background_opacity = "0.95";
+      # background_opacity = "1";
 
       # Cursor
       cursor_shape = "block";
@@ -117,7 +117,7 @@
       #     "kitty/themes/lunar.conf".text = import ./lunar.nix;
       #     "kitty/themes/mocha.conf".text = import ./mocha.nix;
       #     "kitty/themes/macchiato.conf".text = import ./macchiato.nix;
-      "kitty/themes/custom-mocha.conf".text = import ./custom-mocha.nix;
+      # "kitty/themes/custom-mocha.conf".text = import ./custom-mocha.nix;
       #     "kitty/themes/tokyonight_night.conf".text = import ./tokyonight_night.nix;
       #     "kitty/themes/rose-pine.conf".text = import ./rose-pine.nix;
       #     "kitty/themes/oxocarbon-dark.conf".text = import ./oxocarbon.nix;
diff --git a/home/redyf/desktop/addons/kitty/kitty.nix b/home/redyf/desktop/addons/kitty/kitty.nix
deleted file mode 100644
index 1cd3179f..00000000
--- a/home/redyf/desktop/addons/kitty/kitty.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-''
-  font_family      Monolisa-Medium
-  bold_font        Monolisa-Bold
-  italic_font      Monolisa-MediumItalic
-  bold_italic_font Monolisa-BoldItalic
-  font_size 14.00
-  # modify_font cell_height 125%
-  # modify_font cell_width 95%
-  # modify_font underline_position 4
-  # modify_font underline_thickness 150%
-  # text_composition_strategy legacy
-  background_opacity 0.98
-
-  # Don't ask for confirmation when closing a tab.
-  confirm_os_window_close 0
-
-  # Shhhhh
-  enable_audio_bell no
-
-  # Cursor
-  cursor_blink_interval 0
-  cursor_shape block
-
-  # Mouse
-  mouse_hide_wait 10.0
-  url_style double
-
-  # Themes
-  include themes/mocha.conf
-
-  # Padding
-  window_padding_width 0
-
-  # Tab Bar
-  tab_bar_edge top
-  tab_bar_margin_width 5
-  tab_bar_margin_height 5 0
-  tab_bar_style separator
-  tab_bar_min_tabs 2
-  tab_separator ""
-  tab_title_template "{fmt.fg._5c6370}{fmt.bg.default}{fmt.fg._abb2bf}{fmt.bg._5c6370} {tab.active_oldest_wd} {fmt.fg._5c6370}{fmt.bg.default} "
-  active_tab_title_template "{fmt.fg._BAA0E8}{fmt.bg.default}{fmt.fg.default}{fmt.bg._BAA0E8} {tab.active_oldest_wd} {fmt.fg._BAA0E8}{fmt.bg.default} "
-''
diff --git a/home/redyf/desktop/addons/kitty/lunar.nix b/home/redyf/desktop/addons/kitty/lunar.nix
deleted file mode 100644
index 4d128c93..00000000
--- a/home/redyf/desktop/addons/kitty/lunar.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-''
-  foreground #a9b1d6
-  background #1a1b26
-
-  # Black
-  color0 #414868
-  color8 #414868
-
-  # Red
-  color1 #f7768e
-  color9 #f7768e
-
-  # Green
-  color2  #73daca
-  color10 #73daca
-
-  # Yellow
-  color3  #e0af68
-  color11 #e0af68
-
-  # Blue
-  color4  #7aa2f7
-  color12 #7aa2f7
-
-  # Magenta
-  color5  #bb9af7
-  color13 #bb9af7
-
-  # Cyan
-  color6  #7dcfff
-  color14 #7dcfff
-
-  # White
-  color7  #c0caf5
-  color15 #c0caf5
-
-  # Cursor
-  cursor #c0caf5
-  cursor_text_color #1a1b26
-
-  # Selection highlight
-  selection_foreground none
-  selection_background #28344a
-
-  # The color for highlighting URLs on mouse-over
-  url_color #9ece6a
-
-  # Window borders
-  active_border_color #3d59a1
-  inactive_border_color #101014
-  bell_border_color #e0af68
-
-  # Tab bar
-  tab_bar_style powerline
-  tab_powerline_style         slanted
-  tab_title_template          {title}{' :{}:'.format(num_windows) if num_windows > 1 else '}
-  tab_fade 1
-  tab_bar_edge bottom
-  tab_bar_min_tabs 2
-  active_tab_foreground   #3d59a1
-  active_tab_background   #16161e
-  active_tab_font_style   bold
-  inactive_tab_foreground #787c99
-  inactive_tab_background #16161e
-  inactive_tab_font_style bold
-  tab_bar_background #101014
-
-  # Title bar
-  macos_titlebar_color #16161e
-
-  # Storm
-  # background #24283b
-  # cursor_text_color #24283b
-  # active_tab_background   #1f2335
-  # inactive_tab_background #1f2335
-  # macos_titlebar_color #1f2335
-''
diff --git a/home/redyf/desktop/addons/kitty/macchiato.nix b/home/redyf/desktop/addons/kitty/macchiato.nix
deleted file mode 100644
index 0ba66855..00000000
--- a/home/redyf/desktop/addons/kitty/macchiato.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-''
-  # vim:ft=kitty
-
-  ## name:     Catppuccin Kitty Macchiato
-  ## author:   Catppuccin Org
-  ## license:  MIT
-  ## upstream: https://github.com/catppuccin/kitty/blob/main/macchiato.conf
-  ## blurb:    Soothing pastel theme for the high-spirited!
-
-
-
-  # The basic colors
-  foreground              #CAD3F5
-  background              #24273A
-  selection_foreground    #24273A
-  selection_background    #F4DBD6
-
-  # Cursor colors
-  cursor                  #F4DBD6
-  cursor_text_color       #24273A
-
-  # URL underline color when hovering with mouse
-  url_color               #F4DBD6
-
-  # Kitty window border colors
-  active_border_color     #B7BDF8
-  inactive_border_color   #6E738D
-  bell_border_color       #EED49F
-
-  # OS Window titlebar colors
-  wayland_titlebar_color system
-  macos_titlebar_color system
-
-  # Tab bar colors
-  active_tab_foreground   #181926
-  active_tab_background   #C6A0F6
-  inactive_tab_foreground #CAD3F5
-  inactive_tab_background #1E2030
-  tab_bar_background      #181926
-
-  # Colors for marks (marked text in the terminal)
-  mark1_foreground #24273A
-  mark1_background #B7BDF8
-  mark2_foreground #24273A
-  mark2_background #C6A0F6
-  mark3_foreground #24273A
-  mark3_background #7DC4E4
-
-  # The 16 terminal colors
-
-  # black
-  color0 #494D64
-  color8 #5B6078
-
-  # red
-  color1 #ED8796
-  color9 #ED8796
-
-  # green
-  color2  #A6DA95
-  color10 #A6DA95
-
-  # yellow
-  color3  #EED49F
-  color11 #EED49F
-
-  # blue
-  color4  #8AADF4
-  color12 #8AADF4
-
-  # magenta
-  color5  #F5BDE6
-  color13 #F5BDE6
-
-  # cyan
-  color6  #8BD5CA
-  color14 #8BD5CA
-
-  # white
-  color7  #B8C0E0
-  color15 #A5ADCB
-''
diff --git a/home/redyf/desktop/addons/kitty/mocha.nix b/home/redyf/desktop/addons/kitty/mocha.nix
deleted file mode 100644
index 7125f793..00000000
--- a/home/redyf/desktop/addons/kitty/mocha.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-''
-  # vim:ft=kitty
-
-  ## name:     Catppuccin Kitty Mocha
-  ## author:   Catppuccin Org
-  ## license:  MIT
-  ## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
-  ## blurb:    Soothing pastel theme for the high-spirited!
-
-  # The basic colors
-  foreground              #CDD6F4
-  background              #1E1E2E
-  selection_foreground    #1E1E2E
-  selection_background    #F5E0DC
-
-  # Cursor colors
-  cursor                  #F5E0DC
-  cursor_text_color       #1E1E2E
-
-  # URL underline color when hovering with mouse
-  url_color               #F5E0DC
-
-  # Kitty window border colors
-  active_border_color     #B4BEFE
-  inactive_border_color   #6C7086
-  bell_border_color       #F9E2AF
-
-  # OS Window titlebar colors
-  wayland_titlebar_color system
-  macos_titlebar_color system
-
-  # Tab bar colors
-  active_tab_foreground   #11111B
-  active_tab_background   #CBA6F7
-  inactive_tab_foreground #CDD6F4
-  inactive_tab_background #181825
-  tab_bar_background      #11111B
-
-  # Colors for marks (marked text in the terminal)
-  mark1_foreground #1E1E2E
-  mark1_background #B4BEFE
-  mark2_foreground #1E1E2E
-  mark2_background #CBA6F7
-  mark3_foreground #1E1E2E
-  mark3_background #74C7EC
-
-  # The 16 terminal colors
-
-  # black
-  color0 #45475A
-  color8 #585B70
-
-  # red
-  color1 #F38BA8
-  color9 #F38BA8
-
-  # green
-  color2  #A6E3A1
-  color10 #A6E3A1
-
-  # yellow
-  color3  #F9E2AF
-  color11 #F9E2AF
-
-  # blue
-  color4  #89B4FA
-  color12 #89B4FA
-
-  # magenta
-  color5  #F5C2E7
-  color13 #F5C2E7
-
-  # cyan
-  color6  #94E2D5
-  color14 #94E2D5
-
-  # white
-  color7  #BAC2DE
-  color15 #A6ADC8
-''
diff --git a/home/redyf/desktop/addons/kitty/oxocarbon.nix b/home/redyf/desktop/addons/kitty/oxocarbon.nix
deleted file mode 100644
index eb36cce5..00000000
--- a/home/redyf/desktop/addons/kitty/oxocarbon.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-''
-  # Nightfox colors for Kitty
-  ## name: carbonfox
-  ## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/carbonfox/nightfox_kitty.conf
-
-  background #161616
-  foreground #f2f4f8
-  selection_background #2a2a2a
-  selection_foreground #f2f4f8
-  url_color #25be6a
-
-  # Cursor
-  # uncomment for reverse background
-  # cursor none
-  cursor #f2f4f8
-
-  # Border
-  active_border_color #78a9ff
-  inactive_border_color #535353
-  bell_border_color #3ddbd9
-
-  # Tabs
-  active_tab_background #78a9ff
-  active_tab_foreground #0c0c0c
-  inactive_tab_background #2a2a2a
-  inactive_tab_foreground #6e6f70
-
-  # normal
-  color0 #282828
-  color1 #ee5396
-  color2 #25be6a
-  color3 #08bdba
-  color4 #78a9ff
-  color5 #be95ff
-  color6 #33b1ff
-  color7 #dfdfe0
-
-  # bright
-  color8 #484848
-  color9 #f16da6
-  color10 #46c880
-  color11 #2dc7c4
-  color12 #8cb6ff
-  color13 #c8a5ff
-  color14 #52bdff
-  color15 #e4e4e5
-
-  # extended colors
-  color16 #3ddbd9
-  color17 #ff7eb6
-''
diff --git a/home/redyf/desktop/addons/kitty/rose-pine.nix b/home/redyf/desktop/addons/kitty/rose-pine.nix
deleted file mode 100644
index c2f229ef..00000000
--- a/home/redyf/desktop/addons/kitty/rose-pine.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-''
-  ## name: Rosé Pine
-  ## author: mvllow
-  ## license: MIT
-  ## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine.conf
-  ## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
-
-  foreground               #e0def4
-  background               #191724
-  selection_foreground     #e0def4
-  selection_background     #403d52
-
-  cursor                   #524f67
-  cursor_text_color        #e0def4
-
-  url_color                #c4a7e7
-
-  active_tab_foreground    #e0def4
-  active_tab_background    #26233a
-  inactive_tab_foreground  #6e6a86
-  inactive_tab_background  #191724
-
-  active_border_color      #31748f
-  inactive_border_color    #403d52
-
-  # black
-  color0   #26233a
-  color8   #6e6a86
-
-  # red
-  color1   #eb6f92
-  color9   #eb6f92
-
-  # green
-  color2   #31748f
-  color10  #31748f
-
-  # yellow
-  color3   #f6c177
-  color11  #f6c177
-
-  # blue
-  color4   #9ccfd8
-  color12  #9ccfd8
-
-  # magenta
-  color5   #c4a7e7
-  color13  #c4a7e7
-
-  # cyan
-  color6   #ebbcba
-  color14  #ebbcba
-
-  # white
-  color7   #e0def4
-  color15  #e0def4
-''
diff --git a/home/redyf/desktop/addons/kitty/tokyonight_night.nix b/home/redyf/desktop/addons/kitty/tokyonight_night.nix
deleted file mode 100644
index f3aa4b6b..00000000
--- a/home/redyf/desktop/addons/kitty/tokyonight_night.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-''
-  # vim:ft=kitty
-
-  ## name: Tokyo Night
-  ## license: MIT
-  ## author: Folke Lemaitre
-  ## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
-
-
-  background #1a1b26
-  foreground #c0caf5
-  selection_background #33467c
-  selection_foreground #c0caf5
-  url_color #73daca
-  cursor #c0caf5
-  cursor_text_color #1a1b26
-
-  # Tabs
-  active_tab_background #7aa2f7
-  active_tab_foreground #16161e
-  inactive_tab_background #292e42
-  inactive_tab_foreground #545c7e
-  #tab_bar_background #15161e
-
-  # Windows
-  active_border_color #7aa2f7
-  inactive_border_color #292e42
-
-  # normal
-  color0 #15161e
-  color1 #f7768e
-  color2 #9ece6a
-  color3 #e0af68
-  color4 #7aa2f7
-  color5 #bb9af7
-  color6 #7dcfff
-  color7 #a9b1d6
-
-  # bright
-  color8 #414868
-  color9 #f7768e
-  color10 #9ece6a
-  color11 #e0af68
-  color12 #7aa2f7
-  color13 #bb9af7
-  color14 #7dcfff
-  color15 #c0caf5
-
-  # extended colors
-  color16 #ff9e64
-  color17 #db4b4b
-''
diff --git a/home/redyf/desktop/awesomewm.nix b/home/redyf/desktop/awesomewm.nix
index c414118b..1fc695cd 100644
--- a/home/redyf/desktop/awesomewm.nix
+++ b/home/redyf/desktop/awesomewm.nix
@@ -7,6 +7,9 @@
       };
     };
     packages = with pkgs; [
+      xclip
+      dunst
+      dmenu
       flameshot
     ];
   };
diff --git a/home/redyf/desktop/gtk/default.nix b/home/redyf/desktop/gtk/default.nix
index 7d07eb5b..b98d66cd 100644
--- a/home/redyf/desktop/gtk/default.nix
+++ b/home/redyf/desktop/gtk/default.nix
@@ -7,16 +7,16 @@
       size = 32; # Affects gtk applications as the name suggests
     };
 
-    theme = {
-      # name = "Catppuccin-Macchiato-Compact-Blue-dark";
-      # package = pkgs.catppuccin-gtk.override {
-      #   size = "compact";
-      #   accents = ["blue"];
-      #   variant = "macchiato";
-      # };
-      name = "WhiteSur";
-      package = pkgs.whitesur-gtk-theme;
-    };
+    # theme = {
+    # name = "Catppuccin-Macchiato-Compact-Blue-dark";
+    # package = pkgs.catppuccin-gtk.override {
+    #   size = "compact";
+    #   accents = ["blue"];
+    #   variant = "macchiato";
+    # };
+    #   name = "WhiteSur";
+    #   package = pkgs.whitesur-gtk-theme;
+    # };
 
     iconTheme = {
       name = "Papirus-Dark";
diff --git a/home/redyf/desktop/hyprland/default.nix b/home/redyf/desktop/hyprland/default.nix
index f6fa460e..2e4dedac 100644
--- a/home/redyf/desktop/hyprland/default.nix
+++ b/home/redyf/desktop/hyprland/default.nix
@@ -41,9 +41,9 @@ in {
       swww kill
       swww init
 
-      # Dunst (Notifications)
-      pkill dunst
-      dunst &
+      # Mako (Notifications)
+      pkill mako
+      mako &
 
       # Cursor
       gsettings set org.gnome.desktop.interface cursor-theme macOS-BigSur
@@ -118,8 +118,8 @@ in {
         gaps_in = 2;
         gaps_out = 0;
         border_size = 0;
-        "col.active_border" = "${catppuccin_border}";
-        "col.inactive_border" = "${tokyonight_border}";
+        # "col.active_border" = "${catppuccin_border}";
+        # "col.inactive_border" = "${tokyonight_border}";
         layout = "dwindle";
         apply_sens_to_raw = 1; # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
       };
@@ -130,8 +130,8 @@ in {
         drop_shadow = false;
         shadow_range = 20;
         shadow_render_power = 3;
-        "col.shadow" = "rgb(${oxocarbon_background})";
-        "col.shadow_inactive" = "${background}";
+        # "col.shadow" = "rgb(${oxocarbon_background})";
+        # "col.shadow_inactive" = "${background}";
         blur = {
           enabled = true;
           size = 4;
@@ -275,9 +275,9 @@ in {
         "SUPER,o,exec,obsidian"
         "SUPER SHIFT,C,exec,wallpaper"
         "SUPER,z,exec,waybar"
-        # "SUPER,space,exec,bemenu-run"
+        "SUPER,space,exec,bemenu-run"
         # "SUPER,space,exec, tofi-drun --drun-launch=true"
-        "SUPER,space,exec,wofi --show drun -I -s ~/.config/wofi/style.css DP-3"
+        # "SUPER,space,exec,wofi --show drun -I -s ~/.config/wofi/style.css DP-3"
       ];
 
       bindm = [
diff --git a/home/redyf/home.nix b/home/redyf/home.nix
index 841abc3b..648aaf1c 100644
--- a/home/redyf/home.nix
+++ b/home/redyf/home.nix
@@ -15,7 +15,6 @@
     ./apps
     ./cli-apps
     ./desktop
-    ./hardware
     ./rice
     ./system
     ./tools
@@ -51,24 +50,11 @@
               cp -R $src/*.ttf $out/share/fonts/opentype/
             '';
           };
-
-          berkeley = prev.stdenvNoCC.mkDerivation {
-            pname = "berkeley";
-            version = "dev";
-            src = berkeley-mono;
-            dontConfigure = true;
-            installPhase = ''
-              mkdir -p $out/share/fonts/opentype
-              cp -R $src/*.otf $out/share/fonts/opentype/
-            '';
-          };
         }
       )
     ];
   };
 
-  fonts.fontconfig.enable = true;
-
   # Add support for .local/bin
   home.sessionPath = [
     "$HOME/.local/bin"
diff --git a/home/redyf/rice/btop/default.nix b/home/redyf/rice/btop/default.nix
index e07dc987..590ffee1 100644
--- a/home/redyf/rice/btop/default.nix
+++ b/home/redyf/rice/btop/default.nix
@@ -2,7 +2,6 @@ _: {
   programs.btop = {
     enable = true;
     settings = {
-      color_theme = "catppuccin_macchiato";
       vim_keys = true;
       rounded_corners = true;
     };
diff --git a/home/redyf/system/fonts/default.nix b/home/redyf/system/fonts/default.nix
index 4337cb4f..c6f72136 100644
--- a/home/redyf/system/fonts/default.nix
+++ b/home/redyf/system/fonts/default.nix
@@ -5,7 +5,7 @@
       font-awesome
       fira-code-symbols
       material-design-icons
-      (nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})
+      (nerdfonts.override {fonts = ["JetBrainsMono"];})
       noto-fonts
       powerline-symbols
       monolisa-script
diff --git a/home/redyf/system/nix/default.nix b/home/redyf/system/nix/default.nix
index 5fb3befe..2b605850 100644
--- a/home/redyf/system/nix/default.nix
+++ b/home/redyf/system/nix/default.nix
@@ -3,7 +3,7 @@
     nil
     statix
     alejandra
-    nix-index
+    nurl
     nix-init
     nix-prefetch-git
   ];
diff --git a/home/redyf/system/shell/default.nix b/home/redyf/system/shell/default.nix
index a58fc855..473c5892 100644
--- a/home/redyf/system/shell/default.nix
+++ b/home/redyf/system/shell/default.nix
@@ -8,7 +8,6 @@
 in {
   home = {
     shellAliases = {
-      sudo = "doas";
       c = "nvim";
       cp = "cp -i";
       f = "neofetch --sixel";
@@ -17,7 +16,6 @@ in {
       grep = "grep --color=auto";
       mv = "mv -i";
       rip = "rip -i";
-      rebuild = "cd ~/nixdots && doas nixos-rebuild switch --flake .#redyf";
       g = "git";
       ga = "git add";
       gaa = "git add .";
@@ -30,12 +28,11 @@ in {
       gp = "git pull";
       gs = "git status";
     };
-  };
-
-  home.sessionVariables = {
-    MANPAGER = "sh -c 'col -bx | bat -l man -p'";
-    MANROFFOPT = "-c";
-    DIRENV_LOG_FORMAT = ""; # Blank so direnv will shut up
+    sessionVariables = {
+      MANPAGER = "sh -c 'col -bx | bat -l man -p'";
+      MANROFFOPT = "-c";
+      DIRENV_LOG_FORMAT = ""; # Blank so direnv will shut up
+    };
   };
 
   programs = {
@@ -149,6 +146,7 @@ in {
       '';
 
       shellAliases = {
+        sudo = "doas";
         c = "nvim";
         cp = "cp -i";
         f = "neofetch --sixel";
@@ -157,7 +155,6 @@ in {
         grep = "grep --color=auto";
         mv = "mv -i";
         rip = "rip -i";
-        rebuild = "cd ~/nixdots && doas nixos-rebuild switch --flake .#redyf";
         postman = "postman --use-gl=desktop";
         insomnia = "insomnia --use-gl=desktop";
         beekeeper-studio = "beekeeper-studio --use-gl=desktop";
diff --git a/home/redyf/tools/http/default.nix b/home/redyf/tools/http/default.nix
index efbf38d9..ec80233e 100644
--- a/home/redyf/tools/http/default.nix
+++ b/home/redyf/tools/http/default.nix
@@ -1,3 +1,3 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [wget curl httpie openssl];
+  home.packages = with pkgs; [curl httpie openssl];
 }
diff --git a/home/redyf/tools/languages/default.nix b/home/redyf/tools/languages/default.nix
index 51f05403..8cb4afb6 100644
--- a/home/redyf/tools/languages/default.nix
+++ b/home/redyf/tools/languages/default.nix
@@ -3,9 +3,9 @@ _: {
     ./c
     ./go
     ./rust
-    ./ocaml
     ./python
     ./javascript
+    # ./ocaml
     # ./sql
     # ./java
     # ./lua
diff --git a/home/redyf/tools/languages/ocaml/default.nix b/home/redyf/tools/languages/ocaml/default.nix
new file mode 100644
index 00000000..4733da88
--- /dev/null
+++ b/home/redyf/tools/languages/ocaml/default.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    ocaml
+    opam
+  ];
+}
diff --git a/home/redyf/tools/languages/sql/default.nix b/home/redyf/tools/languages/sql/default.nix
index 6358a21a..e9cef014 100644
--- a/home/redyf/tools/languages/sql/default.nix
+++ b/home/redyf/tools/languages/sql/default.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    mysql80
     postgresql
     beekeeper-studio
     # mysql-workbench
diff --git a/home/redyf/virtualization/kvm/default.nix b/home/redyf/virtualization/kvm/default.nix
index 38bf6865..a4ba874b 100644
--- a/home/redyf/virtualization/kvm/default.nix
+++ b/home/redyf/virtualization/kvm/default.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    qemu-utils
     virt-manager
   ];
 }
diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix
index 9321977f..bd477e39 100644
--- a/hosts/redyf/configuration.nix
+++ b/hosts/redyf/configuration.nix
@@ -3,7 +3,9 @@
   pkgs,
   config,
   ...
-}: {
+}: let
+  theme = "rose-pine-moon";
+in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -112,7 +114,7 @@
   # Enable and configure `doas`.
   security = {
     sudo = {
-      enable = false;
+      enable = true;
     };
     doas = {
       enable = true;
@@ -126,17 +128,17 @@
     };
   };
 
-  fonts = {
-    enableDefaultPackages = true;
-    fontconfig = {
-      enable = true;
-      defaultFonts = {
-        serif = ["Times, Noto Serif"];
-        sansSerif = ["Helvetica Neue LT Std, Helvetica, Noto Sans"];
-        monospace = ["Courier Prime, Courier, Noto Sans Mono"];
-      };
-    };
-  };
+  # fonts = {
+  #   enableDefaultPackages = true;
+  #   fontconfig = {
+  #     enable = true;
+  #     defaultFonts = {
+  #       serif = ["Times, Noto Serif"];
+  #       sansSerif = ["Helvetica Neue LT Std, Helvetica, Noto Sans"];
+  #       monospace = ["Courier Prime, Courier, Noto Sans Mono"];
+  #     };
+  #   };
+  # };
 
   programs = {
     zsh.enable = true;
@@ -146,13 +148,52 @@
     };
     noisetorch.enable = true;
     nh = {
-      enable = false;
-      clean.enable = false;
+      enable = true;
+      clean.enable = true;
       clean.extraArgs = "--keep-since 4d --keep 3";
       flake = "/home/redyf/nixdots";
     };
   };
 
+  stylix = {
+    autoEnable = true;
+    image = "./lain05.jpg";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml";
+    fonts = {
+      monospace = {
+        package = with pkgs; nerdfonts.override {fonts = ["JetBrainsMono"];};
+        name = "JetBrainsMono Nerd Font";
+      };
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+      sizes = {
+        applications = 10;
+        terminal = 11;
+        desktop = 10;
+        popups = 11;
+      };
+    };
+    opacity = {
+      applications = 1.0;
+      terminal = 1.0;
+      desktop = 1.0;
+      popups = 1.0;
+    };
+    polarity = "dark";
+    targets = {
+      grub.enable = false;
+      gnome.enable = false;
+      gtk.enable = true;
+      nixos-icons.enable = true;
+    };
+  };
+
   # Enables docker in rootless mode
   virtualisation = {
     docker.rootless = {
@@ -164,7 +205,7 @@
   };
 
   time.timeZone = "America/Bahia";
-  #
+
   i18n = {
     defaultLocale = "pt_BR.UTF-8";
     extraLocaleSettings = {
@@ -193,7 +234,7 @@
       trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
     };
     gc = {
-      automatic = true;
+      automatic = false;
       dates = "weekly";
       options = "--delete-older-than 7d";
     };
@@ -226,7 +267,12 @@
       audio.enable = true;
     };
 
+    fstrim.enable = true;
     sshd.enable = true;
+    mysql = {
+      enable = false;
+      package = pkgs.mysql80;
+    };
     libinput = {
       enable = true;
       mouse = {
@@ -254,7 +300,6 @@
           enable = true;
           luaModules = with pkgs.luaPackages; [
             luarocks
-            # luadbi-mysql
           ];
         };
       };
@@ -266,26 +311,27 @@
     };
     logmein-hamachi.enable = false;
     flatpak.enable = false;
-    # autorandr = {
-    #   enable = true;
-    #   profiles = {
-    #     redyf = {
-    #       config = {
-    #         DP-0 = {
-    #           enable = true;
-    #           primary = true;
-    #           mode = "1920x1080";
-    #           rate = "165.00";
-    #           position = "0x0";
-    #         };
-    #       };
-    #     };
-    #   };
-    # };
+    autorandr = {
+      enable = true;
+      profiles = {
+        redyf = {
+          config = {
+            DP-0 = {
+              enable = true;
+              primary = true;
+              mode = "1920x1080";
+              rate = "165.00";
+              position = "0x0";
+            };
+          };
+        };
+      };
+    };
   };
 
   environment.systemPackages = with pkgs; [
     git
+    docker-compose
     xdg-desktop-portal-hyprland
   ];
 
diff --git a/hosts/redyf/lain05.jpg b/hosts/redyf/lain05.jpg
new file mode 100644
index 00000000..c5f73dfc
Binary files /dev/null and b/hosts/redyf/lain05.jpg differ