diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index 90134ef..fe2f611 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -53,8 +53,8 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.geoclue2.enable = true;
-  services.tlp.enable = true;
-  services.thermald.enable = true;
+  # services.tlp.enable = true;
+  # services.thermald.enable = true;
 
   # Enable sound.
   sound.enable = true;
@@ -95,12 +95,12 @@
     description = "Aria Nolan";
   };
 
-  programs.river.enable = true;
-  programs.river.extraPackages = with pkgs; [
-    swaylock
-    swayidle
-    brightnessctl
-  ];
+  # programs.river.enable = true;
+  # programs.river.extraPackages = with pkgs; [
+  #   swaylock
+  #   swayidle
+  #   brightnessctl
+  # ];
 
   programs.sway.enable = true;
   programs.sway.wrapperFeatures.gtk = true;
@@ -108,6 +108,7 @@
     swaylock
     swayidle
     brightnessctl
+    wl-mirror
   ];
 
   programs.waybar.enable = true;
@@ -117,6 +118,7 @@
     systemPackages = with pkgs; [
       vim
       exfat
+      ntfs3g
     ];
     defaultPackages = with pkgs; [
       perl
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 604fd82..5e1056d 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -15,6 +15,7 @@
     packages = with pkgs; [
       rnote
       libreoffice
+      notify-desktop
       texlive.combined.scheme-medium
       libsixel
       aspell
@@ -30,7 +31,7 @@
       jetbrains-mono
       fira-code
       mononoki
-      iosevka
+      inter
       (nerdfonts.override {fonts = ["FiraCode"];})
       gnupg
       pandoc
diff --git a/users/tacocat/programs/default.nix b/users/tacocat/programs/default.nix
index a677d81..f3a6d11 100644
--- a/users/tacocat/programs/default.nix
+++ b/users/tacocat/programs/default.nix
@@ -4,6 +4,7 @@
     ./git.nix
     ./taskwarrior.nix
     ./firefox.nix
+    # ./thunderbird.nix
   ];
 
   programs.eza = {
diff --git a/users/tacocat/programs/firefox.nix b/users/tacocat/programs/firefox.nix
index e4bedb6..4a004f4 100644
--- a/users/tacocat/programs/firefox.nix
+++ b/users/tacocat/programs/firefox.nix
@@ -50,6 +50,7 @@
           aria2-integration
           sponsorblock
           xbrowsersync
+          sidebery
         ];
         settings = {
           "browser.aboutConfig.showWarning" = false;
@@ -69,6 +70,7 @@
           "browser.urlbar.suggest.trending" = false;
           "browser.tabs.firefox-view" = false;
           "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+          "browser.toolbars.bookmarks.visibility" = "never";
         };
         search = {
           force = true;
@@ -120,7 +122,7 @@
         userChrome = ''
           @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
           * {
-              font-family: "mononoki" !important;
+              font-family: "Inter" !important;
               font-size: 14px !important;
 
               --arrowpanel-background: ${theme.base00} !important;
@@ -156,6 +158,7 @@
               background-color: ${theme.base02} !important;
               border-radius: 0px !important;
               margin-block: 0px !important;
+              min-height: 0px !important;
           }
           .tabbrowser-tab:hover .tab-background {
               background-color: ${theme.base09} !important;
@@ -177,6 +180,18 @@
           #TabsToolbar {
               z-index: 1000 !important;
           }
+          #firefox-view-button {
+            visibility: collapse;
+          }
+          #alltabs-button {
+            visibility: collapse;
+          }
+          hbox.titlebar-spacer:nth-child(3) {
+            visibility: collapse;
+          }
+          hbox.titlebar-buttonbox-container:nth-child(5) {
+            visibility: collapse;
+          }
           #mainPopupSet menupopup,
           menupopup:not(.in-menulist) > menuitem,
           menupopup:not(.in-menulist) > menu {
@@ -228,6 +243,9 @@
           #tabbrowser-tabs {
             -moz-box-flex: 1 !important;
             text-align: center !important;
+            border-inline-start: 0px !important;
+            padding-inline-start: 0px !important;
+            margin-inline-start: 0px !important;
           }
           #tabs-newtab-button{
             display: none !important;
@@ -327,6 +345,22 @@
               padding-inline: var(--urlbarView-item-inline-padding) 18px;
               opacity: 0.6;
           }
+          :root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
+          :root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
+            toolbarbutton:not(#firefox-view-button),
+            toolbarpaletteitem:not(#wrapper-firefox-view-button)
+          ) + #tabbrowser-tabs {
+            border-inline-start: 0px !important;
+            padding-inline-start: 0px !important;
+            margin-inline-start: 0px !important;
+          }
+          .tab-icon-stack {
+            display: none;
+          }
+          .tab-label {
+            white-space: nowrap;
+            line-height: 2 !important;  /* override 'normal' in case of fallback math fonts with huge metrics */
+          }
         '';
         userContent = ''
           @namespace url("http://www.w3.org/1999/xhtml");
