diff --git a/home-modules/applications/mako.nix b/home-modules/applications/mako.nix
index 7a706bb..65fab2a 100644
--- a/home-modules/applications/mako.nix
+++ b/home-modules/applications/mako.nix
@@ -2,15 +2,14 @@
 {
   services.mako = {
     enable = true;
-    #backgroundColor = "#CCCCCCCC"; # TODO: Make layout colors in a central place
-    borderSize = 0;
-    #borderColor = "#4C7899FF";
-    defaultTimeout = 1500;
-    #ignoreTimeout = true;
-    #textColor = "#FFFFFFFF";
-    #width = 300;
-    #height = 100;
-    #font = "monospace 10";
+    settings = {
+      border-size = 0;
+      default-timeout = 1500;
+      #ignoreTimeout = true;
+      #width = 300;
+      #height = 100;
+      #font = "monospace 10";
+    };
   }; # TODO
   catppuccin.mako.enable = true;
 }
diff --git a/home-modules/theme/default.nix b/home-modules/theme/default.nix
index 3e86482..cc4fc62 100644
--- a/home-modules/theme/default.nix
+++ b/home-modules/theme/default.nix
@@ -4,6 +4,6 @@
 }:
 {
   imports = [
-    inputs.catppuccin.homeManagerModules.catppuccin
+    inputs.catppuccin.homeModules.catppuccin
   ];
 }
diff --git a/nixos-modules/desktop/desktop-environment.nix b/nixos-modules/desktop/desktop-environment.nix
index c83c023..e5c5236 100644
--- a/nixos-modules/desktop/desktop-environment.nix
+++ b/nixos-modules/desktop/desktop-environment.nix
@@ -34,7 +34,7 @@ in
 
   services.gnome = {
     # TODO: Do this manually and not all at once.
-    core-utilities.enable = true;
+    core-apps.enable = true;
     core-os-services.enable = false;
 
     gnome-keyring.enable = true;