diff --git a/flake.lock b/flake.lock
index 125df90..f39c6f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -237,11 +237,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1715014280,
-        "narHash": "sha256-70dgc0r7vCVkp93yTwzaQ7Xfh9cE63t+0mCVbreK8SQ=",
+        "lastModified": 1715172584,
+        "narHash": "sha256-hB2QxcKNFILCtkRTEN3lf/ivY+KkDBRmthYFuT82iS4=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "beb5afcbef9f102c209de7aa32f126ded9dda515",
+        "rev": "f4a61006bf70340e57f10842abf47bd88c2cc1ec",
         "type": "github"
       },
       "original": {
@@ -257,11 +257,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714981474,
-        "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
+        "lastModified": 1715077503,
+        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
+        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
         "type": "github"
       },
       "original": {
@@ -393,11 +393,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714980446,
-        "narHash": "sha256-SZLOdVXaCIxbtS8fwuKG2tbczQ5ta4UpjfL/64FSLAk=",
+        "lastModified": 1715179875,
+        "narHash": "sha256-S8ZOu/PZwhnk825aRL6E5kVbi55Hj8+wGVzJdBhuRRs=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "b24b3344f0eab00503da8c99ad546539699bbdd5",
+        "rev": "aae0df6fd9c9e8498fca76bc3244189eddf99e34",
         "type": "github"
       },
       "original": {
@@ -489,11 +489,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1714906307,
-        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
+        "lastModified": 1715087517,
+        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
+        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
         "type": "github"
       },
       "original": {
@@ -505,11 +505,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1715035541,
-        "narHash": "sha256-H8w0GhZxBpMzjY5HEaT5S/tnhsKx4lACUW4UPAi9DcI=",
+        "lastModified": 1715206400,
+        "narHash": "sha256-KxwYJL8ot3DyvIfNFeRdZCaIfvdz5QOBw+beKIAvwxk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "590b4fc898660027bfa5baf09cebb0dc87f49ed5",
+        "rev": "c08fcf2a2209e0dcba24555460a91aadfb89801d",
         "type": "github"
       },
       "original": {
@@ -595,11 +595,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714961776,
-        "narHash": "sha256-LiIxWRKbm1DZ+7l1a6FMmIO8leQx5yrRLIApCMai1DY=",
+        "lastModified": 1715134005,
+        "narHash": "sha256-oujsCgNiQnZoQntNkkNkA7BhCmUvf9FLWj+2oGT2Jvc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f3b20ea4131408ea585bddb1f41f91c4de9499cf",
+        "rev": "a8bfc2569a1965c0da8711d289d973f0011b441a",
         "type": "github"
       },
       "original": {
diff --git a/home/home.nix b/home/home.nix
index 39ca878..a15560c 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -9,11 +9,12 @@ in {
   home.stateVersion = "22.11";
 
   imports = [
-    ./programs/cli.nix
-    ./programs/desktop.nix
-    ./programs/dev.nix
-    ./programs/theming.nix
+    ./modules/cli.nix
+    ./modules/desktop.nix
+    ./modules/dev.nix
+    ./modules/theming.nix
     ./util/ez.nix
+    ./util/flatpak.nix
     inputs.nix-index-database.hmModules.nix-index
   ];
 
diff --git a/home/programs/icons/comfyui.png b/home/icons/comfyui.png
similarity index 100%
rename from home/programs/icons/comfyui.png
rename to home/icons/comfyui.png
diff --git a/home/programs/icons/fb_msg.png b/home/icons/fb_msg.png
similarity index 100%
rename from home/programs/icons/fb_msg.png
rename to home/icons/fb_msg.png
diff --git a/home/programs/icons/ms_teams.png b/home/icons/ms_teams.png
similarity index 100%
rename from home/programs/icons/ms_teams.png
rename to home/icons/ms_teams.png
diff --git a/home/programs/icons/openwebui.png b/home/icons/openwebui.png
similarity index 100%
rename from home/programs/icons/openwebui.png
rename to home/icons/openwebui.png
diff --git a/home/programs/icons/syncthing.png b/home/icons/syncthing.png
similarity index 100%
rename from home/programs/icons/syncthing.png
rename to home/icons/syncthing.png
diff --git a/home/programs/icons/tafe.jpg b/home/icons/tafe.jpg
similarity index 100%
rename from home/programs/icons/tafe.jpg
rename to home/icons/tafe.jpg
diff --git a/home/programs/icons/winlogo.png b/home/icons/winlogo.png
similarity index 100%
rename from home/programs/icons/winlogo.png
rename to home/icons/winlogo.png
diff --git a/home/modules/chat.nix b/home/modules/chat.nix
new file mode 100644
index 0000000..e2a41b3
--- /dev/null
+++ b/home/modules/chat.nix
@@ -0,0 +1,23 @@
+{config, ...}: {
+  imports = [
+    ../util/firefox-webapp.nix
+    ../util/flatpak.nix
+  ];
+  programs.firefox.webapps = {
+    "Microsoft-Teams" = {
+      url = "https://teams.microsoft.com";
+      id = 1;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "Microsoft Teams";
+      icon = ../icons/ms_teams.png;
+    };
+    "Facebook-Messenger" = {
+      url = "https://www.messenger.com";
+      id = 2;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "Facebook Messenger";
+      icon = ../icons/fb_msg.png;
+    };
+  };
+  flatpaks = ["im.fluffychat.Fluffychat"];
+}
diff --git a/home/programs/cli.nix b/home/modules/cli.nix
similarity index 51%
rename from home/programs/cli.nix
rename to home/modules/cli.nix
index 495ac1d..dcbed32 100644
--- a/home/programs/cli.nix
+++ b/home/modules/cli.nix
@@ -1,10 +1,10 @@
 {pkgs, ...}: {
   imports = [
-    ./kitty.nix
-    ./zsh.nix
-    ./xresources.nix
-    ./helix.nix
-    ./atuin.nix
+    ../programs/kitty.nix
+    ../programs/zsh.nix
+    ../programs/xresources.nix
+    ../programs/helix.nix
+    ../programs/atuin.nix
   ];
   home.packages = with pkgs; [
     btop
diff --git a/home/programs/creative.nix b/home/modules/creative.nix
similarity index 74%
rename from home/programs/creative.nix
rename to home/modules/creative.nix
index f50db5e..d77b93d 100644
--- a/home/programs/creative.nix
+++ b/home/modules/creative.nix
@@ -1,4 +1,7 @@
 {...}: {
+  imports = [
+    ../util/flatpak.nix
+  ];
   flatpaks = [
     "ar.com.tuxguitar.TuxGuitar"
     "org.inkscape.Inkscape"
diff --git a/home/programs/desktop.nix b/home/modules/desktop.nix
similarity index 80%
rename from home/programs/desktop.nix
rename to home/modules/desktop.nix
index 86bbb0e..b79b0a1 100644
--- a/home/programs/desktop.nix
+++ b/home/modules/desktop.nix
@@ -1,12 +1,11 @@
 {pkgs, ...}: {
   imports = [
     ./media-players.nix
-    ./firefox.nix
-    ./flatpak.nix
     ./webapps.nix
-    ./vscode.nix
     ./documents.nix
     ./creative.nix
+    ./chat.nix
+    ../programs/firefox.nix
   ];
   home.packages = with pkgs; [
     gnome.file-roller
diff --git a/home/programs/dev.nix b/home/modules/dev.nix
similarity index 88%
rename from home/programs/dev.nix
rename to home/modules/dev.nix
index 0078e98..4cc64e7 100644
--- a/home/programs/dev.nix
+++ b/home/modules/dev.nix
@@ -1,4 +1,8 @@
 {pkgs, ...}: {
+  imports = [
+    ../programs/vscode.nix
+  ];
+
   home.packages = with pkgs; [
     git-credential-keepassxc
     direnv
diff --git a/home/programs/documents.nix b/home/modules/documents.nix
similarity index 86%
rename from home/programs/documents.nix
rename to home/modules/documents.nix
index 47234d4..b2dc76c 100644
--- a/home/programs/documents.nix
+++ b/home/modules/documents.nix
@@ -1,4 +1,7 @@
 {...}: {
+  imports = [
+    ../util/flatpak.nix
+  ];
   flatpaks = [
     {
       name = "md.obsidian.Obsidian";
diff --git a/home/programs/media-players.nix b/home/modules/media-players.nix
similarity index 100%
rename from home/programs/media-players.nix
rename to home/modules/media-players.nix
diff --git a/home/programs/theming.nix b/home/modules/theming.nix
similarity index 94%
rename from home/programs/theming.nix
rename to home/modules/theming.nix
index 0deb27d..5e8649c 100644
--- a/home/programs/theming.nix
+++ b/home/modules/theming.nix
@@ -17,7 +17,7 @@
     #   inherit package name;
     # };
     theme = {
-      name = "adw-gtk3-dark";
+      name = "Adwaita-dark";
       package = adw-gtk3; # cosmic
     };
     iconTheme = with icons; {
diff --git a/home/modules/webapps.nix b/home/modules/webapps.nix
new file mode 100644
index 0000000..05b9227
--- /dev/null
+++ b/home/modules/webapps.nix
@@ -0,0 +1,21 @@
+{config, ...}: {
+  imports = [
+    ../util/firefox-webapp.nix
+  ];
+  programs.firefox.webapps = {
+    "Syncthing" = {
+      url = "http://127.0.0.1:8384";
+      id = 3;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "Syncthing";
+      icon = ../icons/syncthing.png;
+    };
+    "StudyTAFE" = {
+      url = "https://www.studytafensw.edu.au";
+      id = 4;
+      extraSettings = config.programs.firefox.profiles.default.settings;
+      name = "TAFE Study";
+      icon = ../icons/tafe.jpg;
+    };
+  };
+}
diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix
index 6632a67..b98f949 100644
--- a/home/programs/firefox.nix
+++ b/home/programs/firefox.nix
@@ -77,6 +77,8 @@ in {
       name = "Default";
       settings = {
         "browser.startup.homepage" = "about:blank";
+        "browser.shell.didSkipDefaultBrowserCheckOnFirstRun" = true;
+        "browser.policies.applied" = true;
         "widget.use-xdg-desktop-portal.file-picker" = 1;
         "widget.use-xdg-desktop-portal.mime-handler" = 1;
       };
diff --git a/home/programs/ollama.nix b/home/programs/ollama.nix
index 2689a73..cba5642 100644
--- a/home/programs/ollama.nix
+++ b/home/programs/ollama.nix
@@ -11,7 +11,7 @@ in {
     openwebui = rec {
       name = "Ollama (OpenWebUI)";
       genericName = "Ollama";
-      icon = ./icons/openwebui.png;
+      icon = ../icons/openwebui.png;
       id = 6;
       port = 3021;
       service = let
diff --git a/home/programs/stable-diffusion.nix b/home/programs/stable-diffusion.nix
index 265356b..8fe7b6f 100644
--- a/home/programs/stable-diffusion.nix
+++ b/home/programs/stable-diffusion.nix
@@ -11,7 +11,7 @@ in {
     stable-diffusion = {
       name = "Stable Diffusion (ComfyUI)";
       genericName = "Stable Diffusion";
-      icon = ./icons/comfyui.png;
+      icon = ../icons/comfyui.png;
       id = 5;
       port = 7860;
       service = {
diff --git a/home/programs/webapps.nix b/home/programs/webapps.nix
deleted file mode 100644
index d492864..0000000
--- a/home/programs/webapps.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{config, ...}: {
-  imports = [
-    ../util/firefox-webapp.nix
-  ];
-  programs.firefox.webapps = {
-    "Microsoft-Teams" = {
-      url = "https://teams.microsoft.com";
-      id = 1;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "Microsoft Teams";
-      icon = ./icons/ms_teams.png;
-    };
-    "Facebook-Messenger" = {
-      url = "https://www.messenger.com";
-      id = 2;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "Facebook Messenger";
-      icon = ./icons/fb_msg.png;
-    };
-    "Syncthing" = {
-      url = "http://127.0.0.1:8384";
-      id = 3;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "Syncthing";
-      icon = ./icons/syncthing.png;
-    };
-    "StudyTAFE" = {
-      url = "https://www.studytafensw.edu.au";
-      id = 4;
-      extraSettings = config.programs.firefox.profiles.default.settings;
-      name = "TAFE Study";
-      icon = ./icons/tafe.jpg;
-    };
-  };
-}
diff --git a/home/programs/flatpak.nix b/home/util/flatpak.nix
similarity index 100%
rename from home/programs/flatpak.nix
rename to home/util/flatpak.nix