@@ -345,7 +379,7 @@
           }
           @-moz-document url("about:newtab"), url("about:home") {
               * {
-                  font-family: "mononoki" !important;
+                  font-family: "Inter" !important;
               }
               body {
                   background-color: ${theme.base00} !important;
diff --git a/users/tacocat/programs/taskwarrior.nix b/users/tacocat/programs/taskwarrior.nix
index eb1c4f8..38a4be4 100644
--- a/users/tacocat/programs/taskwarrior.nix
+++ b/users/tacocat/programs/taskwarrior.nix
@@ -1,5 +1,24 @@
 {...}: {
   programs.taskwarrior = {
     enable = true;
+    config = {
+      dateformat = "Y-M-D H:N";
+      report.list.columns = [
+        "id"
+        "entry.age"
+        "scheduled"
+        "due"
+        "description"
+        "urgency"
+      ];
+      report.list.labels = [
+        "ID"
+        "Age"
+        "Sched"
+        "Due"
+        "Description"
+        "Urg"        
+      ];
+    };
   };
 }
diff --git a/users/tacocat/programs/thunderbird.nix b/users/tacocat/programs/thunderbird.nix
new file mode 100644
index 0000000..7a5953f
--- /dev/null
+++ b/users/tacocat/programs/thunderbird.nix
@@ -0,0 +1,5 @@
+{...}: {
+  programs.thunderbird = {
+    enable = true;
+  };
+}
diff --git a/users/tacocat/shell/default.nix b/users/tacocat/shell/default.nix
index 810bf01..beabc35 100644
--- a/users/tacocat/shell/default.nix
+++ b/users/tacocat/shell/default.nix
@@ -13,7 +13,6 @@
     settings = {
       add_newline = false;
       format = lib.concatStrings [
-        "$shlvl"
         "$directory"
         "$git_branch"
         "$git_commit"
@@ -29,9 +28,9 @@
       scan_timeout = 10;
       git_commit.tag_disabled = false;
       git_status = {
-        ahead = ''⇡''${count}'';
-        behind = ''⇣''${count}'';
-        diverged = ''⇕⇡''${ahead_count}⇣''${behind_count}'';
+        ahead = ''↑''${count}'';
+        behind = ''↓''${count}'';
+        diverged = ''↕↑''${ahead_count}⇣''${behind_count}'';
         staged = "+$count";
       };
       nix_shell = {
@@ -40,10 +39,17 @@
         pure_msg = "ρ";
         symbol = "❄️";
       };
-      # character = {
-      #   success_symbol = "[%](bold green)";
-      #   error_symbol = "[%](bold red)";
-      # };
+      directory = {
+        read_only = " ";
+      };
+      character = {
+        # success_symbol = "[)](bold green)";
+        # error_symbol = "[)](bold red)";
+        # vimcmd_symbol = "[(](bold green)";
+        # vimcmd_replace_one_symbol = "[(](bold purple)]";
+        # vimcmd_replace_symbol = "[(](bold purple)]";
+        # vimcmd_visual_symbol = "[(](bold yellow)]";
+      };
     };
   };
 }
diff --git a/users/tacocat/wayland/default.nix b/users/tacocat/wayland/default.nix
index 59848db..f0f5383 100644
--- a/users/tacocat/wayland/default.nix
+++ b/users/tacocat/wayland/default.nix
@@ -4,14 +4,6 @@
     ./foot.nix
   ];
 
-  xdg.configFile."river" = {
-    source = ./river;
-    executable = true;
-    recursive = true;
-  };
-
-  xdg.configFile."river/background.jpg".source = ../background.jpg;
-
   xdg.configFile."sway" = {
     source = ./sway;
     executable = true;
@@ -22,9 +14,6 @@
 
   home.packages = with pkgs; [
     wl-clipboard
-    # swaylock
-    # swayidle
-    wbg
     dunst
     grim
     slurp
diff --git a/users/tacocat/wayland/sway/config b/users/tacocat/wayland/sway/config
index 7de8c8f..1b57364 100755
--- a/users/tacocat/wayland/sway/config
+++ b/users/tacocat/wayland/sway/config
@@ -251,6 +251,9 @@ bindsym $mod+r mode "resize"
 #     }
 # }
 
+# Screenshot
+    bindsym Print exec IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy && notify-desktop "Screenshot has been saved and copied to your clipboard" -a "grim" -u normal -t 2000
+
 #
 # Player
 #
@@ -270,8 +273,8 @@ bindsym $mod+r mode "resize"
 
 # Backlight
 #
-    # bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob 
-    # bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob
+    # bindsym XF86MonBrightnessUp exec brightnessctl s +5%
+    # bindsym XF86MonBrightnessDown exec brightnessctl s 5%-
 #
 
 # SwayFX
diff --git a/users/tacocat/wayland/sway/config.d/autostart b/users/tacocat/wayland/sway/config.d/autostart
index 7ab84a8..77cdb65 100755
--- a/users/tacocat/wayland/sway/config.d/autostart
+++ b/users/tacocat/wayland/sway/config.d/autostart
@@ -1,5 +1,5 @@
 exec nm-applet
-exec systemctl --user restart wireplumber
+# exec systemctl --user restart wireplumber
 exec gammastep-indicator
 exec dunst
 #exec swayidle -w \