diff --git a/common.nix b/common.nix
index a707db2..6fee626 100644
--- a/common.nix
+++ b/common.nix
@@ -2,58 +2,58 @@
 { config, pkgs, lib, ... }:
 
 {
-
-imports = [
-	./settings/gnome.nix
-	./settings/locale.nix
-	./settings/audio.nix
-	./settings/users.nix
-	./apps/fastfetch.nix
-	./apps/flatpaks.nix
-    # Add all your hosts here
+  imports = [
+    ./settings/gnome.nix
+    ./settings/locale.nix
+    ./settings/audio.nix
+    ./settings/users.nix
+    ./apps/fastfetch.nix
+    ./apps/flatpaks.nix
   ];
 
-# Use latest kernel
-boot.kernelPackages = pkgs.linuxPackages_latest;
+  # Use latest kernel
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
-# Allow unfree packages
-nixpkgs.config.allowUnfree = true;
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
 
-# Enable network-manager
-networking.networkmanager.enable = true;
-systemd.services.NetworkManager-wait-online.enable = false;
+  # Enable network-manager
+  networking.networkmanager.enable = true;
+  systemd.services.NetworkManager-wait-online.enable = false;
 
-# Shell aliases
-environment.shellAliases = {
-  update = ''
-    dconf reset -f /org/gnome/desktop/background/
-    CHANNEL=$(sudo nix-channel --list | grep "^nixos " | awk '{print $2}')
-    if [[ "$CHANNEL" != *"nixos-unstable"* ]]; then
-      echo "Switching to nixos-unstable channel..."
-      sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos
+  # Shell aliases
+  environment.shellAliases = {
+    update = ''
+      dconf reset -f /org/gnome/desktop/background/
+      CHANNEL=$(sudo nix-channel --list | grep "^nixos " | awk '{print $2}')
+      if [[ "$CHANNEL" != *"nixos-unstable"* ]]; then
+        echo "Switching to nixos-unstable channel..."
+        sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos
+        sudo nix-channel --update
+      fi
+      
+      # Add nix-flatpak channel if not present
+      if ! sudo nix-channel --list | grep -q "nix-flatpak"; then
+        echo "Adding nix-flatpak channel..."
+        sudo nix-channel --add https://github.com/gmodena/nix-flatpak/archive/main.tar.gz nix-flatpak
+      fi
+      
       sudo nix-channel --update
-    fi
-    
-    # Add nix-flatpak channel if not present
-    if ! sudo nix-channel --list | grep -q "nix-flatpak"; then
-      echo "Adding nix-flatpak channel..."
-      sudo nix-channel --add https://github.com/gmodena/nix-flatpak/archive/main.tar.gz nix-flatpak
-    fi
-    
-    sudo nix-channel --update
-    sudo nixos-rebuild switch --upgrade --option tarball-ttl 0
-  '';
-  clean = "sudo nix-collect-garbage -d";
-  ll = "ls -alh";
-  clear = "command clear && fastfetch --config /etc/fastfetch/config.jsonc";
-};
-
-# Add packages
-environment.systemPackages = with pkgs; [
-	git
-	adwaita-icon-theme
-];
 
+      # Wipe the flatpak state cache to ensure a fresh sync
+      echo "Cleaning Flatpak state cache..."
+      sudo rm -f /nix/var/nix/gcroots/flatpak-state.json
 
+      sudo nixos-rebuild switch --upgrade --option tarball-ttl 0
+    '';
+    clean = "sudo nix-collect-garbage -d";
+    ll = "ls -alh";
+    clear = "command clear && fastfetch --config /etc/fastfetch/config.jsonc";
+  };
 
+  # Add packages
+  environment.systemPackages = with pkgs; [
+      git
+      adwaita-icon-theme
+  ];
 }