diff --git a/home/firefox/work.nix b/home/firefox/work.nix
index 664d9610..03f66aff 100644
--- a/home/firefox/work.nix
+++ b/home/firefox/work.nix
@@ -2,6 +2,14 @@
   imports = [./default.nix];
   programs.firefox.profiles.default = {
     settings."browser.startup.homepage" = "https://nucleus.ukaea.uk";
+    search.engines."JET Pulse" = {
+      urls = [{template = "https://data.jet.uk/dashboard/pulses/{searchTerms}/overview";}];
+      definedAliases = ["@p"];
+    };
+    search.engines."JET Dashboard" = {
+      urls = [{template = "https://data.jet.uk/dashboard/sessions/?search_for={searchTerms}";}];
+      definedAliases = ["@jd"];
+    };
     bookmarks = [
       {
         name = "toolbar";
@@ -56,6 +64,10 @@
             tags = ["JET" "operations"];
             url = "https://www.jspo.jet.uk/";
           }
+          {
+            name = "J2 Roster";
+            url = "https://apps.powerapps.com/play/e/default-c6ac664b-ae27-4d5d-b4e6-bb5717196fc7/a/c403a9ad-95e0-47b7-8c82-752b22a6d6f5?tenantId=c6ac664b-ae27-4d5d-b4e6-bb5717196fc7&source=portal";
+          }
           {
             name = "OpenWikis";
             bookmarks = [
@@ -79,6 +91,11 @@
                 tags = ["JET" "operations" "wiki"];
                 url = "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals";
               }
+              {
+                name = "DCO Wiki";
+                tags = ["JET" "operations" "wiki"];
+                url = "https://wiki.jetdata.eu/open/index.php?title=Diagnostic_Coordinator_Wiki";
+              }
             ];
           }
           {
diff --git a/home/shell/default.nix b/home/shell/default.nix
index 9dcbb2f1..e4f43b6e 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -31,8 +31,11 @@
     starship.enable = true;
     taskwarrior = {
       enable = true;
-      colorTheme = "dark-violets-256";
+      colorTheme = ./taskwarrior.theme;
     };
   };
-  xdg.configFile."starship.toml".source = ./starship.toml;
+  xdg.configFile = {
+    "starship.toml".source = ./starship.toml;
+    "pypoetry/config.toml".source = ./pypoetry.toml;
+  };
 }
diff --git a/home/shell/config/pypoetry/config.toml b/home/shell/pypoetry.toml
similarity index 100%
rename from home/shell/config/pypoetry/config.toml
rename to home/shell/pypoetry.toml
diff --git a/home/shell/starship.toml b/home/shell/starship.toml
index 79f0bfda..cad43313 100644
--- a/home/shell/starship.toml
+++ b/home/shell/starship.toml
@@ -11,13 +11,7 @@ palette = "catppuccin_macchiato"
 
 [directory]
 fish_style_pwd_dir_length = 1
-read_only = "󰌾"
-
-# [directory.substitutions]  # Disables fish_style_pwd_dir_length
-# "Documents" = " "
-# "Downloads" = " "
-# "Music" = " "
-# "Pictures" = " "
+read_only = "󰌾 "
 
 [character]
 success_symbol = "[ ](green)"
@@ -26,80 +20,21 @@ error_symbol = "[ ](red)"
 [line_break]
 disabled = false
 
-[aws]
-symbol = "  "
-
-[buf]
-symbol = " "
-
-[c]
-symbol = " "
-
-[conda]
-symbol = " "
-
-[dart]
-symbol = " "
-
-[docker_context]
-symbol = " "
-
-[elixir]
-symbol = " "
-
-[elm]
-symbol = " "
-
 [git_branch]
-symbol = "󰊢 "
+symbol = " "
 
 [git_metrics]
 disabled = false
 
-[golang]
-symbol = " "
-
-[guix_shell]
-symbol = " "
-
-[haskell]
-symbol = " "
-
-[haxe]
-symbol = "⌘ "
-
 [hostname]
+ssh_only = false
 ssh_symbol = "󰢹 "
 style = "bold green"
 
-[hg_branch]
-symbol = " "
-
-[java]
-symbol = " "
-
-[julia]
-symbol = " "
-
-[lua]
-symbol = " "
-
 [memory_usage]
