diff --git a/home/programs/lazygit/default.nix b/home/programs/lazygit/default.nix
index 55c5bb1..88d4e5d 100644
--- a/home/programs/lazygit/default.nix
+++ b/home/programs/lazygit/default.nix
@@ -1,7 +1,5 @@
 { config, lib, ... }:
 let
-  transparentButtons = config.var.theme.bar.transparentButtons;
-
   accent = "#${config.lib.stylix.colors.base0D}";
   muted = "#${config.lib.stylix.colors.base03}";
 in {
diff --git a/home/programs/markdown/default.nix b/home/programs/markdown/default.nix
index 156f649..91b5ca9 100644
--- a/home/programs/markdown/default.nix
+++ b/home/programs/markdown/default.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ wkhtmltopdf ]; }
+# Work in progress on another repo
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ wkhtmltopdf ];
+}
diff --git a/home/programs/nextcloud/default.nix b/home/programs/nextcloud/default.nix
index 4f8a01a..fbd21bd 100644
--- a/home/programs/nextcloud/default.nix
+++ b/home/programs/nextcloud/default.nix
@@ -1,6 +1,7 @@
+# Nextcloud is a suite of client-server software for creating file hosting services and using them. It is functionally similar to Dropbox, although Nextcloud is free and open-source, allowing anyone to install and operate it on a private server. In contrast to proprietary services, Nextcloud can be hosted on a private server, without additional cost.
 {
-    services.nextcloud-client = {
-        enable = true;
-        startInBackground = true;
-    };
-}
\ No newline at end of file
+  services.nextcloud-client = {
+    enable = true;
+    startInBackground = true;
+  };
+}
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index e4b379c..66f12ee 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -1,3 +1,4 @@
+# Nixvim is a NixOS module that installs and configures Neovim
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
diff --git a/home/programs/nvim/options.nix b/home/programs/nvim/options.nix
index f4d9fce..8cb51c7 100644
--- a/home/programs/nvim/options.nix
+++ b/home/programs/nvim/options.nix
@@ -1,5 +1,4 @@
 {
-
   programs.nixvim.globals.mapleader = " ";
   programs.nixvim.opts = {
     updatetime = 50; # Faster completion
diff --git a/home/programs/qutebrowser/default.nix b/home/programs/qutebrowser/default.nix
index 44832d9..e1ce816 100644
--- a/home/programs/qutebrowser/default.nix
+++ b/home/programs/qutebrowser/default.nix
@@ -1,3 +1,5 @@
+# Qutebrowser is a keyboard-focused browser with a minimal GUI.
+# My homepage is generated using https://github.com/anotherhadi/homepage
 { pkgs, config, ... }:
 let
 
diff --git a/home/programs/qutebrowser/duckduckgo-colorscheme.nix b/home/programs/qutebrowser/duckduckgo-colorscheme.nix
index b90c33a..e395b46 100644
--- a/home/programs/qutebrowser/duckduckgo-colorscheme.nix
+++ b/home/programs/qutebrowser/duckduckgo-colorscheme.nix
@@ -1,3 +1,4 @@
+# A duckduckgo colorscheme generated for the Stylix theme used.
 { config, ... }:
 let
   accent = config.lib.stylix.colors.base0D;
diff --git a/home/programs/shell/eza.nix b/home/programs/shell/eza.nix
index b22604b..470852c 100644
--- a/home/programs/shell/eza.nix
+++ b/home/programs/shell/eza.nix
@@ -1,3 +1,4 @@
+# Eza is a ls replacement
 {
   programs.eza = {
     enable = true;
diff --git a/home/programs/shell/fzf.nix b/home/programs/shell/fzf.nix
index 781acbc..fff80b2 100644
--- a/home/programs/shell/fzf.nix
+++ b/home/programs/shell/fzf.nix
@@ -1,3 +1,4 @@
+# Fzf is a general-purpose command-line fuzzy finder.
 { config, lib, ... }:
 let
   accent = "#" + config.lib.stylix.colors.base0D;
diff --git a/home/programs/shell/starship.nix b/home/programs/shell/starship.nix
index 7cf95fa..088c1de 100644
--- a/home/programs/shell/starship.nix
+++ b/home/programs/shell/starship.nix
@@ -1,3 +1,4 @@
+# starship is a minimal, fast, and extremely customizable prompt for any shell!
 { config, lib, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";
diff --git a/home/programs/shell/tmux.nix b/home/programs/shell/tmux.nix
index ec89ab5..e3b05b1 100644
--- a/home/programs/shell/tmux.nix
+++ b/home/programs/shell/tmux.nix
@@ -1,3 +1,4 @@
+# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
 { pkgs, ... }: {
   programs.tmux = {
     enable = true;
diff --git a/home/programs/shell/zoxide.nix b/home/programs/shell/zoxide.nix
index 12c084c..4bf8749 100644
--- a/home/programs/shell/zoxide.nix
+++ b/home/programs/shell/zoxide.nix
@@ -1,6 +1,7 @@
+# Zoxide is a cd replacement
 {
   programs.zoxide = {
-   enable= true;
-   enableZshIntegration = true;
+    enable = true;
+    enableZshIntegration = true;
   };
 }
diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix
index fd76ec8..6e5d43d 100644
--- a/home/programs/shell/zsh.nix
+++ b/home/programs/shell/zsh.nix
@@ -1,3 +1,4 @@
+# My shell configuration
 { pkgs, lib, config, ... }:
 let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch
 in {
diff --git a/home/programs/spicetify/default.nix b/home/programs/spicetify/default.nix
index 84e51a0..b22bf3e 100644
--- a/home/programs/spicetify/default.nix
+++ b/home/programs/spicetify/default.nix
@@ -1,18 +1,23 @@
+# Spicetify is a spotify client customizer
 { pkgs, config, lib, inputs, ... }:
 let
   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
-  accent = "#${config.lib.stylix.colors.base0D}";
+  accent = "${config.lib.stylix.colors.base0D}";
 in {
-
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
+
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [ "spotify" ];
+
+  stylix.targets.spicetify.enable = false;
+
   programs.spicetify = {
     enable = true;
     theme = lib.mkForce spicePkgs.themes.text;
 
-    # TODO: Colors not working
-    customColorScheme = lib.mkForce {
+    colorScheme = "custom";
+
+    customColorScheme = {
       button = accent;
       button-active = accent;
       tab-active = accent;
diff --git a/home/programs/thunar/default.nix b/home/programs/thunar/default.nix
index 350d7d7..f56db89 100644
--- a/home/programs/thunar/default.nix
+++ b/home/programs/thunar/default.nix
@@ -1,3 +1,4 @@
+# Thunar is a file explorer
 { pkgs, ... }: {
   # ctrl + m to toggle the menubar
   home.packages = with pkgs.xfce; [
diff --git a/home/programs/yazi/default.nix b/home/programs/yazi/default.nix
index b4d4a16..15a093e 100644
--- a/home/programs/yazi/default.nix
+++ b/home/programs/yazi/default.nix
@@ -1,3 +1,4 @@
+# Yazi is a TUI file explorer
 {
   programs.yazi = {
     enable = true;
diff --git a/home/system/batsignal/default.nix b/home/system/batsignal/default.nix
index b5d908c..7b40d03 100644
--- a/home/system/batsignal/default.nix
+++ b/home/system/batsignal/default.nix
@@ -1,3 +1,4 @@
+# Batsignal is a simple utility to send battery notifications.
 {
   services.batsignal = {
     enable = true;
diff --git a/home/system/clipman/default.nix b/home/system/clipman/default.nix
index eca248e..bbbb5a1 100644
--- a/home/system/clipman/default.nix
+++ b/home/system/clipman/default.nix
@@ -1,3 +1,4 @@
+# Clipman allows you to save and retrieve clipboard history.
 { pkgs, ... }:
 let
   clipboard-clear = pkgs.writeShellScriptBin "clipboard-clear" ''
diff --git a/home/system/gtk/default.nix b/home/system/gtk/default.nix
index a17c5c0..e3a4855 100644
--- a/home/system/gtk/default.nix
+++ b/home/system/gtk/default.nix
@@ -1,3 +1,4 @@
+# GTK & QT theme configuration
 { config, pkgs, lib, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";
diff --git a/home/system/hypridle/default.nix b/home/system/hypridle/default.nix
index 31f0c4f..b354e15 100644
--- a/home/system/hypridle/default.nix
+++ b/home/system/hypridle/default.nix
@@ -1,3 +1,4 @@
+# Hypridle is a daemon that listens for user activity and runs commands when the user is idle.
 { pkgs, ... }: {
   services.hypridle = {
     enable = true;
diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index 2476496..e63fcde 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -1,5 +1,5 @@
+# So best window tiling manager
 { pkgs, config, inputs, ... }:
-
 let
   border-size = config.var.theme.border-size;
   gaps-in = config.var.theme.gaps-in;
diff --git a/home/system/hyprlock/default.nix b/home/system/hyprlock/default.nix
index 587b28c..8513003 100644
--- a/home/system/hyprlock/default.nix
+++ b/home/system/hyprlock/default.nix
@@ -1,3 +1,4 @@
+# Hyprlock is a lockscreen for Hyprland
 { config, ... }:
 let
   foreground = "rgba(216, 222, 233, 0.70)";
diff --git a/home/system/hyprpanel/default.nix b/home/system/hyprpanel/default.nix
index 020287c..25faf09 100644
--- a/home/system/hyprpanel/default.nix
+++ b/home/system/hyprpanel/default.nix
@@ -1,3 +1,5 @@
+# Hyprpanel is the bar on top of the screen
+# Display informations like workspaces, battery, wifi, ...
 { pkgs, config, ... }:
 let
   transparentButtons = config.var.theme.bar.transparentButtons;
diff --git a/home/system/hyprpaper/default.nix b/home/system/hyprpaper/default.nix
index 23bf1ce..0edeb96 100644
--- a/home/system/hyprpaper/default.nix
+++ b/home/system/hyprpaper/default.nix
@@ -1,3 +1,4 @@
+# Hyprpaper is used to set the wallpaper on the system
 {
   # The wallpaper is set by stylix
   services.hyprpaper = {
diff --git a/home/system/hyprswitch/default.nix b/home/system/hyprswitch/default.nix
deleted file mode 100644
index 85b91cc..0000000
--- a/home/system/hyprswitch/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ inputs, pkgs, ... }: {
-  home.packages = [ inputs.hyprswitch.packages."${pkgs.system}".default ];
-
-  wayland.windowManager.hyprland.settings.exec-once = [
-    "${inputs.hyprswitch.packages."${pkgs.system}".default}/bin/hyprswitch init"
-  ];
-
-}
diff --git a/home/system/kdeconnect/default.nix b/home/system/kdeconnect/default.nix
index 544c162..1fa3ec8 100644
--- a/home/system/kdeconnect/default.nix
+++ b/home/system/kdeconnect/default.nix
@@ -1,3 +1,4 @@
+# KDE Connect is a project that enables all your devices to communicate with each other. (laptop/phone)
 {
   services.kdeconnect = {
     enable = true;
diff --git a/home/system/mime/default.nix b/home/system/mime/default.nix
index 7248d0c..597f658 100644
--- a/home/system/mime/default.nix
+++ b/home/system/mime/default.nix
@@ -1,3 +1,4 @@
+# Mime allows us to configure the default applications for each file type
 {
   xdg.mimeApps = {
     enable = true;
diff --git a/home/system/tofi/default.nix b/home/system/tofi/default.nix
index 45d74a4..e2c17e0 100644
--- a/home/system/tofi/default.nix
+++ b/home/system/tofi/default.nix
@@ -1,3 +1,4 @@
+# Tofi is a dmeny-like application launcher
 # TODO: Tofi configuration
 { config, lib, ... }:
 let
diff --git a/home/system/udiskie/default.nix b/home/system/udiskie/default.nix
index decab95..f87dc5b 100644
--- a/home/system/udiskie/default.nix
+++ b/home/system/udiskie/default.nix
@@ -1,3 +1,4 @@
+# Udiskie is a simple daemon that uses udisks to automatically mount removable storage devices.
 {
   services.udiskie = {
     enable = true;
diff --git a/home/system/wofi/default.nix b/home/system/wofi/default.nix
index ed40e18..f495525 100644
--- a/home/system/wofi/default.nix
+++ b/home/system/wofi/default.nix
@@ -1,3 +1,4 @@
+# Wofi is a launcher for Wayland, inspired by rofi.
 { config, pkgs, lib, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";
diff --git a/home/system/zathura/default.nix b/home/system/zathura/default.nix
index 4e56637..8cb738a 100644
--- a/home/system/zathura/default.nix
+++ b/home/system/zathura/default.nix
@@ -1,4 +1,4 @@
-# PDF viewer
+# Zathura is a PDF viewer
 {
   programs.zathura = {
     enable = true;
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index cf5bf32..e752b90 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -26,7 +26,6 @@
     ../../home/system/hyprlock
     ../../home/system/hyprpanel
     ../../home/system/hyprpaper
-    # ../../home/system/hyprswitch
     ../../home/system/gtk
     ../../home/system/wofi
     ../../home/system/batsignal