diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix
index 8e9c5ee9..712787aa 100644
--- a/modules/crypto/default.nix
+++ b/modules/crypto/default.nix
@@ -30,7 +30,7 @@ in
       };
 
       home.packages = [
-        gnome3.seahorse
+        gnome.seahorse
         keepassxc
         libsecret
         qMasterPassword
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 5da7f4f6..d38b4d1a 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -95,10 +95,11 @@ in
 
         flameshot
         libnotify
-        gnome3.adwaita-icon-theme
+        gnome.adwaita-icon-theme
         gnome.eog
-        gnome3.nautilus
+        gnome.nautilus
         gnome.yelp
+        hicolor-icon-theme
 
         wine
 
@@ -119,7 +120,7 @@ in
         enable = true;
         font.name = "Lato";
         iconTheme = {
-          package = pkgs.papirus-maia-icon-theme;
+          package = pkgs.papirus-icon-theme;
           name = "Papirus-Adapta-Nokto-Maia";
         };
         theme = {
diff --git a/modules/office/default.nix b/modules/office/default.nix
index c1b552b7..204e3ae8 100644
--- a/modules/office/default.nix
+++ b/modules/office/default.nix
@@ -17,7 +17,7 @@ in
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
         libreoffice-fresh
-        gnome3.simple-scan
+        gnome.simple-scan
         # Tools like pdfunite
         poppler_utils
         # tool for annotating PDFs
diff --git a/profiles/base-user/.config/git/gitmessage.nix b/profiles/base-user/.config/git/gitmessage.nix
index 11cac0f9..7f4b1c64 100644
--- a/profiles/base-user/.config/git/gitmessage.nix
+++ b/profiles/base-user/.config/git/gitmessage.nix
@@ -8,18 +8,15 @@ in
 # No more than 50 chars. #### 50 chars is here:  #
 #
 
-#
-# Remember blank line between title and body.
-#
 
-#
+# ^ Remember ending with an extra blank line
 # Body: Explain *what* and *why* (not *how*). Include issue number.
 # Wrap at 72 chars. ################################## which is here:  #
 #
 
-#
+
+# ^ Remember ending with an extra blank line
 # At the end: Include Co-authored-by for all contributors.
-# Include at least one empty line before it. Format:
 #
 Co-authored-by: ${user.fullName} <${user.email}>