-symbol = " "
+symbol = "󰍛 "
 disabled = false
 
-[meson]
-symbol = "喝 "
-
-[nim]
-symbol = " "
-
-[nix_shell]
-symbol = " "
-
-[nodejs]
-symbol = " "
-
 [os]
 format = "on [$symbol $name ]($style)"
 style = "bold blue"
@@ -107,69 +42,63 @@ disabled = false
 
 [os.symbols]
 Alpine = " "
-Amazon = " "
 Android = " "
 Arch = " "
 CentOS = " "
 Debian = " "
-DragonFly = " "
-Emscripten = " "
-EndeavourOS = " "
+EndeavourOS = " "
 Fedora = " "
 FreeBSD = " "
-Garuda = "﯑ "
 Gentoo = " "
-HardenedBSD = "ﲊ "
-Illumos = " "
+Illumos = " "
 Linux = " "
 Macos = " "
 Manjaro = " "
-Mariner = " "
-MidnightBSD = " "
-Mint = " "
-NetBSD = " "
+Mint = "󰣭 "
 NixOS = " "
-OpenBSD = " "
+OpenBSD = " "
 openSUSE = " "
-OracleLinux = " "
-Pop = " "
+Pop = " "
 Raspbian = " "
 Redhat = " "
 RedHatEnterprise = " "
-Redox = " "
-Solus = "ﴱ "
+Solus = " "
 SUSE = " "
 Ubuntu = " "
-Unknown = " "
-Windows = " "
+Unknown = " "
+Windows = " "
 
 [package]
-symbol = " "
-
-[php]
-symbol = ""
-
-[python]
-symbol = " "
-
-[rlang]
-symbol = "ﳒ "
-
-[ruby]
-symbol = " "
-
-[rust]
-symbol = " "
-
-[scala]
-symbol = " "
+symbol = " "
 
 [shell]
 format = "using [$indicator ]($style)"
 disabled = false
 
-[spack]
-symbol = "🅢 "
+[sudo]
+symbol = "󰪋 "
+disabled = false
+
+[docker_context]
+symbol = " "
+
+[julia]
+symbol = " "
+
+[lua]
+symbol = " "
+
+[nix_shell]
+symbol = " "
+
+[python]
+symbol = " "
+
+[rlang]
+symbol = " "
+
+[rust]
+symbol = " "
 
 [palettes.catppuccin_macchiato]
 rosewater = "#f4dbd6"
diff --git a/home/shell/taskwarrior.theme b/home/shell/taskwarrior.theme
new file mode 100644
index 00000000..86f4344e
--- /dev/null
+++ b/home/shell/taskwarrior.theme
@@ -0,0 +1,75 @@
+# Theme colors for catppuccin
+
+# General decoration
+color.label=magenta
+color.label.sort=magenta
+color.alternate=
+color.header=cyan
+color.footnote=yellow
+color.warning=bold red
+color.error=white on red
+color.debug=blue
+
+# Task state
+color.completed=black
+color.deleted=red
+color.active=green
+color.recurring=blue
+color.scheduled=white on green
+color.until=yellow
+color.blocked=black on white
+color.blocking=black on bright white
+
+# Project
+color.project.none=red
+
+# Priority
+color.uda.priority.H=bold white
+color.uda.priority.M=white
+color.uda.priority.L=
+
+# Tags
+color.tag.next=bold yellow
+color.tag.none=
+color.tagged=
+
+# Due
+color.due=red
+color.due.today=red
+color.overdue=bold red
+
+# UDA
+#color.uda.X=
+
+# Report: burndown
+color.burndown.done=on green
+color.burndown.pending=on magenta
+color.burndown.started=on blue
+
+# Report: history
+color.history.add=black on blue
+color.history.delete=black on red
+color.history.done=black on green
+
+# Report: summary
+color.summary.background=
+color.summary.bar=black on green
+
+# Command: calendar
+color.calendar.due=red
+color.calendar.due.today=underline bold red
+color.calendar.holiday=black on bright yellow
+color.calendar.overdue=bold white on bright red
+color.calendar.scheduled=green
+color.calendar.today=black on cyan
+color.calendar.weekend=black
+color.calendar.weeknumber=bold blue
+
+# Command: sync
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+
+# Command: undo
+color.undo.after=green
+color.undo.before=red