diff --git a/modules/programs/gnome/default.nix b/modules/programs/gnome/default.nix
index 057f10e..2d3d681 100644
--- a/modules/programs/gnome/default.nix
+++ b/modules/programs/gnome/default.nix
@@ -10,7 +10,11 @@ in {
   config = lib.mkIf cfg.enable {
     environment = {
       systemPackages = with pkgs; [
+        # Themes
         arc-theme
+        libsForQt5.qtstyleplugin-kvantum
+
+        # Gnome Shell Extensions
         gnomeExtensions.appindicator
         gnomeExtensions.caffeine
         gnomeExtensions.gnome-40-ui-improvements
@@ -23,14 +27,17 @@ in {
         gnomeExtensions.gsconnect
         gnomeExtensions.blur-my-shell
         gnomeExtensions.forge
+
+        # Programs
         gnome.eog
         gnome.nautilus
         gnome.evince
-        unstable.gnome.gnome-shell
         gnome.gnome-terminal
         pinentry-gnome
+        mousai
+
+        # For config
         dconf # For home-manager
-        libsForQt5.qtstyleplugin-kvantum
       ];
       gnome.excludePackages = pkgs.gnome.optionalPackages;
     };